[MediaWiki-commits] [Gerrit] Update namespaces in Konkani gom-deva - change (mediawiki/core)

[Gerrit Patch Uploader (Code Review)]

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: Update namespaces in Konkani gom-deva
..

Update namespaces in Konkani gom-deva

Replaces 7 namespace names

Bug: T129315
Change-Id: Ia51b9bb7eb9c0cfc241bb9b71dba4e6c99842684
---
M languages/messages/MessagesGom_deva.php
1 file changed, 8 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/292777/1

diff --git a/languages/messages/MessagesGom_deva.php 
b/languages/messages/MessagesGom_deva.php
index fc65e58..fb7eeb3 100644
--- a/languages/messages/MessagesGom_deva.php
+++ b/languages/messages/MessagesGom_deva.php
@@ -7,16 +7,17 @@
  * @file
  *
  * @author Darshan kandolkar
+ * @author The Discoverer
  */
 
 $fallback = 'hi';
 
 $namespaceNames = [
-   NS_MEDIA=> 'मिडिया',
+   NS_MEDIA=> 'माध्यम',
NS_SPECIAL  => 'विशेश',
NS_TALK => 'चर्चा',
-   NS_USER => 'उपेगकर्तो',
-   NS_USER_TALK=> 'उपेगकर्तो_चर्चा',
+   NS_USER => 'वापरपी',
+   NS_USER_TALK=> 'वापरपी_चर्चा',
NS_PROJECT_TALK => '$1_चर्चा',
NS_FILE => 'फायल',
NS_FILE_TALK=> 'फायल_चर्चा',
@@ -24,8 +25,8 @@
NS_MEDIAWIKI_TALK   => 'मिडियाविकी_चर्चा',
NS_TEMPLATE => 'प्रारूप',
NS_TEMPLATE_TALK=> 'प्रारूप_चर्चा',
-   NS_HELP => 'मजत',
-   NS_HELP_TALK=> 'मजत_चर्चा',
-   NS_CATEGORY => 'श्रेणी',
-   NS_CATEGORY_TALK=> 'श्रेणी_चर्चा',
+   NS_HELP => 'आदार',
+   NS_HELP_TALK=> 'आदार_चर्चा',
+   NS_CATEGORY => 'वर्ग',
+   NS_CATEGORY_TALK=> 'वर्ग_चर्चा',
 ];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia51b9bb7eb9c0cfc241bb9b71dba4e6c99842684
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: The Discoverer 

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

[MediaWiki-commits] [Gerrit] i18n: Use https: scheme for HSTS external links - change (mediawiki/core)

[Link Mauve (Code Review)]

Link Mauve has uploaded a new change for review.

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

Change subject: i18n: Use https: scheme for HSTS external links
..

i18n: Use https: scheme for HSTS external links

When the local wiki is accessed in HTTP, clicking an external link
starting with // will (if this is the first visit) do an unencrypted
HTTP call to the target server before being redirected to the HTTPS
version, potentially allowing a man in the middle attack.

This commit changes the URI scheme to https: for every link with HSTS
enabled in the codebase, namely www.mediawiki.org, *.wikimedia.org,
*.wikipedia.org, translatewiki.net and bugs.php.net.

Change-Id: I002b502952f32fb49823e18b281252977ecca8cf
---
M includes/installer/i18n/af.json
M includes/installer/i18n/aln.json
M includes/installer/i18n/am.json
M includes/installer/i18n/an.json
M includes/installer/i18n/ang.json
M includes/installer/i18n/ar.json
M includes/installer/i18n/ary.json
M includes/installer/i18n/arz.json
M includes/installer/i18n/as.json
M includes/installer/i18n/ast.json
M includes/installer/i18n/az.json
M includes/installer/i18n/ba.json
M includes/installer/i18n/bar.json
M includes/installer/i18n/bcc.json
M includes/installer/i18n/bcl.json
M includes/installer/i18n/be-tarask.json
M includes/installer/i18n/be.json
M includes/installer/i18n/bg.json
M includes/installer/i18n/bgn.json
M includes/installer/i18n/bjn.json
M includes/installer/i18n/bn.json
M includes/installer/i18n/bpy.json
M includes/installer/i18n/br.json
M includes/installer/i18n/bs.json
M includes/installer/i18n/ca.json
M includes/installer/i18n/ce.json
M includes/installer/i18n/ceb.json
M includes/installer/i18n/ckb.json
M includes/installer/i18n/cps.json
M includes/installer/i18n/crh-cyrl.json
M includes/installer/i18n/crh-latn.json
M includes/installer/i18n/cs.json
M includes/installer/i18n/cv.json
M includes/installer/i18n/cy.json
M includes/installer/i18n/da.json
M includes/installer/i18n/de-ch.json
M includes/installer/i18n/de-formal.json
M includes/installer/i18n/de.json
M includes/installer/i18n/diq.json
M includes/installer/i18n/dsb.json
M includes/installer/i18n/dtp.json
M includes/installer/i18n/el.json
M includes/installer/i18n/en-gb.json
M includes/installer/i18n/en.json
M includes/installer/i18n/eo.json
M includes/installer/i18n/es-formal.json
M includes/installer/i18n/es.json
M includes/installer/i18n/et.json
M includes/installer/i18n/eu.json
M includes/installer/i18n/ext.json
M includes/installer/i18n/fa.json
M includes/installer/i18n/fi.json
M includes/installer/i18n/fo.json
M includes/installer/i18n/fr.json
M includes/installer/i18n/frc.json
M includes/installer/i18n/frp.json
M includes/installer/i18n/frr.json
M includes/installer/i18n/fy.json
M includes/installer/i18n/ga.json
M includes/installer/i18n/gag.json
M includes/installer/i18n/gan-hans.json
M includes/installer/i18n/gan-hant.json
M includes/installer/i18n/gd.json
M includes/installer/i18n/gl.json
M includes/installer/i18n/gom-latn.json
M includes/installer/i18n/grc.json
M includes/installer/i18n/gsw.json
M includes/installer/i18n/gu.json
M includes/installer/i18n/hak.json
M includes/installer/i18n/he.json
M includes/installer/i18n/hi.json
M includes/installer/i18n/hif-latn.json
M includes/installer/i18n/hil.json
M includes/installer/i18n/hr.json
M includes/installer/i18n/hrx.json
M includes/installer/i18n/hsb.json
M includes/installer/i18n/ht.json
M includes/installer/i18n/hu-formal.json
M includes/installer/i18n/hu.json
M includes/installer/i18n/hy.json
M includes/installer/i18n/ia.json
M includes/installer/i18n/id.json
M includes/installer/i18n/ig.json
M includes/installer/i18n/io.json
M includes/installer/i18n/is.json
M includes/installer/i18n/it.json
M includes/installer/i18n/ja.json
M includes/installer/i18n/jam.json
M includes/installer/i18n/jut.json
M includes/installer/i18n/jv.json
M includes/installer/i18n/ka.json
M includes/installer/i18n/kaa.json
M includes/installer/i18n/kbd-cyrl.json
M includes/installer/i18n/kiu.json
M includes/installer/i18n/kk-arab.json
M includes/installer/i18n/kk-cyrl.json
M includes/installer/i18n/kk-latn.json
M includes/installer/i18n/km.json
M includes/installer/i18n/kn.json
M includes/installer/i18n/ko.json
M includes/installer/i18n/krc.json
M includes/installer/i18n/ksh.json
M includes/installer/i18n/ku-latn.json
M includes/installer/i18n/lad.json
M includes/installer/i18n/lb.json
M includes/installer/i18n/lfn.json
M includes/installer/i18n/lg.json
M includes/installer/i18n/li.json
M includes/installer/i18n/lki.json
M includes/installer/i18n/lt.json
M includes/installer/i18n/lv.json
M includes/installer/i18n/lzh.json
M includes/installer/i18n/lzz.json
M includes/installer/i18n/mai.json
M includes/installer/i18n/mdf.json
M includes/installer/i18n/mg.json
M includes/installer/i18n/min.json
M includes/installer/i18n/mk.json
M includes/installer/i18n/ml.json
M 

[MediaWiki-commits] [Gerrit] Remove bits URL from make-css-assets.bash - change (apps...wikipedia)

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review.

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

Change subject: Remove bits URL from make-css-assets.bash
..

Remove bits URL from make-css-assets.bash

Since bits is being decommissioned (see T107430, T132969).

Change-Id: Ie81f1095cace7d2b3c421d85dc144d79c5fe8eb7
---
M scripts/make-css-assets.bash
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/scripts/make-css-assets.bash b/scripts/make-css-assets.bash
index ef9322d..bbe4b3d 100755
--- a/scripts/make-css-assets.bash
+++ b/scripts/make-css-assets.bash
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-#PREFIX="http://bits.beta.wmflabs.org/en.wikipedia.beta.wmflabs.org;
 PREFIX="http://127.0.0.1:8080/w;
 BASE_PATH="`dirname $0`/.."
 

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

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

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

[MediaWiki-commits] [Gerrit] Update CSS files - change (apps...wikipedia)

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review.

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

Change subject: Update CSS files
..

Update CSS files

Pulled in recent updates via Vagrant & make-css-assets.bash.

Change-Id: I24a1f77091c76262c289253c0dc0c04859003447
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
2 files changed, 78 insertions(+), 74 deletions(-)


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

diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index a12cc6e..60d7ec2 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -55,8 +55,8 @@
   margin: 0;
   padding: 0;
   border: 0;
-  font-size: 100%;
   font: inherit;
+  font-size: 100%;
   vertical-align: baseline;
   background: none;
 }
@@ -95,7 +95,7 @@
   font-size: 100%;
 }
 body {
-  font-family: "Helvetica Neue", "Helvetica", "Nimbus Sans L", "Arial", 
"Liberation Sans", sans-serif;
+  font-family: 'Helvetica Neue', 'Helvetica', 'Nimbus Sans L', 'Arial', 
'Liberation Sans', sans-serif;
   line-height: 1.4;
   color: #252525;
   background: #fff;
@@ -184,7 +184,7 @@
 h4,
 h5,
 h6 {
-  font-family: "Linux Libertine", Georgia, Times, serif;
+  font-family: 'Linux Libertine', 'Georgia', ' Times', serif;
   line-height: 1.3;
   word-wrap: break-word;
   word-break: break-word;
@@ -210,9 +210,9 @@
   font-weight: bold;
 }
 blockquote {
-  font-family: "Linux Libertine", Georgia, Times, serif;
+  font-family: 'Linux Libertine', 'Georgia', ' Times', serif;
   font-size: 1.1em;
-  quotes: "\201C" "\201D";
+  quotes: '\201C' '\201D';
   padding: 1em 25px 1em 30px;
   position: relative;
   overflow: hidden;
@@ -382,7 +382,6 @@
 
 FIXME: Review all of these hacks to see if they still apply.
 */
-.content .sistersitebox,
 .content .tmbox,
 .content .ambox,
 .content #coordinates,
@@ -441,7 +440,7 @@
   column-width: 35em;
 }
 .references li:target {
-  background-color: #ddeeff;
+  background-color: #def;
 }
 .hatnote,
 .dablink,
@@ -479,40 +478,42 @@
 }
 
 /* With a group set */
-span.mw-ref a[data-mw-group]::after {
-   content: "[" attr(data-mw-group) " " counter(mw-Ref, decimal) "]"}
+span.mw-ref a[data-mw-group]:after {
+   content: '[' attr( data-mw-group ) ' ' counter( mw-Ref, decimal ) ']';
+}
 
 /* Groups with special appearance */
-span.mw-ref a[data-mw-group="decimal"]::after {
-   content: "[" counter(mw-Ref, decimal) "]";
+span.mw-ref a[data-mw-group='decimal']:after {
+   content: '[' counter( mw-Ref, decimal ) ']';
 }
-span.mw-ref a[data-mw-group="lower-alpha"]::after {
-   content: "[" counter(mw-Ref, lower-alpha) "]";
+span.mw-ref a[data-mw-group='lower-alpha']:after {
+   content: '[' counter( mw-Ref, lower-alpha ) ']';
 }
-span.mw-ref a[data-mw-group="upper-alpha"]::after {
-   content: "[" counter(mw-Ref, upper-alpha) "]";
+span.mw-ref a[data-mw-group='upper-alpha']:after {
+   content: '[' counter( mw-Ref, upper-alpha ) ']';
 }
-span.mw-ref a[data-mw-group="lower-greek"]::after {
-   content: "[" counter(mw-Ref, lower-greek) "]";
+span.mw-ref a[data-mw-group='lower-greek']:after {
+   content: '[' counter( mw-Ref, lower-greek ) ']';
 }
-span.mw-ref a[data-mw-group="lower-roman"]::after {
-   content: "[" counter(mw-Ref, lower-roman) "]";
+span.mw-ref a[data-mw-group='lower-roman']:after {
+   content: '[' counter( mw-Ref, lower-roman ) ']';
 }
-span.mw-ref a[data-mw-group="upper-roman"]::after {
-   content: "[" counter(mw-Ref, upper-roman) "]";
+span.mw-ref a[data-mw-group='upper-roman']:after {
+   content: '[' counter( mw-Ref, upper-roman ) ']';
 }
-span.mw-ref a[data-mw-group="error-test"]::after {
-   content: "[" counter(mw-Ref, symbols(cyclic "first" "second" "last!")) 
"]";
+span.mw-ref a[data-mw-group='error-test']:after {
+   content: '[' counter( mw-Ref, symbols( cyclic 'first' 'second' 'last!' 
) ) ']';
 }
 
 /* Without a group */
-span.mw-ref a::after {
-   content: "[" counter(mw-Ref, decimal) "]";
+span.mw-ref a:after {
+   content: '[' counter( mw-Ref, decimal ) ']';
 }
 
 /* Hide the default rendering in browsers that support content
- * generation by selecting for ::after pseudo-element.*/
-x-thereisnoelementwiththisname::after, span.mw-reflink-text {
+ * generation by selecting for :after pseudo-element.*/
+x-thereisnoelementwiththisname:after,
+span.mw-reflink-text {
display: none;
 }
 
@@ -525,29 +526,30 @@
counter-increment: mw-ref-linkback;
 }
 
-[rel="mw:referencedBy"] {
+[rel='mw:referencedBy'] {
counter-reset: mw-ref-linkback -1;
 }
 
-[rel="mw:referencedBy"]::before {
-   content: "↑ ";
+[rel='mw:referencedBy']:before {
+   content: '↑ ';
 }
 
-span[rel="mw:referencedBy"] a::before {
+span[rel='mw:referencedBy'] a:before {
counter-increment: mw-ref-linkback;
-   content: counters(mw-ref-linkback, 

[MediaWiki-commits] [Gerrit] Add extra_param to pass to the ORES service and use precaching - change (mediawiki...ORES)

[jenkins-bot (Code Review)]

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

Change subject: Add extra_param to pass to the ORES service and use precaching
..


Add extra_param to pass to the ORES service and use precaching

Change-Id: I4be941b08bdff6639a3b852343abc6ef33112921
---
M includes/FetchScoreJob.php
M includes/Hooks.php
M includes/Scoring.php
3 files changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/includes/FetchScoreJob.php b/includes/FetchScoreJob.php
index ff73692..7cfa446 100644
--- a/includes/FetchScoreJob.php
+++ b/includes/FetchScoreJob.php
@@ -18,7 +18,8 @@
public function run() {
$logger = LoggerFactory::getInstance( 'ORES' );
$logger->info( 'Fetching scores for revision ' . json_encode( 
$this->params ) );
-   $scores = Scoring::instance()->getScores( 
$this->params['revid'] );
+   $scores = Scoring::instance()->getScores(
+   $this->params['revid'], null, 
$this->params['extra_params'] );
Cache::instance()->storeScores( $scores );
$logger->debug( 'Stored scores: ' . json_encode( $scores ) );
 
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 60a2ba7..f8c5ff7 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -50,6 +50,7 @@
] );
$job = new FetchScoreJob( $rc->getTitle(), [
'revid' => $revid,
+   'extra_params' => [ 'precache' => 'true' ],
] );
JobQueueGroup::singleton()->push( $job );
$logger->debug( 'Job pushed for {revid}', [
diff --git a/includes/Scoring.php b/includes/Scoring.php
index a7f1c81..09579c8 100644
--- a/includes/Scoring.php
+++ b/includes/Scoring.php
@@ -7,19 +7,22 @@
 * @param integer|array $revisions Single or multiple revisions
 * @param string|array|null $models Single or multiple model names.  If
 * left empty, all configured models are queries.
+* @param array $params extra params to be passed to ORES endpoint
 * @return array Results in the form returned by ORES
 * @throws \RuntimeException
 */
-   public function getScores( $revisions, $models = null ) {
+   public function getScores( $revisions, $models = null, array 
$extra_params = [] ) {
if ( !$models ) {
global $wgOresModels;
$models = array_keys( array_filter( $wgOresModels ) );
}
 
-   $wireData = Api::request( [
+   $params = [
'models' => implode( '|', (array) $models ),
'revids' => implode( '|', (array) $revisions ),
-   ] );
+   ];
+
+   $wireData = Api::request( array_merge( $params, $extra_params ) 
);
return $wireData;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4be941b08bdff6639a3b852343abc6ef33112921
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Legoktm 
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] Cache phrase suggest settings - change (mediawiki...CirrusSearch)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Cache phrase suggest settings
..

Cache phrase suggest settings

I was profiling our test suite and this came up at 6% of the total
runtime. It's not a crazy amount, but it's significant enough we could
probably throw it into the local cache and give our users (and our
tests) a better experience.

Change-Id: Idb4897fe8a2eda7a019db3a661a0671bcffe3bab
---
M profiles/PhraseSuggesterProfiles.php
1 file changed, 12 insertions(+), 5 deletions(-)


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

diff --git a/profiles/PhraseSuggesterProfiles.php 
b/profiles/PhraseSuggesterProfiles.php
index 77ebc5a..5c923db 100644
--- a/profiles/PhraseSuggesterProfiles.php
+++ b/profiles/PhraseSuggesterProfiles.php
@@ -223,11 +223,18 @@
$wgCirrusSearchPhraseSuggestPrefixLengthHardLimit,
$wgCirrusSearchPhraseSuggestAllowedMode;
 
-   $source = wfMessage( 'cirrussearch-didyoumean-settings' 
)->inContentLanguage();
-   if ( !$source || $source->isDisabled() ) {
-   return;
-   }
-   $lines = Util::parseSettingsInMessage( $source->plain() );
+   $cache = \ObjectCache::getLocalServerInstance()
+   $lines = $cache->getWithSetCallback(
+   $cache->makeKey( 'cirrussearch-didyoumean-settings' ),
+   600,
+   function () {
+   $source = wfMessage( 
'cirrussearch-didyoumean-settings' )->inContentLanguage();
+   if ( !$source || $source->isDisabled() ) {
+   return array()
+   }
+   return Util::parseSettingsInMessage( 
$source->plain() );
+   }
+   );
 
// Keep original alpha or discount settings
if ( isset ( 
$wgCirrusSearchPhraseSuggestSettings['smoothing_model']['laplace']['alpha'] ) ) 
{

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb4897fe8a2eda7a019db3a661a0671bcffe3bab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
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] redirect moon.wikimedia.org to meta page - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: redirect moon.wikimedia.org to meta page
..

redirect moon.wikimedia.org to meta page

Bug:T136557
Change-Id: I9066da317e003aef4813eae1565c8209c2fbcddc
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/modules/mediawiki/files/apache/sites/redirects.conf 
b/modules/mediawiki/files/apache/sites/redirects.conf
index 146d71e..2f71613 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -309,6 +309,7 @@
ServerAlias labs.wikimedia.org
ServerAlias labsconsole.wikimedia.org
ServerAlias coffee.wikimedia.org
+   ServerAlias moon.wikimedia.org
ServerAlias techblog.wikimedia.org
ServerAlias dev.wikimedia.org
ServerAlias old-bugzilla.wikimedia.org
@@ -850,6 +851,9 @@
# funnelcoffee.wikimedia.org
//en.wikipedia.org/wiki/Hyper_Text_Coffee_Pot_Control_Protocol
RewriteCond %{HTTP_HOST} =coffee.wikimedia.org
RewriteRule . 
%{ENV:RW_PROTO}://en.wikipedia.org/wiki/Hyper_Text_Coffee_Pot_Control_Protocol 
[R=301,L,NE]
+   # funnelmoon.wikimedia.org  
//meta.wikimedia.org/wiki/Wikipedia_to_the_Moon
+   RewriteCond %{HTTP_HOST} =moon.wikimedia.org
+   RewriteRule . 
%{ENV:RW_PROTO}://meta.wikimedia.org/wiki/Wikipedia_to_the_Moon [R=301,L,NE]
# rewrite   techblog.wikimedia.org  //blog.wikimedia.org
RewriteCond %{HTTP_HOST} =techblog.wikimedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://blog.wikimedia.org$0 
[R=301,L,NE]
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 86367c0..c03d135 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -418,6 +418,9 @@
 # coffee - keep for historic reasons:)
 funnel coffee.wikimedia.org
//en.wikipedia.org/wiki/Hyper_Text_Coffee_Pot_Control_Protocol
 
+# moon - T136557
+funnel moon.wikimedia.org  //meta.wikimedia.org/wiki/Wikipedia_to_the_Moon
+
 # wikipediazero.org - T82495
 funnel *wikipediazero.org  //wikimediafoundation.org/wiki/Wikipedia_Zero
 

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

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

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

[MediaWiki-commits] [Gerrit] add moon.wikimedia.org, point to cluster - change (operations/dns)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: add moon.wikimedia.org, point to cluster
..

add moon.wikimedia.org, point to cluster

Bug:T136557
Change-Id: Ia54153b424e6aa0e84dc4b3da5e4ef664e398d79
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/71/292771/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 0f52725..e0eaf3d 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -664,6 +664,7 @@
 labsconsole  600 IN DYNA geoip!text-addrs
 logstash 600 IN DYNA geoip!misc-addrs
 metrics  600 IN DYNA geoip!misc-addrs
+moon 600 IN DYNA geoip!text-addrs
 noc  600 IN DYNA geoip!misc-addrs
 nyc  600 IN DYNA geoip!text-addrs
 old-bugzilla 600 IN DYNA geoip!text-addrs

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

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

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

[MediaWiki-commits] [Gerrit] aptrepo: make owners of incoming dir configurable - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: aptrepo: make owners of incoming dir configurable
..


aptrepo: make owners of incoming dir configurable

For different uses (apt.wm vs. releases.wm) we have
different users/groups owning the incoming directory.

Now that we use the same module for them we need to make
it configurable too, for uploads to work like before.

This is not changing the actual owner/group from how it was
before, it's restoring carbon and bromine as they were.

Bug:T132757
Change-Id: I62ecadc06c98b0a4e9e8b755a930e6c5cb38a206
---
M modules/aptrepo/manifests/init.pp
M modules/role/manifests/aptrepo/wikimedia.pp
2 files changed, 11 insertions(+), 5 deletions(-)

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



diff --git a/modules/aptrepo/manifests/init.pp 
b/modules/aptrepo/manifests/init.pp
index 1ac50b3..6339177 100644
--- a/modules/aptrepo/manifests/init.pp
+++ b/modules/aptrepo/manifests/init.pp
@@ -13,6 +13,8 @@
 #   - *uploaders*: A list of uploaders instructions (see "uploaders file")
 #   - *incomingdir*: Path considered for incoming uploads.
 #   - *incomingconf*: Name of a template with config options for incoming 
uploads. (conf/incoming)
+#   - *incominguser*: The user name that owns the incoming directory.
+#   - *incominggroup*: The group name that owns the incoming directory.
 #   - *default_distro*: The default distribution if none specified.
 #   - *gpg_secring*: The GPG secret keyring for reprepro to use.
 #   - *gpg_pubring*: The GPG public keyring for reprepro to use.
@@ -36,6 +38,8 @@
 $uploaders   = [],
 $incomingdir = 'incoming',
 $incomingconf= 'incoming',
+$incominguser= 'reprepro',
+$incominggroup   = 'reprepro',
 $default_distro  = 'jessie',
 $gpg_secring = undef,
 $gpg_pubring = undef,
@@ -124,12 +128,11 @@
 require => User['reprepro'],
 }
 
-# Allow wikidev users to upload to /srv/wikimedia/incoming
 file { "${basedir}/incoming":
 ensure => directory,
 mode   => '1775',
-owner  => 'root',
-group  => 'wikidev',
+owner  => $incominguser,
+group  => $incominggroup,
 }
 
 file { "${basedir}/logs":
diff --git a/modules/role/manifests/aptrepo/wikimedia.pp 
b/modules/role/manifests/aptrepo/wikimedia.pp
index 6aa5c81..14485e9 100644
--- a/modules/role/manifests/aptrepo/wikimedia.pp
+++ b/modules/role/manifests/aptrepo/wikimedia.pp
@@ -4,8 +4,11 @@
 $basedir = '/srv/wikimedia'
 
 class { '::aptrepo':
-basedir  => $basedir,
-incomingconf => 'incoming-wikimedia',
+basedir   => $basedir,
+incomingconf  => 'incoming-wikimedia',
+incominguser  => 'root',
+# Allow wikidev users to upload to /srv/wikimedia/incoming
+incominggroup => 'wikidev',
 }
 
 file { "${basedir}/conf/distributions":

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

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

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

[MediaWiki-commits] [Gerrit] aptrepo: make owners of incoming dir configurable - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: aptrepo: make owners of incoming dir configurable
..

aptrepo: make owners of incoming dir configurable

For different uses (apt.wm vs. releases.wm) we have
different users/groups owning the incoming directory.

Now that we use the same module for them we need to make
it configurable too, for uploads to work like before.

This is not changing the actual owner/group from how it was
before, it's restoring carbon and bromine as they were.

Bug:T132757
Change-Id: I62ecadc06c98b0a4e9e8b755a930e6c5cb38a206
---
M modules/aptrepo/manifests/init.pp
M modules/role/manifests/aptrepo/wikimedia.pp
2 files changed, 11 insertions(+), 5 deletions(-)


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

diff --git a/modules/aptrepo/manifests/init.pp 
b/modules/aptrepo/manifests/init.pp
index 1ac50b3..6339177 100644
--- a/modules/aptrepo/manifests/init.pp
+++ b/modules/aptrepo/manifests/init.pp
@@ -13,6 +13,8 @@
 #   - *uploaders*: A list of uploaders instructions (see "uploaders file")
 #   - *incomingdir*: Path considered for incoming uploads.
 #   - *incomingconf*: Name of a template with config options for incoming 
uploads. (conf/incoming)
+#   - *incominguser*: The user name that owns the incoming directory.
+#   - *incominggroup*: The group name that owns the incoming directory.
 #   - *default_distro*: The default distribution if none specified.
 #   - *gpg_secring*: The GPG secret keyring for reprepro to use.
 #   - *gpg_pubring*: The GPG public keyring for reprepro to use.
@@ -36,6 +38,8 @@
 $uploaders   = [],
 $incomingdir = 'incoming',
 $incomingconf= 'incoming',
+$incominguser= 'reprepro',
+$incominggroup   = 'reprepro',
 $default_distro  = 'jessie',
 $gpg_secring = undef,
 $gpg_pubring = undef,
@@ -124,12 +128,11 @@
 require => User['reprepro'],
 }
 
-# Allow wikidev users to upload to /srv/wikimedia/incoming
 file { "${basedir}/incoming":
 ensure => directory,
 mode   => '1775',
-owner  => 'root',
-group  => 'wikidev',
+owner  => $incominguser,
+group  => $incominggroup,
 }
 
 file { "${basedir}/logs":
diff --git a/modules/role/manifests/aptrepo/wikimedia.pp 
b/modules/role/manifests/aptrepo/wikimedia.pp
index 6aa5c81..14485e9 100644
--- a/modules/role/manifests/aptrepo/wikimedia.pp
+++ b/modules/role/manifests/aptrepo/wikimedia.pp
@@ -4,8 +4,11 @@
 $basedir = '/srv/wikimedia'
 
 class { '::aptrepo':
-basedir  => $basedir,
-incomingconf => 'incoming-wikimedia',
+basedir   => $basedir,
+incomingconf  => 'incoming-wikimedia',
+incominguser  => 'root',
+# Allow wikidev users to upload to /srv/wikimedia/incoming
+incominggroup => 'wikidev',
 }
 
 file { "${basedir}/conf/distributions":

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

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

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

[MediaWiki-commits] [Gerrit] Use 'noform' error when appropriate - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Use 'noform' error when appropriate
..


Use 'noform' error when appropriate

Instead of error-default

Change-Id: I99bd506de3fef95816a2394dbfa9cced58e65c7a
---
M gateway_common/gateway.adapter.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 2d072dd..2b8394e 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -3283,6 +3283,10 @@
} else {
//Invalid form. Go get one that is valid, and squawk in 
the error logs.
$new_ff = GatewayFormChooser::getOneValidForm( 
$country, $currency, $payment_method, $payment_submethod, $recurring, $gateway 
);
+   if ( empty( $new_ff ) && $this->getGlobal( 'RapidFail' 
) ) {
+   // No valid form exists and we want to display 
an error without a redirect
+   $new_ff = 'error-noform';
+   }
$this->addRequestData( array ( 'ffname' => $new_ff ) );
 
//now construct a useful error message

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: FIXMEs
..


FIXMEs

Change-Id: I385ffc8828df7e4d0a4bf5589ddfa5742d30a662
---
M DonationInterfaceFormSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/DonationInterfaceFormSettings.php 
b/DonationInterfaceFormSettings.php
index 8792db7..d1e0db7 100644
--- a/DonationInterfaceFormSettings.php
+++ b/DonationInterfaceFormSettings.php
@@ -328,6 +328,7 @@
'countries' => array('-' => 'VN')
 );
 
+// FIXME: is this still needed?
 /* Special case for Vietnam while GC is still having problems.
  * In the meantime: Visa & Mastercard, USD-only.
  */
@@ -442,7 +443,6 @@
 $forms_whitelist['paypal'] = array(
'gateway' => 'paypal',
'payment_methods' => array('paypal' => 'ALL'),
-   // FIXME: 'redirect' is not necessary?
 );
 
 $forms_whitelist['paypal-recurring'] = array(

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

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

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

[MediaWiki-commits] [Gerrit] Remove FormDir and filename for Mustache forms - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Remove FormDir and filename for Mustache forms
..


Remove FormDir and filename for Mustache forms

Clean up some globals and form settings

Bug: T86248
Change-Id: I08887bea91c59ab72488bc28a8567c0e912d7340
---
M DonationInterface.php
M DonationInterfaceFormSettings.php
M tests/FormChooserTest.php
3 files changed, 1 insertion(+), 22 deletions(-)

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



diff --git a/DonationInterface.php b/DonationInterface.php
index ac8181e..8819abc 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -409,8 +409,6 @@
 $wgPaypalGatewayTestingURL = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
 $wgPaypalGatewayRecurringLength = '0'; // 0 should mean forever
 
-$wgPaypalGatewayHtmlFormDir = __DIR__ . '/paypal_gateway/forms/html';
-
 $wgPaypalGatewayXclickCountries = array();
 
 #  $wgPaypalGatewayAccountInfo['example'] = array(
@@ -431,8 +429,6 @@
 $wgPaypalExpressGatewayURL = 'https://api-3t.paypal.com/nvp';
 $wgPaypalExpressGatewayTestingURL = 'https://api-3t.sandbox.paypal.com/nvp';
 
-$wgAdyenGatewayHtmlFormDir = __DIR__ . '/adyen_gateway/forms/html';
-
 $wgAdyenGatewayURL = 'https://live.adyen.com';
 $wgAdyenGatewayTestingURL = 'https://test.adyen.com';
 
@@ -442,7 +438,6 @@
 #  'SkinCode' => '';
 #  );
 
-$wgAstroPayGatewayHtmlFormDir = __DIR__ . '/astropay_gateway/forms/html';
 // Set base URLs here.  Individual transactions have their own paths
 $wgAstroPayGatewayURL = 'https://astropaycard.com/';
 $wgAstroPayGatewayTestingURL = 'https://sandbox.astropaycard.com/';
@@ -1201,10 +1196,8 @@
  * Base directories for each gateway's form templates.
  */
 $wgDonationInterfaceFormDirs = array(
-   'adyen' => $wgAdyenGatewayHtmlFormDir,
'default' => $wgDonationInterfaceHtmlFormDir,
'gc' => $wgGlobalCollectGatewayHtmlFormDir,
-   'paypal' => $wgPaypalGatewayHtmlFormDir,
'worldpay' => $wgWorldpayGatewayHtmlFormDir,
 );
 
diff --git a/DonationInterfaceFormSettings.php 
b/DonationInterfaceFormSettings.php
index 8f31231..8792db7 100644
--- a/DonationInterfaceFormSettings.php
+++ b/DonationInterfaceFormSettings.php
@@ -440,14 +440,12 @@
  */
 
 $forms_whitelist['paypal'] = array(
-   'file' => $form_dirs['paypal'] . '/paypal.html',
'gateway' => 'paypal',
'payment_methods' => array('paypal' => 'ALL'),
// FIXME: 'redirect' is not necessary?
 );
 
 $forms_whitelist['paypal-recurring'] = array(
-   'file' => $form_dirs['paypal'] . '/paypal-recurring.html',
'gateway' => 'paypal',
'payment_methods' => array('paypal' => 'ALL'),
'recurring',
@@ -461,7 +459,6 @@
  * AstroPay *
  /
 $forms_whitelist['astropay'] = array(
-   'file' => __DIR__ . '/gateway_forms/mustache/index.html.mustache',
'gateway' => 'astropay',
'countries' => array( '+' => 'BR' ),
'currencies' => array( '+' => 'BRL' ),
@@ -488,7 +485,6 @@
'selection_weight' => 110,
 );
 $forms_whitelist['astropay-ar'] = array(
-   'file' => __DIR__ . '/gateway_forms/mustache/index.html.mustache',
'gateway' => 'astropay',
'countries' => array( '+' => 'AR' ),
'currencies' => array( '+' => 'ARS' ),
@@ -516,7 +512,6 @@
'selection_weight' => 110,
 );
 $forms_whitelist['astropay-cl'] = array(
-   'file' => __DIR__ . '/gateway_forms/mustache/index.html.mustache',
'gateway' => 'astropay',
'countries' => array( '+' => 'CL' ),
'currencies' => array( '+' => 'CLP' ),
@@ -538,7 +533,6 @@
'selection_weight' => 110,
 );
 $forms_whitelist['astropay-co'] = array(
-   'file' => __DIR__ . '/gateway_forms/mustache/index.html.mustache',
'gateway' => 'astropay',
'countries' => array( '+' => 'CO' ),
'currencies' => array( '+' => 'COP' ),
@@ -560,7 +554,6 @@
'selection_weight' => 110,
 );
 $forms_whitelist['astropay-mx'] = array(
-   'file' => __DIR__ . '/gateway_forms/mustache/index.html.mustache',
'gateway' => 'astropay',
'countries' => array( '+' => 'MX' ),
'currencies' => array( '+' => 'MXN' ),
@@ -581,7 +574,6 @@
'selection_weight' => 110,
 );
 $forms_whitelist['astropay-uy'] = array(
-   'file' => __DIR__ . '/gateway_forms/mustache/index.html.mustache',
'gateway' => 'astropay',
'countries' => array( '+' => 'UY' ),
'currencies' => array( '+' => 'UYU' ),
@@ -597,7 +589,6 @@
  * Adyen *
  **/
 $forms_whitelist['adyen'] = array(
-   'file' => __DIR__ . '/gateway_forms/mustache/index.html.mustache',
'gateway' => 'adyen',
'countries' => array( '+' => array( 'FR', 'IL', 'JP', 'UA', 'US', ), ),
'currencies' => array( '+' => array( 'EUR', 'ILS', 'JPY', 'UAH', 'USD', 
), ),
@@ -623,7 +614,6 @@
 
 // Worldpay 

[MediaWiki-commits] [Gerrit] revisiondelete: Fix $oldBits/$newBits usage in setVisibility() - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: revisiondelete: Fix $oldBits/$newBits usage in setVisibility()
..


revisiondelete: Fix $oldBits/$newBits usage in setVisibility()

This addresses the FIXME comment around updateLog()

Change-Id: Iedb9df0b4cf65308a6b58bd9d9295d1850bc2c28
---
M includes/logging/DeleteLogFormatter.php
M includes/revisiondelete/RevDelList.php
2 files changed, 14 insertions(+), 3 deletions(-)

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



diff --git a/includes/logging/DeleteLogFormatter.php 
b/includes/logging/DeleteLogFormatter.php
index f9b7875..c205626 100644
--- a/includes/logging/DeleteLogFormatter.php
+++ b/includes/logging/DeleteLogFormatter.php
@@ -61,6 +61,7 @@
&& in_array( $params[3], [ 'revision', 
'archive', 'oldimage', 'filearchive' ] )
)
) {
+   // See 
RevDelList::getLogParams()/RevDelLogList::getLogParams()
$paramStart = $subtype === 'revision' ? 4 : 3;
 
$old = $this->parseBitField( 
$params[$paramStart + 1] );
diff --git a/includes/revisiondelete/RevDelList.php 
b/includes/revisiondelete/RevDelList.php
index 79d66a9..87e641d 100644
--- a/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@ -125,7 +125,13 @@
$status->itemStatuses = [];
}
 
+   // For multi-item deletions, set the old/new bitfields in 
log_params such that "hid X"
+   // shows in logs if field X was hidden from ANY item and 
likewise for "unhid Y". Note the
+   // form does not let the same field get hidden and unhidden in 
different items at once.
+   $virtualOldBits = 0;
+   $virtualNewBits = 0;
$logType = 'delete';
+
// @codingStandardsIgnoreStart 
Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
for ( $this->reset(); $this->current(); $this->next() ) {
// @codingStandardsIgnoreEnd
@@ -187,6 +193,11 @@
if ( ( $oldBits | $newBits ) & 
$this->getSuppressBit() ) {
$logType = 'suppress';
}
+   // Track which fields where (un)hidden for each 
item
+   $addedBits = ( $oldBits ^ $newBits ) & $newBits;
+   $removedBits = ( $oldBits ^ $newBits ) & 
$oldBits;
+   $virtualNewBits |= $addedBits;
+   $virtualOldBits |= $removedBits;
 
$status->successCount++;
if ( $item->getAuthorId() > 0 ) {
@@ -228,14 +239,13 @@
}
 
// Log it
-   // @FIXME: $newBits/$oldBits set in for loop, makes IDE 
warnings too
$this->updateLog(
$logType,
[
'title' => $this->title,
'count' => $successCount,
-   'newBits' => $newBits,
-   'oldBits' => $oldBits,
+   'newBits' => $virtualNewBits,
+   'oldBits' => $virtualOldBits,
'comment' => $comment,
'ids' => $idsForLog,
'authorIds' => $authorIds,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iedb9df0b4cf65308a6b58bd9d9295d1850bc2c28
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ores: deprecate flower - change (operations/puppet)

[Anonymous Coward (Code Review)]

ladsgr...@gmail.com has uploaded a new change for review.

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

Change subject: ores: deprecate flower
..

ores: deprecate flower

We use graphite now, removed the role already in
https://wikitech.wikimedia.org/w/index.php?oldid=610289

Bug: T137003
Change-Id: I7d37e7143f1ef8b58ee40e0f7937aaae2f098dc2
---
D modules/ores/manifests/flower.pp
D modules/role/manifests/labs/ores/flower.pp
2 files changed, 0 insertions(+), 20 deletions(-)


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

diff --git a/modules/ores/manifests/flower.pp b/modules/ores/manifests/flower.pp
deleted file mode 100644
index cb8acb7..000
--- a/modules/ores/manifests/flower.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# = Class: ores::flower
-# Sets up a private flower instance to monitor celery
-#
-# Users should use ssh port forwarding to access the
-# instance.
-class ores::flower {
-require ores::base
-
-celery::flower { 'ores':
-app => 'ores_celery.application',
-working_dir => $ores::base::config_path,
-user=> 'www-data',
-group   => 'www-data',
-celery_bin_path => "${ores::base::venv_path}/bin/celery",
-}
-}
diff --git a/modules/role/manifests/labs/ores/flower.pp 
b/modules/role/manifests/labs/ores/flower.pp
deleted file mode 100644
index 3345d61..000
--- a/modules/role/manifests/labs/ores/flower.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class role::labs::ores::flower {
-include ::ores::flower
-include ::role::labs::ores::redisproxy
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d37e7143f1ef8b58ee40e0f7937aaae2f098dc2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ladsgr...@gmail.com

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

[MediaWiki-commits] [Gerrit] Bump version after release - change (mediawiki...parsoid)

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review.

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

Change subject: Bump version after release
..

Bump version after release

Change-Id: Iaed8279cb06c0c7b55940b1e4aed3f8b21262e79
---
M npm-shrinkwrap.json
M package.json
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4d6642f..5ab9cd9 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "parsoid",
-  "version": "0.4.1-git",
+  "version": "0.5.1-git",
   "npm-shrinkwrap-version": "200.4.0",
   "node-version": "v0.10.26",
   "dependencies": {
diff --git a/package.json b/package.json
index 2f0d05e..d13191e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "parsoid",
   "description": "Mediawiki parser for the VisualEditor.",
-  "version": "0.4.1+git",
+  "version": "0.5.1+git",
   "license": "GPL-2.0+",
   "dependencies": {
 "async": "^0.9.0",

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

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

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

[MediaWiki-commits] [Gerrit] aptrepo: set separate incoming conf for releases - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: aptrepo: set separate incoming conf for releases
..


aptrepo: set separate incoming conf for releases

After we made this configurable, make the actual "default"
config used on releases the default and set a separate one
for the config of apt.wm.org on carbon to make uploads from tin
work again as before.

Bug:T132757
Change-Id: I83b49fbb5a83208483532f9018dc1319c3dbd0c2
---
A modules/aptrepo/templates/incoming-wikimedia.erb
M modules/aptrepo/templates/incoming.erb
M modules/role/manifests/aptrepo/wikimedia.pp
3 files changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/modules/aptrepo/templates/incoming-wikimedia.erb 
b/modules/aptrepo/templates/incoming-wikimedia.erb
new file mode 100644
index 000..fc864ca
--- /dev/null
+++ b/modules/aptrepo/templates/incoming-wikimedia.erb
@@ -0,0 +1,4 @@
+Name: default
+IncomingDir: <%= @incomingdir %>
+TempDir: /tmp
+Allow: precise-wikimedia trusty-wikimedia jessie-wikimedia 
precise>precise-wikimedia trusty>trusty-wikimedia jessie->jessie-wikimedia
diff --git a/modules/aptrepo/templates/incoming.erb 
b/modules/aptrepo/templates/incoming.erb
index fc864ca..19315cb 100644
--- a/modules/aptrepo/templates/incoming.erb
+++ b/modules/aptrepo/templates/incoming.erb
@@ -1,4 +1,4 @@
 Name: default
 IncomingDir: <%= @incomingdir %>
-TempDir: /tmp
-Allow: precise-wikimedia trusty-wikimedia jessie-wikimedia 
precise>precise-wikimedia trusty>trusty-wikimedia jessie->jessie-wikimedia
+TempDir: tmp
+Default: <% @default_distro %>
diff --git a/modules/role/manifests/aptrepo/wikimedia.pp 
b/modules/role/manifests/aptrepo/wikimedia.pp
index 8c39cd1..6aa5c81 100644
--- a/modules/role/manifests/aptrepo/wikimedia.pp
+++ b/modules/role/manifests/aptrepo/wikimedia.pp
@@ -4,7 +4,8 @@
 $basedir = '/srv/wikimedia'
 
 class { '::aptrepo':
-basedir => $basedir,
+basedir  => $basedir,
+incomingconf => 'incoming-wikimedia',
 }
 
 file { "${basedir}/conf/distributions":

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

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

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

[MediaWiki-commits] [Gerrit] aptrepo: make conf/incoming configurable parameter - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: aptrepo: make conf/incoming configurable parameter
..


aptrepo: make conf/incoming configurable parameter

Because we have 2 use cases for aptrepo, carbon (apt.wm) and bromine
(releases.wm) with different config for incoming uploads, we need
to make this configurable.

Adds a parameter incomingconf to set to a template name
that will have the content of ./reprepro/conf/incoming.

Bug:T132757
Change-Id: Ibaf755e1e92f8cf3907665ea86bf054bc96d0da1
---
M modules/aptrepo/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/aptrepo/manifests/init.pp 
b/modules/aptrepo/manifests/init.pp
index 6aa0865..1ac50b3 100644
--- a/modules/aptrepo/manifests/init.pp
+++ b/modules/aptrepo/manifests/init.pp
@@ -12,6 +12,7 @@
 #   - *options*: A list of options for reprepro (see conf/options file).
 #   - *uploaders*: A list of uploaders instructions (see "uploaders file")
 #   - *incomingdir*: Path considered for incoming uploads.
+#   - *incomingconf*: Name of a template with config options for incoming 
uploads. (conf/incoming)
 #   - *default_distro*: The default distribution if none specified.
 #   - *gpg_secring*: The GPG secret keyring for reprepro to use.
 #   - *gpg_pubring*: The GPG public keyring for reprepro to use.
@@ -34,6 +35,7 @@
 $options = [],
 $uploaders   = [],
 $incomingdir = 'incoming',
+$incomingconf= 'incoming',
 $default_distro  = 'jessie',
 $gpg_secring = undef,
 $gpg_pubring = undef,
@@ -103,7 +105,7 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => template('aptrepo/incoming.erb'),
+content => template("aptrepo/${incomingconf}.erb"),
 }
 
 file { "${basedir}/conf/log":

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

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

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

[MediaWiki-commits] [Gerrit] aptrepo: set separate incoming conf for releases - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: aptrepo: set separate incoming conf for releases
..

aptrepo: set separate incoming conf for releases

After we made this configurable, make the actual "default"
config used on releases the default and set a separate one
for the config of apt.wm.org on carbon to make uploads from tin
work again as before.

Bug:T132757
Change-Id: I83b49fbb5a83208483532f9018dc1319c3dbd0c2
---
A modules/aptrepo/templates/incoming-wikimedia.erb
M modules/aptrepo/templates/incoming.erb
M modules/role/manifests/aptrepo/wikimedia.pp
3 files changed, 8 insertions(+), 3 deletions(-)


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

diff --git a/modules/aptrepo/templates/incoming-wikimedia.erb 
b/modules/aptrepo/templates/incoming-wikimedia.erb
new file mode 100644
index 000..fc864ca
--- /dev/null
+++ b/modules/aptrepo/templates/incoming-wikimedia.erb
@@ -0,0 +1,4 @@
+Name: default
+IncomingDir: <%= @incomingdir %>
+TempDir: /tmp
+Allow: precise-wikimedia trusty-wikimedia jessie-wikimedia 
precise>precise-wikimedia trusty>trusty-wikimedia jessie->jessie-wikimedia
diff --git a/modules/aptrepo/templates/incoming.erb 
b/modules/aptrepo/templates/incoming.erb
index fc864ca..19315cb 100644
--- a/modules/aptrepo/templates/incoming.erb
+++ b/modules/aptrepo/templates/incoming.erb
@@ -1,4 +1,4 @@
 Name: default
 IncomingDir: <%= @incomingdir %>
-TempDir: /tmp
-Allow: precise-wikimedia trusty-wikimedia jessie-wikimedia 
precise>precise-wikimedia trusty>trusty-wikimedia jessie->jessie-wikimedia
+TempDir: tmp
+Default: <% @default_distro %>
diff --git a/modules/role/manifests/aptrepo/wikimedia.pp 
b/modules/role/manifests/aptrepo/wikimedia.pp
index 8c39cd1..6aa5c81 100644
--- a/modules/role/manifests/aptrepo/wikimedia.pp
+++ b/modules/role/manifests/aptrepo/wikimedia.pp
@@ -4,7 +4,8 @@
 $basedir = '/srv/wikimedia'
 
 class { '::aptrepo':
-basedir => $basedir,
+basedir  => $basedir,
+incomingconf => 'incoming-wikimedia',
 }
 
 file { "${basedir}/conf/distributions":

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

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

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

[MediaWiki-commits] [Gerrit] More cleanup around GatewayPage constructor - change (mediawiki...DonationInterface)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: More cleanup around GatewayPage constructor
..

More cleanup around GatewayPage constructor

Set the language up front, so we have it for the displayFailPage in
the catch block. Remove isFailed flag and just do the stuff in catch.

Also move the hook registration down to where we know we're going to
try showing an actual adapter form.

Finally, clean up some test constructor stuff we don't need since
awight fixed the page titles.

Change-Id: I581ebeae5c2b6a1726082b9bb37cdcecd91463c8
---
M gateway_common/GatewayPage.php
M tests/includes/test_page/TestingAmazonGateway.php
M tests/includes/test_page/TestingGlobalCollectGateway.php
M tests/includes/test_page/TestingWorldpayGateway.php
4 files changed, 12 insertions(+), 40 deletions(-)


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

diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index 4ffcb61..8bca2d4 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -53,12 +53,6 @@
protected $logger;
 
/**
-* If set to true in constructor, execute() should immediately display 
fail page
-* @var bool
-*/
-   private $isFailed = false;
-
-   /**
 * Constructor
 */
public function __construct() {
@@ -74,6 +68,14 @@
public function execute( $par ) {
global $wgContributionTrackingFundraiserMaintenance, 
$wgContributionTrackingFundraiserMaintenanceUnsched;
 
+   // FIXME: Deprecate "language" param.
+   $language = $this->getRequest()->getVal( 'language' );
+   if ( $language ) {
+   $this->getContext()->setLanguage( $language );
+   global $wgLang;
+   $wgLang = $this->getContext()->getLanguage(); // 
BackCompat
+   }
+
try {
$className = $this->getAdapterClass();
$this->adapter = new $className;
@@ -87,28 +89,16 @@
);
}
$this->logger->error(
-   "Exception in GatewayPage constructor with 
adapter class {$this->getAdapterClass()}: " .
+   "Exception setting up GatewayPage with adapter 
class {$this->getAdapterClass()}: " .

"{$ex->getMessage()}\n{$ex->getTraceAsString()}"
);
-   $this->isFailed = true;
-   }
-
-   Hooks::register( 'MakeGlobalVariablesScript', array( 
$this->adapter, 'setClientVariables' ) );
-
-   // FIXME: Deprecate "language" param.
-   $language = $this->getRequest()->getVal( 'language' );
-   if ( $language ) {
-   $this->getContext()->setLanguage( $language );
-   global $wgLang;
-   $wgLang = $this->getContext()->getLanguage(); // 
BackCompat
-   }
-
-   if ( $this->isFailed ) {
-   // Constructor catastrophe, no point in continuing
+   // Setup scrambled, no point in continuing
$this->displayFailPage();
return;
}
 
+   Hooks::register( 'MakeGlobalVariablesScript', array( 
$this->adapter, 'setClientVariables' ) );
+
if ( $this->adapter->getGlobal( 'Enabled' ) !== true ) {
$this->logger->info( 'Displaying fail page for disabled 
gateway' );
$this->displayFailPage();
diff --git a/tests/includes/test_page/TestingAmazonGateway.php 
b/tests/includes/test_page/TestingAmazonGateway.php
index 66e6128..60c42e5 100644
--- a/tests/includes/test_page/TestingAmazonGateway.php
+++ b/tests/includes/test_page/TestingAmazonGateway.php
@@ -4,8 +4,4 @@
 
protected $adapterClass = 'TestingAmazonAdapter';
 
-   public function __construct() {
-   GatewayPage::__construct();
-   $this->mName = 'AmazonGateway'; // So as not to add a useless 
l10n message
-   }
 }
diff --git a/tests/includes/test_page/TestingGlobalCollectGateway.php 
b/tests/includes/test_page/TestingGlobalCollectGateway.php
index ee9cf85..da6d4de 100644
--- a/tests/includes/test_page/TestingGlobalCollectGateway.php
+++ b/tests/includes/test_page/TestingGlobalCollectGateway.php
@@ -29,11 +29,4 @@
 
protected $adapterClass = 'TestingGlobalCollectAdapter';
 
-   public function __construct() {
-   GatewayPage::__construct(); //DANGER: See main class comments.
-   // Don't want untranslated 'TestingGlobalCollectGateway' to 
foul our tests,
-   // 

[MediaWiki-commits] [Gerrit] Handle error-default form in Mustache - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Handle error-default form in Mustache
..


Handle error-default form in Mustache

And use more general text than the CC decline form's "Your payment
could not be accepted". This is the fallback, so they may not have
tried to pay us yet.

Bug: T131995
Change-Id: I7144534fbdda1f6a46d0264da99633657e0aab09
---
M gateway_forms/MustacheErrorForm.php
M gateway_forms/mustache/error_form.html.mustache
2 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/gateway_forms/MustacheErrorForm.php 
b/gateway_forms/MustacheErrorForm.php
index 53058c1..3346610 100644
--- a/gateway_forms/MustacheErrorForm.php
+++ b/gateway_forms/MustacheErrorForm.php
@@ -49,6 +49,7 @@
// set the appropriate header
$headers = array(
'error-cc' => 'php-response-declined',
+   'error-default' => 'donate_interface-error-msg-general',
'error-noform' => 'donate_interface-error-msg-general',
'maintenance' => 'donate_interface-maintenance-notice',
);
diff --git a/gateway_forms/mustache/error_form.html.mustache 
b/gateway_forms/mustache/error_form.html.mustache
index af8d63e..852bede 100644
--- a/gateway_forms/mustache/error_form.html.mustache
+++ b/gateway_forms/mustache/error_form.html.mustache
@@ -6,6 +6,9 @@
 {{# error-cc }}
 {{{ l10n "donate_interface-donate-error-try-again-html" 
ffname_retry ways_to_give problems_email }}}
 {{/ error-cc }}
+{{# error-default }}
+{{{ l10n "donate_interface-otherways" }}}
+{{/ error-default }}
 {{# error-noform }}
 {{{ l10n "donate_interface-error-no-form-html" ways_to_give 
problems_email }}}
 {{/ error-noform }}

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

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

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

[MediaWiki-commits] [Gerrit] aptrepo: make conf/incoming configurable parameter - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: aptrepo: make conf/incoming configurable parameter
..

aptrepo: make conf/incoming configurable parameter

Because we have 2 use cases for aptrepo, carbon (apt.wm) and bromine
(releases.wm) with different config for incoming uploads, we need
to make this configurable.

Adds a parameter incomingconf to set to a template name
that will have the content of ./reprepro/conf/incoming.

Bug:T132757
Change-Id: Ibaf755e1e92f8cf3907665ea86bf054bc96d0da1
---
M modules/aptrepo/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/292765/1

diff --git a/modules/aptrepo/manifests/init.pp 
b/modules/aptrepo/manifests/init.pp
index 6aa0865..1ac50b3 100644
--- a/modules/aptrepo/manifests/init.pp
+++ b/modules/aptrepo/manifests/init.pp
@@ -12,6 +12,7 @@
 #   - *options*: A list of options for reprepro (see conf/options file).
 #   - *uploaders*: A list of uploaders instructions (see "uploaders file")
 #   - *incomingdir*: Path considered for incoming uploads.
+#   - *incomingconf*: Name of a template with config options for incoming 
uploads. (conf/incoming)
 #   - *default_distro*: The default distribution if none specified.
 #   - *gpg_secring*: The GPG secret keyring for reprepro to use.
 #   - *gpg_pubring*: The GPG public keyring for reprepro to use.
@@ -34,6 +35,7 @@
 $options = [],
 $uploaders   = [],
 $incomingdir = 'incoming',
+$incomingconf= 'incoming',
 $default_distro  = 'jessie',
 $gpg_secring = undef,
 $gpg_pubring = undef,
@@ -103,7 +105,7 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => template('aptrepo/incoming.erb'),
+content => template("aptrepo/${incomingconf}.erb"),
 }
 
 file { "${basedir}/conf/log":

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

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

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

[MediaWiki-commits] [Gerrit] releases: delete unused role::releases::upload - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: releases: delete unused role::releases::upload
..


releases: delete unused role::releases::upload

This class has been renamed and moved to
role::microsites::releases::upload in Ie8dcd8ff0d8cf75,
I74c16340c44318876 but was not removed here as it should have been.

Change-Id: Icbf42299bb01c3863e3b9f108b42f349a5d6369d
---
M modules/role/manifests/microsites/releases.pp
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/modules/role/manifests/microsites/releases.pp 
b/modules/role/manifests/microsites/releases.pp
index 26f78f6..5beea6e 100644
--- a/modules/role/manifests/microsites/releases.pp
+++ b/modules/role/manifests/microsites/releases.pp
@@ -29,6 +29,3 @@
 backup::set { 'srv-org-wikimedia': }
 }
 
-class role::releases::upload {
-class { '::releases::reprepro::upload': }
-}

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

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

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

[MediaWiki-commits] [Gerrit] Move GatewayPage fun into the execute() method - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Move GatewayPage fun into the execute() method
..


Move GatewayPage fun into the execute() method

Change-Id: Ie1ad4101b2989939e4c2171bc69667fe9a0b3ee1
---
M gateway_common/GatewayPage.php
1 file changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index eacc7cb..4ffcb61 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -62,6 +62,18 @@
 * Constructor
 */
public function __construct() {
+   $me = get_called_class();
+   parent::__construct( $me );
+   }
+
+   /**
+* Show the special page
+*
+* @param $par Mixed: parameter passed to the page or null
+*/
+   public function execute( $par ) {
+   global $wgContributionTrackingFundraiserMaintenance, 
$wgContributionTrackingFundraiserMaintenanceUnsched;
+
try {
$className = $this->getAdapterClass();
$this->adapter = new $className;
@@ -80,18 +92,6 @@
);
$this->isFailed = true;
}
-
-   $me = get_called_class();
-   parent::__construct( $me );
-   }
-
-   /**
-* Show the special page
-*
-* @param $par Mixed: parameter passed to the page or null
-*/
-   public function execute( $par ) {
-   global $wgContributionTrackingFundraiserMaintenance, 
$wgContributionTrackingFundraiserMaintenanceUnsched;
 
Hooks::register( 'MakeGlobalVariablesScript', array( 
$this->adapter, 'setClientVariables' ) );
 

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

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

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

[MediaWiki-commits] [Gerrit] Add descriptive hints on nvaigation types to dialog names - change (oojs/ui)

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

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

Change subject: Add descriptive hints on nvaigation types to dialog names
..

Add descriptive hints on nvaigation types to dialog names

Adding descriptive hints what special navigation is to expect at
certain dialog. Also fixing small difference in “Indexed dialog”.

Change-Id: I802c2d62ed86faf93a14e8ae1aa26beb923eba38
---
M demos/pages/dialogs.js
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/64/292764/1

diff --git a/demos/pages/dialogs.js b/demos/pages/dialogs.js
index 8085dd3..a6b6032 100644
--- a/demos/pages/dialogs.js
+++ b/demos/pages/dialogs.js
@@ -434,7 +434,7 @@
IndexedDialog.parent.call( this, config );
}
OO.inheritClass( IndexedDialog, OO.ui.ProcessDialog );
-   IndexedDialog.static.title = 'Index dialog';
+   IndexedDialog.static.title = 'Indexed dialog';
IndexedDialog.static.actions = [
{ action: 'save', label: 'Done', flags: [ 'primary', 
'progressive' ] },
{ action: 'cancel', label: 'Cancel', flags: 'safe' }
@@ -789,21 +789,21 @@
}
},
{
-   name: 'Outlined booklet dialog',
+   name: 'Outlined booklet dialog (aside navigation)',
dialogClass: OutlinedBookletDialog,
config: {
size: 'medium'
}
},
{
-   name: 'Continuous outlined booklet dialog',
+   name: 'Continuous outlined booklet dialog (aside 
navigation)',
dialogClass: ContinuousOutlinedBookletDialog,
config: {
size: 'medium'
}
},
{
-   name: 'Indexed dialog',
+   name: 'Indexed dialog (tab navigation)',
dialogClass: IndexedDialog,
config: {
size: 'medium'

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

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

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

[MediaWiki-commits] [Gerrit] releases: delete unused role::releases::upload - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: releases: delete unused role::releases::upload
..

releases: delete unused role::releases::upload

This class has been renamed and moved to
role::microsites::releases::upload in Ie8dcd8ff0d8cf75,
I74c16340c44318876 but was not removed here as it should have been.

Change-Id: Icbf42299bb01c3863e3b9f108b42f349a5d6369d
---
M modules/role/manifests/microsites/releases.pp
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/modules/role/manifests/microsites/releases.pp 
b/modules/role/manifests/microsites/releases.pp
index 26f78f6..5beea6e 100644
--- a/modules/role/manifests/microsites/releases.pp
+++ b/modules/role/manifests/microsites/releases.pp
@@ -29,6 +29,3 @@
 backup::set { 'srv-org-wikimedia': }
 }
 
-class role::releases::upload {
-class { '::releases::reprepro::upload': }
-}

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

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

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

[MediaWiki-commits] [Gerrit] Restore bawiki logo - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Restore bawiki logo
..


Restore bawiki logo

Follows-up 3463cd6e which added a logo from the local wiki, but
at the time Bashkir Wikipedia was having their 10th anniversary.

In April 2015 they added code in MediaWiki:Common.css in order
to go back to their usual logo from Commons.

https://upload.wikimedia.org/wikipedia/commons/7/77/Wikipedia-logo-v2-ba.png
https://commons.wikimedia.org/wiki/File:Wikipedia-logo-v2-ba.png

Downloaded locally and run through `optipng -o7`.

Change-Id: I9632d2adbc6349f1fe7b29180bcea4a5ab0ab7fe
---
M static/images/project-logos/bawiki.png
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/static/images/project-logos/bawiki.png 
b/static/images/project-logos/bawiki.png
index d4fdc6e..4ece995 100644
--- a/static/images/project-logos/bawiki.png
+++ b/static/images/project-logos/bawiki.png
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9632d2adbc6349f1fe7b29180bcea4a5ab0ab7fe
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Follows-up 3463cd6e which added a logo from the local wiki, ... - change (operations/mediawiki-config)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: Follows-up 3463cd6e which added a logo from the local wiki, but 
at the time Bashkir Wikipedia was having their 10th anniversary.
..

Follows-up 3463cd6e which added a logo from the local wiki, but
at the time Bashkir Wikipedia was having their 10th anniversary.

In April 2015 they added code in MediaWiki:Common.css in order
to go back to their usual logo from Commons.

https://upload.wikimedia.org/wikipedia/commons/7/77/Wikipedia-logo-v2-ba.png
https://commons.wikimedia.org/wiki/File:Wikipedia-logo-v2-ba.png

Downloaded locally and run through `optipng -o7`.

Change-Id: I9632d2adbc6349f1fe7b29180bcea4a5ab0ab7fe
---
M static/images/project-logos/bawiki.png
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/static/images/project-logos/bawiki.png 
b/static/images/project-logos/bawiki.png
index d4fdc6e..4ece995 100644
--- a/static/images/project-logos/bawiki.png
+++ b/static/images/project-logos/bawiki.png
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9632d2adbc6349f1fe7b29180bcea4a5ab0ab7fe
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] Renamed var names for consistency - change (mediawiki...ZeroPortal)

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Renamed var names for consistency
..

Renamed var names for consistency

Change-Id: Ia24276ebc4760dbf113d7174ceb0c0dd55fb0857
---
M includes/ConfigPageHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroPortal 
refs/changes/61/292761/1

diff --git a/includes/ConfigPageHooks.php b/includes/ConfigPageHooks.php
index ce29293..a810d7c 100644
--- a/includes/ConfigPageHooks.php
+++ b/includes/ConfigPageHooks.php
@@ -21,9 +21,9 @@
 * @return bool
 */
static function isZeroConfigTitle( TitleValue $titleValue ) {
-   $jtv = JCSingleton::parseTitle( $titleValue );
+   $jct = JCSingleton::parseTitle( $titleValue );
 
-   return $jtv ? $jtv->getConfig()->model === 'JsonZeroConfig' : 
false;
+   return $jct ? $jct->getConfig()->model === 'JsonZeroConfig' : 
false;
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia24276ebc4760dbf113d7174ceb0c0dd55fb0857
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroPortal
Gerrit-Branch: master
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] Removed getDefaultAttributes() - change (mediawiki...Kartographer)

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Removed getDefaultAttributes()
..

Removed getDefaultAttributes()

Change-Id: I3bfabb65b8a5f9e818d2599a4c8487912afabd3f
---
M includes/Tag/MapFrame.php
M includes/Tag/MapLink.php
M includes/Tag/TagHandler.php
3 files changed, 14 insertions(+), 18 deletions(-)


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

diff --git a/includes/Tag/MapFrame.php b/includes/Tag/MapFrame.php
index 1ea7227..1165ee2 100644
--- a/includes/Tag/MapFrame.php
+++ b/includes/Tag/MapFrame.php
@@ -81,7 +81,7 @@
$output->addModules( 'ext.kartographer.live' );
 
 
-   $attrs = $this->getDefaultAttributes();
+   $attrs = [ 'class' => 'mw-kartographer', 
'mw-data' => 'interface' ];
$attrs['class'] .= ' 
mw-kartographer-interactive';
if ( isset( $alignClasses[$this->align] ) ) {
$attrs['class'] .= ' ' . 
$alignClasses[$this->align];
diff --git a/includes/Tag/MapLink.php b/includes/Tag/MapLink.php
index 1222eaa..db38eae 100644
--- a/includes/Tag/MapLink.php
+++ b/includes/Tag/MapLink.php
@@ -24,20 +24,17 @@
$output->addModules( 'ext.kartographer.live' );
$interact = $output->getExtensionData( 'kartographer_interact' 
);
if ( $interact === null ) {
-   $output->setExtensionData( 'kartographer_interact', [] 
);
+   $output->setExtensionData( 'kartographer_interact', [ ] 
);
}
 
// @todo: Mapbox markers don't support localized numbers yet
$text = $this->getText( 'text', null, '/\S+/' );
-   if ( $text === null ) {
-   $text = $this->counter
-   ?: CoordFormatter::format( $this->lat, 
$this->lon, $this->getLanguage() );
-   }
-   $text = $this->parser->recursiveTagParse( $text, $this->frame );
-   $style = $this->extractMarkerCss();
-   $attrs = $this->getDefaultAttributes();
 
-   $attrs['class'] .= ' mw-kartographer-link';
+   $attrs = [
+   'mw-data' => 'interface',
+   'class' => 'mw-kartographer-link',
+   ];
+   $style = $this->extractMarkerCss();
if ( $style ) {
$attrs['class'] .= ' mw-kartographer-autostyled';
$attrs['style'] = $style;
@@ -54,6 +51,13 @@
FormatJson::ALL_OK );
}
 
+   if ( $text === null ) {
+   $text =
+   $this->counter ?: CoordFormatter::format( 
$this->lat, $this->lon,
+   $this->getLanguage() );
+   }
+   $text = $this->parser->recursiveTagParse( $text, $this->frame );
+
return Html::rawElement( 'a', $attrs, $text );
}
 
diff --git a/includes/Tag/TagHandler.php b/includes/Tag/TagHandler.php
index d8a6cc8..b21a51b 100644
--- a/includes/Tag/TagHandler.php
+++ b/includes/Tag/TagHandler.php
@@ -157,14 +157,6 @@
}
 
/**
-* Returns default HTML attributes of the outermost tag of the output
-* @return string[]
-*/
-   protected function getDefaultAttributes() {
-   return [ 'class' => 'mw-kartographer', 'mw-data' => 'interface' 
];
-   }
-
-   /**
 * When overridden in a descendant class, returns tag HTML
 * @return string
 */

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

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

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

[MediaWiki-commits] [Gerrit] Avoid DBPerformance warnings in Category::initialize() - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Avoid DBPerformance warnings in Category::initialize()
..


Avoid DBPerformance warnings in Category::initialize()

Use DeferredUpdates and zero-out negative values in the meantime.

Bug: T92357
Change-Id: Ia1339395b70b042edba6dc1d570acb92c90a287b
---
M includes/Category.php
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/includes/Category.php b/includes/Category.php
index 6209a1a..28b566a 100644
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -95,7 +95,11 @@
# and should not be kept, and 2) we *probably* don't have to 
scan many
# rows to obtain the correct figure, so let's risk a one-time 
recount.
if ( $this->mPages < 0 || $this->mSubcats < 0 || $this->mFiles 
< 0 ) {
-   $this->refreshCounts();
+   $this->mPages = max( $this->mPages, 0 );
+   $this->mSubcats = max( $this->mSubcats, 0 );
+   $this->mFiles = max( $this->mFiles, 0 );
+
+   DeferredUpdates::addCallableUpdate( [ $this, 
'refreshCounts' ] );
}
 
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1339395b70b042edba6dc1d570acb92c90a287b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fixed PHP Strict Standards notice "non-static method should ... - change (mediawiki...MinimumNameLength)

[Kghbln (Code Review)]

Kghbln has submitted this change and it was merged.

Change subject: Fixed PHP Strict Standards notice "non-static method should not 
be called statically"
..


Fixed PHP Strict Standards notice "non-static method should not be called 
statically"

Issue:
* PHP Strict Standards: non-static method MinimumNameLength::onAbortNewAccount()
should not be called statically in /.../w/includes/Hooks.php on line 206

Also:
* Incremented version to 1.2.2
* Updated link to source code to point to Phabricator

Change-Id: Ida00a03f9534ac76ffaa954f12ae9a7178a202de
---
M CHANGELOG
M MinimumNameLength.class.php
M MinimumNameLength.php
3 files changed, 11 insertions(+), 3 deletions(-)

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



diff --git a/CHANGELOG b/CHANGELOG
index e571969..0702ad9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,14 @@
 The CHANGELOG of the Minimum Name Length extension to MediaWiki.
 
 
+== Version 1.2.2 ==
+
+Released on June 4, 2016.
+
+* Fixed PHP Strict Standards notice "non-static method should not be called 
statically"
+* Added translation updates from translatewiki.net
+
+
 == Version 1.2.1 ==
 
 Released on March 10, 2016.
diff --git a/MinimumNameLength.class.php b/MinimumNameLength.class.php
index 79ac610..9340fed 100644
--- a/MinimumNameLength.class.php
+++ b/MinimumNameLength.class.php
@@ -20,7 +20,7 @@
 
 class MinimumNameLength {
 
-   public function onAbortNewAccount( $user, &$error ) {
+   public static function onAbortNewAccount( $user, &$error ) {
global $wgMinimumUsernameLength;
 
if( mb_strlen( $user->getName() ) < $wgMinimumUsernameLength ) {
diff --git a/MinimumNameLength.php b/MinimumNameLength.php
index 06c5d58..b16d86d 100644
--- a/MinimumNameLength.php
+++ b/MinimumNameLength.php
@@ -5,7 +5,7 @@
  *
  * @link https://www.mediawiki.org/wiki/Extension:Minimum_Name_Length 
Documentation
  * @link https://www.mediawiki.org/wiki/Extension_talk:Mimimum_Name_Length 
Support
- * @link 
https://git.wikimedia.org/summary/mediawiki%2Fextensions%2FMinimumNameLength.git
 Source Code
+ * @link https://phabricator.wikimedia.org/diffusion/EMNL/repository/master/ 
Source Code
  *
  * @file
  * @ingroup Extensions
@@ -26,7 +26,7 @@
 $wgExtensionCredits['other'][] = array(
'path' => '__FILE__',
'name' => 'Minimum Username Length',
-   'version' => '1.2.1',
+   'version' => '1.2.2',
'author' => array(
'Rob Church',
'Karsten Hoffmeyer',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida00a03f9534ac76ffaa954f12ae9a7178a202de
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MinimumNameLength
Gerrit-Branch: master
Gerrit-Owner: Kghbln 
Gerrit-Reviewer: Kghbln 

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

[MediaWiki-commits] [Gerrit] Fixed PHP Strict Standards notice "non-static method should ... - change (mediawiki...MinimumNameLength)

[Kghbln (Code Review)]

Kghbln has uploaded a new change for review.

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

Change subject: Fixed PHP Strict Standards notice "non-static method should not 
be called statically"
..

Fixed PHP Strict Standards notice "non-static method should not be called 
statically"

Issue: PHP Strict Standards: non-static method 
MinimumNameLength::onAbortNewAccount()
should not be called statically in /.../w/includes/Hooks.php on line 206

Change-Id: Ida00a03f9534ac76ffaa954f12ae9a7178a202de
---
M CHANGELOG
M MinimumNameLength.class.php
M MinimumNameLength.php
3 files changed, 11 insertions(+), 3 deletions(-)


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

diff --git a/CHANGELOG b/CHANGELOG
index e571969..cd737c3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,14 @@
 The CHANGELOG of the Minimum Name Length extension to MediaWiki.
 
 
+== Version 1.2.2 ==
+
+Released on Juni 4, 2016.
+
+* Fixed PHP Strict Standards notice "non-static method should not be called 
statically"
+* Added translation updates from translatewiki.net
+
+
 == Version 1.2.1 ==
 
 Released on March 10, 2016.
diff --git a/MinimumNameLength.class.php b/MinimumNameLength.class.php
index 79ac610..9340fed 100644
--- a/MinimumNameLength.class.php
+++ b/MinimumNameLength.class.php
@@ -20,7 +20,7 @@
 
 class MinimumNameLength {
 
-   public function onAbortNewAccount( $user, &$error ) {
+   public static function onAbortNewAccount( $user, &$error ) {
global $wgMinimumUsernameLength;
 
if( mb_strlen( $user->getName() ) < $wgMinimumUsernameLength ) {
diff --git a/MinimumNameLength.php b/MinimumNameLength.php
index 06c5d58..b16d86d 100644
--- a/MinimumNameLength.php
+++ b/MinimumNameLength.php
@@ -5,7 +5,7 @@
  *
  * @link https://www.mediawiki.org/wiki/Extension:Minimum_Name_Length 
Documentation
  * @link https://www.mediawiki.org/wiki/Extension_talk:Mimimum_Name_Length 
Support
- * @link 
https://git.wikimedia.org/summary/mediawiki%2Fextensions%2FMinimumNameLength.git
 Source Code
+ * @link https://phabricator.wikimedia.org/diffusion/EMNL/repository/master/ 
Source Code
  *
  * @file
  * @ingroup Extensions
@@ -26,7 +26,7 @@
 $wgExtensionCredits['other'][] = array(
'path' => '__FILE__',
'name' => 'Minimum Username Length',
-   'version' => '1.2.1',
+   'version' => '1.2.2',
'author' => array(
'Rob Church',
'Karsten Hoffmeyer',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida00a03f9534ac76ffaa954f12ae9a7178a202de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MinimumNameLength
Gerrit-Branch: master
Gerrit-Owner: Kghbln 

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

[MediaWiki-commits] [Gerrit] Apply AbuseFilter configuration syntax change - change (operations/mediawiki-config)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Apply AbuseFilter configuration syntax change
..

Apply AbuseFilter configuration syntax change

Due to switching to extension registration, some config keys had
to be changed from plain to associative arrays (and were renamed
to reduce confusion). Apply the new syntax (and drop drop some lines
that just re-stated the default settings).

Change-Id: I63e93d0fb299d701e756f2193cbb6473351f9acb
Depends-On: I790d39c2849922d7daf7479f298cd90cf30af129
---
M wmf-config/abusefilter.php
1 file changed, 20 insertions(+), 24 deletions(-)


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

diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index d3da3d6..d8b3b6e 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -18,9 +18,11 @@
 $wgGroupPermissions['sysop']['abusefilter-private'] = false;
 
 // Disable some potentially dangerous actions
-$wgAbuseFilterAvailableActions = array_diff(
-   $wgAbuseFilterAvailableActions,
-   array( 'block', 'rangeblock', 'degroup' ) );
+$wgAbuseFilterActions = array(
+   'block' => false,
+   'rangeblock' => false,
+   'degroup' => false,
+);
 
 // T31922 - Prevent anyone being given the abusefilter-private right by 
removing it
 $wgAvailableRights = array_diff( $wgAvailableRights, array( 
'abusefilter-private' ) );
@@ -53,7 +55,7 @@
$wgGroupPermissions['sysop']['abusefilter-view-private'] = true;
$wgGroupPermissions['*']['abusefilter-view'] = false;
$wgGroupPermissions['user']['abusefilter-view'] = true;
-   $wgAbuseFilterAvailableActions[] = 'block';
+   $wgAbuseFilterActions['block'] = true;
$wgAbuseFilterBlockDuration = '2 hours';
$wgAbuseFilterAnonBlockDuration = '2 hours';
break;
@@ -96,7 +98,6 @@
$wgAbuseFilterNotificationsPrivate = true; // T46045
break;
case 'enwikibooks':
-   $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 
'warn', 'disallow', 'blockautopromote', 'tag' );
$wgGroupPermissions['*']['abusefilter-view'] = false;
$wgGroupPermissions['*']['abusefilter-log'] = false;
$wgAbuseFilterNotifications = false;
@@ -105,7 +106,7 @@
$wgGroupPermissions['autoconfirmed']['abusefilter-log-detail'] 
= false; // T44012
break;
case 'enwikinews':
-   $wgAbuseFilterAvailableActions[] = 'block'; // T57868
+   $wgAbuseFilterActions['block'] = true; // T57868
break;
case 'enwikisource':
$wgGroupPermissions['sysop']['abusefilter-modify'] = false;
@@ -127,7 +128,7 @@
$wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = 
true;
$wgGroupPermissions['sysop']['abusefilter-revert'] = true;
$wgGroupPermissions['sysop']['abusefilter-view-private'] = true;
-   $wgAbuseFilterAvailableActions[] = 'block';
+   $wgAbuseFilterActions['block'] = true;
$wgAbuseFilterBlockDuration = 'indefinite'; // T96669
$wgAbuseFilterAnonBlockDuration = '31 hours'; // T96669
$wgAbuseFilterNotifications = false;
@@ -137,13 +138,13 @@
$wgGroupPermissions['abusefilter']['abusefilter-modify'] = true;
$wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = 
true;
$wgGroupPermissions['sysop']['abusefilter-revert'] = true;
-   $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 
'warn', 'disallow', 'tag', 'block' );
+   $wgAbuseFilterActions['block'] = true;
$wgAbuseFilterBlockDuration = '2 days';
$wgAbuseFilterAnonBlockDuration = '2 days';
break;
case 'eswikivoyage': // T64321
$wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = 
true;
-   $wgAbuseFilterAvailableActions[] = 'block';
+   $wgAbuseFilterActions['block'] = true;
$wgAbuseFilterBlockDuration = '24 hours';
$wgAbuseFilterAnonBlockDuration = '24 hours';
break;
@@ -171,7 +172,7 @@
$wgGroupPermissions['sysop']['abusefilter-view-private'] = true;
$wgGroupPermissions['sysop']['abusefilter-revert'] = true;
$wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = 
true;
-   $wgAbuseFilterAvailableActions =  array( 'flag', 'throttle', 
'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' 
);
+   $wgAbuseFilterActions = array( 'rangeblock' => true );

[MediaWiki-commits] [Gerrit] logging: Simplify DeleteLogFormatter b/c check - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: logging: Simplify DeleteLogFormatter b/c check
..


logging: Simplify DeleteLogFormatter b/c check

Change-Id: Iab16663579d2eece4a94f80f7120b231aed0e572
---
M includes/logging/DeleteLogFormatter.php
1 file changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/includes/logging/DeleteLogFormatter.php 
b/includes/logging/DeleteLogFormatter.php
index 012d53c..f9b7875 100644
--- a/includes/logging/DeleteLogFormatter.php
+++ b/includes/logging/DeleteLogFormatter.php
@@ -54,10 +54,11 @@
// 'filearchive' for file versions, or a 
comma-separated list of log_ids for log
// entries. $subtype here is 'revision' for page 
revisions and file
// versions, or 'event' for log entries.
-   if ( ( $subtype === 'event' && count( $params ) === 6 )
-   || ( $subtype === 'revision' && isset( 
$params[3] )
-   && ( $params[3] === 'revision' || 
$params[3] === 'oldimage'
-   || $params[3] === 'archive' || 
$params[3] === 'filearchive' )
+   if (
+   ( $subtype === 'event' && count( $params ) === 
6 )
+   || (
+   $subtype === 'revision' && isset( 
$params[3] )
+   && in_array( $params[3], [ 'revision', 
'archive', 'oldimage', 'filearchive' ] )
)
) {
$paramStart = $subtype === 'revision' ? 4 : 3;
@@ -70,7 +71,8 @@
foreach ( $hid as $v ) {
$changes[] = $this->msg( "$v-hid" 
)->plain();
}
-   // messages used: revdelete-content-unhid, 
revdelete-summary-unhid, revdelete-uname-unhid
+   // messages used: revdelete-content-unhid, 
revdelete-summary-unhid,
+   // revdelete-uname-unhid
foreach ( $unhid as $v ) {
$changes[] = $this->msg( "$v-unhid" 
)->plain();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab16663579d2eece4a94f80f7120b231aed0e572
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Clean up setVisibility() log type logic - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Clean up setVisibility() log type logic
..


Clean up setVisibility() log type logic

The log type used should be based on whether any item
was (un)suppressed, not just the last log entry. Otherwise,
unsuppression could end up in the wrong log if the last
item in the list was not unsuppressed but others were.

Change-Id: I7b6af524cc45a1d83b2b719bfa00138531455e35
---
M includes/revisiondelete/RevDelList.php
1 file changed, 31 insertions(+), 25 deletions(-)

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



diff --git a/includes/revisiondelete/RevDelList.php 
b/includes/revisiondelete/RevDelList.php
index b92..79d66a9 100644
--- a/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@ -125,6 +125,7 @@
$status->itemStatuses = [];
}
 
+   $logType = 'delete';
// @codingStandardsIgnoreStart 
Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
for ( $this->reset(); $this->current(); $this->next() ) {
// @codingStandardsIgnoreEnd
@@ -144,7 +145,8 @@
$newBits = RevisionDeleter::extractBitfield( $bitPars, 
$oldBits );
 
if ( $oldBits == $newBits ) {
-   $itemStatus->warning( 'revdelete-no-change', 
$item->formatDate(), $item->formatTime() );
+   $itemStatus->warning(
+   'revdelete-no-change', 
$item->formatDate(), $item->formatTime() );
$status->failCount++;
continue;
} elseif ( $oldBits == 0 && $newBits != 0 ) {
@@ -157,21 +159,21 @@
 
if ( $item->isHideCurrentOp( $newBits ) ) {
// Cannot hide current version text
-   $itemStatus->error( 'revdelete-hide-current', 
$item->formatDate(), $item->formatTime() );
+   $itemStatus->error(
+   'revdelete-hide-current', 
$item->formatDate(), $item->formatTime() );
$status->failCount++;
continue;
-   }
-   if ( !$item->canView() ) {
+   } elseif ( !$item->canView() ) {
// Cannot access this revision
$msg = ( $opType == 'show' ) ?
'revdelete-show-no-access' : 
'revdelete-modify-no-access';
$itemStatus->error( $msg, $item->formatDate(), 
$item->formatTime() );
$status->failCount++;
continue;
-   }
// Cannot just "hide from Sysops" without hiding any 
fields
-   if ( $newBits == Revision::DELETED_RESTRICTED ) {
-   $itemStatus->warning( 
'revdelete-only-restricted', $item->formatDate(), $item->formatTime() );
+   } elseif ( $newBits == Revision::DELETED_RESTRICTED ) {
+   $itemStatus->warning(
+   'revdelete-only-restricted', 
$item->formatDate(), $item->formatTime() );
$status->failCount++;
continue;
}
@@ -181,6 +183,11 @@
 
if ( $ok ) {
$idsForLog[] = $item->getId();
+   // If any item field was suppressed or 
unsupressed
+   if ( ( $oldBits | $newBits ) & 
$this->getSuppressBit() ) {
+   $logType = 'suppress';
+   }
+
$status->successCount++;
if ( $item->getAuthorId() > 0 ) {
$authorIds[] = $item->getAuthorId();
@@ -188,7 +195,8 @@
$authorIPs[] = $item->getAuthorName();
}
} else {
-   $itemStatus->error( 
'revdelete-concurrent-change', $item->formatDate(), $item->formatTime() );
+   $itemStatus->error(
+   'revdelete-concurrent-change', 
$item->formatDate(), $item->formatTime() );
$status->failCount++;
}
}
@@ -221,16 +229,19 @@
 
// Log it
// @FIXME: $newBits/$oldBits set in for loop, makes IDE 
warnings too
-   $this->updateLog( [
- 

[MediaWiki-commits] [Gerrit] Use 'noform' error when appropriate - change (mediawiki...DonationInterface)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Use 'noform' error when appropriate
..

Use 'noform' error when appropriate

Instead of error-default

Change-Id: I99bd506de3fef95816a2394dbfa9cced58e65c7a
---
M gateway_common/gateway.adapter.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 2d072dd..2b8394e 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -3283,6 +3283,10 @@
} else {
//Invalid form. Go get one that is valid, and squawk in 
the error logs.
$new_ff = GatewayFormChooser::getOneValidForm( 
$country, $currency, $payment_method, $payment_submethod, $recurring, $gateway 
);
+   if ( empty( $new_ff ) && $this->getGlobal( 'RapidFail' 
) ) {
+   // No valid form exists and we want to display 
an error without a redirect
+   $new_ff = 'error-noform';
+   }
$this->addRequestData( array ( 'ffname' => $new_ff ) );
 
//now construct a useful error message

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

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

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

[MediaWiki-commits] [Gerrit] Normalize all lists to not mix wikitext and HTML list syntax - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: Normalize all lists to not mix wikitext and HTML list syntax
..


Normalize all lists to not mix wikitext and HTML list syntax

* We have a "new-list-items-only" qualification when forcibly converting
  list items in HTML lists to HTML format.

* In 8d73f60a, I removed a similar qualification for tables to prevent
  mixing HTML and wikitext syntax for table content. Roundtrip testing
  seems to indicate this is going through well without dirty diffs.

* I am now removing the qualifier for lists as well. Hopefully there
  will be very few normalizations. Selser will continue to prevent
  large-scale normalization but when existing list items are edited,
  they will start getting normalized.

* Added 2 new tests, one of which fails. This is not a new failure.
  Fixing that requires a bit more work. I am considering changing
  strategy for both tables and lists to insert stx: html data-parsoid
  attribute during a normalization phase and getting rid of the code here.
  For later.

Change-Id: Ic39ce73bd1d3a17108ff9776bde82b45eeda4662
---
M lib/html2wt/WikitextSerializer.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 53 insertions(+), 3 deletions(-)

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



diff --git a/lib/html2wt/WikitextSerializer.js 
b/lib/html2wt/WikitextSerializer.js
index b706b2f..eb85dca 100644
--- a/lib/html2wt/WikitextSerializer.js
+++ b/lib/html2wt/WikitextSerializer.js
@@ -721,9 +721,8 @@
}
 
// If parent node is a list in html-syntax, then serialize
-   // new elements in html-syntax rather than wiki-syntax.
-   if (DU.isNewElt(node)
-   && DU.isListItem(node)
+   // list content in html-syntax rather than wiki-syntax.
+   if (DU.isListItem(node)
&& DU.isList(node.parentNode)
&& DU.isLiteralHTMLNode(node.parentNode)) {
return htmlElementHandler;
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index db6c8d0..9f2973c 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -776,6 +776,7 @@
 add("html2wt", "Build table with pipe as data", "{| class=\"wikitable\"\n\n! 
header\n\n! second header\n\n|- style=\"color:red;\"\n| data \n| 
style=\"color:red;\" | second data\n\n|-\n| style=\"color:red;\" | data 
with | \n| style=\"color:red;\" | second data with 
|\n\n|-\n| data with | \n| second data with 
|\n|}\n");
 add("html2wt", "Build table with wikilink", "{| class=\"wikitable\"\n\n! 
header \n! second header\n\n|- style=\"color:red;\"\n| data [[wiki/Main 
Page|linktext]] \n| second data [[wiki/Main Page|linktext]]\n\n|-\n| data \n| 
second data [[wiki/Main Page|link|text with pipe]]\n|}\n");
 add("html2wt", "Wikitext table with html-syntax row", "{|\n\n|foo\n|}\n");
+add("html2wt", "Wikitext lists can be nested inside HTML lists", 
"\na\n* b\n\n\n\n\nx\n** y\n\n");
 add("html2wt", "Plain link, capitalized", "[[wiki/Main Page|Main Page]]\n");
 add("html2wt", "Plain link, uncapitalized", "[[wiki/Main Page|main Page]]\n");
 add("html2wt", "Piped link", "[[wiki/Main Page|The Main Page]]\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 1f1d53b..d4d43b1 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -7243,6 +7243,56 @@
 
 !! end
 
+!! test
+Serialize wikitext list items as HTML list items when embedded in a HTML list
+!! options
+parsoid=html2wt
+!! html
+
+a
+b
+
+!! wikitext
+
+a
+b
+
+!! end
+
+# SSS FIXME: Is this actually a good thing given the
+# odd nested list output that is generated by MW?
+# foo.. instead of
+# foo..
+!! test
+Wikitext lists can be nested inside HTML lists
+!! options
+parsoid=html2wt
+!! html
+
+a
+b
+
+
+
+
+x
+y
+
+
+!! wikitext
+
+a
+* b
+
+
+
+
+x
+* y
+
+
+!! end
+
 ###
 ### Internal links
 ###

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic39ce73bd1d3a17108ff9776bde82b45eeda4662
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
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] Make module bar chart more readible - change (mediawiki...PerformanceInspector)

[jenkins-bot (Code Review)]

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

Change subject: Make module bar chart more readible
..


Make module bar chart more readible

Lets make the grey part of the chart darker grey to make it easier
to read.

Bug: T133760
Change-Id: If06970632ad105ba2cfcd24ffb3a568a70949c96
---
M modules/css/ext.PerformanceInspector.css
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/css/ext.PerformanceInspector.css 
b/modules/css/ext.PerformanceInspector.css
index 9eb0113..fdf9406 100644
--- a/modules/css/ext.PerformanceInspector.css
+++ b/modules/css/ext.PerformanceInspector.css
@@ -14,7 +14,7 @@
 }
 .barchart .barWrap {
   position: relative;
-  background: #d0d0d0;
+  background: #99;
   width: 100%;
   height: 100%;
   overflow: hidden;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If06970632ad105ba2cfcd24ffb3a568a70949c96
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PerformanceInspector
Gerrit-Branch: master
Gerrit-Owner: Phedenskog 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update for AbuseFilter configuration changes - change (mediawiki...Configure)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Update for AbuseFilter configuration changes
..

Update for AbuseFilter configuration changes

Update for I790d39c2849922d7daf7479f298cd90cf30af129

This is a search patch; I did not try to verify that
this works or is a sane thing to do.

Change-Id: I2403f878ce33d66ba191e532e208444399c01ed9
---
M settings/Settings-ext.txt
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Configure 
refs/changes/56/292756/1

diff --git a/settings/Settings-ext.txt b/settings/Settings-ext.txt
index e540569..b97f454 100644
--- a/settings/Settings-ext.txt
+++ b/settings/Settings-ext.txt
@@ -13,21 +13,21 @@
 url = http://www.mediawiki.org/wiki/Extension:AbsenteeLandlord
 
 AbuseFilter
-settings[] = wgAbuseFilterAvailableActions: array
+settings[] = wgAbuseFilterActions: array
 settings[] = wgAbuseFilterConditionLimit: int
 settings[] = wgAbuseFilterEmergencyDisableThreshold: text
 settings[] = wgAbuseFilterEmergencyDisableCount: int
 settings[] = wgAbuseFilterEmergencyDisableAge: int
 settings[] = wgAbuseFilterParserClass: text
-settings[] = wgAbuseFilterRestrictedActions: array
+settings[] = wgAbuseFilterRestricions: array
 settings[] = wgAbuseFilterUDPAddress: text
 settings[] = wgAbuseFilterUDPPort: int
 settings[] = wgAbuseFilterUDPPrefix: text
 settings[] = wgAbuseFilterCentralDB: text
 settings[] = wgAbuseFilterIsCentral: bool
 settings[] = wgAbuseFilterBlockDuration: text
-array[] = wgAbuseFilterAvailableActions: simple
-array[] = wgAbuseFilterRestrictedActions: simple
+array[] = wgAbuseFilterActions: assoc
+array[] = wgAbuseFilterRestricions: assoc
 empty[] = wgAbuseFilterCentralDB: null
 extensions-dependencies[] = AntiSpoof
 schema = true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2403f878ce33d66ba191e532e208444399c01ed9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Configure
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] Show sister site boxes again - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Show sister site boxes again
..


Show sister site boxes again

These are no longer being replaced by a Wikidata 'In another project'.

Bug: T136642
Change-Id: I1806b8896e9f465097a8e39b43556e3d0029b756
---
M resources/skins.minerva.content.styles/hacks.less
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/resources/skins.minerva.content.styles/hacks.less 
b/resources/skins.minerva.content.styles/hacks.less
index 3a5ed2b..52088fa 100644
--- a/resources/skins.minerva.content.styles/hacks.less
+++ b/resources/skins.minerva.content.styles/hacks.less
@@ -13,8 +13,6 @@
 @import 'minerva.mixins';
 
 .content {
-   // Hide links such as `Wikisource has original works on the topic 
dinosaur (use wikidata instead)
-   .sistersitebox,
// Hide cleanup templates by default to non-javascript users as these 
stop them from reading the article itself
// Talk page informational boxes
.tmbox,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1806b8896e9f465097a8e39b43556e3d0029b756
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
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][PoC] Use confluent-kafka python instead of kafka-pytho... - change (eventlogging)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: [WIP][PoC] Use confluent-kafka python instead of kafka-python 
and pykafka
..

[WIP][PoC] Use confluent-kafka python instead of kafka-python and pykafka

Still need to test to see if this solves T133779, but at least
synchronous produce performance seems good.

Bug: T133779
Change-Id: I5df1e5dacd94903c05e1c485124a75e898945102
---
M eventlogging/handlers.py
M requirements.txt
2 files changed, 220 insertions(+), 176 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/eventlogging 
refs/changes/55/292755/1

diff --git a/eventlogging/handlers.py b/eventlogging/handlers.py
index c9e5354..55ef536 100644
--- a/eventlogging/handlers.py
+++ b/eventlogging/handlers.py
@@ -72,12 +72,13 @@
 @writes('kafka')
 def kafka_writer(
 path,
-producer='simple',
 topic=None,
-key='{schema}_{revision}',
+key=None,
+async=True,
 blacklist=None,
 raw=False,
-**kafka_producer_args
+identity=None,
+**kwargs
 ):
 """
 Write events to Kafka.
@@ -85,172 +86,142 @@
 Kafka URIs look like:
 kafka:///b1:9092,b2:9092?topic=eventlogging_%s(schema)=True&...
 
-This producer uses either SimpleProducer or KeyedProducer from
-kafka-python.  You may pass any configs that base Producer takes
-as keyword arguments via URI query params.
+This uses the Producer from the librdkafka backed confluent-kafka
+python library. You may pass any configs that the librdkafka Producer
+take as keyword arguments via URI query params.
 
-NOTE:  If you do not explicitly set it, async will default to True.
+Arguments:
+*path (str): URI path should be comma separated Kafka Brokers.
+e.g. kafka01:9092,kafka02:9092,kafka03:9092
 
-path  - URI path should be comma separated Kafka Brokers.
-e.g. kafka01:9092,kafka02:9092,kafka03:9092
+*topic (str): Python format string topic name.
+If the incoming event is a dict (not a raw string)
+topic will be formatted against event.  I.e.
+topic.format(**event).  Default: None.
 
-producer  - Either 'keyed' or 'simple'.  Default: 'simple'.
+If topic is None, the topic will be extracted from
+the event meta data rather than formatting
+against event.  This means that the 'topic' key must
+be in the event metadata. You _must_ provide a static
+topic if raw=True.
 
-topic - Python format string topic name.
-If the incoming event is a dict (not a raw string)
-topic will be formatted against event.  I.e.
-topic.format(**event).  Default: None.
+*key (str): Format string key of the message in Kafka.
+The key will be formatted against event.  I.e.
+key.format(**event).  Default: None.
+If raw=True, formatting will not happen, and the
+key will be used exactly as set.
 
-If topic is None, the topic will be extracted from
-the event meta data rather than formatting
-against event.  This means that the 'topic' key must
-be in the event metadata. You _must_ provide a static
-topic if raw=True.
+*async (bool): If True, this will not block to wait for Kafka
+message ACKs before producing the next message.  Defaults to True.
+If False and not otherwise specified, queue.buffering.max.ms and
+socket.blocking.max.ms will both be set to 1 to ensure
+higher throughput for synchronous production.  This may
+result in higher CPU usage for low volume clients.
 
-key   - Format string key of the message in Kafka.
-The key will be formatted against event.  I.e.
-key.format(**event).  Default: '{schema}_{revision}'.
-This is ignored if you are using the simple producer.
-If raw=True, formatting will not happen, and the
-key will be used exactly as set.
+*blacklist (str): Pattern string matching a list of schemas that
+should not be written. This is useful to keep high volume schemas
+from being written to an output stream.  This will
+be ignored if the incoming events are raw.
 
-blacklist - Pattern string matching a list of schemas that should not
-be written. This is useful to keep high volume schemas
-from being written to an output stream.  This will
-be ignored if the incoming events are raw.
+*raw (bool): Should the incoming stream be treated as raw strings or
+as Events?  No topic or key 

[MediaWiki-commits] [Gerrit] Updatefor AbuseFilter configuration changes - change (mediawiki...Premoderation)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Updatefor AbuseFilter configuration changes
..

Updatefor AbuseFilter configuration changes

Update for I790d39c2849922d7daf7479f298cd90cf30af129

This is a search patch; I did not try to verify that
this works or is a sane thing to do.

Change-Id: I2403f878ce33d66ba191e532e208444399c01ed9
---
M Premoderation.class.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Premoderation 
refs/changes/54/292754/1

diff --git a/Premoderation.class.php b/Premoderation.class.php
index d52003a..d6bc45d 100644
--- a/Premoderation.class.php
+++ b/Premoderation.class.php
@@ -13,7 +13,7 @@
if( !class_exists( 'AbuseFilter' ) ) {
exit( 'You must install AbuseFilter 
extension before using option $wgPremoderationType = \'abusefilter\'.' );
}
-   $wgAbuseFilterAvailableActions[] = 'moderation';
+   $wgAbuseFilterActions['moderation'] = true;

$wgAbuseFilterCustomActionsHandlers['moderation'] = 
'Premoderation::handleAFAction';
break;
}
@@ -182,4 +182,4 @@
dirname( __FILE__ ) . '/db_whitelist.sql', true ) );
return true;
}
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2403f878ce33d66ba191e532e208444399c01ed9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Premoderation
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] Use ObjectCache instead of the global $wgMemc - change (mediawiki...Graph)

[jenkins-bot (Code Review)]

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

Change subject: Use ObjectCache instead of the global $wgMemc
..


Use ObjectCache instead of the global $wgMemc

Per recommendation in 
https://gerrit.wikimedia.org/r/#/c/263160/6/includes/Graph.body.php

Change-Id: I55efdeb6abadb4de8ac7669204c60f23eeda5559
---
M includes/ApiGraph.php
M includes/Graph.body.php
2 files changed, 11 insertions(+), 14 deletions(-)

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



diff --git a/includes/ApiGraph.php b/includes/ApiGraph.php
index 317d552..21b7356 100644
--- a/includes/ApiGraph.php
+++ b/includes/ApiGraph.php
@@ -90,12 +90,10 @@
 * @return string
 */
private function getFromStorage( $title, $hash ) {
-   /** @var $wgMemc \BagOStuff */
-   global $wgMemc;
-   $graph = $wgMemc->get( Singleton::makeCacheKey( $hash ) );
-   // NOTE: Very strange wgMemc feature: Even though we store the 
data structure into wgMemc
-   // by JSON-encoding and gzip-ing it, when we get it out it is 
already in the original form.
 
+   // NOTE: Very strange wgMemc feature: Even though we store the 
data structure into memcached
+   // by JSON-encoding and gzip-ing it, when we get it out it is 
already in the original form.
+   $graph = Singleton::getDataFromCache( $hash );
if ( !$graph ) {
$title = Title::newFromText( $title );
if ( !$title || !$title->exists() || !$title->userCan( 
'read', $this->getUser() ) ) {
diff --git a/includes/Graph.body.php b/includes/Graph.body.php
index edc2280..72af062 100644
--- a/includes/Graph.body.php
+++ b/includes/Graph.body.php
@@ -12,6 +12,7 @@
 use FormatJson;
 use Html;
 use JsonConfig\JCContent;
+use ObjectCache;
 use Parser;
 use ParserOptions;
 use ParserOutput;
@@ -51,8 +52,7 @@
 * @param \PPFrame $frame
 * @return string
 */
-   public static function onGraphTag( $input, /** @noinspection 
PhpUnusedParameterInspection */
-  array $args, Parser $parser, 
\PPFrame $frame ) {
+   public static function onGraphTag( $input, array $args, Parser $parser, 
\PPFrame $frame ) {
return self::buildHtml( $input, $parser->getTitle(), 
$parser->getRevisionId(),
$parser->getOutput(), 
$parser->getOptions()->getIsPreview(), $args );
}
@@ -228,19 +228,18 @@
 * @param $data string Graph spec after json encoding
 */
private static function saveDataToCache( $hash, $data ) {
-   /** @var $wgMemc \BagOStuff */
-   global $wgMemc;
-   $wgMemc->add( self::makeCacheKey( $hash ), $data );
+   $cache = ObjectCache::getLocalClusterInstance();
+   $cache->add( $cache->makeKey( 'graph-data', $hash ), $data );
}
 
/**
+* Get graph data from the memcached
 * @param $hash
 * @return mixed
 */
-   public static function makeCacheKey( $hash ) {
-   /** @var $wgMemc \BagOStuff */
-   global $wgMemc;
-   return $wgMemc->makeKey( 'graph-data', $hash );
+   public static function getDataFromCache( $hash ) {
+   $cache = ObjectCache::getLocalClusterInstance();
+   return $cache->get( $cache->makeKey( 'graph-data', $hash ) );
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I55efdeb6abadb4de8ac7669204c60f23eeda5559
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Krinkle 
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] Enable VisualEditor by default for all users of the German W... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Enable VisualEditor by default for all users of the German 
Wikivoyage
..

Enable VisualEditor by default for all users of the German Wikivoyage

Bug: T136991
Change-Id: I5520658c35ecf0b497f748a4cc89c5101ce17691
---
M dblists/visualeditor-default.dblist
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/dblists/visualeditor-default.dblist 
b/dblists/visualeditor-default.dblist
index 0c83d52..8b0d60b 100644
--- a/dblists/visualeditor-default.dblist
+++ b/dblists/visualeditor-default.dblist
@@ -254,6 +254,7 @@
 frwikiversity
 ptwikiversity
 # Wikivoyages
+dewikivoyage
 elwikivoyage
 eswikivoyage
 fawikivoyage

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

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

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

[MediaWiki-commits] [Gerrit] Enable VisualEditor by default for all users of the English ... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Enable VisualEditor by default for all users of the English 
Wikivoyage
..

Enable VisualEditor by default for all users of the English Wikivoyage

Bug: T136992
Change-Id: Icc1b161d5a120a8c195d9fc09f2a9bf36c9b6bc4
---
M dblists/visualeditor-default.dblist
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/dblists/visualeditor-default.dblist 
b/dblists/visualeditor-default.dblist
index 0c83d52..64c83c3 100644
--- a/dblists/visualeditor-default.dblist
+++ b/dblists/visualeditor-default.dblist
@@ -255,6 +255,7 @@
 ptwikiversity
 # Wikivoyages
 elwikivoyage
+enwikivoyage
 eswikivoyage
 fawikivoyage
 hewikivoyage

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

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

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

[MediaWiki-commits] [Gerrit] Enable VisualEditor by default for all users of the French W... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Enable VisualEditor by default for all users of the French 
Wikivoyage
..

Enable VisualEditor by default for all users of the French Wikivoyage

Bug: T136993
Change-Id: I63437e22af97fba6ed90b5fd85c4070ba34e846d
---
M dblists/visualeditor-default.dblist
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/dblists/visualeditor-default.dblist 
b/dblists/visualeditor-default.dblist
index 0c83d52..233e596 100644
--- a/dblists/visualeditor-default.dblist
+++ b/dblists/visualeditor-default.dblist
@@ -257,6 +257,7 @@
 elwikivoyage
 eswikivoyage
 fawikivoyage
+frwikivoyage
 hewikivoyage
 nlwikivoyage
 plwikivoyage

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

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

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

[MediaWiki-commits] [Gerrit] Enable VisualEditor by default for all users of the Italian ... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Enable VisualEditor by default for all users of the Italian 
Wikivoyage
..

Enable VisualEditor by default for all users of the Italian Wikivoyage

Bug: T136994
Change-Id: I55351e7940b53ef52ed5f35afef89e421db0acbc
---
M dblists/visualeditor-default.dblist
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/dblists/visualeditor-default.dblist 
b/dblists/visualeditor-default.dblist
index 0c83d52..9ee0b03 100644
--- a/dblists/visualeditor-default.dblist
+++ b/dblists/visualeditor-default.dblist
@@ -258,6 +258,7 @@
 eswikivoyage
 fawikivoyage
 hewikivoyage
+itwikivoyage
 nlwikivoyage
 plwikivoyage
 ptwikivoyage

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

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

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

[MediaWiki-commits] [Gerrit] Enable VisualEditor by default for all users of the Russian ... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Enable VisualEditor by default for all users of the Russian 
Wikivoyage
..

Enable VisualEditor by default for all users of the Russian Wikivoyage

Bug: T136995
Change-Id: Id9199a88c385255c2cea2a15b07ddc2b0f57a272
---
M dblists/visualeditor-default.dblist
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/dblists/visualeditor-default.dblist 
b/dblists/visualeditor-default.dblist
index 0c83d52..f051fb8 100644
--- a/dblists/visualeditor-default.dblist
+++ b/dblists/visualeditor-default.dblist
@@ -262,6 +262,7 @@
 plwikivoyage
 ptwikivoyage
 rowikivoyage
+ruwikivoyage
 svwikivoyage
 ukwikivoyage
 viwikivoyage

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

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

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

[MediaWiki-commits] [Gerrit] Enable VisualEditor by default for all users of the Chinese ... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Enable VisualEditor by default for all users of the Chinese 
Wikivoyage
..

Enable VisualEditor by default for all users of the Chinese Wikivoyage

Bug: T136996
Change-Id: I0d8e35615cdc7d1f2ddf670f69e96fc1b8d4fac0
---
M dblists/visualeditor-default.dblist
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/dblists/visualeditor-default.dblist 
b/dblists/visualeditor-default.dblist
index 0c83d52..2d52c94 100644
--- a/dblists/visualeditor-default.dblist
+++ b/dblists/visualeditor-default.dblist
@@ -265,6 +265,7 @@
 svwikivoyage
 ukwikivoyage
 viwikivoyage
+zhwikivoyage
 # Wikimanias
 wikimania2015wiki
 wikimania2016wiki

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

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

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

[MediaWiki-commits] [Gerrit] Enable VisualEditor by default on eleven Wikivoyages - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Enable VisualEditor by default on eleven Wikivoyages
..

Enable VisualEditor by default on eleven Wikivoyages

* Greek
* Spanish
* Farsi
* Hebrew
* Dutch
* Polish
* Portuguese
* Romanian
* Swedish
* Ukranian
* Vietnamese

Bug: T132495
Change-Id: I7e48d0b720906a2be5d9f52eed0e496def6b92ca
---
M dblists/visualeditor-default.dblist
1 file changed, 11 insertions(+), 0 deletions(-)


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

diff --git a/dblists/visualeditor-default.dblist 
b/dblists/visualeditor-default.dblist
index 5013fce..0c83d52 100644
--- a/dblists/visualeditor-default.dblist
+++ b/dblists/visualeditor-default.dblist
@@ -254,6 +254,17 @@
 frwikiversity
 ptwikiversity
 # Wikivoyages
+elwikivoyage
+eswikivoyage
+fawikivoyage
+hewikivoyage
+nlwikivoyage
+plwikivoyage
+ptwikivoyage
+rowikivoyage
+svwikivoyage
+ukwikivoyage
+viwikivoyage
 # Wikimanias
 wikimania2015wiki
 wikimania2016wiki

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

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

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

[MediaWiki-commits] [Gerrit] Make sure parser function doesn't throw fatal exception befo... - change (mediawiki...PageAssessments)

[Kaldari (Code Review)]

Kaldari has uploaded a new change for review.

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

Change subject: Make sure parser function doesn't throw fatal exception before 
scap
..

Make sure parser function doesn't throw fatal exception before scap

See https://phabricator.wikimedia.org/T125551#2353890

Change-Id: Iffc92b6d4db2cd2f2972ed28aff7bfd90c475922
---
M PageAssessments.hooks.php
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/PageAssessments.hooks.php b/PageAssessments.hooks.php
index 2ad0093..3ceac2d 100644
--- a/PageAssessments.hooks.php
+++ b/PageAssessments.hooks.php
@@ -28,7 +28,11 @@
 * @return bool
 */
public static function onParserFirstCallInit( &$parser ) {
-   $parser->setFunctionHook( 'assessment', 
'PageAssessmentsBody::cacheAssessment' );
+   try {
+   $parser->setFunctionHook( 'assessment', 
'PageAssessmentsBody::cacheAssessment' );
+   } catch ( Exception $ex ) {
+   MWExceptionHandler::logException( $ex );
+   }
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] Detect whether NavPopups gadget is enabled before showing Ho... - change (mediawiki...Popups)

[Bmansurov (Code Review)]

Bmansurov has uploaded a new change for review.

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

Change subject: Detect whether NavPopups gadget is enabled before showing 
Hovercards
..

Detect whether NavPopups gadget is enabled before showing Hovercards

Do not rely on the gadget module name as it can be different depending
on the wiki. Rather check whether the global `window.pg` object has been
created on each `hover` over eligible links. The existence of the object
means that the NavPopups gadget is enabled, thus do not show Hovercards.

Bug: T135628
Change-Id: Ica154dd3bfd913202a8b558ea4b10ad177176f83
---
M Popups.hooks.php
M resources/ext.popups.core.js
M resources/ext.popups.targets/desktopTarget.js
M resources/ext.popups.targets/mobileTarget.js
M tests/qunit/ext.popups.core.test.js
A tests/qunit/ext.popups.targets/desktopTarget.test.js
6 files changed, 156 insertions(+), 152 deletions(-)


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

diff --git a/Popups.hooks.php b/Popups.hooks.php
index c81db91..90f1f37 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -229,6 +229,7 @@
'scripts' => array(

'tests/qunit/ext.popups.renderer/desktopRenderer.test.js',

'tests/qunit/ext.popups.renderer.article.test.js',
+   
'tests/qunit/ext.popups.targets/desktopTarget.test.js',
'tests/qunit/ext.popups.core.test.js',

'tests/qunit/ext.popups.schemaPopups.utils.test.js',
'tests/qunit/ext.popups.settings.test.js',
diff --git a/resources/ext.popups.core.js b/resources/ext.popups.core.js
index d96c25e..a42df0c 100644
--- a/resources/ext.popups.core.js
+++ b/resources/ext.popups.core.js
@@ -36,47 +36,6 @@
];
 
/**
-* Temporarily remove the title attribute of the links so that
-* the yellow tooltips don't show up alongside the Hovercard.
-*
-* @method removeTooltips
-*/
-   mw.popups.removeTooltips = function ( $elements ) {
-   $elements
-   .filter( '[title]:not([title=""])' )
-   .on( 'mouseenter focus', function () {
-   // We shouldn't empty the title attribute of 
links that
-   // can't have Hovercards, ie. TextExtracts 
didn't return
-   // anything. Its set in the article.init after 
attempting
-   // to make an API request.
-   if ( $( this ).data( 'dont-empty-title' ) !== 
true ) {
-   $( this )
-   .data( 'title', $( this ).attr( 
'title' ) )
-   .attr( 'title', '' );
-   }
-   } )
-   .on( 'mouseleave blur', function () {
-   $( this )
-   .attr( 'title', $( this ).data( 'title' 
) );
-   } );
-   };
-
-   /**
-* Register a hover event that may render a popup on an appropriate 
link.
-*
-* @method setupTriggers
-*/
-   mw.popups.setupTriggers = function ( $elements ) {
-   $elements.on( mw.popups.triggers, function ( event ) {
-   if ( mw.popups.scrolled ) {
-   return;
-   }
-
-   mw.popups.render.render( $( this ), event, mw.now(), 
mw.popups.getRandomToken() );
-   } );
-   };
-
-   /**
 * Given an href string for the local wiki, return the title, or 
undefined if
 * the link is external, has extra query parameters, or contains no 
title.
 *
diff --git a/resources/ext.popups.targets/desktopTarget.js 
b/resources/ext.popups.targets/desktopTarget.js
index 5a32d2e..7264759 100644
--- a/resources/ext.popups.targets/desktopTarget.js
+++ b/resources/ext.popups.targets/desktopTarget.js
@@ -5,14 +5,84 @@
 * @return {boolean}
 */
function isNavigationPopupsGadgetEnabled() {
-   // Temporary fix to get this code working on huwiki
-   var moduleName = mw.config.get( 'wgPageContentLanguage' ) === 
'hu' ?
-   'ext.gadget.latszer' : 
'ext.gadget.Navigation_popups',
-   moduleState = mw.loader.getState( moduleName );
+   return window.pg !== undefined;
+   }
+   /**
+* Temporarily remove the title attribute of the links so that
+* the yellow tooltips don't show up alongside the Hovercard.
+*
+* @method removeTooltips
+* @param 

[MediaWiki-commits] [Gerrit] [WIP] Move GatewayPage fun into the execute() method - change (mediawiki...DonationInterface)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: [WIP] Move GatewayPage fun into the execute() method
..

[WIP] Move GatewayPage fun into the execute() method

Change-Id: Ie1ad4101b2989939e4c2171bc69667fe9a0b3ee1
---
M gateway_common/GatewayPage.php
1 file changed, 14 insertions(+), 13 deletions(-)


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

diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index eacc7cb..3c8aeef 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -62,11 +62,24 @@
 * Constructor
 */
public function __construct() {
+   $this->getOutput()->addModules( 
'donationInterface.skinOverride' );
+
+   $me = get_called_class();
+   parent::__construct( $me );
+   }
+
+   /**
+* Show the special page
+*
+* @param $par Mixed: parameter passed to the page or null
+*/
+   public function execute( $par ) {
+   global $wgContributionTrackingFundraiserMaintenance, 
$wgContributionTrackingFundraiserMaintenanceUnsched;
+
try {
$className = $this->getAdapterClass();
$this->adapter = new $className;
$this->logger = DonationLoggerFactory::getLogger( 
$this->adapter );
-   $this->getOutput()->addModules( 
'donationInterface.skinOverride' );
} catch ( Exception $ex ) {
if ( !$this->logger ) {
$this->logger = 
DonationLoggerFactory::getLoggerForType(
@@ -80,18 +93,6 @@
);
$this->isFailed = true;
}
-
-   $me = get_called_class();
-   parent::__construct( $me );
-   }
-
-   /**
-* Show the special page
-*
-* @param $par Mixed: parameter passed to the page or null
-*/
-   public function execute( $par ) {
-   global $wgContributionTrackingFundraiserMaintenance, 
$wgContributionTrackingFundraiserMaintenanceUnsched;
 
Hooks::register( 'MakeGlobalVariablesScript', array( 
$this->adapter, 'setClientVariables' ) );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1ad4101b2989939e4c2171bc69667fe9a0b3ee1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
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] Disable Wikivoyage mode by default - change (mediawiki...Kartographer)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Disable Wikivoyage mode by default
..

Disable Wikivoyage mode by default

Bug: T129106
Change-Id: I9478b0ad3877137dd4161df807f57ef3cafc8ef4
---
M extension.json
M tests/parserTests.txt
2 files changed, 52 insertions(+), 2 deletions(-)


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

diff --git a/extension.json b/extension.json
index c47251d..53bcf92 100644
--- a/extension.json
+++ b/extension.json
@@ -228,8 +228,6 @@
"ParserTestFiles": [
"tests/parserTests.txt"
],
-
-   "@comment-config": "TODO: KartographerWikivoyageMode should be false by 
default",
"config": {
"KartographerWikivoyageMode": true,
"KartographerDfltStyle": "osm-intl",
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 613e744..8ca4f0b 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -270,3 +270,55 @@
 A
 
 !! end
+
+!! test
+Wikivoyage mode enabled
+!! config
+wgKartographerWikivoyageMode=true
+!! input
+
+
+{
+"type": "Feature",
+   "geometry": {
+   "type": "Point",
+   "coordinates": [-122.3988, 37.8013]
+   },
+   "properties": {
+   "marker-symbol": "-letter",
+   "marker-color": "#abcdef"
+   }
+}
+
+!! result
+0°0′0″N 0°0′0″E
+
+
+
+!! end
+
+!! test
+Wikivoyage mode disabled
+!! config
+wgKartographerWikivoyageMode=false
+!! input
+
+
+{
+"type": "Feature",
+   "geometry": {
+   "type": "Point",
+   "coordinates": [-122.3988, 37.8013]
+   },
+   "properties": {
+   "marker-symbol": "-letter",
+   "marker-color": "#abcdef"
+   }
+}
+
+!! result
+0°0′0″N 
0°0′0″E
+
+
+
+!! end
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 61cb539..50f6f46 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 61cb539..50f6f46
..

Syncronize VisualEditor: 61cb539..50f6f46

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/41/292741/1

diff --git a/VisualEditor b/VisualEditor
index 61cb539..50f6f46 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 61cb539c7b7a1aadfaccd333d0fd6b9a0186c143
+Subproject commit 50f6f466ea17a8d5778e89c7fbd443bbea94bfc3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ee54eba8572975482f09a4d2f2840bfd9f8bf5b
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: 61cb539..50f6f46 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 61cb539..50f6f46
..


Syncronize VisualEditor: 61cb539..50f6f46

Change-Id: I7ee54eba8572975482f09a4d2f2840bfd9f8bf5b
---
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 61cb539..50f6f46 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 61cb539c7b7a1aadfaccd333d0fd6b9a0186c143
+Subproject commit 50f6f466ea17a8d5778e89c7fbd443bbea94bfc3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ee54eba8572975482f09a4d2f2840bfd9f8bf5b
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] update DonationInterface submodule - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: update DonationInterface submodule
..


update DonationInterface submodule

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

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 8d0f6e9..6efa849 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 8d0f6e90052690f6f30afe938ffd01c7aa68d6f8
+Subproject commit 6efa8492f25c4959e6718b19ba9c919008b0cfdb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22878ac916211cbe1924b621548f205aafa2db4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
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 some logging - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Add some logging
..


Add some logging

Trying to figure out a fraud issue

Change-Id: Ic13a41042ed87eb1b6df7b477e7fec924796da77
---
M extras/custom_filters/custom_filters.body.php
M gateway_common/gateway.adapter.php
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/extras/custom_filters/custom_filters.body.php 
b/extras/custom_filters/custom_filters.body.php
index e0f10e7..f4b4946 100644
--- a/extras/custom_filters/custom_filters.body.php
+++ b/extras/custom_filters/custom_filters.body.php
@@ -35,11 +35,15 @@
 
protected function __construct( GatewayType $gateway_adapter ) {
parent::__construct( $gateway_adapter ); //gateway_adapter is 
set in there. 
+
// load user action ranges and risk score   
$this->action_ranges = $this->gateway_adapter->getGlobal( 
'CustomFiltersActionRanges' );
$this->risk_score = 
$this->gateway_adapter->getRequest()->getSessionData( 'risk_scores' );
if ( !$this->risk_score ) {
$this->risk_score = array();
+   } else {
+   $unnecessarily_escaped_session_contents = addslashes( 
json_encode( $this->risk_score ) );
+   $this->fraud_logger->info( '"Loaded from session" ' . 
$unnecessarily_escaped_session_contents );
}
$this->risk_score['initial'] = 
$this->gateway_adapter->getGlobal( 'CustomFiltersRiskScore' );
}
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 67860d6..44a9404 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -242,6 +242,8 @@
 
$this->profiler = DonationLoggerFactory::getProfiler( $this );
 
+   $this->logger->info( "Creating a new adapter of type: 
[{$this->getGatewayName()}]" );
+
if ( !self::getGlobal( 'Test' ) ) {
$this->url = self::getGlobal( 'URL' );
} else {

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

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

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

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

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: update DonationInterface submodule
..

update DonationInterface submodule

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/292664/1

diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 8d0f6e9..6efa849 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 8d0f6e90052690f6f30afe938ffd01c7aa68d6f8
+Subproject commit 6efa8492f25c4959e6718b19ba9c919008b0cfdb

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

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

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

[MediaWiki-commits] [Gerrit] Add some logging - change (mediawiki...DonationInterface)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Add some logging
..

Add some logging

Trying to figure out a fraud issue

Change-Id: Ic13a41042ed87eb1b6df7b477e7fec924796da77
---
M extras/custom_filters/custom_filters.body.php
M gateway_common/gateway.adapter.php
2 files changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/extras/custom_filters/custom_filters.body.php 
b/extras/custom_filters/custom_filters.body.php
index e0f10e7..f4b4946 100644
--- a/extras/custom_filters/custom_filters.body.php
+++ b/extras/custom_filters/custom_filters.body.php
@@ -35,11 +35,15 @@
 
protected function __construct( GatewayType $gateway_adapter ) {
parent::__construct( $gateway_adapter ); //gateway_adapter is 
set in there. 
+
// load user action ranges and risk score   
$this->action_ranges = $this->gateway_adapter->getGlobal( 
'CustomFiltersActionRanges' );
$this->risk_score = 
$this->gateway_adapter->getRequest()->getSessionData( 'risk_scores' );
if ( !$this->risk_score ) {
$this->risk_score = array();
+   } else {
+   $unnecessarily_escaped_session_contents = addslashes( 
json_encode( $this->risk_score ) );
+   $this->fraud_logger->info( '"Loaded from session" ' . 
$unnecessarily_escaped_session_contents );
}
$this->risk_score['initial'] = 
$this->gateway_adapter->getGlobal( 'CustomFiltersRiskScore' );
}
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 67860d6..44a9404 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -242,6 +242,8 @@
 
$this->profiler = DonationLoggerFactory::getProfiler( $this );
 
+   $this->logger->info( "Creating a new adapter of type: 
[{$this->getGatewayName()}]" );
+
if ( !self::getGlobal( 'Test' ) ) {
$this->url = self::getGlobal( 'URL' );
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic13a41042ed87eb1b6df7b477e7fec924796da77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
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 some logging - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Add some logging
..


Add some logging

Trying to figure out a fraud issue

Change-Id: Ic13a41042ed87eb1b6df7b477e7fec924796da77
---
M extras/custom_filters/custom_filters.body.php
M gateway_common/gateway.adapter.php
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/extras/custom_filters/custom_filters.body.php 
b/extras/custom_filters/custom_filters.body.php
index e0f10e7..f4b4946 100644
--- a/extras/custom_filters/custom_filters.body.php
+++ b/extras/custom_filters/custom_filters.body.php
@@ -35,11 +35,15 @@
 
protected function __construct( GatewayType $gateway_adapter ) {
parent::__construct( $gateway_adapter ); //gateway_adapter is 
set in there. 
+
// load user action ranges and risk score   
$this->action_ranges = $this->gateway_adapter->getGlobal( 
'CustomFiltersActionRanges' );
$this->risk_score = 
$this->gateway_adapter->getRequest()->getSessionData( 'risk_scores' );
if ( !$this->risk_score ) {
$this->risk_score = array();
+   } else {
+   $unnecessarily_escaped_session_contents = addslashes( 
json_encode( $this->risk_score ) );
+   $this->fraud_logger->info( '"Loaded from session" ' . 
$unnecessarily_escaped_session_contents );
}
$this->risk_score['initial'] = 
$this->gateway_adapter->getGlobal( 'CustomFiltersRiskScore' );
}
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 5c68ca8..2d072dd 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -242,6 +242,8 @@
 
$this->profiler = DonationLoggerFactory::getProfiler( $this );
 
+   $this->logger->info( "Creating a new adapter of type: 
[{$this->getGatewayName()}]" );
+
if ( !self::getGlobal( 'Test' ) ) {
$this->url = self::getGlobal( 'URL' );
} else {

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

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

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

[MediaWiki-commits] [Gerrit] Update HISTORY.md with recent fixes - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: Update HISTORY.md with recent fixes
..


Update HISTORY.md with recent fixes

Change-Id: I70a459dc1f3678ec664f626eb39a54056f84c419
---
M HISTORY.md
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/HISTORY.md b/HISTORY.md
index 4bc281d..0c4d5d1 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -5,6 +5,8 @@
   * T100681: Remove deprecated v1/v2 HTTP APIs
   * T130638: Add data-mw as a separate JSON blob in the pagebundle
   * T135596: Return client error for missing data attributes
+  * T134389: Serialize content in HTML tables using HTML tags
+  * T125419: Fix selser issues serializing first table row
 
 0.4.1 / 2015-09-17
 ==

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70a459dc1f3678ec664f626eb39a54056f84c419
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
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] browsertests: Only run setup once when parallelized - change (mediawiki...CirrusSearch)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: [WIP] browsertests: Only run setup once when parallelized
..

[WIP] browsertests: Only run setup once when parallelized

Change-Id: I454b5441e2b750a253d00a3b038a6fbca177c2eb
---
M tests/browser/features/support/hooks.rb
1 file changed, 316 insertions(+), 80 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/37/292637/1

diff --git a/tests/browser/features/support/hooks.rb 
b/tests/browser/features/support/hooks.rb
index 27ec1f9..c5d5748 100644
--- a/tests/browser/features/support/hooks.rb
+++ b/tests/browser/features/support/hooks.rb
@@ -7,9 +7,9 @@
 end
 
 main = false
-Before("@setup_main, @filters, @prefix, @bad_syntax, @wildcard, @exact_quotes, 
@phrase_prefix") do
+setup_main = lambda do |world|
   unless main
-steps %(
+world.steps %(
   Given a page named Template:Template Test exists with contents pickles 
[[Category:TemplateTagged]]
   And a page named Catapult/adsf exists with contents catapult subpage 
[[Catapult]]
   And a page named Links To Catapult exists with contents [[Catapult]]
@@ -31,9 +31,9 @@
 end
 
 clean = false
-Before("@clean") do
+setup_clean = lambda do |world|
   unless clean
-steps %(
+world.steps %(
   Given I delete DeleteMeRedirect
 )
 clean = true
@@ -41,9 +41,9 @@
 end
 
 redirect_loop = false
-Before("@redirect_loop") do
+setup_redirect_loop = lambda do |world|
   unless redirect_loop
-steps %(
+world.steps %(
   Given a page named Redirect Loop exists with contents #REDIRECT 
[[Redirect Loop 1]]
   And a page named Redirect Loop 1 exists with contents #REDIRECT 
[[Redirect Loop 2]]
   And a page named Redirect Loop 2 exists with contents #REDIRECT 
[[Redirect Loop 1]]
@@ -53,9 +53,9 @@
 end
 
 main2 = false
-Before("@setup_main, @prefix, @bad_syntax") do
+setup_main2 = lambda do |world|
   unless main2
-steps %(
+world.steps %(
   Given a page named Rdir exists with contents #REDIRECT [[Two Words]]
   And a file named File:Savepage-greyed.png exists with contents 
Savepage-greyed.png and description Screenshot, for test purposes, associated 
with https://bugzilla.wikimedia.org/show_bug.cgi?id=52908 .
   And a page named IHaveAVideo exists with contents [[File:How to Edit 
Article in Arabic Wikipedia.ogg|thumb|267x267px]]
@@ -66,9 +66,9 @@
 end
 
 commons = false
-Before("@setup_main, @commons") do
+setup_commons = lambda do |world|
   unless commons
-steps %(
+world.steps %(
 
   Given I delete on commons File:OnCommons.svg
   And I delete on commons File:DuplicatedLocally.svg
@@ -85,9 +85,9 @@
 end
 
 africa = false
-Before("@setup_main, @prefix, @go, @bad_syntax") do
+setup_africa = lambda do |world|
   unless africa
-steps %(
+world.steps %(
   Given a page named África exists with contents for testing
 )
 africa = true
@@ -95,9 +95,9 @@
 end
 
 prefix = false
-Before("@prefix") do
+setup_prefix = lambda do |world|
   unless prefix
-steps %(
+world.steps %(
   Given a page named L'Oréal exists
   And a page named Jean-Yves Le Drian exists
 )
@@ -106,9 +106,9 @@
 end
 
 headings = false
-Before("@headings") do
+setup_headings = lambda do |world|
   unless headings
-steps %(
+world.steps %(
   Given a page named HasHeadings exists with contents @has_headings.txt
   And a page named HasReferencesInText exists with contents References 
[[Category:HeadingsTest]]
   And a page named HasHeadingsWithHtmlComment exists with contents 
@has_headings_with_html_comment.txt
@@ -119,9 +119,9 @@
 end
 
 javascript_injection = false
-Before("@javascript_injection") do
+setup_javacsript_injection = lambda do |world|
   unless javascript_injection
-steps %(
+world.steps %(
   Given a page named Javascript Direct Inclusion exists with contents 
@javascript.txt
   Given a page named Javascript Pre Tag Inclusion exists with contents 
@javascript_in_pre.txt
 )
@@ -130,9 +130,9 @@
 end
 
 setup_namespaces = false
-Before("@setup_namespaces") do
+setup_setup_namespaces = lambda do |world|
   unless setup_namespaces
-steps %(
+world.steps %(
   Given a page named Talk:Two Words exists with contents why is this page 
about catapults?
   And a page named Help:Smoosh exists with contents test
   And a page named File:Nothingasdf exists with contents nothingasdf
@@ -142,9 +142,9 @@
 end
 
 suggestions = false
-Before("@suggestions") do
+setup_suggestions = lambda do |world|
   unless suggestions
-steps %(
+world.steps %(
   Given a page named Popular Culture exists with contents popular culture
   And a page named Nobel Prize exists with contents nobel prize
   And a page named Noble Gasses exists with contents noble gasses
@@ -183,9 +183,9 @@

[MediaWiki-commits] [Gerrit] Add some logging - change (mediawiki...DonationInterface)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Add some logging
..

Add some logging

Trying to figure out a fraud issue

Change-Id: Ic13a41042ed87eb1b6df7b477e7fec924796da77
---
M extras/custom_filters/custom_filters.body.php
M gateway_common/gateway.adapter.php
2 files changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/extras/custom_filters/custom_filters.body.php 
b/extras/custom_filters/custom_filters.body.php
index e0f10e7..f4b4946 100644
--- a/extras/custom_filters/custom_filters.body.php
+++ b/extras/custom_filters/custom_filters.body.php
@@ -35,11 +35,15 @@
 
protected function __construct( GatewayType $gateway_adapter ) {
parent::__construct( $gateway_adapter ); //gateway_adapter is 
set in there. 
+
// load user action ranges and risk score   
$this->action_ranges = $this->gateway_adapter->getGlobal( 
'CustomFiltersActionRanges' );
$this->risk_score = 
$this->gateway_adapter->getRequest()->getSessionData( 'risk_scores' );
if ( !$this->risk_score ) {
$this->risk_score = array();
+   } else {
+   $unnecessarily_escaped_session_contents = addslashes( 
json_encode( $this->risk_score ) );
+   $this->fraud_logger->info( '"Loaded from session" ' . 
$unnecessarily_escaped_session_contents );
}
$this->risk_score['initial'] = 
$this->gateway_adapter->getGlobal( 'CustomFiltersRiskScore' );
}
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 5c68ca8..2d072dd 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -242,6 +242,8 @@
 
$this->profiler = DonationLoggerFactory::getProfiler( $this );
 
+   $this->logger->info( "Creating a new adapter of type: 
[{$this->getGatewayName()}]" );
+
if ( !self::getGlobal( 'Test' ) ) {
$this->url = self::getGlobal( 'URL' );
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic13a41042ed87eb1b6df7b477e7fec924796da77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
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] Remove Kartographer.php - change (mediawiki...Kartographer)

[jenkins-bot (Code Review)]

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

Change subject: Remove Kartographer.php
..


Remove Kartographer.php

Was never used in practice

Change-Id: I4f3741e32c45b8de62aee6400ae912ddfface2e7
---
D Kartographer.php
1 file changed, 0 insertions(+), 13 deletions(-)

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



diff --git a/Kartographer.php b/Kartographer.php
deleted file mode 100644
index 9f18b9b..000
--- a/Kartographer.php
+++ /dev/null
@@ -1,13 +0,0 @@
-https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
-   ); */
-   return;
-} else {
-   die( 'This version of the Kartographer extension requires MediaWiki 
1.25+' );
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f3741e32c45b8de62aee6400ae912ddfface2e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] setting labmon1001's new mac address - change (operations/puppet)

[RobH (Code Review)]

RobH has submitted this change and it was merged.

Change subject: setting labmon1001's new mac address
..


setting labmon1001's new mac address

new system for labmon1001

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

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0302988..47285ba 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2922,7 +2922,7 @@
 }
 
 host labmon1001 {
-hardware ethernet F0:1F:AF:E8:B1:77;
+hardware ethernet 14:58:d0:5f:84:20;
 fixed-address labmon1001.eqiad.wmnet;
 option pxelinux.pathprefix "jessie-installer/";
 filename "jessie-installer/debian-installer/amd64/pxelinux.0";

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

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

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

[MediaWiki-commits] [Gerrit] setting labmon1001's new mac address - change (operations/puppet)

[RobH (Code Review)]

RobH has uploaded a new change for review.

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

Change subject: setting labmon1001's new mac address
..

setting labmon1001's new mac address

new system for labmon1001

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/292632/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0302988..47285ba 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2922,7 +2922,7 @@
 }
 
 host labmon1001 {
-hardware ethernet F0:1F:AF:E8:B1:77;
+hardware ethernet 14:58:d0:5f:84:20;
 fixed-address labmon1001.eqiad.wmnet;
 option pxelinux.pathprefix "jessie-installer/";
 filename "jessie-installer/debian-installer/amd64/pxelinux.0";

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

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

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

[MediaWiki-commits] [Gerrit] Remove inline styling - change (mediawiki...Kartographer)

[jenkins-bot (Code Review)]

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

Change subject: Remove inline styling
..


Remove inline styling

Change-Id: Ic19226b7ee9667cfafb4ab31fb8041144a249d88
---
M includes/Tag/MapLink.php
M includes/Tag/TagHandler.php
M tests/parserTests.txt
3 files changed, 6 insertions(+), 33 deletions(-)

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



diff --git a/includes/Tag/MapLink.php b/includes/Tag/MapLink.php
index 732304c..1222eaa 100644
--- a/includes/Tag/MapLink.php
+++ b/includes/Tag/MapLink.php
@@ -35,11 +35,12 @@
}
$text = $this->parser->recursiveTagParse( $text, $this->frame );
$style = $this->extractMarkerCss();
+   $attrs = $this->getDefaultAttributes();
 
-   $attrs = $this->getDefaultAttributes( $style );
$attrs['class'] .= ' mw-kartographer-link';
if ( $style ) {
$attrs['class'] .= ' mw-kartographer-autostyled';
+   $attrs['style'] = $style;
}
if ( $this->cssClass !== '' ) {
$attrs['class'] .= ' ' . $this->cssClass;
diff --git a/includes/Tag/TagHandler.php b/includes/Tag/TagHandler.php
index 1b89c6c..d8a6cc8 100644
--- a/includes/Tag/TagHandler.php
+++ b/includes/Tag/TagHandler.php
@@ -17,7 +17,6 @@
 use Parser;
 use ParserOutput;
 use PPFrame;
-use Sanitizer;
 use Status;
 use stdClass;
 
@@ -48,9 +47,6 @@
 
/** @var string */
protected $mapStyle;
-
-   /** @var string */
-   protected $style = '';
 
/** @var string name of the group, or null for private */
protected $groupName;
@@ -158,21 +154,14 @@
$this->zoom = $this->getInt( 'zoom' );
$regexp = '/^(' . implode( '|', $wgKartographerStyles ) . ')$/';
$this->mapStyle = $this->getText( 'mapstyle', 
$wgKartographerDfltStyle, $regexp );
-   $this->style = Sanitizer::checkCss( trim( $this->getText( 
'style', '' ) ) );
}
 
/**
 * Returns default HTML attributes of the outermost tag of the output
-* @param string $extraStyle
 * @return string[]
 */
-   protected function getDefaultAttributes( $extraStyle = '' ) {
-   $attrs = [ 'class' => 'mw-kartographer', 'mw-data' => 
'interface' ];
-   $style = trim( "{$extraStyle} {$this->style}" );
-   if ( $style ) {
-   $attrs['style'] = $style;
-   }
-   return $attrs;
+   protected function getDefaultAttributes() {
+   return [ 'class' => 'mw-kartographer', 'mw-data' => 'interface' 
];
}
 
/**
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 613e744..15eab50 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -184,11 +184,9 @@
 !! test
 CSS sanitization
 !! input
-
-https://example.com);" text="
+https://example.com);'foo
 !! result
-foo
-foo
+foo
 
 !! end
 
@@ -228,23 +226,8 @@
}
 }
 ]
-
-
-{
-"type": "Feature",
-   "geometry": {
-   "type": "Point",
-   "coordinates": [-122.3988, 37.8013]
-   },
-   "properties": {
-   "marker-symbol": "-number",
-   "marker-color": "FFF"
-   }
-}
-
 !! result
 A
-2
 
 !! end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic19226b7ee9667cfafb4ab31fb8041144a249d88
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

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

[jenkins-bot (Code Review)]

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

Change subject: Update DonationInterface submodule
..


Update DonationInterface submodule

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

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 0cefb44..8d0f6e9 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 0cefb4420985d1096971c185097397d821b307d7
+Subproject commit 8d0f6e90052690f6f30afe938ffd01c7aa68d6f8

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If51b3f97ef3992544ff93c3379ff6eb69e1b5609
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

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

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Update DonationInterface submodule
..

Update DonationInterface submodule

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


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

diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 0cefb44..8d0f6e9 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 0cefb4420985d1096971c185097397d821b307d7
+Subproject commit 8d0f6e90052690f6f30afe938ffd01c7aa68d6f8

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

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

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

[MediaWiki-commits] [Gerrit] Remove Kartographer.php - change (mediawiki...Kartographer)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Remove Kartographer.php
..

Remove Kartographer.php

Was never used in practice

Change-Id: I4f3741e32c45b8de62aee6400ae912ddfface2e7
---
D Kartographer.php
1 file changed, 0 insertions(+), 13 deletions(-)


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

diff --git a/Kartographer.php b/Kartographer.php
deleted file mode 100644
index 9f18b9b..000
--- a/Kartographer.php
+++ /dev/null
@@ -1,13 +0,0 @@
-https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
-   ); */
-   return;
-} else {
-   die( 'This version of the Kartographer extension requires MediaWiki 
1.25+' );
-}

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

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

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

[MediaWiki-commits] [Gerrit] Clear out expensive js landmine - change (mediawiki...DonationInterface)

[Ejegg (Code Review)]

Ejegg has submitted this change and it was merged.

Change subject: Clear out expensive js landmine
..


Clear out expensive js landmine

Wowow, this one sucked.

Change-Id: I9d8b88c95193260962e22544d1f929257347e507
---
M adyen_gateway/forms/js/adyen.js
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/adyen_gateway/forms/js/adyen.js b/adyen_gateway/forms/js/adyen.js
index dee5736..d223505 100644
--- a/adyen_gateway/forms/js/adyen.js
+++ b/adyen_gateway/forms/js/adyen.js
@@ -7,13 +7,12 @@
 
var sendData,
$payment,
-   $pForm,
-   currency_code = 'USD';
+   $pForm;
 
sendData = {
action: 'donate',
gateway: 'adyen',
-   currency_code: currency_code,
+   currency_code: $( '#currency_code' ).val(),
amount: $( '#amount' ).val(),
fname: $( '#fname' ).val(),
lname: $( '#lname' ).val(),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d8b88c95193260962e22544d1f929257347e507
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Clear out expensive js landmine - change (mediawiki...DonationInterface)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Clear out expensive js landmine
..

Clear out expensive js landmine

Wowow, this one sucked.

Change-Id: I9d8b88c95193260962e22544d1f929257347e507
---
M adyen_gateway/forms/js/adyen.js
1 file changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/adyen_gateway/forms/js/adyen.js b/adyen_gateway/forms/js/adyen.js
index dee5736..d223505 100644
--- a/adyen_gateway/forms/js/adyen.js
+++ b/adyen_gateway/forms/js/adyen.js
@@ -7,13 +7,12 @@
 
var sendData,
$payment,
-   $pForm,
-   currency_code = 'USD';
+   $pForm;
 
sendData = {
action: 'donate',
gateway: 'adyen',
-   currency_code: currency_code,
+   currency_code: $( '#currency_code' ).val(),
amount: $( '#amount' ).val(),
fname: $( '#fname' ).val(),
lname: $( '#lname' ).val(),

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

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

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

[MediaWiki-commits] [Gerrit] Clear out expensive js landmine - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Clear out expensive js landmine
..


Clear out expensive js landmine

Wowow, this one sucked.

Change-Id: I9d8b88c95193260962e22544d1f929257347e507
---
M adyen_gateway/forms/js/adyen.js
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/adyen_gateway/forms/js/adyen.js b/adyen_gateway/forms/js/adyen.js
index dee5736..d223505 100644
--- a/adyen_gateway/forms/js/adyen.js
+++ b/adyen_gateway/forms/js/adyen.js
@@ -7,13 +7,12 @@
 
var sendData,
$payment,
-   $pForm,
-   currency_code = 'USD';
+   $pForm;
 
sendData = {
action: 'donate',
gateway: 'adyen',
-   currency_code: currency_code,
+   currency_code: $( '#currency_code' ).val(),
amount: $( '#amount' ).val(),
fname: $( '#fname' ).val(),
lname: $( '#lname' ).val(),

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

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

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

[MediaWiki-commits] [Gerrit] Clear out expensive js landmine - change (mediawiki...DonationInterface)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Clear out expensive js landmine
..

Clear out expensive js landmine

Wowow, this one sucked.

Change-Id: I9d8b88c95193260962e22544d1f929257347e507
---
M adyen_gateway/forms/js/adyen.js
1 file changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/adyen_gateway/forms/js/adyen.js b/adyen_gateway/forms/js/adyen.js
index dee5736..d223505 100644
--- a/adyen_gateway/forms/js/adyen.js
+++ b/adyen_gateway/forms/js/adyen.js
@@ -7,13 +7,12 @@
 
var sendData,
$payment,
-   $pForm,
-   currency_code = 'USD';
+   $pForm;
 
sendData = {
action: 'donate',
gateway: 'adyen',
-   currency_code: currency_code,
+   currency_code: $( '#currency_code' ).val(),
amount: $( '#amount' ).val(),
fname: $( '#fname' ).val(),
lname: $( '#lname' ).val(),

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

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

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

[MediaWiki-commits] [Gerrit] Remove inline styling - change (mediawiki...Kartographer)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Remove inline styling
..

Remove inline styling

Change-Id: Ic19226b7ee9667cfafb4ab31fb8041144a249d88
---
M includes/Tag/MapLink.php
M includes/Tag/TagHandler.php
M tests/parserTests.txt
3 files changed, 6 insertions(+), 32 deletions(-)


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

diff --git a/includes/Tag/MapLink.php b/includes/Tag/MapLink.php
index 732304c..1222eaa 100644
--- a/includes/Tag/MapLink.php
+++ b/includes/Tag/MapLink.php
@@ -35,11 +35,12 @@
}
$text = $this->parser->recursiveTagParse( $text, $this->frame );
$style = $this->extractMarkerCss();
+   $attrs = $this->getDefaultAttributes();
 
-   $attrs = $this->getDefaultAttributes( $style );
$attrs['class'] .= ' mw-kartographer-link';
if ( $style ) {
$attrs['class'] .= ' mw-kartographer-autostyled';
+   $attrs['style'] = $style;
}
if ( $this->cssClass !== '' ) {
$attrs['class'] .= ' ' . $this->cssClass;
diff --git a/includes/Tag/TagHandler.php b/includes/Tag/TagHandler.php
index 1b89c6c..7c07d62 100644
--- a/includes/Tag/TagHandler.php
+++ b/includes/Tag/TagHandler.php
@@ -49,9 +49,6 @@
/** @var string */
protected $mapStyle;
 
-   /** @var string */
-   protected $style = '';
-
/** @var string name of the group, or null for private */
protected $groupName;
 
@@ -158,21 +155,14 @@
$this->zoom = $this->getInt( 'zoom' );
$regexp = '/^(' . implode( '|', $wgKartographerStyles ) . ')$/';
$this->mapStyle = $this->getText( 'mapstyle', 
$wgKartographerDfltStyle, $regexp );
-   $this->style = Sanitizer::checkCss( trim( $this->getText( 
'style', '' ) ) );
}
 
/**
 * Returns default HTML attributes of the outermost tag of the output
-* @param string $extraStyle
 * @return string[]
 */
-   protected function getDefaultAttributes( $extraStyle = '' ) {
-   $attrs = [ 'class' => 'mw-kartographer', 'mw-data' => 
'interface' ];
-   $style = trim( "{$extraStyle} {$this->style}" );
-   if ( $style ) {
-   $attrs['style'] = $style;
-   }
-   return $attrs;
+   protected function getDefaultAttributes() {
+   return [ 'class' => 'mw-kartographer', 'mw-data' => 'interface' 
];
}
 
/**
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 613e744..15eab50 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -184,11 +184,9 @@
 !! test
 CSS sanitization
 !! input
-
-https://example.com);" text="
+https://example.com);'foo
 !! result
-foo
-foo
+foo
 
 !! end
 
@@ -228,23 +226,8 @@
}
 }
 ]
-
-
-{
-"type": "Feature",
-   "geometry": {
-   "type": "Point",
-   "coordinates": [-122.3988, 37.8013]
-   },
-   "properties": {
-   "marker-symbol": "-number",
-   "marker-color": "FFF"
-   }
-}
-
 !! result
 A
-2
 
 !! end
 

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

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

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

[MediaWiki-commits] [Gerrit] Add params['PHP_BIN'] = 'hhvm' to npm-node-0.10 - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add params['PHP_BIN'] = 'hhvm' to npm-node-0.10
..

Add params['PHP_BIN'] = 'hhvm' to npm-node-0.10

npm-node-0.10 needs a php lets use hhvm.

Change-Id: Ib86bf489c9ab5a5b79cc480f9b591c8423cba61a
---
M zuul/parameter_functions.py
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/26/292626/1

diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 1ce2928..11ead8a 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -35,6 +35,9 @@
 # T128091: oojs/ui npm job runs on Jessie which only has HHVM
 params['PHP_BIN'] = 'hhvm'
 
+if job.name.endswith('node-0.10'):
+params['PHP_BIN'] = 'php5'
+
 ext_deps_jobs = ('mwext-testextension', 'mwext-qunit', 'mwext-mw-selenium')
 if job.name.startswith(ext_deps_jobs):
 set_ext_dependencies(item, job, params)

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

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

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

[MediaWiki-commits] [Gerrit] Flip $wgKartographerUseMarkerStyle to false by default - change (mediawiki...Kartographer)

[jenkins-bot (Code Review)]

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

Change subject: Flip $wgKartographerUseMarkerStyle to false by default
..


Flip $wgKartographerUseMarkerStyle to false by default

Change-Id: I4ce1d8839a619f0a339c5a500abc6ce44b8005ac
---
M extension.json
M tests/parserTests.txt
2 files changed, 27 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 063b80a..c47251d 100644
--- a/extension.json
+++ b/extension.json
@@ -238,7 +238,7 @@
"KartographerMapServer": "https://maps.wikimedia.org;,
"KartographerIconServer": "https://maps.wikimedia.org;,
"KartographerFrameMode": "interactive",
-   "KartographerUseMarkerStyle": true,
+   "KartographerUseMarkerStyle": false,
"KartographerEnableTags": [ "mapframe", "maplink" ]
},
"TrackingCategories": [
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index daa8417..613e744 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -193,7 +193,9 @@
 !! end
 
 !! test
-Marker styles
+ - marker styles
+!! config
+wgKartographerUseMarkerStyle=true
 !! input
 [
 {
@@ -245,3 +247,26 @@
 2
 
 !! end
+
+!! test
+ - marker styles disabled
+!! config
+wgKartographerUseMarkerStyle=false
+!! input
+
+{
+"type": "Feature",
+   "geometry": {
+   "type": "Point",
+   "coordinates": [-122.3988, 37.8013]
+   },
+   "properties": {
+   "marker-symbol": "-letter",
+   "marker-color": "#abcdef"
+   }
+}
+
+!! result
+A
+
+!! end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ce1d8839a619f0a339c5a500abc6ce44b8005ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Flip $wgKartographerUseMarkerStyle to false by default - change (mediawiki...Kartographer)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Flip $wgKartographerUseMarkerStyle to false by default
..

Flip $wgKartographerUseMarkerStyle to false by default

Change-Id: I4ce1d8839a619f0a339c5a500abc6ce44b8005ac
---
M extension.json
M tests/parserTests.txt
2 files changed, 27 insertions(+), 2 deletions(-)


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

diff --git a/extension.json b/extension.json
index 063b80a..c47251d 100644
--- a/extension.json
+++ b/extension.json
@@ -238,7 +238,7 @@
"KartographerMapServer": "https://maps.wikimedia.org;,
"KartographerIconServer": "https://maps.wikimedia.org;,
"KartographerFrameMode": "interactive",
-   "KartographerUseMarkerStyle": true,
+   "KartographerUseMarkerStyle": false,
"KartographerEnableTags": [ "mapframe", "maplink" ]
},
"TrackingCategories": [
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index daa8417..613e744 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -193,7 +193,9 @@
 !! end
 
 !! test
-Marker styles
+ - marker styles
+!! config
+wgKartographerUseMarkerStyle=true
 !! input
 [
 {
@@ -245,3 +247,26 @@
 2
 
 !! end
+
+!! test
+ - marker styles disabled
+!! config
+wgKartographerUseMarkerStyle=false
+!! input
+
+{
+"type": "Feature",
+   "geometry": {
+   "type": "Point",
+   "coordinates": [-122.3988, 37.8013]
+   },
+   "properties": {
+   "marker-symbol": "-letter",
+   "marker-color": "#abcdef"
+   }
+}
+
+!! result
+A
+
+!! end

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

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

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

[MediaWiki-commits] [Gerrit] add endowment.wikimedia.org - change (operations/dns)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: add endowment.wikimedia.org
..


add endowment.wikimedia.org

Bug:T136735
Change-Id: Ibf66653aeef5d203843dc106e16374f574e19d64
---
M templates/wikimedia.org
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 2653443..907e03c 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -459,6 +459,8 @@
 dev 600 IN DYNA geoip!text-addrs
 doc 600 IN DYNA geoip!misc-addrs
 docs600 IN DYNA geoip!text-addrs
+
+endowment   600 IN DYNA geoip!misc-addrs
 eventdonations  1H  IN CNAME
contrib-wi-10109-10472-20140728-1682402186.us-east-1.elb.amazonaws.com.
 ldap-corp.eqiad 1H  IN CNAMEdubnium
 ldap-corp.codfw 1H  IN CNAMEpollux

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

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

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

[MediaWiki-commits] [Gerrit] varnish: mv wikimedia_vcl, netmapper_upd to separate files - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: varnish: mv wikimedia_vcl, netmapper_upd to separate files
..


varnish: mv wikimedia_vcl, netmapper_upd to separate files

fixing:

./modules/varnish/manifests/instance.pp -
ERROR: varnish::wikimedia_vcl not in autoload module layout on line 1

./modules/varnish/manifests/zero_update.pp -
ERROR: varnish::netmapper_update_common not in autoload module layout on line 2

Change-Id: I5e94fb5000d2bf38e39cd207a525ec421a5240d1
---
M modules/varnish/manifests/instance.pp
A modules/varnish/manifests/netmapper_update_common.pp
A modules/varnish/manifests/wikimedia_vcl.pp
M modules/varnish/manifests/zero_update.pp
4 files changed, 38 insertions(+), 38 deletions(-)

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



diff --git a/modules/varnish/manifests/instance.pp 
b/modules/varnish/manifests/instance.pp
index 2ad339e..18593b0 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -1,17 +1,3 @@
-define varnish::wikimedia_vcl($varnish_testing, $template_path) {
-if $varnish_testing  {
-$varnish_include_path = '/usr/share/varnish/tests/'
-$dynamic_directors = false
-}
-
-file { $title:
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
-content => template($template_path),
-}
-}
-
 define varnish::instance(
 $layer,
 $vcl_config,
diff --git a/modules/varnish/manifests/netmapper_update_common.pp 
b/modules/varnish/manifests/netmapper_update_common.pp
new file mode 100644
index 000..935f782
--- /dev/null
+++ b/modules/varnish/manifests/netmapper_update_common.pp
@@ -0,0 +1,24 @@
+# basic infrastructure for netmapper json files
+class varnish::netmapper_update_common {
+group { 'netmap':
+ensure => present,
+}
+
+user { 'netmap':
+home   => '/var/netmapper',
+gid=> 'netmap',
+system => true,
+managehome => false,
+shell  => '/bin/false',
+require=> Group['netmap'],
+}
+
+file { '/var/netmapper':
+ensure  => directory,
+owner   => 'netmap',
+group   => 'netmap',
+require => User['netmap'],
+mode=> '0755',
+}
+}
+
diff --git a/modules/varnish/manifests/wikimedia_vcl.pp 
b/modules/varnish/manifests/wikimedia_vcl.pp
new file mode 100644
index 000..733c0be
--- /dev/null
+++ b/modules/varnish/manifests/wikimedia_vcl.pp
@@ -0,0 +1,14 @@
+define varnish::wikimedia_vcl($varnish_testing, $template_path) {
+if $varnish_testing  {
+$varnish_include_path = '/usr/share/varnish/tests/'
+$dynamic_directors = false
+}
+
+file { $title:
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => template($template_path),
+}
+}
+
diff --git a/modules/varnish/manifests/zero_update.pp 
b/modules/varnish/manifests/zero_update.pp
index 74eac84..aa985f3 100644
--- a/modules/varnish/manifests/zero_update.pp
+++ b/modules/varnish/manifests/zero_update.pp
@@ -1,27 +1,3 @@
-# basic infrastructure for netmapper json files
-class varnish::netmapper_update_common {
-group { 'netmap':
-ensure => present,
-}
-
-user { 'netmap':
-home   => '/var/netmapper',
-gid=> 'netmap',
-system => true,
-managehome => false,
-shell  => '/bin/false',
-require=> Group['netmap'],
-}
-
-file { '/var/netmapper':
-ensure  => directory,
-owner   => 'netmap',
-group   => 'netmap',
-require => User['netmap'],
-mode=> '0755',
-}
-}
-
 # Zero-specific update stuff
 class varnish::zero_update($site, $auth_content) {
 require 'varnish::netmapper_update_common'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e94fb5000d2bf38e39cd207a525ec421a5240d1
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
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] Fix possible crash when displaying W0 banner. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Fix possible crash when displaying W0 banner.
..


Fix possible crash when displaying W0 banner.

Bug: T136977
Change-Id: I6e76a08ac2a8fb0c8c95d23320885bb0fcd867ef
---
M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java 
b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
index 0a3f710..a180546 100644
--- a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
+++ b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
@@ -6,6 +6,7 @@
 import org.wikipedia.events.WikipediaZeroStateChangeEvent;
 import org.mediawiki.api.json.ApiResult;
 import org.mediawiki.api.json.OnHeaderCheckListener;
+import org.wikipedia.util.ApiUtil;
 import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.FeedbackUtil;
 import org.wikipedia.util.StringUtil;
@@ -225,7 +226,9 @@
 rootView.setMinimumHeight(BANNER_HEIGHT);
 textView.setTextColor(foreground);
 textView.setTextSize(BANNER_TEXT_SIZE);
-textView.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
+if (ApiUtil.hasJellyBeanMr1()) {
+textView.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
+}
 textView.setGravity(Gravity.CENTER_HORIZONTAL);
 snackbar.show();
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e76a08ac2a8fb0c8c95d23320885bb0fcd867ef
Gerrit-PatchSet: 1
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] ssl: delete rt.wikimedia.org.crt - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: ssl: delete rt.wikimedia.org.crt
..


ssl: delete rt.wikimedia.org.crt

Since T119112 RT is now behind varnish misc-web
and therefore doesn't need a separate cert anymore.

Also, it had an LE cert already that replaced this before.

The key in the private repo should be deleted along with this.

Bug:T119112
Change-Id: I58ebadefd3dc24f89922b52e9df6384967a3a92e
---
D files/ssl/rt.wikimedia.org.crt
1 file changed, 0 insertions(+), 31 deletions(-)

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



diff --git a/files/ssl/rt.wikimedia.org.crt b/files/ssl/rt.wikimedia.org.crt
deleted file mode 100644
index 9de2404..000
--- a/files/ssl/rt.wikimedia.org.crt
+++ /dev/null
@@ -1,31 +0,0 @@
--BEGIN CERTIFICATE-
-MIIFQjCCBCqgAwIBAgISESH8hn3EGHHRqR4Hi/tcuqRzMA0GCSqGSIb3DQEBCwUA
-MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
-VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTYwMTExMTkyNjA3WhcNMTcwMTExMTkyNjA3WjB6MQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
-aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xGTAXBgNV
-BAMTEHJ0Lndpa2ltZWRpYS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCxYLF5tPhnKp2g7zJdmwyXYoy9FutGZEmyYOqjB4wrJF6H67N7tcvjQfHt
-lcAnx9d1auxdGdAMznm+bHFFuxPe3acvhy1iZC29Zac7fYSXAO24riXAUXIZlWZE
-D/J4erY7hADgvRnlx5NKK+Jgm0+JGsFmzBceCu7bt68EQ9kMrvEGiqnhAuXyYNKf
-BBONSGhEnI21bWDAiKef4eGL4EfeFFJdEuXHrFNR8ZRBjO0bc6hca6uKvw3CRYiH
-t1ZlGdkrStWfsIsrCAAp8Js17RLG/CWLCEjz+Ic1VxhPp/UFwDC65EtgqZ8J4XvL
-X7j0umpoA1HBD+IG5auCOhr5SdWtAgMBAAGjggHUMIIB0DAOBgNVHQ8BAf8EBAMC
-BaAwSQYDVR0gBEIwQDA+BgZngQwBAgIwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93
-d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wGwYDVR0RBBQwEoIQcnQud2lr
-aW1lZGlhLm9yZzAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29t
-L2dzL2dzb3JnYW5pemF0aW9udmFsc2hhMmcyLmNybDCBoAYIKwYBBQUHAQEEgZMw
-gZAwTQYIKwYBBQUHMAKGQWh0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2Fj
-ZXJ0L2dzb3JnYW5pemF0aW9udmFsc2hhMmcycjEuY3J0MD8GCCsGAQUFBzABhjNo
-dHRwOi8vb2NzcDIuZ2xvYmFsc2lnbi5jb20vZ3Nvcmdhbml6YXRpb252YWxzaGEy
-ZzIwHQYDVR0OBBYEFAKwGoO1SnRHhmRe3bVP3AM1R6K0MB8GA1UdIwQYMBaAFJbe
-YfG9HBYpUxzAzH07gwBA5hp8MA0GCSqGSIb3DQEBCwUAA4IBAQB5XQBbxTU2Rq7q
-NPbKswbMHeANg+LDK/KFhfNd6mmZ0L5XJMiCBS/6B/N8jdTjg73uygElKuhLPL7T
-9Xv497/f0qox8YYhMl2mCKB632wnBIkHPO4/1saZJqnnq4LZCwZQXLyTW0opChBE
-zW9rZNcOLe3mykxzH0RNTi6mjINr62W7ZfxkI4/QRPxd0LbRF3lVrM5Cwo41sJoz
-/TnrwopV1iOnK5LKjydkr7WyK9oZ3Pa6i4WLosWfVlRnAI+3KayJARS4vqYqA9k3
-xMg2pE1hEIKLw+d5g7PcdlS/LlUjH/e3E5ZYSDnqp48GRu8PIpQBNRrqA4CpGHUH
-h6nxwqGJ
--END CERTIFICATE-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58ebadefd3dc24f89922b52e9df6384967a3a92e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Cleanup: Note a couple of items that are varied in Labs only - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Cleanup: Note a couple of items that are varied in Labs only
..

Cleanup: Note a couple of items that are varied in Labs only

Change-Id: Ie0a90f4f5c5af45b4e912db83a5b4ab001ad15b1
---
M wmf-config/InitialiseSettings.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 15b0c73..fc9e002 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13789,6 +13789,7 @@
'viwiktionary' => 'uca-vi', // T47979
 ],
 
+// Varied for Labs only.
 'wmgUsePoolCounter' => [
'default' => true,
 ],
@@ -16849,6 +16850,7 @@
'default' => true,
 ],
 
+// Varied for Labs only.
 'wmgLogAuthmanagerMetrics' => [
'default' => true,
 ],
@@ -16905,6 +16907,7 @@
'default' => true,
 ],
 
+// Varied for Labs only.
 'wmgUseCheckUser' => [
'default' => true,
 ],

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

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

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

[MediaWiki-commits] [Gerrit] Switch Wikivoyages to Single Edit Tab mode for VE Beta Feature - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Switch Wikivoyages to Single Edit Tab mode for VE Beta Feature
..

Switch Wikivoyages to Single Edit Tab mode for VE Beta Feature

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 59cc6de..94dcc7d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13436,6 +13436,7 @@
 
'wikisource' => true,   // Starting from SET
'wiktionary' => true,   // Starting from SET
+   'wikivoyage' => true,   // Starting from SET
 
'mediawikiwiki' => true,
'testwiki' => true,

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

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

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered WikiLoveDefault into CommonSettings - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Cleanup: Move never-altered WikiLoveDefault into CommonSettings
..

Cleanup: Move never-altered WikiLoveDefault into CommonSettings

Change-Id: I9af212aefeef8b56c4fcbe8d14d81c4c9106aa8b
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 6 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 821d037..24d8d12 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2236,9 +2236,7 @@
 if ( $wmgUseWikiLove ) {
require_once( "$IP/extensions/WikiLove/WikiLove.php" );
$wgWikiLoveLogging = true;
-   if ( $wmgWikiLoveDefault ) {
-   $wgDefaultUserOptions['wikilove-enabled'] = 1;
-   }
+   $wgDefaultUserOptions['wikilove-enabled'] = 1;
 }
 
 if ( $wmgUseGuidedTour || $wmgUseGettingStarted ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3baa0c7..15b0c73 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13904,9 +13904,6 @@
'zhwiki' => true, // T32362
'zhwikivoyage' => true, // T75717
 ],
-'wmgWikiLoveDefault' => [
-   'default' => true,
-],
 
 // whether to use the Math extension
 'wmgUseMath' => [

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

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

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered CommonsMetadata* into CommonSett... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Cleanup: Move never-altered CommonsMetadata* into CommonSettings
..

Cleanup: Move never-altered CommonsMetadata* into CommonSettings

Change-Id: I3f93183a312d058bdac10d4904586b2f4293c7c0
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 10 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8620ab1..821d037 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2021,8 +2021,8 @@
 
 if ( $wmgUseCommonsMetadata ) {
require_once( "$IP/extensions/CommonsMetadata/CommonsMetadata.php" );
-   $wgCommonsMetadataSetTrackingCategories = 
$wmgCommonsMetadataSetTrackingCategories;
-   $wgCommonsMetadataForceRecalculate = 
$wmgCommonsMetadataForceRecalculate;
+   $wgCommonsMetadataSetTrackingCategories = true;
+   $wgCommonsMetadataForceRecalculate = false;
 }
 
 if ( $wmgUseGWToolset ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dc6c220..3baa0c7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12558,14 +12558,6 @@
'wikitech' => false,
 ],
 
-'wmgCommonsMetadataSetTrackingCategories' => [
-   'default' => true,
-],
-
-'wmgCommonsMetadataForceRecalculate' => [
-   'default' => false,
-],
-
 // T134778
 'wmgUsePopups' => [
'default' => false,

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

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

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered UseLocalisationUpdate into Commo... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Cleanup: Move never-altered UseLocalisationUpdate into 
CommonSettings
..

Cleanup: Move never-altered UseLocalisationUpdate into CommonSettings

Change-Id: I9e94467a0248c7238ac00653c33677844b8e1b13
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 9 insertions(+), 14 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7bffb3f..8620ab1 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1783,16 +1783,15 @@
 $wgDefaultUserOptions['usebetatoolbar'] = 1;
 $wgDefaultUserOptions['usebetatoolbar-cgd'] = 1;
 
-if ( $wmgUseLocalisationUpdate ) {
-   require_once( 
"$IP/extensions/LocalisationUpdate/LocalisationUpdate.php" );
-   $wgLocalisationUpdateDirectory = 
"/var/lib/l10nupdate/caches/cache-$wmgVersionNumber";
-   $wgLocalisationUpdateRepository = 'local';
-   $wgLocalisationUpdateRepositories['local'] = [
-   'mediawiki' => '/var/lib/l10nupdate/mediawiki/core/%PATH%',
-   'extension' => 
'/var/lib/l10nupdate/mediawiki/extensions/%NAME%/%PATH%',
-   'skins' => '/var/lib/l10nupdate/mediawiki/skins/%NAME%/%PATH%',
-   ];
-}
+# LocalisationUpdate
+require_once( "$IP/extensions/LocalisationUpdate/LocalisationUpdate.php" );
+$wgLocalisationUpdateDirectory = 
"/var/lib/l10nupdate/caches/cache-$wmgVersionNumber";
+$wgLocalisationUpdateRepository = 'local';
+$wgLocalisationUpdateRepositories['local'] = [
+   'mediawiki' => '/var/lib/l10nupdate/mediawiki/core/%PATH%',
+   'extension' => '/var/lib/l10nupdate/mediawiki/extensions/%NAME%/%PATH%',
+   'skins' => '/var/lib/l10nupdate/mediawiki/skins/%NAME%/%PATH%',
+];
 
 if ( $wmgEnableLandingCheck ) {
require_once(  "$IP/extensions/LandingCheck/LandingCheck.php" );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cbe89f4..dc6c220 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12175,10 +12175,6 @@
'default' => 1024,
 ],
 
-'wmgUseLocalisationUpdate' => [
-   'default' => true,
-],
-
 'wmgUseLiquidThreads' => [
 //
 // 
!

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

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

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered CentralAuthUseEventLogging into ... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Cleanup: Move never-altered CentralAuthUseEventLogging into 
CommonSettings
..

Cleanup: Move never-altered CentralAuthUseEventLogging into CommonSettings

Change-Id: I0290c16c5ab4552c08d6c99c5826f4ed4c73d2b0
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 4 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 70df0d7..4709091 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1242,7 +1242,7 @@
$wgCentralAuthCookies = true;
 
$wgDisableUnmergedEditing = $wmgDisableUnmergedEdits;
-   $wgCentralAuthUseEventLogging = $wmgCentralAuthUseEventLogging;
+   $wgCentralAuthUseEventLogging = true;
$wgCentralAuthPreventUnattached = true;
 
if ( $wmfRealm == 'production' ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 64b5a66..21ced97 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11628,9 +11628,6 @@
'default' => 'loginwiki',
 ],
 
-'wmgCentralAuthUseEventLogging' => [
-   'default' => true,
-],
 // This is also guarded by $wmgUseCentralAuth
 'wmgUseGlobalCssJs' => [
'default' => true,

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

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

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered DisableUnmergedEdits into Common... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Cleanup: Move never-altered DisableUnmergedEdits into 
CommonSettings
..

Cleanup: Move never-altered DisableUnmergedEdits into CommonSettings

Change-Id: I09e8a17cf577cae5507cd42de3c8cc2aef6eac53
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4709091..ed98768 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1241,7 +1241,6 @@
$wgGroupPermissions['steward']['centralauth-rename'] = true;
$wgCentralAuthCookies = true;
 
-   $wgDisableUnmergedEditing = $wmgDisableUnmergedEdits;
$wgCentralAuthUseEventLogging = true;
$wgCentralAuthPreventUnattached = true;
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 21ced97..63bf236 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15698,11 +15698,6 @@
'private' => false,
 ],
 
-'wmgDisableUnmergedEdits' => [
-   'default' => false,
-   'wikivoyage' => false,
-],
-
 'wmgUseGeoCrumbs' => [
'default' => false,
'incubatorwiki' => true, // T46725

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

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

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered UseDismissableSiteNotice into Co... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Cleanup: Move never-altered UseDismissableSiteNotice into 
CommonSettings
..

Cleanup: Move never-altered UseDismissableSiteNotice into CommonSettings

Change-Id: Idd92ba969311c161598741050c89ed45f80dade2
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 8 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 299568a..efb4df8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1427,10 +1427,8 @@
 }
 
 // taking it live 2006-12-15 brion
-if ( $wmgUseDismissableSiteNotice ) {
-   require( 
"$IP/extensions/DismissableSiteNotice/DismissableSiteNotice.php" );
-   $wgDismissableSiteNoticeForAnons = true; // T59732
-}
+require( "$IP/extensions/DismissableSiteNotice/DismissableSiteNotice.php" );
+$wgDismissableSiteNoticeForAnons = true; // T59732
 $wgMajorSiteNoticeID = '2';
 
 $wgHooks['LoginAuthenticateAudit'][] = function( $user, $pass, $retval ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 0b3821d..9c7706f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4350,10 +4350,6 @@
'private' => true // make files private and such
 ],
 
-'wmgUseDismissableSiteNotice' => [
-   'default' => true,
-],
-
 'wmgUseCentralNotice' => [
'default' => true,
'advisorywiki' => false, // Per T27519

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

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

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered NewUserSuppressRC into CommonSet... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Cleanup: Move never-altered NewUserSuppressRC into 
CommonSettings
..

Cleanup: Move never-altered NewUserSuppressRC into CommonSettings

Change-Id: If520a5ce4888040820f923312b904410110eccc2
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 5 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ed98768..299568a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1740,7 +1740,7 @@
 
 if ( $wmgUseNewUserMessage ) {
include "$IP/extensions/NewUserMessage/NewUserMessage.php";
-   $wgNewUserSuppressRC = $wmgNewUserSuppressRC;
+   $wgNewUserSuppressRC = true;
$wgNewUserMinorEdit = $wmgNewUserMinorEdit;
$wgNewUserMessageOnAutoCreate = $wmgNewUserMessageOnAutoCreate;
 }
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 63bf236..0b3821d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11844,10 +11844,6 @@
'ukwiki' => true, // T67125
 ],
 
-'wmgNewUserSuppressRC' => [
-   'default' => true,
-],
-
 'wmgNewUserMinorEdit' => [
'default' => true,
'arwiki' => false,

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

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

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered GlobalBlockingBlockXFF into Comm... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Cleanup: Move never-altered GlobalBlockingBlockXFF into 
CommonSettings
..

Cleanup: Move never-altered GlobalBlockingBlockXFF into CommonSettings

Change-Id: I530a6101de26658ed27cd6f1f31feee2d1396f11
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 6 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index aebcaa1..70df0d7 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -910,7 +910,7 @@
include( $IP . '/extensions/GlobalBlocking/GlobalBlocking.php' );
$wgGlobalBlockingDatabase = 'centralauth';
$wgApplyGlobalBlocks = $wmgApplyGlobalBlocks;
-   $wgGlobalBlockingBlockXFF = $wmgUseXFFBlocks;
+   $wgGlobalBlockingBlockXFF = true; // Apply blocks to IPs in XFF (T25343)
 }
 
 include( $IP . '/extensions/TrustedXFF/TrustedXFF.php' );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 94dcc7d..64b5a66 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16728,11 +16728,6 @@
 ],
 ### End (roughly) of general extensions 
 
-// Apply blocks to IPs in XFF (T25343)
-'wmgUseXFFBlocks' => [
-   'default' => true,
-],
-
 'wgUseTidy' => [
'default' => true,
'foundationwiki' => false,

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

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

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered UseAbuseFilter into CommonSettings - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Cleanup: Move never-altered UseAbuseFilter into CommonSettings
..

Cleanup: Move never-altered UseAbuseFilter into CommonSettings

Change-Id: Idaf2bb5e2a9d591b9ecab46e98366e42e0f98a5b
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/abusefilter.php
3 files changed, 6 insertions(+), 12 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index efb4df8..7bffb3f 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1758,14 +1758,13 @@
$wgCodeReviewMaxDiffPaths = 100;
 }
 
-if ( $wmgUseAbuseFilter ) {
-   include "$IP/extensions/AbuseFilter/AbuseFilter.php";
-   include( "$wmfConfigDir/abusefilter.php" );
+# abuse filter @{
+include "$IP/extensions/AbuseFilter/AbuseFilter.php";
+include( "$wmfConfigDir/abusefilter.php" );
 
-   $wgAbuseFilterEmergencyDisableThreshold = 
$wmgAbuseFilterEmergencyDisableThreshold;
-   $wgAbuseFilterEmergencyDisableCount = 
$wmgAbuseFilterEmergencyDisableCount;
-   $wgAbuseFilterEmergencyDisableAge = $wmgAbuseFilterEmergencyDisableAge;
-}
+$wgAbuseFilterEmergencyDisableThreshold = 
$wmgAbuseFilterEmergencyDisableThreshold;
+$wgAbuseFilterEmergencyDisableCount = $wmgAbuseFilterEmergencyDisableCount;
+$wgAbuseFilterEmergencyDisableAge = $wmgAbuseFilterEmergencyDisableAge;
 
 if ( $wmgUsePdfHandler ) {
include ( "$IP/extensions/PdfHandler/PdfHandler.php" );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9c7706f..cbe89f4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11952,10 +11952,6 @@
 ],
 
 # abuse filter @{
-'wmgUseAbuseFilter' => [
-   'default' => true,
-],
-
 'wmgAbuseFilterCentralDB' => [
'default' => 'metawiki',
 ],
diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index d3da3d6..9936744 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -2,7 +2,6 @@
 # WARNING: This file is publically viewable on the web. Do not put private 
data here.
 
 # This file is for the default permissions and custom permissions of the 
AbuseFilter extension.
-# You must also set wmgUseAbuseFilter in InitialiseSettings.php
 # This file is referenced from an include in CommonSettings.php
 
 $wgGroupPermissions['*']['abusefilter-view'] = true;

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

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

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

[MediaWiki-commits] [Gerrit] Show an onboarding snackbar for deleting a page from a readi... - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Show an onboarding snackbar for deleting a page from a reading 
list.
..


Show an onboarding snackbar for deleting a page from a reading list.

Bug: T136740
Change-Id: I86a04620842227387c7d77109459d8d6cef3850c
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/xml/developer_preferences.xml
6 files changed, 30 insertions(+), 0 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
index 29401b1..f442f24 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
@@ -232,6 +232,11 @@
 listDetailView.setReadingList(readingList);
 listDetailView.setSort(readingListPageSortMode);
 pager.setCurrentItem(PAGE_LIST_DETAIL);
+
+if (!readingList.getPages().isEmpty()
+&& Prefs.isReadingListPageDeleteTutorialEnabled()) {
+showDeletePageOnboarding();
+}
 }
 }
 
@@ -306,6 +311,16 @@
 snackbar.show();
 }
 
+private void showDeletePageOnboarding() {
+FeedbackUtil.makeSnackbar(getView(), 
getString(R.string.reading_lists_onboarding_page_delete), 
Snackbar.LENGTH_INDEFINITE)
+.setAction(R.string.reading_lists_onboarding_got_it, new 
View.OnClickListener() {
+@Override
+public void onClick(View v) {
+Prefs.setReadingListPageDeleteTutorialEnabled(false);
+}
+}).show();
+}
+
 private void setSortMode(int sortModeAsc, int sortModeDesc) {
 if (pager.getCurrentItem() == PAGE_READING_LISTS) {
 if (readingListSortMode != sortModeAsc) {
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 9b38a31..382a330 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -371,6 +371,14 @@
 setBoolean(R.string.preference_key_reading_list_tutorial_enabled, 
enabled);
 }
 
+public static boolean isReadingListPageDeleteTutorialEnabled() {
+return 
getBoolean(R.string.preference_key_reading_list_page_delete_tutorial_enabled, 
true);
+}
+
+public static void setReadingListPageDeleteTutorialEnabled(boolean 
enabled) {
+
setBoolean(R.string.preference_key_reading_list_page_delete_tutorial_enabled, 
enabled);
+}
+
 public static boolean isFeatureSearchAutoCompleteEnabled() {
 return getBoolean(R.string.preference_key_feature_search_autocomplete, 
true);
 }
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index ed17fc9..32251a8 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -397,6 +397,7 @@
   Second example of a reading 
list title, in this case favorite animals.
   Third example of a reading 
list title, in this case space (as in outer space, cosmos).
   Label for the button that 
dismisses an introductory dialog that tells the user about the new Reading 
Lists feature.
+  Message for a tooltip 
that gives the user a hint that they can remove an page from a reading list by 
swiping it left or right.
   Checkbox title for Wikimedia account 
preference synchronization.
 {{Identical|Preferences}}
 
diff --git a/app/src/main/res/values/preference_keys.xml 
b/app/src/main/res/values/preference_keys.xml
index 2b46862..92f5b08 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -45,4 +45,5 @@
 enableFeed
 readingListSortMode
 readingListPageSortMode
+readingListPageDeleteTutorialEnabled
 
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index c66898f..ab61be0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -308,6 +308,7 @@
 Favorite animals
 Space!
 Got it
+Tip: Swipe any page 
left or right to remove it from this reading list.
 
 
 
diff --git a/app/src/main/res/xml/developer_preferences.xml 
b/app/src/main/res/xml/developer_preferences.xml
index 44a0c18..3aa1072 100644
--- a/app/src/main/res/xml/developer_preferences.xml
+++ b/app/src/main/res/xml/developer_preferences.xml
@@ -79,6 +79,10 @@

[MediaWiki-commits] [Gerrit] Updated Debian changelog to reflect the 0.5.0 and 0.5.1 deb ... - change (mediawiki...deploy)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

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

Change subject: Updated Debian changelog to reflect the 0.5.0 and 0.5.1 deb 
releases.
..

Updated Debian changelog to reflect the 0.5.0 and 0.5.1 deb releases.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/13/292613/1

diff --git a/debian/changelog b/debian/changelog
index 3a350a6..1981d5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+parsoid (0.5.1all) jessie-mediawiki; urgency=medium
+
+   * Fixes to the broken 0.5.0 release
+
+ -- Subramanya Sastry   Thu, 3 Jun 2015 12:25:52 -0500
+
+parsoid (0.5.0allubuntu1) jessie-mediawiki; urgency=medium
+   
+   * Release v0.5.0
+
+   * Changes since v0.4.1
+   ** Add v3 API to match RESTBase's API URL formats
+   ** Lots of code cleanup + removal of dead code
+   ** Parsoid code repository reorganized
+   ** Keep data-* attributes at the edge of DOM
+   ** Various performance fixes to handle pathological scenarios
+   ** Added initial support for a Parsoid-native extension registration 
mechanism
+  (undocumented and breaking changes expected till this is finalized)
+   ** Added initial support for an autoload mechanism for extensions
+   ** Lots of bug fixes
+ 
+   * See git log between "v0.4.0" and "b0d015f" for the full list of commits
+
+ -- Subramanya Sastry   Thu, 2 Jun 2015 16:20:52 -0500
+
 parsoid (0.4.1all) wmf-production; urgency=medium
 
   * Switch release to 'all' architectures

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieae563d6fb810bb7c9a6815aa5be436a4d74cc64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] Make reading lists sortable. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Make reading lists sortable.
..


Make reading lists sortable.

This adds a Toolbar button in the ReadingLists fragment used for sorting
the lists, as well as sorting the pages in a list. The button expands into
a menu with options to "sort by name" and "sort by recent".

If the user is looking at the list of lists, the sorting will apply to the
list of lists.  If the user is looking at the pages in a certain list, the
sorting will apply to the pages.

The sorting modes for both cases are stored in Prefs.

Bug: T136739
Change-Id: I76c095d912146fafbdd3f1e59de366767a00fafa
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
M app/src/main/java/org/wikipedia/readinglist/ReadingList.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListDetailView.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
M app/src/main/java/org/wikipedia/readinglist/page/ReadingListPageRow.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
R app/src/main/res/drawable/ic_sort_white_24dp.xml
M app/src/main/res/layout/fragment_reading_lists.xml
A app/src/main/res/menu/menu_reading_lists.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/values/strings.xml
13 files changed, 268 insertions(+), 44 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index a58905c..25cccfb 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -582,11 +582,17 @@
 if (!isAdded()) {
 return;
 }
-articleHeaderView.updateBookmark(page != null);
-if (page != null && page.savedOrSaving()) {
-// TODO: mark the page outdated only if the 
revision ID from the server
-// is newer than the one on disk.
-ReadingListPageDao.instance().markOutdated(page);
+if (page != null) {
+articleHeaderView.updateBookmark(true);
+page.touch();
+ReadingListPageDao.instance().upsert(page);
+if (page.savedOrSaving()) {
+// TODO: mark the page outdated only if the 
revision ID from the server
+// is newer than the one on disk.
+
ReadingListPageDao.instance().markOutdated(page);
+}
+} else {
+articleHeaderView.updateBookmark(false);
 }
 }
 });
diff --git 
a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java 
b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
index 178a131..508ac6a 100644
--- a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
+++ b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
@@ -23,6 +23,7 @@
 import org.wikipedia.readinglist.page.ReadingListPage;
 import org.wikipedia.readinglist.page.database.ReadingListDaoProxy;
 import org.wikipedia.readinglist.page.database.ReadingListPageDao;
+import org.wikipedia.settings.Prefs;
 import org.wikipedia.util.FeedbackUtil;
 
 import java.util.ArrayList;
@@ -144,6 +145,8 @@
 @Override
 public void success(List rows) {
 readingLists = rows;
+ReadingList.sortReadingLists(readingLists,
+
Prefs.getReadingListSortMode(ReadingList.SORT_BY_NAME_ASC));
 adapter.notifyDataSetChanged();
 }
 });
diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingList.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
index 6f17a98..7daa7cd 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
@@ -9,11 +9,19 @@
 import org.wikipedia.readinglist.page.ReadingListPage;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 public final class ReadingList extends ReadingListRow {
+public static final int SORT_BY_NAME_ASC = 0;
+public static final int SORT_BY_NAME_DESC = 1;
+public static final int SORT_BY_RECENT_ASC = 2;
+public static final int SORT_BY_RECENT_DESC = 3;
+
 

[MediaWiki-commits] [Gerrit] Revert "endowment: comment out git:clone until repo exists" - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Revert "endowment: comment out git:clone until repo exists"
..


Revert "endowment: comment out git:clone until repo exists"

This reverts commit 067d62cbb8c4c6c9c17a98bf44719ca4944e4542.

Change-Id: I0b415e5d380147b99f6048a82891f60430808543
---
M modules/endowment/manifests/init.pp
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/modules/endowment/manifests/init.pp 
b/modules/endowment/manifests/init.pp
index ba3f378..0983e37 100644
--- a/modules/endowment/manifests/init.pp
+++ b/modules/endowment/manifests/init.pp
@@ -8,9 +8,9 @@
 source => 'puppet:///modules/endowment/endowment.wikimedia.org',
 }
 
-# git::clone { 'wikimedia/endowment':
-# ensure=> 'latest',
-# directory => '/srv/org/wikimedia/endowment',
-# branch=> 'master',
-# }
+git::clone { 'wikimedia/endowment':
+ensure=> 'latest',
+directory => '/srv/org/wikimedia/endowment',
+branch=> 'master',
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] Upgrade Robolectric to v3.1-rc1 - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Upgrade Robolectric to v3.1-rc1
..


Upgrade Robolectric to v3.1-rc1

No release notes[0] yet but this seems to fix the sporadic AsyncTask
threading issue[1,2] that surfaced recently, possibly in 37ed818.

[0] https://github.com/robolectric/robolectric/releases/tag/robolectric-3.1-rc1
[1] https://github.com/robolectric/robolectric/issues/2415
[2] 
https://integration.wikimedia.org/ci/job/apps-android-wikipedia-test/2600/testReport/junit/org.wikipedia.readinglist.api.legacy/GetLegacyReadingListPageTitlesTest/testCollectionPages/

  Error Message

  java.lang.RuntimeException: java.lang.NullPointerException
  Stacktrace

  java.lang.RuntimeException: java.lang.NullPointerException
at 
org.robolectric.RobolectricTestRunner$2.evaluate(RobolectricTestRunner.java:244)
at 
org.robolectric.RobolectricTestRunner.runChild(RobolectricTestRunner.java:188)
at 
org.robolectric.RobolectricTestRunner.runChild(RobolectricTestRunner.java:54)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
at 
org.robolectric.RobolectricTestRunner$1.evaluate(RobolectricTestRunner.java:152)
at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
at 
org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecuter.runTestClass(JUnitTestClassExecuter.java:112)
at 
org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecuter.execute(JUnitTestClassExecuter.java:56)
at 
org.gradle.api.internal.tasks.testing.junit.JUnitTestClassProcessor.processTestClass(JUnitTestClassProcessor.java:66)
at 
org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at 
org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
at 
org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
at 
org.gradle.messaging.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:32)
at 
org.gradle.messaging.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93)
at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
at 
org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:109)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at 
org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
at 
org.gradle.messaging.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
at 
org.gradle.messaging.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:364)
at 
org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:54)
at 
org.gradle.internal.concurrent.StoppableExecutorImpl$1.run(StoppableExecutorImpl.java:40)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
  Caused by: java.lang.NullPointerException
at 
org.robolectric.shadows.ShadowAssetManager.getAndResolve(ShadowAssetManager.java:350)
at 
org.robolectric.shadows.ShadowAssetManager.getResourceText(ShadowAssetManager.java:70)
at android.content.res.AssetManager.getResourceText(AssetManager.java)
at android.content.res.Resources.getText(Resources.java:270)
at org.robolectric.shadows.ShadowResources.getText(ShadowResources.java:358)
at android.content.res.Resources.getText(Resources.java)
at android.content.res.Resources.getString(Resources.java:360)
at org.robolectric.shadows.ShadowContext.getString(ShadowContext.java:33)
at 
org.robolectric.shadows.ShadowContextWrapper.getString(ShadowContextWrapper.java:81)
at android.content.Context.getString(Context.java)
at org.wikipedia.WikipediaApp.initExceptionHandling(WikipediaApp.java:573)
at org.wikipedia.WikipediaApp.onCreate(WikipediaApp.java:167)
at