[MediaWiki-commits] [Gerrit] Fix notifications building from JSON - change (pywikibot/core)

[APerson (Code Review)]

APerson has uploaded a new change for review.

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

Change subject: Fix notifications building from JSON
..

Fix notifications building from JSON

Sometimes (like in welcome messages), notifications don't have a 'title' 
property, so we shouldn't assume there is one.

Bug: T139015
Change-Id: I83e480d04e8e09aa9bcb5edef4f56b47d150e199
---
M pywikibot/echo.py
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/88/296688/1

diff --git a/pywikibot/echo.py b/pywikibot/echo.py
index 8c9584a..6b1fa8b 100644
--- a/pywikibot/echo.py
+++ b/pywikibot/echo.py
@@ -27,8 +27,11 @@
 notif.category = data['category']
 notif.timestamp = 
pywikibot.Timestamp.fromtimestampformat(data['timestamp']['mw'])
 
-# TODO: use 'namespace-key' + 'text' ?
-notif.page = pywikibot.Page(site, data['title']['full'])
+if 'title' in data and 'full' in data['title']:
+# TODO: use 'namespace-key' + 'text' ?
+notif.page = pywikibot.Page(site, data['title']['full'])
+else:
+notif.page = None
 
 if 'agent' in data and 'name' in data['agent']:
 notif.agent = pywikibot.User(site, data['agent']['name'])

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

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

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

[MediaWiki-commits] [Gerrit] Rename ores deploy repo - change (operations/puppet)

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: Rename ores deploy repo
..

Rename ores deploy repo

Bug: T139008
Change-Id: I8c27470f1b6df1898d3142ca13514c3e57b0e657
---
M hieradata/common/scap/server.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/hieradata/common/scap/server.yaml 
b/hieradata/common/scap/server.yaml
index dc9206c..366defa 100644
--- a/hieradata/common/scap/server.yaml
+++ b/hieradata/common/scap/server.yaml
@@ -64,7 +64,7 @@
 
   # ores is the Objective Revision Evaluation Service
   ores/deploy:
-repository: mediawiki/services/ores/deploy
+repository: research/ores/deploy
 
   wdqs/wdqs:
-repository: wikidata/query/deploy
\ No newline at end of file
+repository: wikidata/query/deploy

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

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

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

[MediaWiki-commits] [Gerrit] Fixed Sandbox error reporting - change (mediawiki...Graph)

[jenkins-bot (Code Review)]

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

Change subject: Fixed Sandbox error reporting
..


Fixed Sandbox error reporting

Change-Id: I31037c2186aba5fe736224a65f1319bfd8c0654f
---
M modules/graph.sandbox.js
1 file changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/modules/graph.sandbox.js b/modules/graph.sandbox.js
index df10a3d..092a2d2 100644
--- a/modules/graph.sandbox.js
+++ b/modules/graph.sandbox.js
@@ -20,7 +20,8 @@
 
mw.hook( 'codeEditor.configure' ).add( function ( session ) {
var $json = $( '#mw-graph-json' )[ 0 ],
-   $graph = $( '.mw-graph' )[ 0 ],
+   $graph = $( '.mw-graph' ),
+   $graphEl = $graph[ 0 ],
$rightPanel = $( '#mw-graph-right' ),
$editor = $( '.editor' );
 
@@ -49,6 +50,7 @@
return;
}
oldContent = content;
+   $graph.empty();
 
new mw.Api().post( {
formatversion: 2,
@@ -60,14 +62,13 @@
return;
}
$json.textContent = JSON.stringify( data.graph, 
null, 2 );
-   $graph.textContent = '...';
-   mw.drawVegaGraph( $graph, data.graph, function 
( error ) {
+   mw.drawVegaGraph( $graphEl, data.graph, 
function ( error ) {
if ( error ) {
-   $graph.textContent = ( 
error.exception || error ).toString();
+   $graphEl.textContent = ( 
error.exception || error ).toString();
}
} );
} ).fail( function ( errCode, error ) {
-   $graph.textContent = errCode.toString() + ':' + 
( error.exception || error ).toString();
+   $graphEl.textContent = errCode.toString() + ':' 
+ ( error.exception || error ).toString();
} );
} ) );
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31037c2186aba5fe736224a65f1319bfd8c0654f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik 
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] Gerrit: Stop customizing ssh port. It's not like we're chang... - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Gerrit: Stop customizing ssh port. It's not like we're changing 
it
..

Gerrit: Stop customizing ssh port. It's not like we're changing it

Change-Id: I393918678abcc39ad43bbc3e014a96924cd44910
---
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/296683/1

diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index c120542..3728bda 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -5,7 +5,6 @@
 $url = "https://${::gerrit::host}/r;,
 $db_name = 'reviewdb',
 $db_user = 'gerrit',
-$ssh_port = '29418',
 $git_dir = 'git'
 ) {
 
diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index aacf4bb..349d3ba 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -35,7 +35,7 @@
 javaHome = /usr/lib/jvm/java-7-openjdk-amd64/jre
 heapLimit = 20g
 [sshd]
-listenAddress = *:<%= @ssh_port %>
+listenAddress = *:29418
 threads = 8
 batchThreads = 2
 idleTimeout = 864000

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

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

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

[MediaWiki-commits] [Gerrit] Gerrit: don't pass SMTP server info around either, it's in h... - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Gerrit: don't pass SMTP server info around either, it's in hiera
..

Gerrit: don't pass SMTP server info around either, it's in hiera

Change-Id: I5d7725d73fb9a3f834521830aa9dc6603375958d
---
M modules/gerrit/manifests/init.pp
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
M modules/role/manifests/gerrit/production.pp
4 files changed, 2 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/296682/1

diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 8ba9bbf..65756a7 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -2,13 +2,11 @@
 
 class gerrit(
 $host,
-$replication = '',
-$smtp_host   = ''
+$replication = ''
 ) {
 
 class { 'gerrit::jetty':
 replication => $replication,
-smtp_host   => $smtp_host,
 }
 
 class { 'gerrit::proxy':
diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 73d0aaf..c120542 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -1,7 +1,6 @@
 class gerrit::jetty(
 $db_host,
 $replication,
-$smtp_host,
 $ssh_key,
 $url = "https://${::gerrit::host}/r;,
 $db_name = 'reviewdb',
diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index 0c517fb..aacf4bb 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -29,11 +29,7 @@
 [sendemail]
 includeDiff = true
 smtpServerPort = 25
-<% if @smtp_host != "" then %>
-smtpServer = <%= @smtp_host %>
-<% else %>
-enable = false
-<% end %>
+smtpServer = <%= @mail_smarthost[0] %>
 [container]
 user = gerrit2
 javaHome = /usr/lib/jvm/java-7-openjdk-amd64/jre
diff --git a/modules/role/manifests/gerrit/production.pp 
b/modules/role/manifests/gerrit/production.pp
index 8d270e2..8a0e30c 100644
--- a/modules/role/manifests/gerrit/production.pp
+++ b/modules/role/manifests/gerrit/production.pp
@@ -46,7 +46,6 @@
 
 class { '::gerrit':
 host=> $host,
-smtp_host   => $::mail_smarthost[0],
 replication => {
 # If adding a new entry, remember to add the fingerprint to 
gerrit2's known_hosts
 'github' => {

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

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

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

[MediaWiki-commits] [Gerrit] Move more of the gerrit config out of role class and into hiera - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Move more of the gerrit config out of role class and into hiera
..


Move more of the gerrit config out of role class and into hiera

Also general Gerrit manifest cleanup all over the place

Change-Id: I03eb44cfcdddbaea72ed15234d72a55f33b70cc7
---
M hieradata/role/common/gerrit/production.yaml
A hieradata/role/eqiad/gerrit/production.yaml
M modules/gerrit/manifests/init.pp
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/manifests/proxy.pp
M modules/role/manifests/gerrit/production.pp
6 files changed, 30 insertions(+), 79 deletions(-)

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



diff --git a/hieradata/role/common/gerrit/production.yaml 
b/hieradata/role/common/gerrit/production.yaml
index 98b01a8..40cb6cb 100644
--- a/hieradata/role/common/gerrit/production.yaml
+++ b/hieradata/role/common/gerrit/production.yaml
@@ -4,3 +4,7 @@
 debdeploy::grains:
   debdeploy-gerrit:
 value: standard
+role::gerrit::production::host: 'gerrit.wikimedia.org'
+gerrit::proxy::ssl_cert: '%{::role::gerrit::production::host}'
+gerrit::proxy::ssl_cert_key: '%{::role::gerrit::production::host}'
+gerrit::jetty::ssh_key: 'ssh-rsa 
B3NzaC1yc2EBIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==
 gerrit@production'
diff --git a/hieradata/role/eqiad/gerrit/production.yaml 
b/hieradata/role/eqiad/gerrit/production.yaml
new file mode 100644
index 000..ad0ca4d
--- /dev/null
+++ b/hieradata/role/eqiad/gerrit/production.yaml
@@ -0,0 +1 @@
+gerrit::jetty::db_host: "m2-master.eqiad.wmnet"
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 926f18c..8ba9bbf 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -1,31 +1,18 @@
 # Manifest to setup a Gerrit instance
 
 class gerrit(
-$db_host = '',
-$host= '',
-$ssh_key = '',
-$ssl_cert= 'ssl-cert-snakeoil',
-$ssl_cert_key= 'ssl-cert-snakeoil',
+$host,
 $replication = '',
 $smtp_host   = ''
 ) {
 
-# Configure the base URL
-$url = "https://${host}/r;
-
-class { 'gerrit::proxy':
-ssl_cert => $ssl_cert,
-ssl_cert_key => $ssl_cert_key,
-host => $host
-}
-
 class { 'gerrit::jetty':
-url => $url,
-db_host => $db_host,
-hostname=> $host,
 replication => $replication,
 smtp_host   => $smtp_host,
-ssh_key => $ssh_key,
+}
+
+class { 'gerrit::proxy':
+require => Class['gerrit::jetty'],
 }
 
 class { 'gerrit::crons':
diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 2e3f482..73d0aaf 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -1,10 +1,9 @@
-class gerrit::jetty ($url,
+class gerrit::jetty(
 $db_host,
-$hostname,
-$ssh_port,
 $replication,
 $smtp_host,
 $ssh_key,
+$url = "https://${::gerrit::host}/r;,
 $db_name = 'reviewdb',
 $db_user = 'gerrit',
 $ssh_port = '29418',
@@ -112,12 +111,13 @@
 require => File['/var/lib/gerrit2/review_site/etc'],
 }
 
-file { '/var/lib/gerrit2/review_site/etc/mail/ChangeSubject.vm':
+file { '/var/lib/gerrit2/review_site/etc/mail':
 owner   => 'gerrit2',
 group   => 'gerrit2',
 mode=> '0444',
-source  => 'puppet:///modules/gerrit/mail/ChangeSubject.vm',
-require => Exec['install_gerrit_jetty'],
+recurse => true,
+source  => 'puppet:///modules/gerrit/mail',
+require => File['/var/lib/gerrit2/review_site/etc'],
 }
 
 file { '/var/lib/gerrit2/review_site/etc/GerritSite.css':
@@ -139,47 +139,9 @@
 owner   => 'gerrit2',
 group   => 'gerrit2',
 mode=> '0755',
+source  => 'puppet:///modules/gerrit/its',
 require => File['/var/lib/gerrit2/review_site/etc'],
-}
-
-file { '/var/lib/gerrit2/review_site/etc/its/action.config':
-source  => 'puppet:///modules/gerrit/its/action.config',
-owner   => 'gerrit2',
-group   => 'gerrit2',
-mode=> '0755',
-require => File['/var/lib/gerrit2/review_site/etc/its'],
-}
-
-file { '/var/lib/gerrit2/review_site/etc/its/templates':
-ensure  => directory,
-owner   => 'gerrit2',
-group   => 'gerrit2',
-mode=> '0755',
-require => File['/var/lib/gerrit2/review_site/etc/its'],
-}
-
-file { 

[MediaWiki-commits] [Gerrit] Fix $filters and $tagsToSet static variable handling - change (mediawiki...AbuseFilter)

[jenkins-bot (Code Review)]

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

Change subject: Fix $filters and $tagsToSet static variable handling
..


Fix $filters and $tagsToSet static variable handling

* Make $filters act as a proper process cache with
  lazy-loading and renamed it to $filterCache.
  This avoids warnings that appeared in e91939fb3fd.
* Make sure tags are applied on stash hits by storing
  and reloading the static variable.
* Only check the cache for "edit" actions to avoid
  filling the statsd and logging data with noise.
* Remove some unused class variables.

Bug: T138529
Change-Id: I8230fef0ad0db7ae63086470189204e319382cca
---
M AbuseFilter.class.php
1 file changed, 84 insertions(+), 28 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 2c9e2ef..35d5958 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -10,12 +10,14 @@
  */
 class AbuseFilter {
public static $statsStoragePeriod = 86400;
-   public static $tokenCache = array();
-   public static $modifyCache = array();
public static $condLimitEnabled = true;
+
+   /** @var array Map of (filter ID => stdClass) */
+   private static $filterCache = [];
+
public static $condCount = 0;
-   public static $filters = array();
-   public static $tagsToSet = array();
+   public static $tagsToSet = array(); // FIXME: avoid global state here
+
public static $history_mappings = array(
'af_pattern' => 'afh_pattern',
'af_user' => 'afh_user',
@@ -446,7 +448,7 @@
 * @param $vars AbuseFilterVariableHolder
 * @param string $group The filter's group (as defined in 
$wgAbuseFilterValidGroups)
 *
-* @return array
+* @return bool[] Map of (integer filter ID => bool)
 */
public static function checkAllFilters( $vars, $group = 'default' ) {
global $wgAbuseFilterCentralDB, $wgAbuseFilterIsCentral;
@@ -535,7 +537,7 @@
}
 
// Store the row somewhere convenient
-   self::$filters[$filterID] = $row;
+   self::$filterCache[$filterID] = $row;
 
// Check conditions...
$pattern = trim( $row->af_pattern );
@@ -751,7 +753,8 @@
foreach ( $actionsByFilter as $filter => $actions ) {
// Special-case handling for warnings.
$parsed_public_comments = $wgOut->parseInline(
-   self::$filters[$filter]->af_public_comments );
+   self::getFilter( $filter )->af_public_comments
+   );
 
$global_filter = ( preg_match( '/^global-/', $filter ) 
== 1 );
 
@@ -822,8 +825,11 @@
// Do the rest of the actions
foreach ( $actions as $action => $info ) {
$newMsg = self::takeConsequenceAction(
-   $action, $info['parameters'], $title, 
$vars,
-   
self::$filters[$filter]->af_public_comments,
+   $action,
+   $info['parameters'],
+   $title,
+   $vars,
+   self::getFilter( $filter 
)->af_public_comments,
$filter
);
 
@@ -888,34 +894,47 @@
$user = $wgUser;
}
 
+   $logger = LoggerFactory::getInstance( 'StashEdit' );
+   $statsd = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+
// Add vars from extensions
Hooks::run( 'AbuseFilter-filterAction', array( &$vars, $title ) 
);
$vars->setVar( 'context', 'filter' );
$vars->setVar( 'timestamp', time() );
+
// Get the stash key based on the relevant "input" variables
$cache = ObjectCache::getLocalClusterInstance();
$stashKey = self::getStashKey( $cache, $vars, $group );
+   $isForEdit = ( $vars->getVar( 'action' )->toString() === 'edit' 
);
 
$filter_matched = false;
-   if ( $mode === 'execute' ) {
+   if ( $mode === 'execute' && $isForEdit ) {
// Check the filter edit stash results first
-   $filter_matched = $cache->get( $stashKey );
+   $cacheData = $cache->get( $stashKey );
+   if ( $cacheData ) {
+   $filter_matched = $cacheData['matches'];
+   // Merge in any tags to apply to recent changes 
entries
+

[MediaWiki-commits] [Gerrit] Don't use always true wmgUseXFFBlocks anymore - change (operations/mediawiki-config)

[Dereckson (Code Review)]

Dereckson has uploaded a new change for review.

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

Change subject: Don't use always true wmgUseXFFBlocks anymore
..

Don't use always true wmgUseXFFBlocks anymore

wmgUseXFFBlocks is replaced by true in CS and removed from IS.

This is a follow-up for b4d232a8, reverted by bfe052bd.

Change-Id: I3128399b273190eff4e9fd3bac9ec5454919bfb2
---
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/79/296679/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5947b0d..262a133 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -918,7 +918,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' );
@@ -3229,8 +3229,7 @@
 
 ### End (roughly) of general extensions 
 
-$wgApplyIpBlocksToXff = $wmgUseXFFBlocks;
-
+$wgApplyIpBlocksToXff = true;
 
 // On Special:Version, link to useful release notes
 $wgHooks['SpecialVersionVersionUrl'][] = function( $wgVersion, &$versionUrl ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6593d8a..1fb1ea0 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16822,11 +16822,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/296679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] Revert "Cleanup: Move never-altered GlobalBlockingBlockXFF i... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Revert "Cleanup: Move never-altered GlobalBlockingBlockXFF into 
CommonSettings"
..


Revert "Cleanup: Move never-altered GlobalBlockingBlockXFF into CommonSettings"

This reverts commit b4d232a8362283b58b09d08e3d767242aa5002d7.

Change-Id: I772ca6b7d2cae523e95c1b40148e20e4a628fb87
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 1cfafd2..5947b0d 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -918,7 +918,7 @@
include( $IP . '/extensions/GlobalBlocking/GlobalBlocking.php' );
$wgGlobalBlockingDatabase = 'centralauth';
$wgApplyGlobalBlocks = $wmgApplyGlobalBlocks;
-   $wgGlobalBlockingBlockXFF = true; // Apply blocks to IPs in XFF (T25343)
+   $wgGlobalBlockingBlockXFF = $wmgUseXFFBlocks;
 }
 
 include( $IP . '/extensions/TrustedXFF/TrustedXFF.php' );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1fb1ea0..6593d8a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16822,6 +16822,11 @@
 ],
 ### 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/296677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I772ca6b7d2cae523e95c1b40148e20e4a628fb87
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
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] Revert "Cleanup: Move never-altered GlobalBlockingBlockXFF i... - change (operations/mediawiki-config)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Revert "Cleanup: Move never-altered GlobalBlockingBlockXFF into 
CommonSettings"
..

Revert "Cleanup: Move never-altered GlobalBlockingBlockXFF into CommonSettings"

This reverts commit b4d232a8362283b58b09d08e3d767242aa5002d7.

Change-Id: I772ca6b7d2cae523e95c1b40148e20e4a628fb87
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 6 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e94a116..c531a75 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -918,7 +918,7 @@
include( $IP . '/extensions/GlobalBlocking/GlobalBlocking.php' );
$wgGlobalBlockingDatabase = 'centralauth';
$wgApplyGlobalBlocks = $wmgApplyGlobalBlocks;
-   $wgGlobalBlockingBlockXFF = true; // Apply blocks to IPs in XFF (T25343)
+   $wgGlobalBlockingBlockXFF = $wmgUseXFFBlocks;
 }
 
 include( $IP . '/extensions/TrustedXFF/TrustedXFF.php' );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a52f20d..0cf6d43 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16834,6 +16834,11 @@
 ],
 ### 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/296677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I772ca6b7d2cae523e95c1b40148e20e4a628fb87
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] Increase redisLockManager read timeout from 1 to 2 seconds - change (operations/mediawiki-config)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Increase redisLockManager read timeout from 1 to 2 seconds
..

Increase redisLockManager read timeout from 1 to 2 seconds

Bug: T132921
Change-Id: Ief9b5f9422452198a062d094c862cfe79179b645
---
M wmf-config/filebackend-production.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/filebackend-production.php 
b/wmf-config/filebackend-production.php
index e4887c4..83b3deb 100644
--- a/wmf-config/filebackend-production.php
+++ b/wmf-config/filebackend-production.php
@@ -165,6 +165,7 @@
),
'redisConfig'  => array(
'connectTimeout' => 2,
+   'readTimeout'=> 2,
'password'   => $wmgRedisPassword
)
 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief9b5f9422452198a062d094c862cfe79179b645
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] API parameter might be null rather than an empty array - change (mediawiki...TemplateSandbox)

[jenkins-bot (Code Review)]

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

Change subject: API parameter might be null rather than an empty array
..


API parameter might be null rather than an empty array

Take that into account when processing the input.

Bug: T138979
Change-Id: I034819cabe49ad0d353e9d95097af716062b3be7
(cherry picked from commit d8e8c85a61b72e63c75ccbef02b5c8ca85f323f6)
---
M TemplateSandbox.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/TemplateSandbox.hooks.php b/TemplateSandbox.hooks.php
index 1f73288..14e43c7 100644
--- a/TemplateSandbox.hooks.php
+++ b/TemplateSandbox.hooks.php
@@ -348,7 +348,7 @@
'templatesandboxcontentformat' => null,
];
$params = [
-   'prefix' => $params['templatesandboxprefix'],
+   'prefix' => $params['templatesandboxprefix'] ?: [],
'title' => $params['templatesandboxtitle'],
'text' => $params['templatesandboxtext'],
'contentmodel' => 
$params['templatesandboxcontentmodel'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I034819cabe49ad0d353e9d95097af716062b3be7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateSandbox
Gerrit-Branch: wmf/1.28.0-wmf.8
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jackmcbarn 
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] API parameter might be null rather than an empty array - change (mediawiki...TemplateSandbox)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: API parameter might be null rather than an empty array
..

API parameter might be null rather than an empty array

Take that into account when processing the input.

Bug: T138979
Change-Id: I034819cabe49ad0d353e9d95097af716062b3be7
(cherry picked from commit d8e8c85a61b72e63c75ccbef02b5c8ca85f323f6)
---
M TemplateSandbox.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateSandbox 
refs/changes/75/296675/1

diff --git a/TemplateSandbox.hooks.php b/TemplateSandbox.hooks.php
index 1f73288..14e43c7 100644
--- a/TemplateSandbox.hooks.php
+++ b/TemplateSandbox.hooks.php
@@ -348,7 +348,7 @@
'templatesandboxcontentformat' => null,
];
$params = [
-   'prefix' => $params['templatesandboxprefix'],
+   'prefix' => $params['templatesandboxprefix'] ?: [],
'title' => $params['templatesandboxtitle'],
'text' => $params['templatesandboxtext'],
'contentmodel' => 
$params['templatesandboxcontentmodel'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I034819cabe49ad0d353e9d95097af716062b3be7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateSandbox
Gerrit-Branch: wmf/1.28.0-wmf.8
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Anomie 

___
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)

[jenkins-bot (Code Review)]

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

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(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index faecbff..61bb0f7 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1249,7 +1249,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 7b35eda..35f9b52 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15764,11 +15764,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: merged
Gerrit-Change-Id: I09e8a17cf577cae5507cd42de3c8cc2aef6eac53
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

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

[jenkins-bot (Code Review)]

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

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(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 61bb0f7..1cfafd2 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1792,7 +1792,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 35f9b52..1fb1ea0 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11855,10 +11855,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: merged
Gerrit-Change-Id: If520a5ce4888040820f923312b904410110eccc2
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove rlfeature data gathering - change (mediawiki...WikimediaEvents)

[jenkins-bot (Code Review)]

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

Change subject: Remove rlfeature data gathering
..


Remove rlfeature data gathering

Follows-up 41c787a.

Bug: T128924
Change-Id: I46d06aa1dd4e1d980ea3229e2c6b34a796a701fc
---
M extension.json
D modules/ext.wikimediaEvents.rlfeature.js
2 files changed, 0 insertions(+), 30 deletions(-)

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



diff --git a/extension.json b/extension.json
index dc86d30..b5058f6 100644
--- a/extension.json
+++ b/extension.json
@@ -134,7 +134,6 @@
"ext.wikimediaEvents": {
"scripts": [
"ext.wikimediaEvents.statsd.js",
-   "ext.wikimediaEvents.rlfeature.js",
"ext.wikimediaEvents.searchSatisfaction.js",
"ext.wikimediaEvents.search.js",
"ext.wikimediaEvents.geoFeatures.js"
diff --git a/modules/ext.wikimediaEvents.rlfeature.js 
b/modules/ext.wikimediaEvents.rlfeature.js
deleted file mode 100644
index 8650de2..000
--- a/modules/ext.wikimediaEvents.rlfeature.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
- * Measure pass/fail rate of a proposed feature test for ResourceLoader
- * that would replace the current User-Agent sniffing.
- *
- * https://phabricator.wikimedia.org/T128924
- * https://phabricator.wikimedia.org/T102318
- */
-( function ( mw ) {
-   // Filter: Sample 1 in 1000 page views
-   if ( !mw.eventLog.inSample( 1000 ) ) {
-   return;
-   }
-
-   var supported = (
-   // DOM4 (Selectors API Level 1)
-   'querySelector' in document
-   // HTML5 (Web Storage)
-   && 'localStorage' in window
-   // DOM2 (DOM Level 2 Events)
-   && 'addEventListener' in window
-   );
-
-   if ( supported ) {
-   mw.track( 'counter.mw.js.rlfeature2016.pass', 1 );
-   } else {
-   mw.track( 'counter.mw.js.rlfeature2016.fail', 1 );
-   }
-
-}( mediaWiki ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46d06aa1dd4e1d980ea3229e2c6b34a796a701fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
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] Remove incomplete and dated 'wgUseETag' experiment - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Remove incomplete and dated 'wgUseETag' experiment
..


Remove incomplete and dated 'wgUseETag' experiment

Follows-up:
* 8ff36ebd (r9793) Set ETag header on article views.
* 8167b89e (r16205) Add $wgUseETag, false by default (broke Squid; T9098).

ETag is a useful alternative for If-Modified-Since (see T33639, T49529 about
use cases and bugs it may fix). However the current incomplete implementation
isn't useful.

It's a feature flag that has been disabled since 2006. Enabling it stores
ParserCache::getETag in OutputPage and sends it out as a response header.
It's ignored on incoming requests. We don't check If-None-Match for
'304 Not Modified' anywhere.

ResourceLoader has a working implementation that could be leveraged.

To be re-evaluated in the future. ParserCache::getETag() could use
improvement as well.

Change-Id: I37fd9d0ce1ce9bffb79243c6ae340403fdfd769f
---
M includes/DefaultSettings.php
M includes/OutputPage.php
M includes/page/Article.php
3 files changed, 5 insertions(+), 31 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 39e22a0..b8e1486 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2552,12 +2552,6 @@
 $wgUseGzip = false;
 
 /**
- * Whether MediaWiki should send an ETag header. Seems to cause
- * broken behavior with Squid 2.6, see bug 7098.
- */
-$wgUseETag = false;
-
-/**
  * Clock skew or the one-second resolution of time() can occasionally cause 
cache
  * problems when the user requests two pages within a short period of time. 
This
  * variable adds a given number of seconds to vulnerable timestamps, thereby 
giving
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 5c7203d..15b70c8 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -104,21 +104,10 @@
protected $mStatusCode;
 
/**
-* @var string Variable mLastModified and mEtag are used for sending 
cache control.
+* @var string Used for sending cache control.
 *   The whole caching system should probably be moved into its own 
class.
 */
protected $mLastModified = '';
-
-   /**
-* Contains an HTTP Entity Tags (see RFC 2616 section 3.13) which is 
used
-* as a unique identifier for the content. It is later used by the 
client
-* to compare its cached version with the server version. Client sends
-* headers If-Match and If-None-Match containing its locally cached 
ETAG value.
-*
-* To get more information, you will have to look at HTTP/1.1 protocol 
which
-* is properly described in RFC 2616 : 
http://tools.ietf.org/html/rfc2616
-*/
-   private $mETag = false;
 
/** @var array */
protected $mCategoryLinks = [];
@@ -694,12 +683,10 @@
}
 
/**
-* Set the value of the ETag HTTP header, only used if $wgUseETag is 
true
-*
-* @param string $tag Value of "ETag" header
+* @deprecated since 1.28 Obsolete - wgUseETag experiment was removed.
+* @param string $tag
 */
-   function setETag( $tag ) {
-   $this->mETag = $tag;
+   public function setETag( $tag ) {
}
 
/**
@@ -2156,9 +2143,6 @@
public function sendCacheControl() {
$response = $this->getRequest()->response();
$config = $this->getConfig();
-   if ( $config->get( 'UseETag' ) && $this->mETag ) {
-   $response->header( "ETag: $this->mETag" );
-   }
 
$this->addVaryHeader( 'Cookie' );
$this->addAcceptLanguage();
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 1f1e8d6..2a6f88c 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -467,7 +467,7 @@
 * page of the given title.
 */
public function view() {
-   global $wgUseFileCache, $wgUseETag, $wgDebugToolbar, 
$wgMaxRedirects;
+   global $wgUseFileCache, $wgDebugToolbar, $wgMaxRedirects;
 
# Get variables from query string
# As side effect this will load the revision and update the 
title
@@ -520,10 +520,6 @@
 
# Try client and file cache
if ( !$wgDebugToolbar && $oldid === 0 && 
$this->mPage->checkTouched() ) {
-   if ( $wgUseETag ) {
-   $outputPage->setETag( $parserCache->getETag( 
$this->mPage, $parserOptions ) );
-   }
-
# Use the greatest of the page's timestamp or the 
timestamp of any
# redirect in the chain (bug 67849)
$timestamp = 

[MediaWiki-commits] [Gerrit] [wip] Add a cog menu to Special:Notifications - change (mediawiki...Echo)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

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

Change subject: [wip] Add a cog menu to Special:Notifications
..

[wip] Add a cog menu to Special:Notifications

Also, add 'mark all as read' to the Special:Notifications page.

Bug: T115528
Change-Id: Ibd9dcdf7072d6cbc1a268c18e558e6d0df28f929
---
M Resources.php
M modules/api/mw.echo.api.EchoApi.js
M modules/controller/mw.echo.Controller.js
M modules/nojs/mw.echo.special.less
M modules/special/ext.echo.special.js
A modules/styles/mw.echo.ui.SpecialHelpMenuWidget.less
A modules/ui/mw.echo.ui.SpecialHelpMenuWidget.js
7 files changed, 118 insertions(+), 1 deletion(-)


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

diff --git a/Resources.php b/Resources.php
index 010b885..fae1ea3 100644
--- a/Resources.php
+++ b/Resources.php
@@ -297,6 +297,7 @@
'ui/mw.echo.ui.PageFilterWidget.js',
'ui/mw.echo.ui.CrossWikiUnreadFilterWidget.js',
'ui/mw.echo.ui.NotificationsInboxWidget.js',
+   'ui/mw.echo.ui.SpecialHelpMenuWidget.js',
'special/ext.echo.special.js',
),
'styles' => array(
@@ -307,6 +308,7 @@
'styles/mw.echo.ui.PageNotificationsOptionWidget.less',
'styles/mw.echo.ui.PageFilterWidget.less',
'styles/mw.echo.ui.CrossWikiUnreadFilterWidget.less',
+   'styles/mw.echo.ui.SpecialHelpMenuWidget.less',
),
'dependencies' => array(
'ext.echo.ui',
@@ -322,7 +324,10 @@
'echo-specialpage-pagination-range',
'echo-specialpage-pagefilters-title',
'echo-specialpage-pagefilters-subtitle',
+   'echo-mark-all-as-read',
'echo-more-info',
+   'echo-learn-more',
+   'mypreferences',
'echo-feedback',
'echo-specialpage-section-markread',
),
diff --git a/modules/api/mw.echo.api.EchoApi.js 
b/modules/api/mw.echo.api.EchoApi.js
index 11e2248..7b95c6c 100644
--- a/modules/api/mw.echo.api.EchoApi.js
+++ b/modules/api/mw.echo.api.EchoApi.js
@@ -237,7 +237,7 @@
 * Mark all notifications for a given type as read in the given source.
 *
 * @param {string} source Symbolic name of notifications source
-* @param {string} type Notifications type
+* @param {string|string[]} type Notifications type
 * @return {jQuery.Promise} A promise that is resolved when the 
operation
 *  is complete, with the number of unread notifications still remaining
 *  for that type in the given source
diff --git a/modules/controller/mw.echo.Controller.js 
b/modules/controller/mw.echo.Controller.js
index 4db08ed..ec2d8e6 100644
--- a/modules/controller/mw.echo.Controller.js
+++ b/modules/controller/mw.echo.Controller.js
@@ -382,6 +382,26 @@
};
 
/**
+* Mark all notifications of a certain type as read, even those that
+* are not currently displayed.
+*
+* @param {string} type Notification type
+*/
+   mw.echo.Controller.prototype.markAllRead = function ( type ) {
+   var itemIds = [];
+
+   type = type || 'all';
+
+   this.manager.getLocalNotifications().forEach( function ( 
notification ) {
+   if ( !notification.isRead() ) {
+   itemIds = itemIds.concat( 
notification.getAllIds() );
+   notification.toggleRead( true );
+   }
+   } );
+   return this.api.markAllRead( 'local', type ).then( 
this.refreshUnreadCount.bind( this ) );
+   };
+
+   /**
 * Mark all local notifications as read
 *
 * @return {jQuery.Promise} Promise that is resolved when all
diff --git a/modules/nojs/mw.echo.special.less 
b/modules/nojs/mw.echo.special.less
index e5e8f51..c1f9a9f 100644
--- a/modules/nojs/mw.echo.special.less
+++ b/modules/nojs/mw.echo.special.less
@@ -11,6 +11,10 @@
}
 }
 
+.client-js #mw-indicator-mw-helplink {
+   display: none;
+}
+
 /* Custom header styling for Vector and Monobook skins */
 .mw-special-Notifications.skin-vector #firstHeading,
 .mw-special-Notifications.skin-monobook #firstHeading {
diff --git a/modules/special/ext.echo.special.js 
b/modules/special/ext.echo.special.js
index 2374c9d..eadf628 100644
--- a/modules/special/ext.echo.special.js
+++ b/modules/special/ext.echo.special.js
@@ -23,11 +23,21 @@
limit: limitNotifications,
$overlay: mw.echo.ui.$overlay

[MediaWiki-commits] [Gerrit] Move HistoryAction CSS from mediawiki.legacy.shared - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Move HistoryAction CSS from mediawiki.legacy.shared
..


Move HistoryAction CSS from mediawiki.legacy.shared

...to mediawiki.action.history.styles

Bug: T89981
Change-Id: I0b5c513ebd73aeed287f8fe681e231ffc9b6ab08
---
M resources/src/mediawiki.action/mediawiki.action.history.styles.css
M resources/src/mediawiki.legacy/shared.css
2 files changed, 18 insertions(+), 20 deletions(-)

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



diff --git a/resources/src/mediawiki.action/mediawiki.action.history.styles.css 
b/resources/src/mediawiki.action/mediawiki.action.history.styles.css
index 269db8e..5b08f95 100644
--- a/resources/src/mediawiki.action/mediawiki.action.history.styles.css
+++ b/resources/src/mediawiki.action/mediawiki.action.history.styles.css
@@ -1,5 +1,23 @@
 /* Basic styles for the history page */
 
+#pagehistory .history-user {
+   margin-left: 0.4em;
+   margin-right: 0.2em;
+}
+
+#pagehistory li {
+   border: 1px solid #fff;
+}
+
+#pagehistory li.selected {
+   background-color: #f9f9f9;
+   border: 1px dashed #aaa;
+}
+
+.mw-history-revisionactions {
+   float: right;
+}
+
 .updatedmarker {
background-color: #b7f430;
 }
diff --git a/resources/src/mediawiki.legacy/shared.css 
b/resources/src/mediawiki.legacy/shared.css
index 4ff403a..c7cd14b 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -284,29 +284,9 @@
text-align: right;
 }
 
-/* Page history styling */
-
 /* The auto-generated edit comments */
 .autocomment {
color: #808080;
-}
-
-#pagehistory .history-user {
-   margin-left: 0.4em;
-   margin-right: 0.2em;
-}
-
-#pagehistory li {
-   border: 1px solid #fff;
-}
-
-#pagehistory li.selected {
-   background-color: #f9f9f9;
-   border: 1px dashed #aaa;
-}
-
-.mw-history-revisionactions {
-   float: right;
 }
 
 /** Generic minor/bot/newpage styling (recent changes) */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b5c513ebd73aeed287f8fe681e231ffc9b6ab08
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Prtksxna 
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: Move never-altered CentralAuthUseEventLogging into ... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

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(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e94a116..faecbff 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1250,7 +1250,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 a52f20d..7b35eda 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11638,9 +11638,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: merged
Gerrit-Change-Id: I0290c16c5ab4552c08d6c99c5826f4ed4c73d2b0
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

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

[jenkins-bot (Code Review)]

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

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(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index c531a75..e94a116 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -918,7 +918,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 0cf6d43..a52f20d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16834,11 +16834,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: merged
Gerrit-Change-Id: I530a6101de26658ed27cd6f1f31feee2d1396f11
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Change wmgVisualEditorAvailableNamespaces keys to canonical ... - change (operations/mediawiki-config)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Change wmgVisualEditorAvailableNamespaces keys to canonical 
names instead of indexes
..

Change wmgVisualEditorAvailableNamespaces keys to canonical names instead of 
indexes

A lot of these are based on comments which are assumed to be correct.

Bug: T138999
Change-Id: Ia3344e7249655eac8003d3e4e1f13ee707c0cb3a
---
M wmf-config/InitialiseSettings.php
1 file changed, 42 insertions(+), 42 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9556a80..4c30fe0 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13524,72 +13524,72 @@
 // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces
 'wmgVisualEditorAvailableNamespaces' => [
'default' => [
-   NS_USER => true,
-   NS_FILE => true,
-   NS_HELP => true,
-   NS_CATEGORY => true
+   'User' => true,
+   'File' => true,
+   'Help' => true,
+   'Category' => true
],
 
// Group 0 wikis
'+mediawikiwiki' => [
-   NS_PROJECT => true, // T50430
-   100 /* Manual */ => true, // T50430
-   102 /* Extension */ => true, // T50430
-   104 /* API */ => true, // T50430
-   106 /* Skin */ => true // T50430
+   'Project' => true, // T50430
+   'Manual' => true, // T50430
+   'Extension' => true, // T50430
+   'API' => true, // T50430
+   'Skin' => true // T50430
],
 
// Wikipedias
'+cawiki' => [
-   NS_PROJECT => true, // T88896
-   100 /* Portal */ => true, // T58000
-   102 /* Viquiprojecte */ => true // T58000
+   'Project' => true, // T88896
+   'Portal' => true, // T58000
+   'Viquiprojecte' => true // T58000
],
'+cswiki' => [
-   NS_PROJECT => true, // T136628
+   'Project' => true, // T136628
],
'+enwiki' => [
-   100 /* Portal */ => true, // T58001
-   108 /* Book */ => true, // T58001
-   118 /* Draft */ => true
+   'Portal' => true, // T58001
+   'Book' => true, // T58001
+   'Draft' => true
],
'+fawiki' => [
-   118 /* Draft */ => true // T118060
+   'Draft' => true // T118060
],
'+frwiki' => [
-   102 /* Wikiprojet */ => true // T116603
+   'Projet' => true // T116603
],
'+hewiki' => [
-   118 /* Draft */ => true // T87027
+   'Draft' => true // T87027
],
'+htwiki' => [
-   NS_PROJECT => true // T130177
+   'Project' => true // T130177
],
'+jawiki' => [
-   100 /* Portal */ => true // T97313
+   'Portal' => true // T97313
],
'+kowiki' => [
-   118 /* Draft */ => true // T92798
+   'Draft' => true // T92798
],
'+plwiki' => [
-   NS_PROJECT => true, // T133980
-   100 /* Portal */ => true, // T133980
-   102 /* Wikiprojekt */ => true, // T92698
+   'Project' => true, // T133980
+   'Portal' => true, // T133980
+   'Wikiprojekt' => true, // T92698
],
'+ruwiki' => [
-   102 /* Draft / Incubator */ => true // T86688
+   'Инкубатор' /* Draft / Incubator */ => true // T86688
],
'+zhwiki' => [
-   118 /* Draft */ => true // T91223
+   'Draft' => true // T91223
],
 
// Wiktionaries
'+frwiktionary' => [
-   100 /* Annexe */ => true, // T127819
-   106 /* Thésaurus */ => true // T127819
+   'Annexe' => true, // T127819
+   'Thésaurus' => true // T127819
],
'svwiktionary' => [
-   NS_USER => true // T59356
+   'User' => true // T59356
],
 
// Wikiquotes
@@ -13602,7 +13602,7 @@
 
// Wikiversities
'+frwikiversity' => [
-   104 /* Recherche */ => true // T63874
+   'Recherche' => true // T63874
],
 
// Wikivoyages
@@ -13611,29 +13611,29 @@
 
// Wikimedias
'+sewikimedia' => [
-   100 /* Projekt */ => true // T62882
+   'Projekt' => true // T62882
],
 
// Other wikis (e.g. Commons, Meta)
'+commonswiki' => [
-   100 /* Creator */ => true, // T67067
-   106 /* Institution 

[MediaWiki-commits] [Gerrit] Revert "Enable Echo transition flags in production for testing" - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Revert "Enable Echo transition flags in production for testing"
..


Revert "Enable Echo transition flags in production for testing"

This reverts commit 94746100a4fac52b79c644aff60159ed0a78e629.

Change-Id: I7543796c6ed83967714992aa6d40c0d85aced86f
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9556a80..0cf6d43 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15598,7 +15598,7 @@
 
 // Whether to enable the transition flags for the bundling and 
recategorization changes in Echo
 'wmgEchoTransition' => [
-   'default' => true,
+   'default' => false,
 ],
 
 // Thanks should be enabled for wikis with Echo

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Enable Echo transition flags in production for testing" - change (operations/mediawiki-config)

[Dereckson (Code Review)]

Dereckson has uploaded a new change for review.

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

Change subject: Revert "Enable Echo transition flags in production for testing"
..

Revert "Enable Echo transition flags in production for testing"

This reverts commit 94746100a4fac52b79c644aff60159ed0a78e629.

Change-Id: I7543796c6ed83967714992aa6d40c0d85aced86f
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9556a80..0cf6d43 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15598,7 +15598,7 @@
 
 // Whether to enable the transition flags for the bundling and 
recategorization changes in Echo
 'wmgEchoTransition' => [
-   'default' => true,
+   'default' => false,
 ],
 
 // Thanks should be enabled for wikis with Echo

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

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

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

[MediaWiki-commits] [Gerrit] Improve HTMLCacheUpdate job CDN purge de-duplication - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Improve HTMLCacheUpdate job CDN purge de-duplication
..


Improve HTMLCacheUpdate job CDN purge de-duplication

Bug: T124418
Change-Id: I87005f3ffaf73c70f137137849b628217be946d2
---
M includes/jobqueue/jobs/HTMLCacheUpdateJob.php
1 file changed, 9 insertions(+), 12 deletions(-)

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



diff --git a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php 
b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
index 7acbdf2..a14cdd7 100644
--- a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
+++ b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
@@ -102,18 +102,15 @@
return;
}
 
-   // The page_touched field will need to be bumped for these 
pages.
-   // Only bump it to the present time if no "rootJobTimestamp" 
was known.
-   // If it is known, it can be used instead, which avoids 
invalidating output
-   // that was in fact generated *after* the relevant dependency 
change time
-   // (e.g. template edit). This is particularily useful since 
refreshLinks jobs
-   // save back parser output and usually run along side 
htmlCacheUpdate jobs;
-   // their saved output would be invalidated by using the current 
timestamp.
-   if ( isset( $this->params['rootJobTimestamp'] ) ) {
-   $touchTimestamp = $this->params['rootJobTimestamp'];
-   } else {
-   $touchTimestamp = wfTimestampNow();
-   }
+   // Bump page_touched to the current timestamp. This used to use 
the root job timestamp
+   // (e.g. template/file edit time), which was a bit more 
efficient when template edits are
+   // rare and don't effect the same pages much. However, this way 
allows for better
+   // de-duplication, which is much more useful for wikis with 
high edit rates. Note that
+   // RefreshLinksJob, which is enqueued alongside 
HTMLCacheUpdateJob, saves the parser output
+   // since it has to parse anyway. We assume that vast majority 
of the cache jobs finish
+   // before the link jobs, so using the current timestamp instead 
of the root timestamp is
+   // not expected to invalidate these cache entries too often.
+   $touchTimestamp = wfTimestampNow();
 
$dbw = wfGetDB( DB_MASTER );
// Update page_touched (skipping pages already touched since 
the root job).

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87005f3ffaf73c70f137137849b628217be946d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: GWicke 
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] Adding a bunch of hooks from wikiHow into DifferenceEngine - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Adding a bunch of hooks from wikiHow into DifferenceEngine
..


Adding a bunch of hooks from wikiHow into DifferenceEngine

These hooks allow things such as:
* adding CSS(/JS) into the OutputPage when viewing diffs
* adding extra HTML content (such as avatars) into diff views
* hiding the bottom "mark as patrolled" link
* altering the parser output that is used by DifferenceEngine
* and more

Example extension using these hooks is wikiHow's
/extensions/wikihow/hooks/, specifically the file DiffHooks.php (but the
hooks are setup in WikihowHooks.php).

Live example of the DiffHooks stuff in action can be found at wikiHow.com,
for example:
http://www.wikihow.com/index.php?title=Set-Your-Homepage=17112892=15888129
(user avatars, additional CSS, changes to the old/new revision header
texts/links)

Change-Id: Icbc987fa4806e7bfc66743375301912b428dc348
---
M docs/hooks.txt
M includes/diff/DifferenceEngine.php
2 files changed, 117 insertions(+), 6 deletions(-)

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



diff --git a/docs/hooks.txt b/docs/hooks.txt
index fa664c3..2e7a299 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1135,6 +1135,85 @@
 $row: the DB row for this line
 &$classes: the classes to add to the surrounding 
 
+'DifferenceEngineMarkPatrolledLink': Allows extensions to change the "mark as 
patrolled" link
+which is shown both on the diff header as well as on the bottom of a page, 
usually
+wrapped in a span element which has class="patrollink".
+$differenceEngine: DifferenceEngine object
+&$markAsPatrolledLink: The "mark as patrolled" link HTML (string)
+$rcid: Recent change ID (rc_id) for this change (int)
+$token: Patrol token; $rcid is used in generating this variable
+
+'DifferenceEngineMarkPatrolledRCID': Allows extensions to possibly change the 
rcid parameter.
+For example the rcid might be set to zero due to the user being the same as the
+performer of the change but an extension might still want to show it under 
certain
+conditions.
+&$rcid: rc_id (int) of the change or 0
+$differenceEngine: DifferenceEngine object
+$change: RecentChange object
+$user: User object representing the current user
+
+'DifferenceEngineNewHeader': Allows extensions to change the $newHeader 
variable, which
+contains information about the new revision, such as the revision's author, 
whether
+the revision was marked as a minor edit or not, etc.
+$differenceEngine: DifferenceEngine object
+&$newHeader: The string containing the various #mw-diff-otitle[1-5] divs, which
+include things like revision author info, revision comment, RevisionDelete 
link and more
+$formattedRevisionTools: Array containing revision tools, some of which may 
have
+been injected with the DiffRevisionTools hook
+$nextlink: String containing the link to the next revision (if any); also 
included in $newHeader
+$rollback: Rollback link (string) to roll this revision back to the previous 
one, if any
+$newminor: String indicating if the new revision was marked as a minor edit
+$diffOnly: Boolean parameter passed to DifferenceEngine#showDiffPage, 
indicating
+whether we should show just the diff; passed in as a query string parameter to 
the
+various URLs constructed here (i.e. $nextlink)
+$rdel: RevisionDelete link for the new revision, if the current user is allowed
+to use the RevisionDelete feature
+$unhide: Boolean parameter indicating whether to show RevisionDeleted revisions
+
+'DifferenceEngineOldHeader': Allows extensions to change the $oldHeader 
variable, which
+contains information about the old revision, such as the revision's author, 
whether
+the revision was marked as a minor edit or not, etc.
+$differenceEngine: DifferenceEngine object
+&$oldHeader: The string containing the various #mw-diff-otitle[1-5] divs, which
+include things like revision author info, revision comment, RevisionDelete 
link and more
+$prevlink: String containing the link to the previous revision (if any); also 
included in $oldHeader
+$oldminor: String indicating if the old revision was marked as a minor edit
+$diffOnly: Boolean parameter passed to DifferenceEngine#showDiffPage, 
indicating
+whether we should show just the diff; passed in as a query string parameter to 
the
+various URLs constructed here (i.e. $prevlink)
+$ldel: RevisionDelete link for the old revision, if the current user is allowed
+to use the RevisionDelete feature
+$unhide: Boolean parameter indicating whether to show RevisionDeleted revisions
+
+'DifferenceEngineOldHeaderNoOldRev': Change the $oldHeader variable in cases 
when
+there is no old revision
+&$oldHeader: empty string by default
+
+'DifferenceEngineRenderRevisionAddParserOutput': Allows extensions to change 
the parser output.
+Return false to not add parser output via OutputPage's addParserOutput method.
+$differenceEngine: DifferenceEngine object

[MediaWiki-commits] [Gerrit] Add check in case site does not exist - change (mediawiki...Wikibase)

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: Add check in case site does not exist
..

Add check in case site does not exist

Useful for test sites which may load only partial data, or if the site
is removed.

Change-Id: Ic3746a56fe8c27da933ab086bcf4a9901519a3b2
---
M repo/includes/Rdf/SiteLinksRdfBuilder.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/repo/includes/Rdf/SiteLinksRdfBuilder.php 
b/repo/includes/Rdf/SiteLinksRdfBuilder.php
index e68ae17..e472f13 100644
--- a/repo/includes/Rdf/SiteLinksRdfBuilder.php
+++ b/repo/includes/Rdf/SiteLinksRdfBuilder.php
@@ -94,10 +94,12 @@
 
// FIXME: we should check the site exists using 
hasGlobalId here before asuming it does
$site = $this->siteLookup->getSite( 
$siteLink->getSiteId() );
-
+   if( !$site ) {
+   // Somehow we've got site that we don't know 
about - skip
+   continue;
+   }
// XXX: ideally, we'd use https if the target site 
supports it.
$baseUrl = str_replace( '$1', rawurlencode( 
$siteLink->getPageName() ), $site->getLinkPath() );
-   // $site->getPageUrl( $siteLink->getPageName() );
if ( !parse_url( $baseUrl, PHP_URL_SCHEME ) ) {
$url = "http:".$baseUrl;
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3746a56fe8c27da933ab086bcf4a9901519a3b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 750078a..fc8d1b9 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 750078a..fc8d1b9
..


Syncronize VisualEditor: 750078a..fc8d1b9

Change-Id: Ib2a4fab76679eec12dda99b9823129a913e7c4f1
---
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 750078a..fc8d1b9 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 750078ab63a362090ea0537d5dccaa0217bd12a4
+Subproject commit fc8d1b9d25d0fb08a4ff5b2726615293122abf50

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2a4fab76679eec12dda99b9823129a913e7c4f1
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] Syncronize VisualEditor: 750078a..fc8d1b9 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 750078a..fc8d1b9
..

Syncronize VisualEditor: 750078a..fc8d1b9

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/70/296670/1

diff --git a/VisualEditor b/VisualEditor
index 750078a..fc8d1b9 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 750078ab63a362090ea0537d5dccaa0217bd12a4
+Subproject commit fc8d1b9d25d0fb08a4ff5b2726615293122abf50

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2a4fab76679eec12dda99b9823129a913e7c4f1
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] screenshots: Restore save button to more settings task - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: screenshots: Restore save button to more settings task
..


screenshots: Restore save button to more settings task

Change-Id: I847cf81f3092be50f0fcf019eea3226decedd445
---
M build/screenshots.js
1 file changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/build/screenshots.js b/build/screenshots.js
index 1596f4a..1c57c77 100644
--- a/build/screenshots.js
+++ b/build/screenshots.js
@@ -69,7 +69,7 @@
$element.css( 
'outline', '3px solid #347bff' );

$lastHighlighted = $element;
},
-   runMenuTask: function ( 
done, tool, expanded, highlight ) {
+   runMenuTask: function ( 
done, tool, expanded, highlight, extraElements ) {
var toolGroup = 
tool.toolGroup;
 

seleniumUtils.collapseToolbar();
@@ -88,7 +88,7 @@

seleniumUtils.getBoundingRect( [

toolGroup.$element[ 0 ],

toolGroup.$group[ 0 ]
-   
] )
+   
].concat( extraElements || [] ) )
);
} );
}
@@ -264,7 +264,9 @@
runScreenshotTest( 'VisualEditor_More_Settings',
// This function is converted to a string and 
executed in the browser
function () {
-   seleniumUtils.runMenuTask( arguments[ 
arguments.length - 1 ], ve.init.target.actionsToolbar.tools.advancedSettings );
+   seleniumUtils.runMenuTask( arguments[ 
arguments.length - 1 ], ve.init.target.actionsToolbar.tools.advancedSettings, 
false, false,
+   [ 
ve.init.target.toolbarSaveButton.$element[ 0 ] ]
+   );
}
);
runScreenshotTest( 'VisualEditor_page_settings_item',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I847cf81f3092be50f0fcf019eea3226decedd445
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] screenshots: Add task for plain insert menu - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: screenshots: Add task for plain insert menu
..


screenshots: Add task for plain insert menu

Change-Id: Id77df7ff88e030b283b1f94ff85537bfd4f20345
---
M build/screenshots.js
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/build/screenshots.js b/build/screenshots.js
index 20ae960..1596f4a 100644
--- a/build/screenshots.js
+++ b/build/screenshots.js
@@ -225,6 +225,12 @@
seleniumUtils.runMenuTask( arguments[ 
arguments.length - 1 ], ve.init.target.toolbar.tools.bullet );
}
);
+   runScreenshotTest( 'VisualEditor_Insert_Menu',
+   // This function is converted to a string and 
executed in the browser
+   function () {
+   seleniumUtils.runMenuTask( arguments[ 
arguments.length - 1 ], ve.init.target.toolbar.tools.media, true );
+   }
+   );
runScreenshotTest( 'VisualEditor_Media_Insert_Menu',
// This function is converted to a string and 
executed in the browser
function () {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id77df7ff88e030b283b1f94ff85537bfd4f20345
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Promote REL1_27 to stable - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Promote REL1_27 to stable
..


Promote REL1_27 to stable

Also remove REL1_25 since it is now EOL.

Change-Id: I27aa2680d0b7793402c33732f7b88bc577719500
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3d417ef..c531a75 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -895,10 +895,10 @@
];
 
// Current stable release
-   $wgExtDistDefaultSnapshot = 'REL1_26';
+   $wgExtDistDefaultSnapshot = 'REL1_27';
 
// Current development snapshot
-   $wgExtDistCandidateSnapshot = 'REL1_27';
+   // $wgExtDistCandidateSnapshot = 'REL1_28';
 
// When changing the Snapshot Refs please change the corresponding
// extension distributor messages for mediawiki.org in JSON files
@@ -907,7 +907,6 @@
'master',
'REL1_27',
'REL1_26',
-   'REL1_25',
'REL1_23',
];
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27aa2680d0b7793402c33732f7b88bc577719500
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Promote REL1_27 to stable - change (operations/mediawiki-config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Promote REL1_27 to stable
..

Promote REL1_27 to stable

Also remove REL1_25 since it is now EOL.

Change-Id: I27aa2680d0b7793402c33732f7b88bc577719500
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3d417ef..c531a75 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -895,10 +895,10 @@
];
 
// Current stable release
-   $wgExtDistDefaultSnapshot = 'REL1_26';
+   $wgExtDistDefaultSnapshot = 'REL1_27';
 
// Current development snapshot
-   $wgExtDistCandidateSnapshot = 'REL1_27';
+   // $wgExtDistCandidateSnapshot = 'REL1_28';
 
// When changing the Snapshot Refs please change the corresponding
// extension distributor messages for mediawiki.org in JSON files
@@ -907,7 +907,6 @@
'master',
'REL1_27',
'REL1_26',
-   'REL1_25',
'REL1_23',
];
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27aa2680d0b7793402c33732f7b88bc577719500
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-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] Syncronize VisualEditor: 3c5695e..750078a - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 3c5695e..750078a
..

Syncronize VisualEditor: 3c5695e..750078a

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/68/296668/1

diff --git a/VisualEditor b/VisualEditor
index 3c5695e..750078a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3c5695e87dbc94cafa5629fb609896a596b6433e
+Subproject commit 750078ab63a362090ea0537d5dccaa0217bd12a4

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If13358b415e6fc1d0f8347ba770b448419575087
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: 3c5695e..750078a - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 3c5695e..750078a
..


Syncronize VisualEditor: 3c5695e..750078a

Change-Id: If13358b415e6fc1d0f8347ba770b448419575087
---
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 3c5695e..750078a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3c5695e87dbc94cafa5629fb609896a596b6433e
+Subproject commit 750078ab63a362090ea0537d5dccaa0217bd12a4

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If13358b415e6fc1d0f8347ba770b448419575087
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] MWTemplateDialog: When opening the dialog, add in any unset ... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: MWTemplateDialog: When opening the dialog, add in any unset 
suggested and required parameters
..


MWTemplateDialog: When opening the dialog, add in any unset suggested and 
required parameters

Bug: T97482
Change-Id: Iaf280355f442240aba4e1f74d3ee402fc5d329b0
---
M modules/ve-mw/dm/models/ve.dm.MWTemplateModel.js
M modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
M modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js
M modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
4 files changed, 23 insertions(+), 4 deletions(-)

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



diff --git a/modules/ve-mw/dm/models/ve.dm.MWTemplateModel.js 
b/modules/ve-mw/dm/models/ve.dm.MWTemplateModel.js
index e286cca..e735dd7 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTemplateModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTemplateModel.js
@@ -288,10 +288,7 @@
 };
 
 /**
- * Add all non-existing required and suggested parameters, if any.
- *
- * @method
- * @return {number} Number of parameters added
+ * @inheritdoc
  */
 ve.dm.MWTemplateModel.prototype.addPromptedParameters = function () {
var i, len, addedCount = 0,
diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js 
b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
index 8dbd870..72da8f3 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
@@ -542,4 +542,14 @@
return -1;
};
 
+   /*
+* Add missing required and suggested parameters to each transclusion.
+*/
+   ve.dm.MWTransclusionModel.prototype.addPromptedParameters = function () 
{
+   var i;
+   for ( i = 0; i < this.parts.length; i++ ) {
+   this.parts[ i ].addPromptedParameters();
+   }
+   };
+
 }() );
diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js 
b/modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js
index 8454d2a..a85a1d3 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js
@@ -77,3 +77,13 @@
 ve.dm.MWTransclusionPartModel.prototype.getWikitext = function () {
return '';
 };
+
+/**
+ * Add all non-existing required and suggested parameters, if any.
+ *
+ * @method
+ * @return {number} Number of parameters added
+ */
+ve.dm.MWTransclusionPartModel.prototype.addPromptedParameters = function () {
+   return 0;
+};
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
index c5838e8..dc84ae8 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
@@ -78,6 +78,8 @@
  * Handle the transclusion being ready to use.
  */
 ve.ui.MWTemplateDialog.prototype.onTransclusionReady = function () {
+   // Add missing required and suggested parameters to each transclusion.
+   this.transclusionModel.addPromptedParameters();
this.loaded = true;
this.$element.addClass( 've-ui-mwTemplateDialog-ready' );
this.$body.append( this.bookletLayout.$element );

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

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

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

[MediaWiki-commits] [Gerrit] Use Norwegian Bokmål language code not wiki code - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Use Norwegian Bokmål language code not wiki code
..

Use Norwegian Bokmål language code not wiki code

A follow up to 8e9125b, the languages supported and namespace
translation scripts assume that the wiki subdomain matches the language
code. This is not true for Norwegian Bokmål which has a subdomain of
"no" and a language code of "nb". Update and rerun the scripts to record
the correct language code and move the "nb" to "no" language code to
subdomain translation from LanguageUtil to Site. A translation in
LanguageUtil is unwanted as "nb" is understood by the Android
configuration loader and only Site needs to be aware of the conversion.

Bug: T114042
Bug: T138720
Change-Id: Ia34c0791986e0b9904e178f599b43a4e06b503d6
---
M app/src/main/java/org/wikipedia/Site.java
M app/src/main/java/org/wikipedia/interlanguage/LanguageUtil.java
M app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
M app/src/main/java/org/wikipedia/staticdata/MainPageNameData.java
M app/src/main/java/org/wikipedia/staticdata/SpecialAliasData.java
M app/src/main/res/values/languages_list.xml
M scripts/generate_wiki_languages.py
M scripts/make-templates.py
8 files changed, 17 insertions(+), 6 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/Site.java 
b/app/src/main/java/org/wikipedia/Site.java
index d130a37..f055802 100644
--- a/app/src/main/java/org/wikipedia/Site.java
+++ b/app/src/main/java/org/wikipedia/Site.java
@@ -262,6 +262,8 @@
 case AppLanguageLookUpTable.SIMPLIFIED_CHINESE_LANGUAGE_CODE:
 case AppLanguageLookUpTable.TRADITIONAL_CHINESE_LANGUAGE_CODE:
 return Locale.CHINA.getLanguage();
+case "nb": // Norwegian Bokmål
+return "no"; // T114042
 default:
 return languageCode;
 }
diff --git a/app/src/main/java/org/wikipedia/interlanguage/LanguageUtil.java 
b/app/src/main/java/org/wikipedia/interlanguage/LanguageUtil.java
index 06416af..bdf67c4 100644
--- a/app/src/main/java/org/wikipedia/interlanguage/LanguageUtil.java
+++ b/app/src/main/java/org/wikipedia/interlanguage/LanguageUtil.java
@@ -26,8 +26,6 @@
 return "he"; // Hebrew
 case "in":
 return "id"; // Indonesian
-case "nb":
-return "no"; // Norsk bokmål T114042
 case "ji":
 return "yi"; // Yiddish
 case "zh":
diff --git a/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java 
b/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
index 4578013..f0234e0 100644
--- a/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
+++ b/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
@@ -35,7 +35,7 @@
 DATA_MAP.put("uk", "Файл");
 DATA_MAP.put("ca", "Fitxer");
 DATA_MAP.put("fa", "پرونده");
-DATA_MAP.put("no", "Fil");
+DATA_MAP.put("nb", "Fil");
 DATA_MAP.put("sh", "Datoteka");
 DATA_MAP.put("ar", "ملف");
 DATA_MAP.put("fi", "Tiedosto");
diff --git a/app/src/main/java/org/wikipedia/staticdata/MainPageNameData.java 
b/app/src/main/java/org/wikipedia/staticdata/MainPageNameData.java
index 88a2139..3f20bf7 100644
--- a/app/src/main/java/org/wikipedia/staticdata/MainPageNameData.java
+++ b/app/src/main/java/org/wikipedia/staticdata/MainPageNameData.java
@@ -35,7 +35,7 @@
 DATA_MAP.put("uk", "Головна сторінка");
 DATA_MAP.put("ca", "Portada");
 DATA_MAP.put("fa", "صفحهٔ اصلی");
-DATA_MAP.put("no", "Portal:Forside");
+DATA_MAP.put("nb", "Portal:Forside");
 DATA_MAP.put("sh", "Glavna stranica");
 DATA_MAP.put("ar", "الصفحة الرئيسية");
 DATA_MAP.put("fi", "Wikipedia:Etusivu");
diff --git a/app/src/main/java/org/wikipedia/staticdata/SpecialAliasData.java 
b/app/src/main/java/org/wikipedia/staticdata/SpecialAliasData.java
index a7f259d..2f2d583 100644
--- a/app/src/main/java/org/wikipedia/staticdata/SpecialAliasData.java
+++ b/app/src/main/java/org/wikipedia/staticdata/SpecialAliasData.java
@@ -35,7 +35,7 @@
 DATA_MAP.put("uk", "Спеціальна");
 DATA_MAP.put("ca", "Especial");
 DATA_MAP.put("fa", "ویژه");
-DATA_MAP.put("no", "Spesial");
+DATA_MAP.put("nb", "Spesial");
 DATA_MAP.put("sh", "Posebno");
 DATA_MAP.put("ar", "خاص");
 DATA_MAP.put("fi", "Toiminnot");
diff --git a/app/src/main/res/values/languages_list.xml 
b/app/src/main/res/values/languages_list.xml
index c4d832a..d057d43 100644
--- a/app/src/main/res/values/languages_list.xml
+++ b/app/src/main/res/values/languages_list.xml
@@ -20,7 +20,7 @@
 uk
 ca
 fa
-no
+nb
 sh
 ar
 fi
diff --git 

[MediaWiki-commits] [Gerrit] Update languages supported & namespace translation - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Update languages supported & namespace translation
..

Update languages supported & namespace translation

  scripts/generate_wiki_languages.py &&
  scripts/make-templates.py &&
  mv \
FileAliasData.java \
MainPageNameData.java \
SpecialAliasData.java \
app/src/main/java/org/wikipedia/staticdata/ &&
  mv languages_list.xml app/src/main/res/values/ &&
  rm filealias.json languages_list.json mainpages.json specialalias.json

Change-Id: Ie024730ba6d42092f538708b3bed1d414470f470
---
M app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
M app/src/main/java/org/wikipedia/staticdata/MainPageNameData.java
M app/src/main/java/org/wikipedia/staticdata/SpecialAliasData.java
M app/src/main/res/values/languages_list.xml
4 files changed, 325 insertions(+), 325 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java 
b/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
index 215578a..4578013 100644
--- a/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
+++ b/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
@@ -23,8 +23,8 @@
 DATA_MAP.put("fr", "Fichier");
 DATA_MAP.put("ru", "Файл");
 DATA_MAP.put("it", "File");
-DATA_MAP.put("war", "Paypay");
 DATA_MAP.put("es", "Archivo");
+DATA_MAP.put("war", "Paypay");
 DATA_MAP.put("pl", "Plik");
 DATA_MAP.put("vi", "Tập tin");
 DATA_MAP.put("ja", "ファイル");
@@ -56,47 +56,47 @@
 DATA_MAP.put("sk", "Súbor");
 DATA_MAP.put("hy", "Պատկեր");
 DATA_MAP.put("he", "קובץ");
+DATA_MAP.put("zh-min-nan", "tóng-àn");
 DATA_MAP.put("lt", "Vaizdas");
 DATA_MAP.put("hr", "Datoteka");
 DATA_MAP.put("sl", "Slika");
 DATA_MAP.put("et", "Pilt");
-DATA_MAP.put("zh-min-nan", "tóng-àn");
 DATA_MAP.put("ce", "Файл");
 DATA_MAP.put("gl", "Ficheiro");
-DATA_MAP.put("uz", "Fayl");
 DATA_MAP.put("nn", "Fil");
+DATA_MAP.put("uz", "Fayl");
 DATA_MAP.put("la", "Fasciculus");
 DATA_MAP.put("vo", "Ragiv");
-DATA_MAP.put("simple", "File");
 DATA_MAP.put("el", "Αρχείο");
+DATA_MAP.put("simple", "File");
 DATA_MAP.put("be", "Файл");
 DATA_MAP.put("az", "Şəkil");
-DATA_MAP.put("ka", "ფაილი");
-DATA_MAP.put("ur", "ملف");
-DATA_MAP.put("hi", "चित्र");
 DATA_MAP.put("th", "ไฟล์");
+DATA_MAP.put("ur", "ملف");
+DATA_MAP.put("ka", "ფაილი");
+DATA_MAP.put("hi", "चित्र");
 DATA_MAP.put("oc", "Fichièr");
 DATA_MAP.put("ta", "படிமம்");
 DATA_MAP.put("mk", "Податотека");
 DATA_MAP.put("mg", "Sary");
 DATA_MAP.put("new", "किपा");
+DATA_MAP.put("lv", "Attēls");
 DATA_MAP.put("cy", "Delwedd");
 DATA_MAP.put("bs", "Datoteka");
 DATA_MAP.put("tt", "Файл");
-DATA_MAP.put("lv", "Attēls");
-DATA_MAP.put("te", "దస్త్రం");
 DATA_MAP.put("tl", "Talaksan");
 DATA_MAP.put("pms", "Figura");
+DATA_MAP.put("te", "దస్త్రం");
 DATA_MAP.put("be-tarask", "Файл");
 DATA_MAP.put("br", "Restr");
-DATA_MAP.put("ky", "Файл");
 DATA_MAP.put("sq", "Skeda");
+DATA_MAP.put("ky", "Файл");
 DATA_MAP.put("ht", "Fichye");
 DATA_MAP.put("jv", "Gambar");
 DATA_MAP.put("tg", "Акс");
 DATA_MAP.put("ast", "Ficheru");
-DATA_MAP.put("lb", "Fichier");
 DATA_MAP.put("zh-yue", "File");
+DATA_MAP.put("lb", "Fichier");
 DATA_MAP.put("mr", "चित्र");
 DATA_MAP.put("ml", "പ്രമാണം");
 DATA_MAP.put("bn", "চিত্র");
@@ -106,9 +106,9 @@
 DATA_MAP.put("sco", "File");
 DATA_MAP.put("ga", "Íomhá");
 DATA_MAP.put("ba", "Файл");
+DATA_MAP.put("fy", "Ofbyld");
 DATA_MAP.put("cv", "Ӳкерчĕк");
 DATA_MAP.put("lmo", "Archivi");
-DATA_MAP.put("fy", "Ofbyld");
 DATA_MAP.put("sw", "Picha");
 DATA_MAP.put("my", "File");
 DATA_MAP.put("an", "Imachen");
@@ -116,56 +116,57 @@
 DATA_MAP.put("ne", "चित्र");
 DATA_MAP.put("io", "Arkivo");
 DATA_MAP.put("gu", "ચિત્ર");
-DATA_MAP.put("scn", "File");
 DATA_MAP.put("nds", "Bild");
+DATA_MAP.put("scn", "File");
 DATA_MAP.put("bpy", "ছবি");
 DATA_MAP.put("pa", "ਤਸਵੀਰ");
 DATA_MAP.put("ku", "Wêne");
 DATA_MAP.put("als", "Datei");
 DATA_MAP.put("kn", "ಚಿತ್ರ");
-DATA_MAP.put("qu", "Rikcha");
 DATA_MAP.put("ia", "File");
-DATA_MAP.put("su", "Gambar");
+DATA_MAP.put("qu", "Rikcha");
  

[MediaWiki-commits] [Gerrit] screenshots: Restore save button to more settings task - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: screenshots: Restore save button to more settings task
..

screenshots: Restore save button to more settings task

Change-Id: I847cf81f3092be50f0fcf019eea3226decedd445
---
M build/screenshots.js
1 file changed, 5 insertions(+), 3 deletions(-)


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

diff --git a/build/screenshots.js b/build/screenshots.js
index 1596f4a..1c57c77 100644
--- a/build/screenshots.js
+++ b/build/screenshots.js
@@ -69,7 +69,7 @@
$element.css( 
'outline', '3px solid #347bff' );

$lastHighlighted = $element;
},
-   runMenuTask: function ( 
done, tool, expanded, highlight ) {
+   runMenuTask: function ( 
done, tool, expanded, highlight, extraElements ) {
var toolGroup = 
tool.toolGroup;
 

seleniumUtils.collapseToolbar();
@@ -88,7 +88,7 @@

seleniumUtils.getBoundingRect( [

toolGroup.$element[ 0 ],

toolGroup.$group[ 0 ]
-   
] )
+   
].concat( extraElements || [] ) )
);
} );
}
@@ -264,7 +264,9 @@
runScreenshotTest( 'VisualEditor_More_Settings',
// This function is converted to a string and 
executed in the browser
function () {
-   seleniumUtils.runMenuTask( arguments[ 
arguments.length - 1 ], ve.init.target.actionsToolbar.tools.advancedSettings );
+   seleniumUtils.runMenuTask( arguments[ 
arguments.length - 1 ], ve.init.target.actionsToolbar.tools.advancedSettings, 
false, false,
+   [ 
ve.init.target.toolbarSaveButton.$element[ 0 ] ]
+   );
}
);
runScreenshotTest( 'VisualEditor_page_settings_item',

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

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

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

[MediaWiki-commits] [Gerrit] Update VisualEditor for I3e3ecb3e/I23ee26fa - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Update VisualEditor for I3e3ecb3e/I23ee26fa
..


Update VisualEditor for I3e3ecb3e/I23ee26fa

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 0ee3eea..bae3c78 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 0ee3eeaf1211597d38753d8a5fcefea8eb5475cb
+Subproject commit bae3c78b06c8e0c5216df74eeb188cae9a53bd87

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b241a44f9da842c666e0d382b1f276a35de20cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.8
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
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 VisualEditor for I3e3ecb3e/I23ee26fa - change (mediawiki/core)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Update VisualEditor for I3e3ecb3e/I23ee26fa
..

Update VisualEditor for I3e3ecb3e/I23ee26fa

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/296661/1

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 0ee3eea..bae3c78 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 0ee3eeaf1211597d38753d8a5fcefea8eb5475cb
+Subproject commit bae3c78b06c8e0c5216df74eeb188cae9a53bd87

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b241a44f9da842c666e0d382b1f276a35de20cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.8
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Don't use array_merge for namespace configs - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Don't use array_merge for namespace configs
..


Don't use array_merge for namespace configs

array_merge renumbers numeric keys. The namespace configs can be either
numeric or names. If they're numeric, they shouldn't be renumbered. So just
add them.

Bug: T138980
Change-Id: I3e3ecb3e9e65443ba0d44f8eeb67d6b390eca0bd
---
M ApiVisualEditor.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index b7c5330..f42b976 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -669,7 +669,10 @@
 * @return array
 */
public static function getAvailableNamespaceIds( Config $config ) {
-   $availableNamespaces = $config->get( 
'VisualEditorAvailableNamespaces' );
+   $availableNamespaces =
+   // Note: existing numeric keys might exist, and so 
array_merge cannot be used
+   (array) $config->get( 'VisualEditorAvailableNamespaces' 
) +
+   (array) ExtensionRegistry::getInstance()->getAttribute( 
'VisualEditorAvailableNamespaces' );
return array_map( function ( $namespace ) {
// Convert canonical namespace names to IDs
return is_numeric( $namespace ) ?

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: bf0953b..3c5695e - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: bf0953b..3c5695e
..


Syncronize VisualEditor: bf0953b..3c5695e

Change-Id: I6931f3193c43a36f9d0b2b96bddf1bd88a604894
---
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 bf0953b..3c5695e 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit bf0953b07b9597fc4ab8a459e1adb620b1f4390b
+Subproject commit 3c5695e87dbc94cafa5629fb609896a596b6433e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6931f3193c43a36f9d0b2b96bddf1bd88a604894
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] Don't use array_merge for namespace configs - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Don't use array_merge for namespace configs
..


Don't use array_merge for namespace configs

array_merge renumbers numeric keys. The namespace configs can be either
numeric or names. If they're numeric, they shouldn't be renumbered. So just
add them.

Bug: T138980
Change-Id: I3e3ecb3e9e65443ba0d44f8eeb67d6b390eca0bd
---
M ApiVisualEditor.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index b9b066a..357592f 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -665,7 +665,10 @@
 * @return array
 */
public static function getAvailableNamespaceIds( Config $config ) {
-   $availableNamespaces = $config->get( 
'VisualEditorAvailableNamespaces' );
+   $availableNamespaces =
+   // Note: existing numeric keys might exist, and so 
array_merge cannot be used
+   (array) $config->get( 'VisualEditorAvailableNamespaces' 
) +
+   (array) ExtensionRegistry::getInstance()->getAttribute( 
'VisualEditorAvailableNamespaces' );
return array_map( function ( $namespace ) {
// Convert canonical namespace names to IDs
return is_numeric( $namespace ) ?

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e3ecb3e9e65443ba0d44f8eeb67d6b390eca0bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.28.0-wmf.8
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: bf0953b..3c5695e - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: bf0953b..3c5695e
..

Syncronize VisualEditor: bf0953b..3c5695e

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


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

diff --git a/VisualEditor b/VisualEditor
index bf0953b..3c5695e 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit bf0953b07b9597fc4ab8a459e1adb620b1f4390b
+Subproject commit 3c5695e87dbc94cafa5629fb609896a596b6433e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6931f3193c43a36f9d0b2b96bddf1bd88a604894
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] Don't use array_merge for namespace configs - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Don't use array_merge for namespace configs
..

Don't use array_merge for namespace configs

array_merge renumbers numeric keys. The namespace configs can be either
numeric or names. If they're numeric, they shouldn't be renumbered. So just
add them.

Bug: T138980
Change-Id: I3e3ecb3e9e65443ba0d44f8eeb67d6b390eca0bd
---
M ApiVisualEditor.php
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index b9b066a..357592f 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -665,7 +665,10 @@
 * @return array
 */
public static function getAvailableNamespaceIds( Config $config ) {
-   $availableNamespaces = $config->get( 
'VisualEditorAvailableNamespaces' );
+   $availableNamespaces =
+   // Note: existing numeric keys might exist, and so 
array_merge cannot be used
+   (array) $config->get( 'VisualEditorAvailableNamespaces' 
) +
+   (array) ExtensionRegistry::getInstance()->getAttribute( 
'VisualEditorAvailableNamespaces' );
return array_map( function ( $namespace ) {
// Convert canonical namespace names to IDs
return is_numeric( $namespace ) ?

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e3ecb3e9e65443ba0d44f8eeb67d6b390eca0bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.28.0-wmf.8
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: DLynch 

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

[MediaWiki-commits] [Gerrit] admin: add wdqs-admins to deploy-service group - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: admin: add wdqs-admins to deploy-service group
..

admin: add wdqs-admins to deploy-service group

As requested in T138628, adding the current members of
wdqs-admins to the deploy-service group.

Bug:T138628
Change-Id: Ib2557f150f385476a3b5073ed75711bdd3524b0e
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/296658/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 182b765..447d788 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -410,7 +410,7 @@
 gid: 763
 description: Service deploy users
 members: [eevans, gwicke, mobrovac, demon, twentyafterfour, thcipriani, 
dduvall,
-  yurik, bsitzmann, mholloway-shell, kartik, halfak, ladsgroup]
+  yurik, bsitzmann, mholloway-shell, kartik, halfak, ladsgroup, 
smalyshev, hoo, jzerebecki]
 privileges: []
 
   aqs-admins:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2557f150f385476a3b5073ed75711bdd3524b0e
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] Explain that ZIntStream only represents uint32_t values righ... - change (openzim)

[Kelson (Code Review)]

Kelson has submitted this change and it was merged.

Change subject: Explain that ZIntStream only represents uint32_t values right 
now.
..


Explain that ZIntStream only represents uint32_t values right now.

Change-Id: Id712847949af1ce32b2e3118fc241be171124186
---
M zimlib/include/zim/zintstream.h
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/zimlib/include/zim/zintstream.h b/zimlib/include/zim/zintstream.h
index 1c78a1f..66fdfef 100644
--- a/zimlib/include/zim/zintstream.h
+++ b/zimlib/include/zim/zintstream.h
@@ -41,7 +41,10 @@
   substracted from the actual number, so a 2 byte zero is actually a 128.
 
   The same logic continues on the 3rd, 4th, ... byte. Up to 7 additional bytes
-  are used, so the first byte must contain at least one 0.
+  could used, since the first byte must contain at least one 0.
+
+  This particular implementation only represents uint32_t values (numbers up
+  to 2^32-1), so it will only ever emit 5 bytes per input value.
 
   binary  range
   --- 
--

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id712847949af1ce32b2e3118fc241be171124186
Gerrit-PatchSet: 1
Gerrit-Project: openzim
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Kelson 

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

[MediaWiki-commits] [Gerrit] Explain that ZIntStream only represents uint32_t values righ... - change (openzim)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Explain that ZIntStream only represents uint32_t values right 
now.
..

Explain that ZIntStream only represents uint32_t values right now.

Change-Id: Id712847949af1ce32b2e3118fc241be171124186
---
M zimlib/include/zim/zintstream.h
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/openzim refs/changes/57/296657/1

diff --git a/zimlib/include/zim/zintstream.h b/zimlib/include/zim/zintstream.h
index 1c78a1f..66fdfef 100644
--- a/zimlib/include/zim/zintstream.h
+++ b/zimlib/include/zim/zintstream.h
@@ -41,7 +41,10 @@
   substracted from the actual number, so a 2 byte zero is actually a 128.
 
   The same logic continues on the 3rd, 4th, ... byte. Up to 7 additional bytes
-  are used, so the first byte must contain at least one 0.
+  could used, since the first byte must contain at least one 0.
+
+  This particular implementation only represents uint32_t values (numbers up
+  to 2^32-1), so it will only ever emit 5 bytes per input value.
 
   binary  range
   --- 
--

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id712847949af1ce32b2e3118fc241be171124186
Gerrit-PatchSet: 1
Gerrit-Project: openzim
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Progress indicator at bottom of feed. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Progress indicator at bottom of feed.
..

Progress indicator at bottom of feed.

- Implemented as a permanent "card" that sits at the bottom of the current
list of cards. There's no logic to show or hide it, since seeing it always
implies that more feed content is currently being fetched.
- Changed the "base" view class for cards to be View instead of CardView.

Change-Id: I903519d7e8b1f6426105fa0a4acc8d9ee95caa88
---
M app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
2 files changed, 27 insertions(+), 9 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
index 03a79d0..d4079df 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
@@ -6,6 +6,7 @@
 
 import org.wikipedia.Site;
 import org.wikipedia.feed.model.Card;
+import org.wikipedia.feed.progress.ProgressCard;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,6 +24,7 @@
 private int currentAge;
 private List pendingClients = new ArrayList<>();
 private FeedClient.Callback exhaustionClientCallback = new 
ExhaustionClientCallback();
+private Card progressCard = new ProgressCard();
 
 public FeedCoordinatorBase(@NonNull Context context) {
 this.context = context;
@@ -45,11 +47,12 @@
 }
 pendingClients.clear();
 cards.clear();
+appendProgressCard(cards);
 }
 
 public void more(@NonNull Site site) {
 this.site = site;
-if (cards.size() > 0) {
+if (cards.size() > 1) {
 currentAge++;
 }
 
@@ -78,6 +81,7 @@
 @Override
 public void success(@NonNull List cardList) {
 cards.addAll(cardList);
+appendProgressCard(cards);
 if (updateListener != null) {
 updateListener.update(cards);
 }
@@ -91,4 +95,9 @@
 requestNextCard(site);
 }
 }
+
+private void appendProgressCard(List cards) {
+cards.remove(progressCard);
+cards.add(progressCard);
+}
 }
diff --git a/app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java 
b/app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
index e11abfa..066d8c2 100644
--- a/app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
+++ b/app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.CardView;
+import android.view.View;
 import android.view.ViewGroup;
 
 import org.wikipedia.feed.FeedCoordinatorBase;
@@ -19,6 +19,8 @@
 import org.wikipedia.feed.model.Card;
 import org.wikipedia.feed.mostread.MostReadCardView;
 import org.wikipedia.feed.mostread.MostReadListCard;
+import org.wikipedia.feed.progress.ProgressCard;
+import org.wikipedia.feed.progress.ProgressCardView;
 import org.wikipedia.feed.random.RandomCard;
 import org.wikipedia.feed.random.RandomCardView;
 import org.wikipedia.feed.searchbar.SearchCard;
@@ -26,13 +28,14 @@
 import org.wikipedia.views.DefaultRecyclerAdapter;
 import org.wikipedia.views.DefaultViewHolder;
 
-public class FeedRecyclerAdapter extends DefaultRecyclerAdapter {
+public class FeedRecyclerAdapter extends DefaultRecyclerAdapter {
 private static final int VIEW_TYPE_SEARCH_BAR = 0;
 private static final int VIEW_TYPE_CONTINUE_READING = 1;
 private static final int VIEW_TYPE_BECAUSE_YOU_READ = 2;
 private static final int VIEW_TYPE_MOST_READ = 3;
 private static final int VIEW_TYPE_FEATURED_ARTICLE = 4;
 private static final int VIEW_TYPE_RANDOM = 5;
+private static final int VIEW_TYPE_PROGRESS = 99;
 private static final int VIEW_TYPE_INTEGER_LIST = 100;
 
 @NonNull private FeedCoordinatorBase coordinator;
@@ -44,13 +47,13 @@
 this.callback = callback;
 }
 
-@Override public DefaultViewHolder onCreateViewHolder(ViewGroup 
parent, int viewType) {
+@Override public DefaultViewHolder onCreateViewHolder(ViewGroup 
parent, int viewType) {
 return new DefaultViewHolder<>(newView(parent.getContext(), viewType));
 }
 
-@Override public void onBindViewHolder(DefaultViewHolder holder, 
int position) {
+@Override public void onBindViewHolder(DefaultViewHolder holder, int 
position) {
 Card item = item(position);
-CardView view = holder.getView();
+View view = holder.getView();
 
 if 

[MediaWiki-commits] [Gerrit] Remove publishHere - change (mediawiki...TranslationNotifications)

[jenkins-bot (Code Review)]

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

Change subject: Remove publishHere
..


Remove publishHere

Use the same code path for both local and remote wikis. Makes
maintenance of this code easier and avoid having to create accounts
via code. Now even the local user account must have been created
manually.

Bug: T110766
Change-Id: If2d1430f905410727e20527c505ca295c8c887d3
(cherry picked from commit 167f80029ea5ea9d9c790a4e2794e6303ebb8fde)
---
M TranslationNotificationJob.php
1 file changed, 11 insertions(+), 56 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/TranslationNotificationJob.php b/TranslationNotificationJob.php
index 4033b94..62b69f3 100644
--- a/TranslationNotificationJob.php
+++ b/TranslationNotificationJob.php
@@ -15,11 +15,7 @@
 * @return bool
 */
public function run() {
-   if ( isset( $this->params['otherwiki'] ) ) {
-   $status = $this->publishInOtherWiki();
-   } else {
-   $status = $this->publishHere();
-   }
+   $status = $this->publishInWiki();
 
if ( $status !== true ) {
$this->setLastError( $status );
@@ -45,59 +41,18 @@
);
}
 
-   private function publishHere() {
-   $text = '== ' . $this->params['editSummary'] . " ==\n\n" . 
$this->textDiv();
-
-   $talkPage = WikiPage::factory( $this->title );
-   $flags = $talkPage->checkFlags( 0 );
-   if ( $flags & EDIT_UPDATE ) {
-   $content = $talkPage->getContent( Revision::RAW );
-   if ( $content instanceof TextContent ) {
-   $textContent = $content->getNativeData();
-   } else {
-   // Cannot do anything with non-TextContent 
pages. Shouldn't happen.
-   return true;
-   }
-
-   $text = $textContent . "\n" . $text;
-   }
-
-   global $wgNotificationUsername, $wgNotificationUserPassword;
-   $user = User::newFromName( $wgNotificationUsername );
-   if ( $user->isAllowed( 'bot' ) ) {
-   $flags = $flags | EDIT_FORCE_BOT; // If the user has 
the bot right, mark edit as bot
-   }
-
-   // If user doesn't exist
-   if ( !$user->getId() ) {
-   $user->addToDatabase();
-   $user->setPassword( $wgNotificationUserPassword );
-   $user->saveSettings();
-   // Increment site_stats.ss_users
-   $ssu = new SiteStatsUpdate( 0, 0, 0, 0, 1 );
-   $ssu->doUpdate();
-   }
-
-   $status = $talkPage->doEditContent(
-   ContentHandler::makeContent( $text, $this->title ),
-   $this->params['editSummary'],
-   $flags,
-   false,
-   $user
-   );
-
-   return $status->isGood();
-   }
-
-   private function publishInOtherWiki() {
+   private function publishInWiki() {
global $wgNotificationUsername, $wgNotificationUserPassword;
 
-   $wiki = WikiMap::getWiki( $this->params['otherwiki'] );
-   $otherWikiBaseUrl = $wiki->getCanonicalServer() . wfScript( 
'api' );
+   if ( isset( $this->params['otherwiki'] ) ) {
+   $wiki = WikiMap::getWiki( $this->params['otherwiki'] );
+   $baseUrl = $wiki->getCanonicalServer() . wfScript( 
'api' );
+   } else {
+   $baseUrl = wfExpandUrl( wfScript( 'api' ), 
PROTO_CANONICAL );
+   }
 
// API: Get login token
-
-   $loginUrl = wfAppendQuery( $otherWikiBaseUrl, [
+   $loginUrl = wfAppendQuery( $baseUrl, [
'action' => 'login',
'format' => 'json',
] );
@@ -154,7 +109,7 @@
// API: Get an edit token
 
$userTalkPage = $this->title->getFullText();
-   $editTokenUrl = wfAppendQuery( $otherWikiBaseUrl, [
+   $editTokenUrl = wfAppendQuery( $baseUrl, [
'action' => 'query',
'format' => 'json',
] );
@@ -185,7 +140,7 @@
 
// API: Edit the talk page
 
-   $editUrl = wfAppendQuery( $otherWikiBaseUrl, [
+   $editUrl = wfAppendQuery( $baseUrl, [
'action' => 'edit',
'format' => 'json',
] );

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

[MediaWiki-commits] [Gerrit] Remove consideration of extension registry configured namesp... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Remove consideration of extension registry configured 
namespaces until we can find the correct way to merge them
..


Remove consideration of extension registry configured namespaces until we can 
find the correct way to merge them

This will disable ProofreadPage's addition of the Page namespaces (e.g. on
wikisources), but this is more important right now.

Bug: T138980
Change-Id: I23ee26fa95a01b3e0881a4ca16e70247839d9cd9
---
M ApiVisualEditor.php
1 file changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index fa6d14f..b9b066a 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -665,10 +665,7 @@
 * @return array
 */
public static function getAvailableNamespaceIds( Config $config ) {
-   $availableNamespaces = array_merge(
-   ExtensionRegistry::getInstance()->getAttribute( 
'VisualEditorAvailableNamespaces' ),
-   $config->get( 'VisualEditorAvailableNamespaces' )
-   );
+   $availableNamespaces = $config->get( 
'VisualEditorAvailableNamespaces' );
return array_map( function ( $namespace ) {
// Convert canonical namespace names to IDs
return is_numeric( $namespace ) ?

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23ee26fa95a01b3e0881a4ca16e70247839d9cd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.28.0-wmf.8
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Esanders 
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 consideration of extension registry configured namesp... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Remove consideration of extension registry configured 
namespaces until we can find the correct way to merge them
..


Remove consideration of extension registry configured namespaces until we can 
find the correct way to merge them

This will disable ProofreadPage's addition of the Page namespaces (e.g. on
wikisources), but this is more important right now.

Bug: T138980
Change-Id: I23ee26fa95a01b3e0881a4ca16e70247839d9cd9
---
M ApiVisualEditor.php
1 file changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 66db2e7..b7c5330 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -669,10 +669,7 @@
 * @return array
 */
public static function getAvailableNamespaceIds( Config $config ) {
-   $availableNamespaces = array_merge(
-   ExtensionRegistry::getInstance()->getAttribute( 
'VisualEditorAvailableNamespaces' ),
-   $config->get( 'VisualEditorAvailableNamespaces' )
-   );
+   $availableNamespaces = $config->get( 
'VisualEditorAvailableNamespaces' );
return array_map( function ( $namespace ) {
// Convert canonical namespace names to IDs
return is_numeric( $namespace ) ?

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

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

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

[MediaWiki-commits] [Gerrit] Gerrit replication: ensure group exists before user and befo... - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Gerrit replication: ensure group exists before user and before 
ssh key
..


Gerrit replication: ensure group exists before user and before ssh key

Change-Id: I1748a6812f099a21b5b53b8f8f1ae1e643510b2f
---
M modules/gerrit/manifests/replicationdest.pp
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/gerrit/manifests/replicationdest.pp 
b/modules/gerrit/manifests/replicationdest.pp
index c282d60..4c84edf 100644
--- a/modules/gerrit/manifests/replicationdest.pp
+++ b/modules/gerrit/manifests/replicationdest.pp
@@ -13,11 +13,13 @@
 shell  => '/bin/bash',
 managehome => true,
 system => true,
+require=> Group[$slaveuser],
 }
 
 ssh::userkey { $slaveuser:
 ensure  => present,
 content => $ssh_key,
+require => User[$slaveuser],
 }
 
 # Add ytterbium to ssh exceptions for git replication

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1748a6812f099a21b5b53b8f8f1ae1e643510b2f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
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] Update graphoid to 15ed3f4 - change (mediawiki...deploy)

[Yurik (Code Review)]

Yurik has submitted this change and it was merged.

Change subject: Update graphoid to 15ed3f4
..


Update graphoid to 15ed3f4

List of changes:
xxx Update node module dependencies

Change-Id: Iff1c93e68044e786c3e9e60cd7a9c0378dd5b4ff
---
M node_modules/accepts/node_modules/negotiator/package.json
M node_modules/graph-shared/package.json
M node_modules/graph-shared/src/VegaWrapper.js
M node_modules/preq/index.js
M node_modules/preq/package.json
M 
node_modules/request/node_modules/http-signature/node_modules/jsprim/lib/jsprim.js
M 
node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/.travis.yml
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/benchmarks/encodedecode.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/benchmarks/parseshortmap.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/example.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/index.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/lib/decoder.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/lib/encoder.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/lib/streams.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/1-byte-length-buffers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/1-byte-length-exts.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/1-byte-length-strings.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/15-elements-arrays.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/15-elements-maps.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/16-bits-signed-integers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/16-bits-unsigned-integers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/2-bytes-length-arrays.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/2-bytes-length-buffers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/2-bytes-length-exts.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/2-bytes-length-maps.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/2-bytes-length-strings.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/31-chars-strings.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/32-bits-signed-integers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/32-bits-unsigned-integers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/32-bytes-strings.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/4-bytes-length-arrays.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/4-bytes-length-buffers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/4-bytes-length-exts.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/4-bytes-length-strings.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/5-bits-negative-integers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/64-bits-signed-integers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/64-bits-unsigned-integers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/7-bits-positive-integers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/8-bits-positive-integers.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/8-bits-signed-integers.js
M 

[MediaWiki-commits] [Gerrit] Update tilerator to cae28b9 - change (maps...deploy)

[Yurik (Code Review)]

Yurik has submitted this change and it was merged.

Change subject: Update tilerator to cae28b9
..


Update tilerator to cae28b9

List of changes:
cae28b9 spacing
xxx Update node module dependencies

Change-Id: I85d0695d81310ce798941e6e7156e89652cc9bb8
---
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/package.json
M 
node_modules/jade/node_modules/clean-css/node_modules/source-map/node_modules/amdefine/package.json
M node_modules/jade/node_modules/uglify-js/lib/compress.js
M node_modules/jade/node_modules/uglify-js/lib/output.js
M node_modules/jade/node_modules/uglify-js/package.json
M node_modules/jade/node_modules/uglify-js/tools/exports.js
M node_modules/kartotherian-autogen/package.json
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/package.json
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/package.json
M 
node_modules/kartotherian-cassandra/node_modules/multistream/node_modules/readable-stream/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-overzoom/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/buffer-shims/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/core-util-is/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/isarray/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/process-nextick-args/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/string_decoder/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/util-deprecate/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/package.json
M node_modules/kartotherian-postgres/package.json
M node_modules/kartotherian-server/package.json
M node_modules/kartotherian-substantial/package.json
M node_modules/kue-ui/package.json
M node_modules/mapnik/node_modules/node-pre-gyp/lib/util/abi_crosswalk.json
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/CHANGELOG.md~
M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/log.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/.jshintrc
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/.npmignore
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/LICENSE
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/examples/beep/index.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/examples/clear/index.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/examples/cursorPosition.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/examples/progress/index.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/lib/ansi.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/lib/newlines.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/package.json
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/console-control-strings/LICENSE
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/console-control-strings/README.md~
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/console-control-strings/index.js
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/console-control-strings/package.json
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/.npmignore
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/CHANGELOG.md~
A 

[MediaWiki-commits] [Gerrit] Remove consideration of extension registry configured namesp... - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Remove consideration of extension registry configured 
namespaces until we can find the correct way to merge them
..

Remove consideration of extension registry configured namespaces until we can 
find the correct way to merge them

This will disable ProofreadPage's addition of the Page namespaces (e.g. on
wikisources), but this is more important right now.

Bug: T138980
Change-Id: I23ee26fa95a01b3e0881a4ca16e70247839d9cd9
---
M ApiVisualEditor.php
1 file changed, 1 insertion(+), 4 deletions(-)


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

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 66db2e7..b7c5330 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -669,10 +669,7 @@
 * @return array
 */
public static function getAvailableNamespaceIds( Config $config ) {
-   $availableNamespaces = array_merge(
-   ExtensionRegistry::getInstance()->getAttribute( 
'VisualEditorAvailableNamespaces' ),
-   $config->get( 'VisualEditorAvailableNamespaces' )
-   );
+   $availableNamespaces = $config->get( 
'VisualEditorAvailableNamespaces' );
return array_map( function ( $namespace ) {
// Convert canonical namespace names to IDs
return is_numeric( $namespace ) ?

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

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

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

[MediaWiki-commits] [Gerrit] Remove most-read field from aggregated content model - change (apps...wikipedia)

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review.

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

Change subject: Remove most-read field from aggregated content model
..

Remove most-read field from aggregated content model

This is unused, since we get most-read results from MostReadClient.

We can put it back in if and when we move to using the most-read results
from the aggregated response.

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


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

diff --git 
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java 
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
index 8ba51a7..38a6a33 100644
--- a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
+++ b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
@@ -7,14 +7,9 @@
 
 public class AggregatedFeedContent {
 @SuppressWarnings("NullableProblems") @NonNull private CardPageItem tfa;
-@SuppressWarnings("NullableProblems") @NonNull private MostReadArticles 
mostread;
 @SuppressWarnings("NullableProblems") @NonNull private CardPageItem random;
 
 public CardPageItem tfa() {
 return tfa;
-}
-
-public MostReadArticles mostRead() {
-return mostread;
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f31d1b9a6dd772f9c997ae17bfa18dfdbd8c310
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] Avoid using computed variables to determine stash keys - change (mediawiki...AbuseFilter)

[jenkins-bot (Code Review)]

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

Change subject: Avoid using computed variables to determine stash keys
..


Avoid using computed variables to determine stash keys

These variables are not used as "inputs" and are expensive to
compute (the main reason for caching to begin with).

Bug: T138550
Change-Id: I75849ca8eab941f75ebb82313d07d946bc095ae9
---
M AbuseFilter.class.php
M AbuseFilterVariableHolder.php
2 files changed, 23 insertions(+), 6 deletions(-)

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



diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index e1ee041..2c9e2ef 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -979,7 +979,7 @@
private static function getStashKey(
BagOStuff $cache, AbuseFilterVariableHolder $vars, $group
) {
-   $inputVars = $vars->exportAllVars();
+   $inputVars = $vars->exportNonLazyVars();
// Exclude noisy fields that have superficial changes
unset( $inputVars['old_html'] );
unset( $inputVars['new_html'] );
diff --git a/AbuseFilterVariableHolder.php b/AbuseFilterVariableHolder.php
index f93ec59..657b7c3 100644
--- a/AbuseFilterVariableHolder.php
+++ b/AbuseFilterVariableHolder.php
@@ -95,13 +95,11 @@
/**
 * Export all variables stored in this object as string
 *
-* @return array
+* @return string[]
 */
function exportAllVars() {
-   $allVarNames = array_keys( $this->mVars );
-   $exported = array();
-
-   foreach ( $allVarNames as $varName ) {
+   $exported = [];
+   foreach ( array_keys( $this->mVars ) as $varName ) {
if ( !in_array( $varName, self::$varBlacklist ) ) {
$exported[$varName] = $this->getVar( $varName 
)->toString();
}
@@ -111,6 +109,25 @@
}
 
/**
+* Export all non-lazy variables stored in this object as string
+*
+* @return string[]
+*/
+   function exportNonLazyVars() {
+   $exported = [];
+   foreach ( $this->mVars as $varName => $data ) {
+   if (
+   !( $data instanceof AFComputedVariable )
+   && !in_array( $varName, self::$varBlacklist )
+   ) {
+   $exported[$varName] = $this->getVar( $varName 
)->toString();
+   }
+   }
+
+   return $exported;
+   }
+
+   /**
 * Dump all variables stored in this object in their native types.
 * If you want a not yet set variable to be included in the results you 
can
 * either set $compute to an array with the name of the variable or set

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75849ca8eab941f75ebb82313d07d946bc095ae9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Se4598 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Actually call the (previously-unused) ArticleSource#setFilen... - change (openzim)

[Kelson (Code Review)]

Kelson has submitted this change and it was merged.

Change subject: Actually call the (previously-unused) ArticleSource#setFilename 
method.
..


Actually call the (previously-unused) ArticleSource#setFilename method.

Change-Id: I00d340f86c91419f1237976f6eb636ea8c32a743
---
M zimlib/src/zimcreator.cpp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/zimlib/src/zimcreator.cpp b/zimlib/src/zimcreator.cpp
index 9c024a7..1b528f4 100644
--- a/zimlib/src/zimcreator.cpp
+++ b/zimlib/src/zimcreator.cpp
@@ -110,6 +110,7 @@
  ? fname.substr(0, fname.size() - 4)
  : fname;
   log_debug("basename " << basename);
+  src.setFilename(fname);
 
   INFO("create directory entries");
   createDirentsAndClusters(src, basename + ".tmp");

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I00d340f86c91419f1237976f6eb636ea8c32a743
Gerrit-PatchSet: 2
Gerrit-Project: openzim
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Kelson 
Gerrit-Reviewer: Mgautierfr 

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

[MediaWiki-commits] [Gerrit] admin: add new sectools-roots admin group - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: admin: add new sectools-roots admin group
..


admin: add new sectools-roots admin group

Add a new admin group for root access on (virtual) machines
for running security tools. Will be used for granting access
to members of the security team.

Bug:T138873
Change-Id: I5ac4bf3eabb6670b8ac79bb3ea6543640a2f3f67
---
M modules/admin/data/data.yaml
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index dfc9db3..182b765 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -528,6 +528,11 @@
 members: [halfak, ladsgroup]
 privileges: ['ALL = NOPASSWD: /usr/sbin/service uwsgi-ores *',
  'ALL = NOPASSWD: /usr/sbin/service celery-ores-worker *']
+  sectools-roots:
+description: root access on servers for security tools
+gid: 783
+members: []
+privileges: ['ALL = (ALL) NOPASSWD: ALL']
 users:
   rush:
 ensure: present

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

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

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

[MediaWiki-commits] [Gerrit] Bug fix: don't store pointers inside a dynamic vector. - change (openzim)

[Kelson (Code Review)]

Kelson has submitted this change and it was merged.

Change subject: Bug fix: don't store pointers inside a dynamic vector.
..


Bug fix: don't store pointers inside a dynamic vector.

Use offsets instead, since the actual objects change location whenever
the std::vector resizes its internal storage.

This is a follow-up to f5de40f94b30795f42bb9388cbb46df9cd605167.

Change-Id: I166aa8dd209dd2755e68be70829f269a71a3aaca
---
M zimlib/include/zim/writer/zimcreator.h
M zimlib/src/zimcreator.cpp
2 files changed, 10 insertions(+), 8 deletions(-)

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



diff --git a/zimlib/include/zim/writer/zimcreator.h 
b/zimlib/include/zim/writer/zimcreator.h
index 2e52d7e..8ce2c44 100644
--- a/zimlib/include/zim/writer/zimcreator.h
+++ b/zimlib/include/zim/writer/zimcreator.h
@@ -33,7 +33,7 @@
 {
   public:
 typedef std::vector DirentsType;
-typedef std::vector DirentPtrsType;
+typedef std::vector DirentPtrsType;
 typedef std::vector SizeVectorType;
 typedef std::vector OffsetsType;
 typedef std::map MimeTypes;
diff --git a/zimlib/src/zimcreator.cpp b/zimlib/src/zimcreator.cpp
index 46c550f..9c024a7 100644
--- a/zimlib/src/zimcreator.cpp
+++ b/zimlib/src/zimcreator.cpp
@@ -232,7 +232,7 @@
 }
 dirents.back().setCluster(clusterOffsets.size(), cluster->count());
 cluster->addBlob(blob);
-myDirents->push_back(&(dirents.back()));
+myDirents->push_back(dirents.size()-1);
 
 // If cluster is now large enough, write it to disk.
 if (cluster->size() >= minChunkSize * 1024)
@@ -247,10 +247,11 @@
   cluster->clear();
   myDirents->clear();
   // Update the cluster number of the dirents *not* written to disk.
-  for (DirentPtrsType::iterator di = otherDirents->begin();
-   di != otherDirents->end(); ++di)
+  for (DirentPtrsType::iterator dpi = otherDirents->begin();
+   dpi != otherDirents->end(); ++dpi)
   {
-(*di)->setCluster(clusterOffsets.size(), (*di)->getBlobNumber());
+Dirent *di = [*dpi];
+di->setCluster(clusterOffsets.size(), di->getBlobNumber());
   }
   offset_type end = out.tellp();
   currentSize += (end - start) +
@@ -263,10 +264,11 @@
   {
 clusterOffsets.push_back(out.tellp());
 out << compCluster;
-for (DirentPtrsType::iterator di = uncompDirents.begin();
- di != uncompDirents.end(); ++di)
+for (DirentPtrsType::iterator dpi = uncompDirents.begin();
+ dpi != uncompDirents.end(); ++dpi)
 {
-  (*di)->setCluster(clusterOffsets.size(), (*di)->getBlobNumber());
+  Dirent *di = [*dpi];
+  di->setCluster(clusterOffsets.size(), di->getBlobNumber());
 }
   }
   compCluster.clear();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I166aa8dd209dd2755e68be70829f269a71a3aaca
Gerrit-PatchSet: 1
Gerrit-Project: openzim
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Kelson 
Gerrit-Reviewer: Mgautierfr 

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

[MediaWiki-commits] [Gerrit] Update tilerator to cae28b9 - change (maps...deploy)

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Update tilerator to cae28b9
..

Update tilerator to cae28b9

List of changes:
cae28b9 spacing
xxx Update node module dependencies

Change-Id: I85d0695d81310ce798941e6e7156e89652cc9bb8
---
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/package.json
M 
node_modules/jade/node_modules/clean-css/node_modules/source-map/node_modules/amdefine/package.json
M node_modules/jade/node_modules/uglify-js/lib/compress.js
M node_modules/jade/node_modules/uglify-js/lib/output.js
M node_modules/jade/node_modules/uglify-js/package.json
M node_modules/jade/node_modules/uglify-js/tools/exports.js
M node_modules/kartotherian-autogen/package.json
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/package.json
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/package.json
M 
node_modules/kartotherian-cassandra/node_modules/multistream/node_modules/readable-stream/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-overzoom/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/buffer-shims/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/core-util-is/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/isarray/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/process-nextick-args/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/string_decoder/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/util-deprecate/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/package.json
M node_modules/kartotherian-postgres/package.json
M node_modules/kartotherian-server/package.json
M node_modules/kartotherian-substantial/package.json
M node_modules/kue-ui/package.json
M node_modules/mapnik/node_modules/node-pre-gyp/lib/util/abi_crosswalk.json
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/CHANGELOG.md~
M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/log.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/.jshintrc
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/.npmignore
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/LICENSE
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/examples/beep/index.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/examples/clear/index.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/examples/cursorPosition.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/examples/progress/index.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/lib/ansi.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/lib/newlines.js
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/ansi/package.json
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/console-control-strings/LICENSE
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/console-control-strings/README.md~
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/console-control-strings/index.js
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/console-control-strings/package.json
D 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/.npmignore
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/CHANGELOG.md~
A 

[MediaWiki-commits] [Gerrit] Fix DataSender::justDocumentMissingException - change (mediawiki...CirrusSearch)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Fix DataSender::justDocumentMissingException
..

Fix DataSender::justDocumentMissingException

I'm almost certain this was written previously, but it seems in merging
es2.x branch back into master the code was lost. Fixup the code so we
appropriately recognize document missing exceptions.

Bug: T138257
Change-Id: Ie89abbb171e86b7e735ee1204ccf000376a65b90
---
M includes/DataSender.php
1 file changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/includes/DataSender.php b/includes/DataSender.php
index 9241d16..7749a91 100644
--- a/includes/DataSender.php
+++ b/includes/DataSender.php
@@ -348,9 +348,8 @@
if ( !$bulkResponse->hasError() ) {
continue;
}
-
-   $pos = strpos( $bulkResponse->getError(), 
'DocumentMissingException' );
-   if ( $pos === false ) {
+   $error = $bulkResponse->getFullError();
+   if ( $error['type'] !== 'document_missing_exception' ) {
$justDocumentMissing = false;
} elseif ( $logCallback ) {
// This is generally not an error but we should

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie89abbb171e86b7e735ee1204ccf000376a65b90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: REL1_27
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] Update Wikidata settings accrding to new entityNamespaces fo... - change (mediawiki/vagrant)

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: Update Wikidata settings accrding to new entityNamespaces format
..

Update Wikidata settings accrding to new entityNamespaces format

Bug: T138983
Change-Id: I3c7adb3460a8957654d642555d7f5ba5d0cc
---
M puppet/modules/role/templates/wikidata/shared.php.erb
1 file changed, 7 insertions(+), 4 deletions(-)


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

diff --git a/puppet/modules/role/templates/wikidata/shared.php.erb 
b/puppet/modules/role/templates/wikidata/shared.php.erb
index a614d6c..aca6368 100644
--- a/puppet/modules/role/templates/wikidata/shared.php.erb
+++ b/puppet/modules/role/templates/wikidata/shared.php.erb
@@ -1,13 +1,13 @@
+define( 'WB_NS_PROPERTY', 122 );
+define( 'WB_NS_PROPERTY_TALK', 123 );
 if ( $wmgUseWikibaseRepo ) {
// Define custom namespaces. Use these exact constant names.
$wgNamespaceAliases['Item'] = NS_MAIN;
$wgNamespaceAliases['Item_talk'] = NS_TALK;
 
// Tell Wikibase which namespace to use for which kind of entity
-   $wgWBRepoSettings['entityNamespaces']['wikibase-item'] = NS_MAIN;
-   define( 'WB_NS_PROPERTY', 122 );
-   define( 'WB_NS_PROPERTY_TALK', 123 );
-   $wgWBRepoSettings['entityNamespaces']['wikibase-property'] = 
WB_NS_PROPERTY;
+   $wgWBRepoSettings['entityNamespaces']['item'] = NS_MAIN;
+   $wgWBRepoSettings['entityNamespaces']['property'] = WB_NS_PROPERTY;
 
// Register extra namespaces.
$wgWBNamespaces[WB_NS_PROPERTY] = 'Property';
@@ -18,6 +18,9 @@
 
$wgWBClientSettings['changesDatabase'] = 'wikidatawiki';
$wgWBClientSettings['repoDatabase'] = 'wikidatawiki';
+   // Tell Wikibase which namespace to use for which kind of entity
+   $wgWBClientSettings['entityNamespaces']['item'] = NS_MAIN;
+   $wgWBClientSettings['entityNamespaces']['property'] = WB_NS_PROPERTY;
 }
 
 $wgWBClientSettings['repoUrl'] = '//wikidata<%= 
scope['::mediawiki::multiwiki::base_domain'] %><%= scope['::port_fragment'] %>';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c7adb3460a8957654d642555d7f5ba5d0cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] T138864: Deal with edge cases serializing links - change (mediawiki...parsoid)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

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

Change subject: T138864: Deal with edge cases serializing links
..

T138864: Deal with edge cases serializing links

* Updated tests to capture new expectations.

Change-Id: I3f54ab56a1cfd96f35d46a3827bdab00554a0fa3
---
M lib/html2wt/LinkHandler.js
M tests/parserTests.txt
2 files changed, 28 insertions(+), 10 deletions(-)


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

diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index 2df5f18..88e2423 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -435,16 +435,28 @@
}
} else if (isSimpleWikiLink(env, dp, target, linkData)) {
// Simple case
-   if (!target.modified && !linkData.contentModified) {
-   linkTarget = target.value.replace(/^\.\//, '');
-   } else {
-   escapedTgt = 
escapeLinkTarget(linkData.content.string, state);
-   linkTarget = addColonEscape(env, 
escapedTgt.linkTarget, linkData);
-   if (linkData.isInterwikiLang && 
!/^[:]/.test(linkTarget) &&
-   linkData.type !== 
'mw:PageProp/Language') {
-   // ensure interwiki links can't be 
confused with
-   // interlanguage links.
-   linkTarget = ':' + linkTarget;
+   linkTarget = target.value.replace(/^\.\//, '');
+
+   // Modified target/content: compute linkTarget
+   if (target.modified || linkData.contentModified) {
+   var contentString = linkData.content.string;
+   escapedTgt = escapeLinkTarget(contentString, 
state);
+   if (!escapedTgt.invalidLink) {
+   // If the href & content string are not 
identical
+   // or if the href is not an absolute 
url, use the
+   // content string as the link target.
+   if (!/^\/\//.test(linkData.href)
+   || ((contentString !== 
linkData.href
+   && 
env.normalizeTitle(contentString) !== Util.decodeURI(linkData.href {
+   linkTarget = 
escapedTgt.linkTarget;
+   }
+   linkTarget = addColonEscape(env, 
linkTarget, linkData);
+   if (linkData.isInterwikiLang && 
!/^[:]/.test(linkTarget) &&
+   linkData.type !== 
'mw:PageProp/Language') {
+   // ensure interwiki links can't 
be confused with
+   // interlanguage links.
+   linkTarget = ':' + linkTarget;
+   }
}
}
} else {
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index fb27146..7166902 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -24947,9 +24947,15 @@
 !! html/parsoid
 Foo
 Foo
+//en.wikipedia.org/wiki/Foo
+http://en.wikipedia.org/wiki/Foo;>http://en.wikipedia.org/wiki/Foo
+//en.wikipedia.org/wiki/Foo bar
 !! wikitext
 [[Foo]]
 [[Foo]]
+[[:en:Foo]]
+[[wikipedia:Foo|http://en.wikipedia.org/wiki/Foo]]
+[[:en:Foo_bar]]
 !! end
 
 !! test

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f54ab56a1cfd96f35d46a3827bdab00554a0fa3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
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] Cleanup old notification formatting system - change (mediawiki...Echo)

[Sbisson (Code Review)]

Sbisson has uploaded a new change for review.

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

Change subject: Cleanup old notification formatting system
..

Cleanup old notification formatting system

* Deprecated main entry-points
* Remove unused configuration

Bug: T121612
Change-Id: I639b9d9906d3ff37021cb9b5ed3cb401354b5bd9
---
M Echo.php
M includes/controller/NotificationController.php
M includes/formatters/NotificationFormatter.php
3 files changed, 4 insertions(+), 53 deletions(-)


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

diff --git a/Echo.php b/Echo.php
index 71f4f17..2a1356a 100644
--- a/Echo.php
+++ b/Echo.php
@@ -374,8 +374,6 @@
'email' => false,
),
'presentation-model' => 'EchoWelcomePresentationModel',
-   'title-message' => 'notification-new-user',
-   'title-params' => array( 'agent' ),
'icon' => 'site',
),
'edit-user-talk' => array(
@@ -383,23 +381,10 @@
EchoAttributeManager::ATTR_LOCATORS => array(
'EchoUserLocator::locateTalkPageOwner',
),
-   'primary-link' => array( 'message' => 
'notification-link-text-view-message', 'destination' => 'section' ),
-   'secondary-link' => array( 'message' => 
'notification-link-text-view-changes', 'destination' => 'diff' ),
'category' => 'edit-user-talk',
'group' => 'interactive',
'section' => 'alert',
'bundle' => array( 'web' => true, 'email' => false ),
-   'formatter-class' => 'EchoEditUserTalkFormatter',
-   'title-message' => 'notification-edit-talk-page2',
-   'title-params' => array( 'agent', 'user', 'subject-anchor' ),
-   'bundle-message' => 'notification-edit-talk-page-bundle',
-   'bundle-params' => array( 'agent', 'user', 
'agent-other-display', 'agent-other-count' ),
-   'email-subject-message' => 
'notification-edit-talk-page-email-subject2',
-   'email-subject-params' => array( 'agent' ),
-   'email-body-batch-message' => 
'notification-edit-talk-page-email-batch-body2',
-   'email-body-batch-params' => array( 'agent' ),
-   'email-body-batch-bundle-message' => 
'notification-edit-user-talk-email-batch-bundle-body',
-   'email-body-batch-bundle-params' => array( 'agent', 
'agent-other-display', 'agent-other-count' ),
'icon' => 'edit-user-talk',
'immediate' => true,
),
@@ -408,17 +393,9 @@
EchoAttributeManager::ATTR_LOCATORS => array(
array( 'EchoUserLocator::locateFromEventExtra', array( 
'reverted-user-id' ) ),
),
-   'primary-link' => array( 'message' => 
'notification-link-text-view-edit', 'destination' => 'diff' ),
'category' => 'reverted',
'group' => 'negative',
'section' => 'alert',
-   'formatter-class' => 'EchoEditFormatter',
-   'title-message' => 'notification-reverted2',
-   'title-params' => array( 'agent', 'title', 'difflink', 
'number', 'userpage-contributions' ),
-   'email-subject-message' => 
'notification-reverted-email-subject2',
-   'email-subject-params' => array( 'agent', 'title', 'number' ),
-   'email-body-batch-message' => 
'notification-reverted-email-batch-body2',
-   'email-body-batch-params' => array( 'agent', 'title', 'number' 
),
'icon' => 'revert',
),
'page-linked' => array(
@@ -426,58 +403,30 @@
EchoAttributeManager::ATTR_LOCATORS => array(
'EchoUserLocator::locateArticleCreator',
),
-   'primary-link' => array( 'message' => 
'notification-link-text-view-page', 'destination' => 'link-from-page' ),
'category' => 'article-linked',
'group' => 'neutral',
'section' => 'message',
'bundle' => array( 'web' => true, 'email' => true, 'expandable' 
=> true ),
-   'formatter-class' => 'EchoPageLinkFormatter',
-   'title-message' => 'notification-page-linked',
-   'title-params' => array( 'agent', 'title', 'link-from-page' ),
-   'email-subject-message' => 
'notification-page-linked-email-subject',
-   'email-subject-params' => array(),
-   'email-body-batch-message' => 
'notification-page-linked-email-batch-body',
-   'email-body-batch-params' => array( 'agent', 'title', 
'link-from-page' ),
-   'email-body-batch-bundle-message' => 
'notification-page-linked-email-batch-bundle-body',
-   'email-body-batch-bundle-params' 

[MediaWiki-commits] [Gerrit] search satisfaction: use domInteractive instead of domComplete - change (mediawiki...WikimediaEvents)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: search satisfaction: use domInteractive instead of domComplete
..

search satisfaction: use domInteractive instead of domComplete

jQuery.ready fires after the DOMContentLoaded event. We are not
guaranteed to have domComplete at this point, so change to the
domInteractive timing which always fires before DOMContentLoaded.

Bug: T132516
Change-Id: Ife7f3e5a999dbb1a8c27cdaa8c8e12c4c6f5cfab
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/40/296640/1

diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 812fc2e..c478bfe 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -431,7 +431,7 @@
 * @param {SessionState} session
 */
function setupSearchTest( session ) {
-   var params,
+   var params, logEventWrapper,
textCatExtra = [],
logEvent = genLogEventFn( 'fulltext', session );
 
@@ -487,10 +487,13 @@
hitsReturned: $( '.mw-search-result-heading' 
).length,
extraParams: textCatExtra.join( ',' )
};
+   // This method is called from jQuery.ready which runs 
on DOMContentLoaded. Use domInteractive since that
+   // is immediately before DOMContentLoaded per spec.
if ( window.performance && window.performance.timing ) {
-   params.msToDisplayResults = 
window.performance.timing.domComplete - 
window.performance.timing.navigationStart;
+   params.msToDisplayResults = 
window.performance.timing.domInteractive - 
window.performance.timing.navigationStart;
}
logEvent( 'searchResultPage', params );
+   } );
} else if ( search.cameFromSearch ) {
logEvent( 'visitPage', {
position: search.resultPosition

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife7f3e5a999dbb1a8c27cdaa8c8e12c4c6f5cfab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
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] Update kartotherian to 4bc44bd - change (maps...deploy)

[Yurik (Code Review)]

Yurik has submitted this change and it was merged.

Change subject: Update kartotherian to 4bc44bd
..


Update kartotherian to 4bc44bd

List of changes:
xxx Update node module dependencies

Change-Id: Ic8f23ed347c7c382eca8ff6044541a8d4a8c1a0d
---
M node_modules/accepts/node_modules/negotiator/package.json
M node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
M node_modules/kartotherian-autogen/package.json
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/.travis.yml
A node_modules/kartotherian-cassandra/node_modules/cassandra-driver/appveyor.ps1
A node_modules/kartotherian-cassandra/node_modules/cassandra-driver/appveyor.yml
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/build.yaml
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/client-options.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/client.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/connection.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/control-connection.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/encoder.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/errors.js
A 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/execution-profile.js
A 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/host-connection-pool.js
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/host.js
A 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/metadata/event-debouncer.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/metadata/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/metadata/schema-parser.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/address-resolution.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/load-balancing.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/reconnection.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/retry.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/readers.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/request-handler.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/requests.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/streams.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/tokenizer.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/types/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/types/inet-address.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/types/result-set.js
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/utils.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/writers.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/LICENSE
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/dist/async.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/dist/async.min.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/lib/async.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/package.json
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
M node_modules/kartotherian-geoshapes/geoshapes.js
M node_modules/kartotherian-geoshapes/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-maki/package.json
M node_modules/kartotherian-overzoom/package.json
M node_modules/kartotherian-server/package.json
M node_modules/kartotherian-snapshot/node_modules/abaculus/package.json
M 
node_modules/kartotherian-snapshot/node_modules/canvas/node_modules/nan/package.json
M 
node_modules/kartotherian-snapshot/node_modules/leaflet-headless/node_modules/request/node_modules/http-signature/node_modules/jsprim/lib/jsprim.js
M 

[MediaWiki-commits] [Gerrit] Update mobileapps to 1da6bf0 - change (mediawiki...deploy)

[BearND (Code Review)]

BearND has submitted this change and it was merged.

Change subject: Update mobileapps to 1da6bf0
..


Update mobileapps to 1da6bf0

List of changes:
b61b990 Stop stripping HTML markup from news story text
1f46112 Add content format versioning to Content-Type header
cb8cfb7 Remove (probable) inapplicable picture captions
bef7e18 Picture of the day
xxx Update node module dependencies

Change-Id: Id501d469dc4e20ddff65a2db23e640698d391e8c
---
M node_modules/on-finished/node_modules/ee-first/package.json
M node_modules/phpjs/node_modules/mocha/node_modules/mkdirp/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
D node_modules/service-runner/node_modules/semver/.npmignore
D node_modules/service-runner/node_modules/semver/.travis.yml
M node_modules/service-runner/node_modules/semver/package.json
M node_modules/service-runner/node_modules/semver/semver.js
D node_modules/service-runner/node_modules/semver/test/big-numbers.js
D node_modules/service-runner/node_modules/semver/test/clean.js
D node_modules/service-runner/node_modules/semver/test/gtr.js
D node_modules/service-runner/node_modules/semver/test/index.js
D node_modules/service-runner/node_modules/semver/test/ltr.js
D node_modules/service-runner/node_modules/semver/test/major-minor-patch.js
M src
14 files changed, 25 insertions(+), 1,213 deletions(-)

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



diff --git a/node_modules/on-finished/node_modules/ee-first/package.json 
b/node_modules/on-finished/node_modules/ee-first/package.json
index 35ff70d..c67faf1 100644
--- a/node_modules/on-finished/node_modules/ee-first/package.json
+++ b/node_modules/on-finished/node_modules/ee-first/package.json
@@ -16,7 +16,7 @@
   "license": "MIT",
   "repository": {
 "type": "git",
-"url": "https://github.com/jonathanong/ee-first;
+"url": "git+https://github.com/jonathanong/ee-first.git;
   },
   "devDependencies": {
 "istanbul": "0.3.9",
@@ -59,5 +59,6 @@
 "tarball": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz;
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz;
+  "_resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz;,
+  "readme": "ERROR: No README data found!"
 }
diff --git 
a/node_modules/phpjs/node_modules/mocha/node_modules/mkdirp/package.json 
b/node_modules/phpjs/node_modules/mocha/node_modules/mkdirp/package.json
index 5957c1b..087c6e5 100644
--- a/node_modules/phpjs/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_modules/phpjs/node_modules/mocha/node_modules/mkdirp/package.json
@@ -14,7 +14,7 @@
   ],
   "repository": {
 "type": "git",
-"url": "git+ssh://g...@github.com/substack/node-mkdirp.git"
+"url": "http://github.com/substack/node-mkdirp.git;
   },
   "scripts": {
 "test": "tap test/*.js"
@@ -42,10 +42,5 @@
   ],
   "directories": {},
   "_shasum": "de3e5f8961c88c787ee1368df849ac4413eca8d7",
-  "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz;,
-  "bugs": {
-"url": "https://github.com/substack/node-mkdirp/issues;
-  },
-  "readme": "ERROR: No README data found!",
-  "homepage": "https://github.com/substack/node-mkdirp#readme;
+  "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz;
 }
diff --git 
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
 
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
index 52aaaf2..092a083 100644
--- 
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
+++ 
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
@@ -75,7 +75,7 @@
   },
   "homepage": "https://github.com/kadtools/kad#readme;,
   "_id": "kad@1.3.6",
-  "_shasum": "9ae1c8252914b7e608eb0ee96f31e573e4b30064",
+  "_shasum": "68ef7011c89a022cd6171bb84487779b9a8b5fc9",
   "_from": "git+https://github.com/gwicke/kad.git#master;,
   "_resolved": 
"git+https://github.com/gwicke/kad.git#31449a27a289b6f0ecbeec193d8bac9db8b9f513;
 }
diff --git a/node_modules/service-runner/node_modules/semver/.npmignore 
b/node_modules/service-runner/node_modules/semver/.npmignore
deleted file mode 100644
index 534108e..000
--- a/node_modules/service-runner/node_modules/semver/.npmignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules/
-coverage/
-.nyc_output/
-nyc_output/
diff --git a/node_modules/service-runner/node_modules/semver/.travis.yml 
b/node_modules/service-runner/node_modules/semver/.travis.yml
deleted file mode 100644
index 9c1a7b6..000
--- a/node_modules/service-runner/node_modules/semver/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-sudo: false
-language: node_js
-node_js:
-  - '0.10'
-  - '0.12'
-  - '4'
-  - '5'
diff --git a/node_modules/service-runner/node_modules/semver/package.json 

[MediaWiki-commits] [Gerrit] Update mobileapps to 1da6bf0 - change (mediawiki...deploy)

[BearND (Code Review)]

BearND has uploaded a new change for review.

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

Change subject: Update mobileapps to 1da6bf0
..

Update mobileapps to 1da6bf0

List of changes:
b61b990 Stop stripping HTML markup from news story text
1f46112 Add content format versioning to Content-Type header
cb8cfb7 Remove (probable) inapplicable picture captions
bef7e18 Picture of the day
xxx Update node module dependencies

Change-Id: Id501d469dc4e20ddff65a2db23e640698d391e8c
---
M node_modules/on-finished/node_modules/ee-first/package.json
M node_modules/phpjs/node_modules/mocha/node_modules/mkdirp/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
D node_modules/service-runner/node_modules/semver/.npmignore
D node_modules/service-runner/node_modules/semver/.travis.yml
M node_modules/service-runner/node_modules/semver/package.json
M node_modules/service-runner/node_modules/semver/semver.js
D node_modules/service-runner/node_modules/semver/test/big-numbers.js
D node_modules/service-runner/node_modules/semver/test/clean.js
D node_modules/service-runner/node_modules/semver/test/gtr.js
D node_modules/service-runner/node_modules/semver/test/index.js
D node_modules/service-runner/node_modules/semver/test/ltr.js
D node_modules/service-runner/node_modules/semver/test/major-minor-patch.js
M src
14 files changed, 25 insertions(+), 1,213 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps/deploy 
refs/changes/35/296635/1

diff --git a/node_modules/on-finished/node_modules/ee-first/package.json 
b/node_modules/on-finished/node_modules/ee-first/package.json
index 35ff70d..c67faf1 100644
--- a/node_modules/on-finished/node_modules/ee-first/package.json
+++ b/node_modules/on-finished/node_modules/ee-first/package.json
@@ -16,7 +16,7 @@
   "license": "MIT",
   "repository": {
 "type": "git",
-"url": "https://github.com/jonathanong/ee-first;
+"url": "git+https://github.com/jonathanong/ee-first.git;
   },
   "devDependencies": {
 "istanbul": "0.3.9",
@@ -59,5 +59,6 @@
 "tarball": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz;
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz;
+  "_resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz;,
+  "readme": "ERROR: No README data found!"
 }
diff --git 
a/node_modules/phpjs/node_modules/mocha/node_modules/mkdirp/package.json 
b/node_modules/phpjs/node_modules/mocha/node_modules/mkdirp/package.json
index 5957c1b..087c6e5 100644
--- a/node_modules/phpjs/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_modules/phpjs/node_modules/mocha/node_modules/mkdirp/package.json
@@ -14,7 +14,7 @@
   ],
   "repository": {
 "type": "git",
-"url": "git+ssh://g...@github.com/substack/node-mkdirp.git"
+"url": "http://github.com/substack/node-mkdirp.git;
   },
   "scripts": {
 "test": "tap test/*.js"
@@ -42,10 +42,5 @@
   ],
   "directories": {},
   "_shasum": "de3e5f8961c88c787ee1368df849ac4413eca8d7",
-  "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz;,
-  "bugs": {
-"url": "https://github.com/substack/node-mkdirp/issues;
-  },
-  "readme": "ERROR: No README data found!",
-  "homepage": "https://github.com/substack/node-mkdirp#readme;
+  "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz;
 }
diff --git 
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
 
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
index 52aaaf2..092a083 100644
--- 
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
+++ 
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
@@ -75,7 +75,7 @@
   },
   "homepage": "https://github.com/kadtools/kad#readme;,
   "_id": "kad@1.3.6",
-  "_shasum": "9ae1c8252914b7e608eb0ee96f31e573e4b30064",
+  "_shasum": "68ef7011c89a022cd6171bb84487779b9a8b5fc9",
   "_from": "git+https://github.com/gwicke/kad.git#master;,
   "_resolved": 
"git+https://github.com/gwicke/kad.git#31449a27a289b6f0ecbeec193d8bac9db8b9f513;
 }
diff --git a/node_modules/service-runner/node_modules/semver/.npmignore 
b/node_modules/service-runner/node_modules/semver/.npmignore
deleted file mode 100644
index 534108e..000
--- a/node_modules/service-runner/node_modules/semver/.npmignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules/
-coverage/
-.nyc_output/
-nyc_output/
diff --git a/node_modules/service-runner/node_modules/semver/.travis.yml 
b/node_modules/service-runner/node_modules/semver/.travis.yml
deleted file mode 100644
index 9c1a7b6..000
--- a/node_modules/service-runner/node_modules/semver/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-sudo: false
-language: node_js
-node_js:
-  - '0.10'
-  - '0.12'
-  - '4'
-  - '5'
diff --git 

[MediaWiki-commits] [Gerrit] API parameter might be null rather than an empty array - change (mediawiki...TemplateSandbox)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: API parameter might be null rather than an empty array
..

API parameter might be null rather than an empty array

Take that into account when processing the input.

Bug: T138979
Change-Id: I034819cabe49ad0d353e9d95097af716062b3be7
---
M TemplateSandbox.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/TemplateSandbox.hooks.php b/TemplateSandbox.hooks.php
index 1f73288..14e43c7 100644
--- a/TemplateSandbox.hooks.php
+++ b/TemplateSandbox.hooks.php
@@ -348,7 +348,7 @@
'templatesandboxcontentformat' => null,
];
$params = [
-   'prefix' => $params['templatesandboxprefix'],
+   'prefix' => $params['templatesandboxprefix'] ?: [],
'title' => $params['templatesandboxtitle'],
'text' => $params['templatesandboxtext'],
'contentmodel' => 
$params['templatesandboxcontentmodel'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I034819cabe49ad0d353e9d95097af716062b3be7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateSandbox
Gerrit-Branch: master
Gerrit-Owner: Anomie 

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

[MediaWiki-commits] [Gerrit] Actually call the (previously-unused) ArticleSource#setFilen... - change (openzim)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Actually call the (previously-unused) ArticleSource#setFilename 
method.
..

Actually call the (previously-unused) ArticleSource#setFilename method.

Change-Id: I00d340f86c91419f1237976f6eb636ea8c32a743
---
M zimlib/src/zimcreator.cpp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/openzim refs/changes/32/296632/1

diff --git a/zimlib/src/zimcreator.cpp b/zimlib/src/zimcreator.cpp
index 46c550f..ba47d24 100644
--- a/zimlib/src/zimcreator.cpp
+++ b/zimlib/src/zimcreator.cpp
@@ -110,6 +110,7 @@
  ? fname.substr(0, fname.size() - 4)
  : fname;
   log_debug("basename " << basename);
+  src.setFilename(fname);
 
   INFO("create directory entries");
   createDirentsAndClusters(src, basename + ".tmp");

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00d340f86c91419f1237976f6eb636ea8c32a743
Gerrit-PatchSet: 1
Gerrit-Project: openzim
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] [WIP] Allow users to change edit summary - change (mediawiki/core)

[Sethakill (Code Review)]

Sethakill has uploaded a new change for review.

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

Change subject: [WIP] Allow users to change edit summary
..

[WIP] Allow users to change edit summary

Bug: T15937
Change-Id: I1d715a160ec43b99eb8ff978ecb300e11046404b
---
M includes/DefaultSettings.php
A includes/actions/EditsummaryAction.php
M includes/actions/HistoryAction.php
A includes/logging/EditsummaryLogFormatter.php
M languages/i18n/en.json
5 files changed, 252 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/30/296630/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 39e22a0..4d2e687 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5080,6 +5080,7 @@
 $wgGroupPermissions['user']['sendemail'] = true;
 $wgGroupPermissions['user']['applychangetags'] = true;
 $wgGroupPermissions['user']['changetags'] = true;
+$wgGroupPermissions['user']['editsummary'] = true;
 
 // Implicit group for accounts that pass $wgAutoConfirmAge
 $wgGroupPermissions['autoconfirmed']['autoconfirmed'] = true;
@@ -7349,6 +7350,7 @@
'tag',
'managetags',
'contentmodel',
+   'editsummary',
 ];
 
 /**
@@ -7459,6 +7461,7 @@
'delete/event' => 'DeleteLogFormatter',
'delete/restore' => 'DeleteLogFormatter',
'delete/revision' => 'DeleteLogFormatter',
+   'editsummary/edit' => 'EditsummaryLogFormatter',
'import/interwiki' => 'ImportLogFormatter',
'import/upload' => 'ImportLogFormatter',
'managetags/activate' => 'LogFormatter',
@@ -7615,6 +7618,7 @@
'delete' => true,
'edit' => true,
'editchangetags' => 'SpecialPageAction',
+   'editsummary' => true,
'history' => true,
'info' => true,
'markpatrolled' => true,
diff --git a/includes/actions/EditsummaryAction.php 
b/includes/actions/EditsummaryAction.php
new file mode 100644
index 000..26ebf44
--- /dev/null
+++ b/includes/actions/EditsummaryAction.php
@@ -0,0 +1,139 @@
+msg( 'viewpagelogs' )->escaped()
+   );
+   }
+
+   public function show() {
+   $this->checkCanExecute( $this->getUser() );
+
+   $revId = $this->getRequest()->getInt( 'id', -1 );
+   $rev = Revision::newFromId( $revId );
+   if ( $rev === null ) {
+   throw new ErrorPageError( 'Actionfailed', 
'editsummary-error-invalidtarget' );
+   }
+
+   $revsList = new RevisionList( $this->getContext(), 
$rev->getTitle() );
+
+   if ( $rev->getUserText( Revision::RAW ) !== 
$this->getUser()->getName() ||
+   // FIXME: Revision::getId() should return integer but 
it isn't.
+   intval( $revsList->reset()->getId() ) !== $revId ||
+   $rev->isDeleted( Revision::DELETED_COMMENT )
+   ) {
+   throw new ErrorPageError( 'Actionfailed', 
'editsummary-error-revision' );
+   }
+
+   $this->rev = $rev;
+   $this->revId = $revId;
+   $this->revsList = $revsList;
+
+   parent::show();
+   }
+
+   public function getFormFields() {
+   return [
+   'summary' => [
+   'type' => 'text',
+   'label-message' => 'summary',
+   'default' => $this->rev->getComment(),
+   'maxlength' => 255,
+   ],
+   'id' => [
+   'type' => 'hidden',
+   'default' => $this->revId,
+   ]
+   ];
+   }
+
+   public function alterForm( $form ) {
+   $title = $this->rev->getTitle();
+   $diff = $this->msg( 'editsummary-diff-text' )
+   ->rawParams( Linker::linkKnown( $title, 
$title->getPrefixedText() ) )
+   ->parseAsBlock() .
+   '' . $this->revsList->current()->getHTML() . 
'';
+
+   $form->addPreText( $diff );
+   $form->setAction( $this->getTitle()->getLocalURL( [
+   'action' => $this->getName(),
+   'id' => $this->revId,
+   ] ) );
+   }
+
+   public function onSubmit( $data ) {
+   $newSummary = $data['summary'];
+   $oldSummary = $this->rev->getComment();
+
+   if ( $newSummary === $oldSummary ) {
+   return Status::newFatal( 'editsummary-error-same' );
+   }
+
+   $dbr = wfGetDB( DB_MASTER );
+   $dbr->update(
+   'revision', [ 'rev_comment' => $newSummary ],
+   [ 'rev_id' => $this->revId ], __METHOD__ );
+
+ 

[MediaWiki-commits] [Gerrit] Update tilerator to cae28b9 - change (maps...deploy)

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Update tilerator to cae28b9
..

Update tilerator to cae28b9

List of changes:
cae28b9 spacing
xxx Update node module dependencies

Change-Id: Ib07128c6a840589e224079fe994c18acaec8cbc7
---
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/node_modules/wrappy/package.json
M 
node_modules/compression/node_modules/compressible/node_modules/mime-db/package.json
M 
node_modules/jade/node_modules/clean-css/node_modules/source-map/node_modules/amdefine/package.json
M node_modules/jade/node_modules/uglify-js/lib/compress.js
M node_modules/jade/node_modules/uglify-js/lib/output.js
M node_modules/jade/node_modules/uglify-js/package.json
M node_modules/jade/node_modules/uglify-js/tools/exports.js
M node_modules/kartotherian-autogen/package.json
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/.travis.yml
A node_modules/kartotherian-cassandra/node_modules/cassandra-driver/appveyor.ps1
A node_modules/kartotherian-cassandra/node_modules/cassandra-driver/appveyor.yml
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/build.yaml
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/client-options.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/client.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/connection.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/control-connection.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/encoder.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/errors.js
A 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/execution-profile.js
A 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/host-connection-pool.js
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/host.js
A 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/metadata/event-debouncer.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/metadata/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/metadata/schema-parser.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/address-resolution.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/load-balancing.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/reconnection.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/retry.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/readers.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/request-handler.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/requests.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/streams.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/tokenizer.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/types/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/types/inet-address.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/types/result-set.js
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/utils.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/writers.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/LICENSE
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/dist/async.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/dist/async.min.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/lib/async.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/package.json
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/package.json
M 
node_modules/kartotherian-cassandra/node_modules/multistream/node_modules/readable-stream/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-overzoom/package.json
M 

[MediaWiki-commits] [Gerrit] Fix for eswiki throttle rule - change (operations/mediawiki-config)

[Urbanecm (Code Review)]

Urbanecm has uploaded a new change for review.

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

Change subject: Fix for eswiki throttle rule
..

Fix for eswiki throttle rule

Bug: T137917
Change-Id: I637413a0fa3204d31b8ae7e82271add6251ac25e
---
M wmf-config/throttle.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index f51833c..e1bf851 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -44,7 +44,7 @@
 $wmgThrottlingExceptions[] = [ // T137917
'from'   => '2016-06-29T13:00 -5:00',
'to' => '2016-06-29T16:00 -5:00',
-   'IP' => '181.39.138.146 ',
+   'IP' => '181.39.138.146',
'dbname' => ['eswiki', 'commonswiki'],
'value'  => 40 // 30 expected
 ];

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

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

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

[MediaWiki-commits] [Gerrit] Update kartotherian to 4bc44bd - change (maps...deploy)

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Update kartotherian to 4bc44bd
..

Update kartotherian to 4bc44bd

List of changes:
xxx Update node module dependencies

Change-Id: Ic8f23ed347c7c382eca8ff6044541a8d4a8c1a0d
---
M node_modules/accepts/node_modules/negotiator/package.json
M node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
M node_modules/kartotherian-autogen/package.json
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/.travis.yml
A node_modules/kartotherian-cassandra/node_modules/cassandra-driver/appveyor.ps1
A node_modules/kartotherian-cassandra/node_modules/cassandra-driver/appveyor.yml
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/build.yaml
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/client-options.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/client.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/connection.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/control-connection.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/encoder.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/errors.js
A 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/execution-profile.js
A 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/host-connection-pool.js
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/host.js
A 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/metadata/event-debouncer.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/metadata/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/metadata/schema-parser.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/address-resolution.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/load-balancing.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/reconnection.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/policies/retry.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/readers.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/request-handler.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/requests.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/streams.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/tokenizer.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/types/index.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/types/inet-address.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/types/result-set.js
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/utils.js
M 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/lib/writers.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/LICENSE
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/dist/async.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/dist/async.min.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/lib/async.js
D 
node_modules/kartotherian-cassandra/node_modules/cassandra-driver/node_modules/async/package.json
M node_modules/kartotherian-cassandra/node_modules/cassandra-driver/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
M node_modules/kartotherian-geoshapes/geoshapes.js
M node_modules/kartotherian-geoshapes/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-maki/package.json
M node_modules/kartotherian-overzoom/package.json
M node_modules/kartotherian-server/package.json
M node_modules/kartotherian-snapshot/node_modules/abaculus/package.json
M 
node_modules/kartotherian-snapshot/node_modules/canvas/node_modules/nan/package.json
M 
node_modules/kartotherian-snapshot/node_modules/leaflet-headless/node_modules/request/node_modules/http-signature/node_modules/jsprim/lib/jsprim.js
M 

[MediaWiki-commits] [Gerrit] screenshots: Add task for plain insert menu - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: screenshots: Add task for plain insert menu
..

screenshots: Add task for plain insert menu

Change-Id: Id77df7ff88e030b283b1f94ff85537bfd4f20345
---
M build/screenshots.js
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/build/screenshots.js b/build/screenshots.js
index 20ae960..1596f4a 100644
--- a/build/screenshots.js
+++ b/build/screenshots.js
@@ -225,6 +225,12 @@
seleniumUtils.runMenuTask( arguments[ 
arguments.length - 1 ], ve.init.target.toolbar.tools.bullet );
}
);
+   runScreenshotTest( 'VisualEditor_Insert_Menu',
+   // This function is converted to a string and 
executed in the browser
+   function () {
+   seleniumUtils.runMenuTask( arguments[ 
arguments.length - 1 ], ve.init.target.toolbar.tools.media, true );
+   }
+   );
runScreenshotTest( 'VisualEditor_Media_Insert_Menu',
// This function is converted to a string and 
executed in the browser
function () {

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

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

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

[MediaWiki-commits] [Gerrit] Roll back wikidata to 0.28.0-wmf.7 per request by @aude - change (operations/mediawiki-config)

[20after4 (Code Review)]

20after4 has uploaded a new change for review.

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

Change subject: Roll back wikidata to 0.28.0-wmf.7 per request by @aude
..

Roll back wikidata to 0.28.0-wmf.7 per request by @aude

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


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

diff --git a/wikiversions.json b/wikiversions.json
index 478e690..04f15fb 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -842,7 +842,7 @@
 "wawikibooks": "php-1.28.0-wmf.8",
 "wawiktionary": "php-1.28.0-wmf.8",
 "wg_enwiki": "php-1.28.0-wmf.7",
-"wikidatawiki": "php-1.28.0-wmf.8",
+"wikidatawiki": "php-1.28.0-wmf.7",
 "wikimania2005wiki": "php-1.28.0-wmf.8",
 "wikimania2006wiki": "php-1.28.0-wmf.8",
 "wikimania2007wiki": "php-1.28.0-wmf.8",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d5a4d23903ede3e5f1d07c1de2302f4cea6462b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] WIP: Move more of the gerrit config out of role class and in... - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: WIP: Move more of the gerrit config out of role class and into 
hiera
..

WIP: Move more of the gerrit config out of role class and into hiera

Change-Id: I03eb44cfcdddbaea72ed15234d72a55f33b70cc7
---
M hieradata/role/common/gerrit/production.yaml
A hieradata/role/eqiad/gerrit/production.yaml
M modules/role/manifests/gerrit/production.pp
3 files changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/296622/1

diff --git a/hieradata/role/common/gerrit/production.yaml 
b/hieradata/role/common/gerrit/production.yaml
index 98b01a8..f2bfc7e 100644
--- a/hieradata/role/common/gerrit/production.yaml
+++ b/hieradata/role/common/gerrit/production.yaml
@@ -4,3 +4,7 @@
 debdeploy::grains:
   debdeploy-gerrit:
 value: standard
+gerrit::host: 'gerrit.wikimedia.org'
+gerrit::ssl_cert: "${gerrit::host}"
+gerrit::ssl_cert_key: "${gerrit::host}"
+gerrit::ssk_key: 'ssh-rsa 
B3NzaC1yc2EBIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==
 gerrit@production'
diff --git a/hieradata/role/eqiad/gerrit/production.yaml 
b/hieradata/role/eqiad/gerrit/production.yaml
new file mode 100644
index 000..4861428
--- /dev/null
+++ b/hieradata/role/eqiad/gerrit/production.yaml
@@ -0,0 +1 @@
+gerrit::db_host: "m2-master.eqiad.wmnet"
diff --git a/modules/role/manifests/gerrit/production.pp 
b/modules/role/manifests/gerrit/production.pp
index c2d3155..8012906 100644
--- a/modules/role/manifests/gerrit/production.pp
+++ b/modules/role/manifests/gerrit/production.pp
@@ -45,11 +45,6 @@
 ]
 
 class { '::gerrit':
-db_host  => 'm2-master.eqiad.wmnet',
-host => 'gerrit.wikimedia.org',
-ssh_key  => 'ssh-rsa 
B3NzaC1yc2EBIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==
 gerrit@production',
-ssl_cert => 'gerrit.wikimedia.org',
-ssl_cert_key => 'gerrit.wikimedia.org',
 smtp_host=> $::mail_smarthost[0],
 replication  => {
 # If adding a new entry, remember to add the fingerprint to 
gerrit2's known_hosts
@@ -73,5 +68,4 @@
 # results in Code Search. See T70054.
 }
 }
-
 }

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

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

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

[MediaWiki-commits] [Gerrit] graphite/production: Limit to PRODUCTION_NETWORKS - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: graphite/production: Limit to PRODUCTION_NETWORKS
..


graphite/production: Limit to PRODUCTION_NETWORKS

Data is only logged from production networks.

Change-Id: If15fc480eee49600f2079522c3412f0e663eaac7
---
M modules/role/manifests/graphite/production.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/graphite/production.pp 
b/modules/role/manifests/graphite/production.pp
index 98fb49e..ab7661e 100644
--- a/modules/role/manifests/graphite/production.pp
+++ b/modules/role/manifests/graphite/production.pp
@@ -63,13 +63,13 @@
 ferm::service { 'carbon_c_relay-frontend_relay_udp':
 proto  => 'udp',
 port   => '2003',
-srange => '$ALL_NETWORKS',
+srange => '$PRODUCTION_NETWORKS',
 }
 
 ferm::service { 'carbon_c_relay-frontend_relay_tcp':
 proto  => 'tcp',
 port   => '2003',
-srange => '$ALL_NETWORKS',
+srange => '$PRODUCTION_NETWORKS',
 }
 
 ferm::service { 'carbon_pickled':

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

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

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

[MediaWiki-commits] [Gerrit] group1 wikis to 1.28.0-wmf.8T138555 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: group1 wikis to 1.28.0-wmf.8T138555
..


group1 wikis to 1.28.0-wmf.8T138555

Change-Id: I1be1077c8dff4e5b23601e96568c1da96ae82919
---
M php
M wikiversions.json
2 files changed, 595 insertions(+), 595 deletions(-)

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



diff --git a/php b/php
index e935739..176bbcd 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.28.0-wmf.7
\ No newline at end of file
+php-1.28.0-wmf.8
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 07b7fad..478e690 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,898 +1,898 @@
 {
 "aawiki": "php-1.28.0-wmf.7",
-"aawikibooks": "php-1.28.0-wmf.7",
-"aawiktionary": "php-1.28.0-wmf.7",
+"aawikibooks": "php-1.28.0-wmf.8",
+"aawiktionary": "php-1.28.0-wmf.8",
 "abwiki": "php-1.28.0-wmf.7",
-"abwiktionary": "php-1.28.0-wmf.7",
+"abwiktionary": "php-1.28.0-wmf.8",
 "acewiki": "php-1.28.0-wmf.7",
-"advisorywiki": "php-1.28.0-wmf.7",
+"advisorywiki": "php-1.28.0-wmf.8",
 "adywiki": "php-1.28.0-wmf.7",
 "afwiki": "php-1.28.0-wmf.7",
-"afwikibooks": "php-1.28.0-wmf.7",
-"afwikiquote": "php-1.28.0-wmf.7",
-"afwiktionary": "php-1.28.0-wmf.7",
+"afwikibooks": "php-1.28.0-wmf.8",
+"afwikiquote": "php-1.28.0-wmf.8",
+"afwiktionary": "php-1.28.0-wmf.8",
 "akwiki": "php-1.28.0-wmf.7",
-"akwikibooks": "php-1.28.0-wmf.7",
-"akwiktionary": "php-1.28.0-wmf.7",
+"akwikibooks": "php-1.28.0-wmf.8",
+"akwiktionary": "php-1.28.0-wmf.8",
 "alswiki": "php-1.28.0-wmf.7",
-"alswikibooks": "php-1.28.0-wmf.7",
-"alswikiquote": "php-1.28.0-wmf.7",
-"alswiktionary": "php-1.28.0-wmf.7",
+"alswikibooks": "php-1.28.0-wmf.8",
+"alswikiquote": "php-1.28.0-wmf.8",
+"alswiktionary": "php-1.28.0-wmf.8",
 "amwiki": "php-1.28.0-wmf.7",
-"amwikiquote": "php-1.28.0-wmf.7",
-"amwiktionary": "php-1.28.0-wmf.7",
+"amwikiquote": "php-1.28.0-wmf.8",
+"amwiktionary": "php-1.28.0-wmf.8",
 "angwiki": "php-1.28.0-wmf.7",
-"angwikibooks": "php-1.28.0-wmf.7",
-"angwikiquote": "php-1.28.0-wmf.7",
-"angwikisource": "php-1.28.0-wmf.7",
-"angwiktionary": "php-1.28.0-wmf.7",
+"angwikibooks": "php-1.28.0-wmf.8",
+"angwikiquote": "php-1.28.0-wmf.8",
+"angwikisource": "php-1.28.0-wmf.8",
+"angwiktionary": "php-1.28.0-wmf.8",
 "anwiki": "php-1.28.0-wmf.7",
-"anwiktionary": "php-1.28.0-wmf.7",
+"anwiktionary": "php-1.28.0-wmf.8",
 "arbcom_dewiki": "php-1.28.0-wmf.7",
 "arbcom_enwiki": "php-1.28.0-wmf.7",
 "arbcom_fiwiki": "php-1.28.0-wmf.7",
 "arbcom_nlwiki": "php-1.28.0-wmf.7",
 "arcwiki": "php-1.28.0-wmf.7",
 "arwiki": "php-1.28.0-wmf.7",
-"arwikibooks": "php-1.28.0-wmf.7",
-"arwikimedia": "php-1.28.0-wmf.7",
-"arwikinews": "php-1.28.0-wmf.7",
-"arwikiquote": "php-1.28.0-wmf.7",
-"arwikisource": "php-1.28.0-wmf.7",
-"arwikiversity": "php-1.28.0-wmf.7",
-"arwiktionary": "php-1.28.0-wmf.7",
+"arwikibooks": "php-1.28.0-wmf.8",
+"arwikimedia": "php-1.28.0-wmf.8",
+"arwikinews": "php-1.28.0-wmf.8",
+"arwikiquote": "php-1.28.0-wmf.8",
+"arwikisource": "php-1.28.0-wmf.8",
+"arwikiversity": "php-1.28.0-wmf.8",
+"arwiktionary": "php-1.28.0-wmf.8",
 "arzwiki": "php-1.28.0-wmf.7",
 "astwiki": "php-1.28.0-wmf.7",
-"astwikibooks": "php-1.28.0-wmf.7",
-"astwikiquote": "php-1.28.0-wmf.7",
-"astwiktionary": "php-1.28.0-wmf.7",
+"astwikibooks": "php-1.28.0-wmf.8",
+"astwikiquote": "php-1.28.0-wmf.8",
+"astwiktionary": "php-1.28.0-wmf.8",
 "aswiki": "php-1.28.0-wmf.7",
-"aswikibooks": "php-1.28.0-wmf.7",
-"aswikisource": "php-1.28.0-wmf.7",
-"aswiktionary": "php-1.28.0-wmf.7",
-"auditcomwiki": "php-1.28.0-wmf.7",
+"aswikibooks": "php-1.28.0-wmf.8",
+"aswikisource": "php-1.28.0-wmf.8",
+"aswiktionary": "php-1.28.0-wmf.8",
+"auditcomwiki": "php-1.28.0-wmf.8",
 "avwiki": "php-1.28.0-wmf.7",
-"avwiktionary": "php-1.28.0-wmf.7",
+"avwiktionary": "php-1.28.0-wmf.8",
 "aywiki": "php-1.28.0-wmf.7",
-"aywikibooks": "php-1.28.0-wmf.7",
-"aywiktionary": "php-1.28.0-wmf.7",
+"aywikibooks": "php-1.28.0-wmf.8",
+"aywiktionary": "php-1.28.0-wmf.8",
 "azbwiki": "php-1.28.0-wmf.7",
 "azwiki": "php-1.28.0-wmf.7",
-"azwikibooks": "php-1.28.0-wmf.7",
-"azwikiquote": "php-1.28.0-wmf.7",
-"azwikisource": "php-1.28.0-wmf.7",
-"azwiktionary": "php-1.28.0-wmf.7",
+"azwikibooks": "php-1.28.0-wmf.8",
+"azwikiquote": "php-1.28.0-wmf.8",
+"azwikisource": "php-1.28.0-wmf.8",
+"azwiktionary": "php-1.28.0-wmf.8",
 "barwiki": "php-1.28.0-wmf.7",
 "bat_smgwiki": "php-1.28.0-wmf.7",
 "bawiki": "php-1.28.0-wmf.7",
-"bawikibooks": 

[MediaWiki-commits] [Gerrit] group1 wikis to 1.28.0-wmf.8T138555 - change (operations/mediawiki-config)

[20after4 (Code Review)]

20after4 has uploaded a new change for review.

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

Change subject: group1 wikis to 1.28.0-wmf.8T138555
..

group1 wikis to 1.28.0-wmf.8T138555

Change-Id: I1be1077c8dff4e5b23601e96568c1da96ae82919
---
M php
M wikiversions.json
2 files changed, 595 insertions(+), 595 deletions(-)


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

diff --git a/php b/php
index e935739..176bbcd 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.28.0-wmf.7
\ No newline at end of file
+php-1.28.0-wmf.8
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 07b7fad..478e690 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,898 +1,898 @@
 {
 "aawiki": "php-1.28.0-wmf.7",
-"aawikibooks": "php-1.28.0-wmf.7",
-"aawiktionary": "php-1.28.0-wmf.7",
+"aawikibooks": "php-1.28.0-wmf.8",
+"aawiktionary": "php-1.28.0-wmf.8",
 "abwiki": "php-1.28.0-wmf.7",
-"abwiktionary": "php-1.28.0-wmf.7",
+"abwiktionary": "php-1.28.0-wmf.8",
 "acewiki": "php-1.28.0-wmf.7",
-"advisorywiki": "php-1.28.0-wmf.7",
+"advisorywiki": "php-1.28.0-wmf.8",
 "adywiki": "php-1.28.0-wmf.7",
 "afwiki": "php-1.28.0-wmf.7",
-"afwikibooks": "php-1.28.0-wmf.7",
-"afwikiquote": "php-1.28.0-wmf.7",
-"afwiktionary": "php-1.28.0-wmf.7",
+"afwikibooks": "php-1.28.0-wmf.8",
+"afwikiquote": "php-1.28.0-wmf.8",
+"afwiktionary": "php-1.28.0-wmf.8",
 "akwiki": "php-1.28.0-wmf.7",
-"akwikibooks": "php-1.28.0-wmf.7",
-"akwiktionary": "php-1.28.0-wmf.7",
+"akwikibooks": "php-1.28.0-wmf.8",
+"akwiktionary": "php-1.28.0-wmf.8",
 "alswiki": "php-1.28.0-wmf.7",
-"alswikibooks": "php-1.28.0-wmf.7",
-"alswikiquote": "php-1.28.0-wmf.7",
-"alswiktionary": "php-1.28.0-wmf.7",
+"alswikibooks": "php-1.28.0-wmf.8",
+"alswikiquote": "php-1.28.0-wmf.8",
+"alswiktionary": "php-1.28.0-wmf.8",
 "amwiki": "php-1.28.0-wmf.7",
-"amwikiquote": "php-1.28.0-wmf.7",
-"amwiktionary": "php-1.28.0-wmf.7",
+"amwikiquote": "php-1.28.0-wmf.8",
+"amwiktionary": "php-1.28.0-wmf.8",
 "angwiki": "php-1.28.0-wmf.7",
-"angwikibooks": "php-1.28.0-wmf.7",
-"angwikiquote": "php-1.28.0-wmf.7",
-"angwikisource": "php-1.28.0-wmf.7",
-"angwiktionary": "php-1.28.0-wmf.7",
+"angwikibooks": "php-1.28.0-wmf.8",
+"angwikiquote": "php-1.28.0-wmf.8",
+"angwikisource": "php-1.28.0-wmf.8",
+"angwiktionary": "php-1.28.0-wmf.8",
 "anwiki": "php-1.28.0-wmf.7",
-"anwiktionary": "php-1.28.0-wmf.7",
+"anwiktionary": "php-1.28.0-wmf.8",
 "arbcom_dewiki": "php-1.28.0-wmf.7",
 "arbcom_enwiki": "php-1.28.0-wmf.7",
 "arbcom_fiwiki": "php-1.28.0-wmf.7",
 "arbcom_nlwiki": "php-1.28.0-wmf.7",
 "arcwiki": "php-1.28.0-wmf.7",
 "arwiki": "php-1.28.0-wmf.7",
-"arwikibooks": "php-1.28.0-wmf.7",
-"arwikimedia": "php-1.28.0-wmf.7",
-"arwikinews": "php-1.28.0-wmf.7",
-"arwikiquote": "php-1.28.0-wmf.7",
-"arwikisource": "php-1.28.0-wmf.7",
-"arwikiversity": "php-1.28.0-wmf.7",
-"arwiktionary": "php-1.28.0-wmf.7",
+"arwikibooks": "php-1.28.0-wmf.8",
+"arwikimedia": "php-1.28.0-wmf.8",
+"arwikinews": "php-1.28.0-wmf.8",
+"arwikiquote": "php-1.28.0-wmf.8",
+"arwikisource": "php-1.28.0-wmf.8",
+"arwikiversity": "php-1.28.0-wmf.8",
+"arwiktionary": "php-1.28.0-wmf.8",
 "arzwiki": "php-1.28.0-wmf.7",
 "astwiki": "php-1.28.0-wmf.7",
-"astwikibooks": "php-1.28.0-wmf.7",
-"astwikiquote": "php-1.28.0-wmf.7",
-"astwiktionary": "php-1.28.0-wmf.7",
+"astwikibooks": "php-1.28.0-wmf.8",
+"astwikiquote": "php-1.28.0-wmf.8",
+"astwiktionary": "php-1.28.0-wmf.8",
 "aswiki": "php-1.28.0-wmf.7",
-"aswikibooks": "php-1.28.0-wmf.7",
-"aswikisource": "php-1.28.0-wmf.7",
-"aswiktionary": "php-1.28.0-wmf.7",
-"auditcomwiki": "php-1.28.0-wmf.7",
+"aswikibooks": "php-1.28.0-wmf.8",
+"aswikisource": "php-1.28.0-wmf.8",
+"aswiktionary": "php-1.28.0-wmf.8",
+"auditcomwiki": "php-1.28.0-wmf.8",
 "avwiki": "php-1.28.0-wmf.7",
-"avwiktionary": "php-1.28.0-wmf.7",
+"avwiktionary": "php-1.28.0-wmf.8",
 "aywiki": "php-1.28.0-wmf.7",
-"aywikibooks": "php-1.28.0-wmf.7",
-"aywiktionary": "php-1.28.0-wmf.7",
+"aywikibooks": "php-1.28.0-wmf.8",
+"aywiktionary": "php-1.28.0-wmf.8",
 "azbwiki": "php-1.28.0-wmf.7",
 "azwiki": "php-1.28.0-wmf.7",
-"azwikibooks": "php-1.28.0-wmf.7",
-"azwikiquote": "php-1.28.0-wmf.7",
-"azwikisource": "php-1.28.0-wmf.7",
-"azwiktionary": "php-1.28.0-wmf.7",
+"azwikibooks": "php-1.28.0-wmf.8",
+"azwikiquote": "php-1.28.0-wmf.8",
+"azwikisource": "php-1.28.0-wmf.8",
+"azwiktionary": "php-1.28.0-wmf.8",
 "barwiki": "php-1.28.0-wmf.7",
 "bat_smgwiki": "php-1.28.0-wmf.7",

[MediaWiki-commits] [Gerrit] Gerrit: minor (no-op) manifest cleanup - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Gerrit: minor (no-op) manifest cleanup
..

Gerrit: minor (no-op) manifest cleanup

- Remove unused robots.txt stuff
- Rename main class to gerrit instead of gerrit::instance

Change-Id: I760dbf277e05482ab23e30a9ca85a0b9274f4d04
---
D modules/gerrit/files/robots-txt-disallow
R modules/gerrit/manifests/init.pp
M modules/gerrit/manifests/proxy.pp
M modules/role/manifests/gerrit/production.pp
4 files changed, 2 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/296619/1

diff --git a/modules/gerrit/files/robots-txt-disallow 
b/modules/gerrit/files/robots-txt-disallow
deleted file mode 100644
index 94cb4c9..000
--- a/modules/gerrit/files/robots-txt-disallow
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS MANAGED BY PUPPET
-#
-# puppet:///modules/gerrit/robots-txt-disallow
-#
-User-agent: *
-Disallow: /
diff --git a/modules/gerrit/manifests/instance.pp 
b/modules/gerrit/manifests/init.pp
similarity index 96%
rename from modules/gerrit/manifests/instance.pp
rename to modules/gerrit/manifests/init.pp
index 44e4381..926f18c 100644
--- a/modules/gerrit/manifests/instance.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -1,6 +1,6 @@
 # Manifest to setup a Gerrit instance
 
-class gerrit::instance(
+class gerrit(
 $db_host = '',
 $host= '',
 $ssh_key = '',
diff --git a/modules/gerrit/manifests/proxy.pp 
b/modules/gerrit/manifests/proxy.pp
index 7c2ede7..8f3c347 100644
--- a/modules/gerrit/manifests/proxy.pp
+++ b/modules/gerrit/manifests/proxy.pp
@@ -8,16 +8,6 @@
 content => template('gerrit/gerrit.wikimedia.org.erb'),
 }
 
-# We don't use gitweb anymore, so we're going to allow spiders again
-# If it becomes a problem, just set ensure => present again
-file { '/var/www/robots.txt':
-ensure => absent,
-mode   => '0444',
-owner  => 'root',
-group  => 'root',
-source => 'puppet:///modules/gerrit/robots-txt-disallow',
-}
-
 include ::apache::mod::rewrite
 
 include ::apache::mod::proxy
diff --git a/modules/role/manifests/gerrit/production.pp 
b/modules/role/manifests/gerrit/production.pp
index 711d7a1..c2d3155 100644
--- a/modules/role/manifests/gerrit/production.pp
+++ b/modules/role/manifests/gerrit/production.pp
@@ -44,7 +44,7 @@
 '+refs/tags/*:refs/tags/*',
 ]
 
-class { 'gerrit::instance':
+class { '::gerrit':
 db_host  => 'm2-master.eqiad.wmnet',
 host => 'gerrit.wikimedia.org',
 ssh_key  => 'ssh-rsa 
B3NzaC1yc2EBIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==
 gerrit@production',

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

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

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

[MediaWiki-commits] [Gerrit] Improve positioning and behavior of feed refresh circle. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Improve positioning and behavior of feed refresh circle.
..

Improve positioning and behavior of feed refresh circle.

Now using a more correct arrangement of SwipeRefreshLayout ->
CoordinatorLayout -> RecyclerView.

No longer need custom refresh start/stop offsets.

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


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

diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 067640b..de3b152 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -78,9 +78,6 @@
 appBarLayout.addOnOffsetChangedListener(headerOffsetChangedListener);
 searchIconShowThresholdPx = (int) 
getResources().getDimension(R.dimen.view_feed_header_height) - 
DimenUtil.getContentTopOffsetPx(getContext());
 
-swipeRefreshLayout.setProgressViewOffset(true,
-(int) 
getResources().getDimension(R.dimen.view_feed_refresh_offset_start),
-(int) 
getResources().getDimension(R.dimen.view_feed_refresh_offset_end));
 swipeRefreshLayout.setOnRefreshListener(new 
SwipeRefreshLayout.OnRefreshListener() {
 @Override
 public void onRefresh() {
diff --git a/app/src/main/res/layout/fragment_feed.xml 
b/app/src/main/res/layout/fragment_feed.xml
index 772f582..37153f5 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -1,54 +1,53 @@
 
-http://schemas.android.com/apk/res/android;
 xmlns:app="http://schemas.android.com/apk/res-auto;
+android:id="@+id/feed_swipe_refresh_layout"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
-android:background="@color/feed_window_background"
 android:fitsSystemWindows="true">
 
-
-
-
-
-
-
-
-
-
-
-
-
+android:background="@color/feed_window_background"
+android:fitsSystemWindows="true">
+
+
+
+
+
+
+
+
+
+
+
 
 
 
-
+
 
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml 
b/app/src/main/res/values/dimens.xml
index 27c9ece..a124a0d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -90,8 +90,6 @@
 
 
 260dp
-40dp
-60dp
 229.3dp
 8dp
 5.3dp

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

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

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

[MediaWiki-commits] [Gerrit] Gerrit: stop replicating to antimony for gitblit - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Gerrit: stop replicating to antimony for gitblit
..


Gerrit: stop replicating to antimony for gitblit

Remove non-functioning replication to lead for now too, will
likely use rsync for this anyway (something something old
key ciphers)

Change-Id: Ia336abb8d197f318c71b476da7b124c02ca0cc49
---
M manifests/site.pp
M modules/role/manifests/gerrit/production.pp
2 files changed, 1 insertion(+), 28 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 428fc00..d2dab99 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1541,8 +1541,6 @@
 # to update the role::zuul::configuration variable 'gerrit_server'
 include standard
 include base::firewall
-
-role gerrit::production::replicationdest
 }
 
 node 'lithium.eqiad.wmnet' {
diff --git a/modules/role/manifests/gerrit/production.pp 
b/modules/role/manifests/gerrit/production.pp
index 5ce1785..711d7a1 100644
--- a/modules/role/manifests/gerrit/production.pp
+++ b/modules/role/manifests/gerrit/production.pp
@@ -53,32 +53,7 @@
 smtp_host=> $::mail_smarthost[0],
 replication  => {
 # If adding a new entry, remember to add the fingerprint to 
gerrit2's known_hosts
-
-'gitblit' => {
-# Note: This is in single quotes on purpose. ${name} is not
-# expected to be expanded by puppet but rather by gerrit
-#
-# lint:ignore:single_quote_string_with_variables
-'url'   => 
'gerritsl...@antimony.wikimedia.org:/var/lib/git/${name}.git',
-# lint:endignore
-'threads'   => '4',
-'authGroup' => 'mediawiki-replication',
-'push'  => '+refs/*:refs/*',
-'mirror'=> true,
-},
-#'lead'  => {
-# Note: This is in single quotes on purpose. ${name} is not
-# expected to be expanded by puppet but rather by gerrit
-#
-# lint:ignore:single_quote_string_with_variables
-#'url'   => 
'gerritsl...@lead.wikimedia.org:/srv/gerrit/git/${name}.git',
-# lint:endignore
-#'threads'   => '4',
-#'authGroup' => 'mediawiki-replication',
-#'push'  => '+refs/*:refs/*',
-#'mirror'=> true,
-#},
-'github'  => {
+'github' => {
 # Note: This is in single quotes on purpose. ${name} is not
 # expected to be expanded by puppet but rather by gerrit
 #

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia336abb8d197f318c71b476da7b124c02ca0cc49
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
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] Workaround for display of SVG images in Safari - change (mediawiki...Popups)

[jenkins-bot (Code Review)]

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

Change subject: Workaround for display of SVG images in Safari
..


Workaround for display of SVG images in Safari

Tested in IE9 and Safari. It seems in Safari the mixture of jQuery
and setAttributeNS causes issues.

Bug: T138430
Change-Id: I4bc63da18d008487d0c8f7b906688e4c8c809efd
---
M resources/ext.popups.renderer.article.js
1 file changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/resources/ext.popups.renderer.article.js 
b/resources/ext.popups.renderer.article.js
index 7fa13e4..c5320d9 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -6,6 +6,7 @@
 * @singleton
 */
var currentRequest,
+   isSafari = navigator.userAgent.match( /Safari/ ) !== null,
article = {},
surveyLink = mw.config.get( 'wgPopupsSurveyLink' ),
$window = $( window ),
@@ -385,8 +386,6 @@
ns = 'http://www.w3.org/2000/svg',
svgElement = article.createSVGTag( 'image' );
 
-   // certain browsers e.g. ie9 will not correctly set attributes 
from foreign namespaces (T134979)
-   svgElement.setAttributeNS( ns, 'xlink:href', url );
$thumbnailSVGImage = $( svgElement );
$thumbnailSVGImage
.addClass( className )
@@ -398,6 +397,13 @@
'clip-path': 'url(#' + clipPath + ')'
} );
 
+   // Make image render in Safari (T138430)
+   if ( isSafari ) {
+   svgElement.setAttribute( 'xlink:href', url );
+   } else {
+   // certain browsers e.g. ie9 will not correctly set 
attributes from foreign namespaces (T134979)
+   svgElement.setAttributeNS( ns, 'xlink:href', url );
+   }
$thumbnail = $( '' )
.attr( {
xmlns: ns,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4bc63da18d008487d0c8f7b906688e4c8c809efd
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Phuedx 
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 antimony from dns - change (operations/dns)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Remove antimony from dns
..

Remove antimony from dns

Change-Id: I8efb6320927a372cf2691c1a0ca8ccd790e5e85e
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 0 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/17/296617/1

diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index df440dd..1f23551 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -24,8 +24,6 @@
 ; (in-subnet) service IPs
 
 
-7.0.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   antimony.wikimedia.org.
-
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   lists.wikimedia.org.
 
 3.5.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   uranium.wikimedia.org.
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 1592c76..02fb3f7 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1893,7 +1893,6 @@
 118 1H  IN PTR  wmf4073.mgmt.eqiad.wmnet.
 118 1H  IN PTR  tin.mgmt.eqiad.wmnet.
 119 1H  IN PTR  wmf4074.mgmt.eqiad.wmnet.
-119 1H  IN PTR  antimony.mgmt.eqiad.wmnet.
 120 1H  IN PTR  labservices1002.mgmt.eqiad.wmnet.
 120 1H  IN PTR  wmf4075.mgmt.eqiad.wmnet.
 121 1H  IN PTR  barium.mgmt.eqiad.wmnet.
@@ -4339,4 +4338,3 @@
 $ORIGIN 1.230.{{ zonename }}.
 
 $ORIGIN 1.252.{{ zonename }}.
-
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 8f612d0..90c728f 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -21,7 +21,6 @@
 3   1H  IN PTR  ae1-1001.cr2-eqiad.wikimedia.org.
 4   1H  IN PTR  lists.wikimedia.org.
 
-7   1H  IN PTR  antimony.wikimedia.org.
 10  1H  IN PTR  carbon.wikimedia.org.
 11  1H  IN PTR  dataset1001.wikimedia.org.
 12  1H  IN PTR  labservices1002.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index cce602a..4e48264 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -94,8 +94,6 @@
 achernar1H  IN A208.80.153.42
 1H  IN  2620:0:860:2:208:80:153:42
 alsafi  1H  IN A208.80.153.50
-antimony1H  IN A208.80.154.7
-1H  IN  2620:0:861:1:208:80:154:7
 astatine1H  IN A208.80.155.110
 baham   1H  IN A208.80.153.13
 1H  IN  2620:0:860:1:208:80:153:13
@@ -737,4 +735,3 @@
 
 ; Silverpop - mass-email contractor for fundraising (T130414)
 spop1024._domainkey  1H IN TXT  "k=rsa; 
p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDpnujkAKfZWUN6W07scekor+i8wGvRGq3Ns9bk3nmgWovfbBebFwzHoNv3Oaq9VMf1cdTf53fuQY5NVZQ+hGZXqJ4mkcNJnSC0BZuGC45kUWjyOhB+Pxf0o9AuGM8QCQwm4nnvNqUe/lME7bFTzrtCSrF7sG0UxvwM2AeDEZj5NQIDAQAB"
-
diff --git a/templates/wmnet b/templates/wmnet
index 5313b8d..4392b2d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2065,7 +2065,6 @@
 WMF4073 1H  IN A10.65.3.118
 tin 1H  IN A10.65.3.118
 WMF4074 1H  IN A10.65.3.119
-antimony1H  IN A10.65.3.119
 WMF4075 1H  IN A10.65.3.120
 labservices1002 1H  IN A10.65.3.120
 WMF4076 1H  IN A10.65.3.121

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

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

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

[MediaWiki-commits] [Gerrit] Remove antimony - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Remove antimony
..

Remove antimony

Change-Id: I39483a392127820cfd375df502fbf1eb22c6e888
---
D hieradata/role/common/gitblit.yaml
D manifests/role/gitblit.pp
M manifests/site.pp
M modules/debdeploy/templates/debdeploy.erb
D modules/gitblit/files/gitblit.conf
D modules/gitblit/files/gitblit.properties
D modules/gitblit/files/gitblit.service
D modules/gitblit/files/header.md
D modules/gitblit/manifests/init.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/openstack/files/wikitech-robots.txt
12 files changed, 5 insertions(+), 1,682 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/296616/1

diff --git a/hieradata/role/common/gitblit.yaml 
b/hieradata/role/common/gitblit.yaml
deleted file mode 100644
index ed89533..000
--- a/hieradata/role/common/gitblit.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-admin::groups:
-  - gerrit-root
-  - gerrit-admin
-debdeploy::grains:
-  debdeploy-gitblit:
-value: standard
diff --git a/manifests/role/gitblit.pp b/manifests/role/gitblit.pp
deleted file mode 100644
index 2226fd7..000
--- a/manifests/role/gitblit.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# manifests/role/gitblit.pp
-
-class role::gitblit {
-system::role { 'role::gitblit': description => 'Gitblit, a git viewer' }
-
-include role::gerrit::production::replicationdest
-
-class { '::gitblit':
-host => 'git.wikimedia.org',
-}
-
-# Firewall GitBlit, it should be accessed from localhost or Varnish
-ferm::rule { 'gitblit_8080':
-rule => 'proto tcp dport 8080 { saddr $INTERNAL ACCEPT; }'
-}
-
-nrpe::monitor_service { 'gitblit_process':
-description  => 'gitblit process',
-nrpe_command => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 
--ereg-argument-array '^/usr/bin/java .*-jar gitblit.jar'"
-}
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index d2dab99..cacb5e7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -147,16 +147,6 @@
 role aqs
 }
 
-
-# git.wikimedia.org
-node 'antimony.wikimedia.org' {
-role gitblit
-include base::firewall
-include standard
-
-interface::add_ip6_mapped { 'main': }
-}
-
 node 'auth1001.eqiad.wmnet' {
 role yubiauth::server
 }
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index ec398df..4f37f37 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -5,14 +5,14 @@
 [serverlists]
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
-misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-packagebuild:standard, debdeploy-racktables:standard, 
debdeploy-syslog:standard, debdeploy-ipv6relay:standard, 
debdeploy-archiva:standard, debdeploy-pmacct:standard, 
debdeploy-labmon:standard, debdeploy-nova-control:standard, 
debdeploy-bugzilla:standard, debdeploy-installserver:standard, 
debdeploy-xenon:standard, debdeploy-icinga:standard, 
debdeploy-kafkatee:standard, debdeploy-gerrit:standard, 
debdeploy-ganglia:standard, debdeploy-db-maintenance:standard, 
debdeploy-hue:standard, debdeploy-ci:standard, debdeploy-librenms:standard, 
debdeploy-graphite:standard, debdeploy-piwik:standard, 
debdeploy-labsnfs:standard
+misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-spare:standard, debdeploy-releases:standard, 
debdeploy-testsystem:standard, debdeploy-etherpad:standard, 
debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-packagebuild:standard, debdeploy-racktables:standard, 
debdeploy-syslog:standard, debdeploy-ipv6relay:standard, 
debdeploy-archiva:standard, debdeploy-pmacct:standard, 
debdeploy-labmon:standard, debdeploy-nova-control:standard, 
debdeploy-bugzilla:standard, debdeploy-installserver:standard, 
debdeploy-xenon:standard, debdeploy-icinga:standard, 
debdeploy-kafkatee:standard, debdeploy-gerrit:standard, 
debdeploy-ganglia:standard, debdeploy-db-maintenance:standard, 
debdeploy-hue:standard, debdeploy-ci:standard, debdeploy-librenms:standard, 
debdeploy-graphite:standard, debdeploy-piwik:standard, 
debdeploy-labsnfs:standard
 

[MediaWiki-commits] [Gerrit] Show languages that appear in the page's text - change (mediawiki...UniversalLanguageSelector)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

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

Change subject: Show languages that appear in the page's text
..

Show languages that appear in the page's text

This is just a simple search for elements with
a lang attribute.

The task suggests also limiting their number,
which is easy to do if needed.

Bug: T70077
Change-Id: Idfffdd250af1942c3ca73faffdf05c920392f013
---
M resources/js/ext.uls.compactlinks.js
1 file changed, 25 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/15/296615/1

diff --git a/resources/js/ext.uls.compactlinks.js 
b/resources/js/ext.uls.compactlinks.js
index a050cf5..99a6786 100644
--- a/resources/js/ext.uls.compactlinks.js
+++ b/resources/js/ext.uls.compactlinks.js
@@ -237,6 +237,9 @@
// These are the most probable languages 
predicted by ULS.
this.getCommonLanguages( languages ),
 
+   // Add languages text in which appears in the 
page itself
+   this.filterByLangsInText( languages ),
+
// Some global fallbacks to avoid showing 
languages in the beginning of the alphabet
this.getExtraCommonLanguages( languages ),
 
@@ -269,6 +272,28 @@
},
 
/**
+* Filter the language list by languages that appear in
+* the page's text. This is done by looking for HTML elements 
with
+* a "lang" attribute—they are likely to appear in a foreign 
name,
+* for example.
+* The reader doesn't necessarily know this language, but it
+* appears relevant to the page.
+*
+* @return {Array} List of language codes supported by the 
article
+*/
+   filterByLangsInText: function ( languages ) {
+   var languagesInText = [];
+
+   $( '#mw-content-text [lang]' ).each( function ( i, el ) {
+   languagesInText.push( $( el ).attr( 'lang' ) );
+   } );
+
+   return $.grep( languagesInText, function ( language ) {
+   return $.inArray( language, languages ) >= 0;
+   } );
+   },
+
+   /**
 * Filter the language list by common languages.
 * Common languages are the most probable languages predicted 
by ULS.
 *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfffdd250af1942c3ca73faffdf05c920392f013
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 

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

[MediaWiki-commits] [Gerrit] add option to XML dump stubs of page ranges with explicit re... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: add option to XML dump stubs of page ranges with explicit 
rev_id ordering
..


add option to XML dump stubs of page ranges with explicit rev_id ordering

tested for stubs, text, logging with and without start/end values,
with and without orderrevs, seems to work as expected, with the
appropriate changes to the query.

Bug: T29112
Change-Id: I94ca4a06235bdbed384bb997deb7432bb5aaa5b9
---
M includes/export/WikiExporter.php
M maintenance/backup.inc
M maintenance/dumpBackup.php
3 files changed, 29 insertions(+), 9 deletions(-)

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



diff --git a/includes/export/WikiExporter.php b/includes/export/WikiExporter.php
index 54de26d..c1f2d59 100644
--- a/includes/export/WikiExporter.php
+++ b/includes/export/WikiExporter.php
@@ -134,13 +134,21 @@
 * @param int $start Inclusive lower limit (this id is included)
 * @param int $end Exclusive upper limit (this id is not included)
 *   If 0, no upper limit.
+* @param bool $orderRevs order revisions within pages in ascending 
order
 */
-   public function pagesByRange( $start, $end ) {
-   $condition = 'page_id >= ' . intval( $start );
-   if ( $end ) {
-   $condition .= ' AND page_id < ' . intval( $end );
+   public function pagesByRange( $start, $end, $orderRevs ) {
+   if ( $orderRevs ) {
+   $condition = 'rev_page >= ' . intval( $start );
+   if ( $end ) {
+   $condition .= ' AND rev_page < ' . intval( $end 
);
+   }
+   } else {
+   $condition = 'page_id >= ' . intval( $start );
+   if ( $end ) {
+   $condition .= ' AND page_id < ' . intval( $end 
);
+   }
}
-   $this->dumpFrom( $condition );
+   $this->dumpFrom( $condition, $orderRevs );
}
 
/**
@@ -245,7 +253,7 @@
 * @throws MWException
 * @throws Exception
 */
-   protected function dumpFrom( $cond = '' ) {
+   protected function dumpFrom( $cond = '', $orderRevs = false ) {
# For logging dumps...
if ( $this->history & self::LOGS ) {
$where = [ 'user_id = log_user' ];
@@ -332,7 +340,16 @@
}
} elseif ( $this->history & WikiExporter::FULL ) {
# Full history dumps...
-   $join['revision'] = [ 'INNER JOIN', 
'page_id=rev_page' ];
+   # query optimization for history stub dumps
+   if ( $this->text == WikiExporter::STUB && 
$orderRevs ) {
+   $tables = [ 'revision', 'page' ];
+   $opts[] = 'STRAIGHT_JOIN';
+   $opts['ORDER BY'] = [ 'rev_page ASC', 
'rev_id ASC' ];
+   $opts['USE INDEX']['revision'] = 
'rev_page_id';
+   $join['page'] = [ 'INNER JOIN', 
'rev_page=page_id' ];
+   } else {
+   $join['revision'] = [ 'INNER JOIN', 
'page_id=rev_page' ];
+   }
} elseif ( $this->history & WikiExporter::CURRENT ) {
# Latest revision dumps...
if ( $this->list_authors && $cond != '' ) { // 
List authors, if so desired
@@ -369,7 +386,6 @@
if ( $this->buffer == WikiExporter::STREAM ) {
$prev = $this->db->bufferResults( false );
}
-
$result = null; // Assuring $result is not undefined, 
if exception occurs early
try {
Hooks::run( 'ModifyExportQuery',
diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index 3271fd6..db3af92 100644
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -41,6 +41,7 @@
public $revEndId = 0;
public $dumpUploads = false;
public $dumpUploadFileContents = false;
+   public $orderRevs = false;
 
protected $reportingInterval = 100;
protected $pageCount = 0;
@@ -271,7 +272,7 @@
} elseif ( is_null( $this->pages ) ) {
# Page dumps: all or by page ID range
if ( $this->startId || $this->endId ) {
-   $exporter->pagesByRange( $this->startId, 
$this->endId );
+   $exporter->pagesByRange( $this->startId, 
$this->endId, 

[MediaWiki-commits] [Gerrit] add option to XML dump stubs of page ranges with explicit re... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: add option to XML dump stubs of page ranges with explicit 
rev_id ordering
..


add option to XML dump stubs of page ranges with explicit rev_id ordering

tested for stubs, text, logging with and without start/end values,
with and without orderrevs, seems to work as expected, with the
appropriate changes to the query.

Bug: T29112
Change-Id: I94ca4a06235bdbed384bb997deb7432bb5aaa5b9
---
M includes/export/WikiExporter.php
M maintenance/backup.inc
M maintenance/dumpBackup.php
3 files changed, 29 insertions(+), 9 deletions(-)

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



diff --git a/includes/export/WikiExporter.php b/includes/export/WikiExporter.php
index 54de26d..c1f2d59 100644
--- a/includes/export/WikiExporter.php
+++ b/includes/export/WikiExporter.php
@@ -134,13 +134,21 @@
 * @param int $start Inclusive lower limit (this id is included)
 * @param int $end Exclusive upper limit (this id is not included)
 *   If 0, no upper limit.
+* @param bool $orderRevs order revisions within pages in ascending 
order
 */
-   public function pagesByRange( $start, $end ) {
-   $condition = 'page_id >= ' . intval( $start );
-   if ( $end ) {
-   $condition .= ' AND page_id < ' . intval( $end );
+   public function pagesByRange( $start, $end, $orderRevs ) {
+   if ( $orderRevs ) {
+   $condition = 'rev_page >= ' . intval( $start );
+   if ( $end ) {
+   $condition .= ' AND rev_page < ' . intval( $end 
);
+   }
+   } else {
+   $condition = 'page_id >= ' . intval( $start );
+   if ( $end ) {
+   $condition .= ' AND page_id < ' . intval( $end 
);
+   }
}
-   $this->dumpFrom( $condition );
+   $this->dumpFrom( $condition, $orderRevs );
}
 
/**
@@ -245,7 +253,7 @@
 * @throws MWException
 * @throws Exception
 */
-   protected function dumpFrom( $cond = '' ) {
+   protected function dumpFrom( $cond = '', $orderRevs = false ) {
# For logging dumps...
if ( $this->history & self::LOGS ) {
$where = [ 'user_id = log_user' ];
@@ -332,7 +340,16 @@
}
} elseif ( $this->history & WikiExporter::FULL ) {
# Full history dumps...
-   $join['revision'] = [ 'INNER JOIN', 
'page_id=rev_page' ];
+   # query optimization for history stub dumps
+   if ( $this->text == WikiExporter::STUB && 
$orderRevs ) {
+   $tables = [ 'revision', 'page' ];
+   $opts[] = 'STRAIGHT_JOIN';
+   $opts['ORDER BY'] = [ 'rev_page ASC', 
'rev_id ASC' ];
+   $opts['USE INDEX']['revision'] = 
'rev_page_id';
+   $join['page'] = [ 'INNER JOIN', 
'rev_page=page_id' ];
+   } else {
+   $join['revision'] = [ 'INNER JOIN', 
'page_id=rev_page' ];
+   }
} elseif ( $this->history & WikiExporter::CURRENT ) {
# Latest revision dumps...
if ( $this->list_authors && $cond != '' ) { // 
List authors, if so desired
@@ -369,7 +386,6 @@
if ( $this->buffer == WikiExporter::STREAM ) {
$prev = $this->db->bufferResults( false );
}
-
$result = null; // Assuring $result is not undefined, 
if exception occurs early
try {
Hooks::run( 'ModifyExportQuery',
diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index 3271fd6..db3af92 100644
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -41,6 +41,7 @@
public $revEndId = 0;
public $dumpUploads = false;
public $dumpUploadFileContents = false;
+   public $orderRevs = false;
 
protected $reportingInterval = 100;
protected $pageCount = 0;
@@ -271,7 +272,7 @@
} elseif ( is_null( $this->pages ) ) {
# Page dumps: all or by page ID range
if ( $this->startId || $this->endId ) {
-   $exporter->pagesByRange( $this->startId, 
$this->endId );
+   

[MediaWiki-commits] [Gerrit] Readd fixed codfw appserver hosts to dsh - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Readd fixed codfw appserver hosts to dsh
..


Readd fixed codfw appserver hosts to dsh

Bug: T138812
Change-Id: Ia161dc81a880fe1621edfd45f86dd94649d41f20
---
M modules/scap/files/dsh/group/mediawiki-installation
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/scap/files/dsh/group/mediawiki-installation 
b/modules/scap/files/dsh/group/mediawiki-installation
index 5fa68d3..47a3f32 100644
--- a/modules/scap/files/dsh/group/mediawiki-installation
+++ b/modules/scap/files/dsh/group/mediawiki-installation
@@ -289,7 +289,7 @@
 mw2095.codfw.wmnet
 mw2096.codfw.wmnet
 mw2097.codfw.wmnet
-#mw2098.codfw.wmnet # T138812
+mw2098.codfw.wmnet
 mw2099.codfw.wmnet
 mw2100.codfw.wmnet
 mw2101.codfw.wmnet
@@ -314,7 +314,7 @@
 mw2120.codfw.wmnet
 mw2121.codfw.wmnet
 mw2122.codfw.wmnet
-#mw2123.codfw.wmnet # T138812
+mw2123.codfw.wmnet
 mw2124.codfw.wmnet
 mw2125.codfw.wmnet
 mw2126.codfw.wmnet
@@ -325,7 +325,7 @@
 mw2131.codfw.wmnet
 mw2132.codfw.wmnet
 mw2133.codfw.wmnet
-#mw2134.codfw.wmnet # T138812
+mw2134.codfw.wmnet
 mw2135.codfw.wmnet
 mw2136.codfw.wmnet
 mw2137.codfw.wmnet

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

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

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

[MediaWiki-commits] [Gerrit] Readd fixed codfw appserver hosts to dsh - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Readd fixed codfw appserver hosts to dsh
..

Readd fixed codfw appserver hosts to dsh

Bug: T138812
Change-Id: Ia161dc81a880fe1621edfd45f86dd94649d41f20
---
M modules/scap/files/dsh/group/mediawiki-installation
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/296612/1

diff --git a/modules/scap/files/dsh/group/mediawiki-installation 
b/modules/scap/files/dsh/group/mediawiki-installation
index 5fa68d3..47a3f32 100644
--- a/modules/scap/files/dsh/group/mediawiki-installation
+++ b/modules/scap/files/dsh/group/mediawiki-installation
@@ -289,7 +289,7 @@
 mw2095.codfw.wmnet
 mw2096.codfw.wmnet
 mw2097.codfw.wmnet
-#mw2098.codfw.wmnet # T138812
+mw2098.codfw.wmnet
 mw2099.codfw.wmnet
 mw2100.codfw.wmnet
 mw2101.codfw.wmnet
@@ -314,7 +314,7 @@
 mw2120.codfw.wmnet
 mw2121.codfw.wmnet
 mw2122.codfw.wmnet
-#mw2123.codfw.wmnet # T138812
+mw2123.codfw.wmnet
 mw2124.codfw.wmnet
 mw2125.codfw.wmnet
 mw2126.codfw.wmnet
@@ -325,7 +325,7 @@
 mw2131.codfw.wmnet
 mw2132.codfw.wmnet
 mw2133.codfw.wmnet
-#mw2134.codfw.wmnet # T138812
+mw2134.codfw.wmnet
 mw2135.codfw.wmnet
 mw2136.codfw.wmnet
 mw2137.codfw.wmnet

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

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

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

[MediaWiki-commits] [Gerrit] Integrate eventlogging for pages navigated from the Feed. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Integrate eventlogging for pages navigated from the Feed.
..

Integrate eventlogging for pages navigated from the Feed.

- Extended the LinkPreviewFunnel (which was already sending 'navigate'
  events for every link clicked) to contain a 'source' parameter which
  maps to the HistoryEntry source that we use when navigating to pages.
- Made the Feed callback interfaces return HistoryEntry objects instead of
  plain PageTitles, and allow different card types to specify their own
  history source parameter.

Bug: T129085
Change-Id: I2bad6d8f08b6de4ad58bf9485add911c12548581
---
M app/src/main/java/org/wikipedia/MainActivity.java
M app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
M 
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
M 
app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
M app/src/main/java/org/wikipedia/feed/model/BigPictureCard.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
M app/src/main/java/org/wikipedia/history/HistoryEntry.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
13 files changed, 62 insertions(+), 47 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/MainActivity.java 
b/app/src/main/java/org/wikipedia/MainActivity.java
index 2ffa8b4..4735350 100644
--- a/app/src/main/java/org/wikipedia/MainActivity.java
+++ b/app/src/main/java/org/wikipedia/MainActivity.java
@@ -51,6 +51,7 @@
 import org.wikipedia.activity.ActivityUtil;
 import org.wikipedia.activity.ThemedActionBarActivity;
 import org.wikipedia.analytics.IntentFunnel;
+import org.wikipedia.analytics.LinkPreviewFunnel;
 import org.wikipedia.analytics.ReadingListsFunnel;
 import org.wikipedia.analytics.WikipediaZeroUsageFunnel;
 import org.wikipedia.events.ChangeTextSizeEvent;
@@ -655,6 +656,10 @@
 return;
 }
 
+if (entry.getSource() != HistoryEntry.SOURCE_INTERNAL_LINK || 
!app.isLinkPreviewEnabled()) {
+new LinkPreviewFunnel(app, entry.getSource()).logNavigate();
+}
+
 // Close the link preview, if one is open.
 hideLinkPreview();
 
@@ -841,18 +846,18 @@
 }
 
 @Override
-public void onFeedSelectPage(PageTitle title) {
-loadPage(title, new HistoryEntry(title, HistoryEntry.SOURCE_FEED));
+public void onFeedSelectPage(HistoryEntry entry) {
+loadPage(entry.getTitle(), entry);
 }
 
 @Override
-public void onFeedAddPageToList(PageTitle title) {
-showAddToListDialog(title, AddToReadingListDialog.InvokeSource.FEED);
+public void onFeedAddPageToList(HistoryEntry entry) {
+showAddToListDialog(entry.getTitle(), 
AddToReadingListDialog.InvokeSource.FEED);
 }
 
 @Override
-public void onFeedSharePage(PageTitle title) {
-ShareUtil.shareText(this, title);
+public void onFeedSharePage(HistoryEntry entry) {
+ShareUtil.shareText(this, entry.getTitle());
 }
 
 private void loadMainPageIfNoTabs() {
diff --git a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java 
b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
index 9b69a19..8a8309d 100644
--- a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
@@ -8,16 +8,19 @@
 
 public class LinkPreviewFunnel extends TimedFunnel {
 private static final String SCHEMA_NAME = "MobileWikiAppLinkPreview";
-private static final int REV_ID = 14095177;
+private static final int REV_ID = 15730939;
 private static final int PROD_LINK_PREVIEW_VERSION = 3;
+private final int source;
 
-public LinkPreviewFunnel(WikipediaApp app) {
+public LinkPreviewFunnel(WikipediaApp app, int source) {
 super(app, SCHEMA_NAME, REV_ID, app.isProdRelease() ? 
Funnel.SAMPLE_LOG_100 : Funnel.SAMPLE_LOG_ALL);
+this.source = source;
 }
 
 @Override
 protected JSONObject preprocessData(@NonNull JSONObject eventData) {
 preprocessData(eventData, "version", PROD_LINK_PREVIEW_VERSION);
+preprocessData(eventData, "source", source);
 return super.preprocessData(eventData);
 }
 
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 067640b..729d98c 100644
--- 

[MediaWiki-commits] [Gerrit] varnish: git.wm.org to iridium, remove related config/tests/... - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: varnish: git.wm.org to iridium, remove related 
config/tests/monitoring
..


varnish: git.wm.org to iridium, remove related config/tests/monitoring

This changes the backend to iridium so that the rewrites from git.w.o to
phabricator.w.o can be on the same host as phabricator.

This is also removing config and tests that was specifically for gitblit and
should not be needed anymore. It removes the monitoring for git.w.o as
phabricator is already monitored.

Bug:T137224
Depends-On: I67ad308f9e6373e5234cb2d83006457d6f467bf8
Change-Id: Id8dad592e3f16736bc8eb0d6806be1b53feb94fe
---
M manifests/role/icinga.pp
D modules/icinga/manifests/monitor/git.pp
M modules/role/manifests/cache/misc.pp
D modules/varnish/files/tests/misc/02-git.w.o-x-forwarded.vtc
M templates/varnish/misc-frontend.inc.vcl.erb
5 files changed, 2 insertions(+), 51 deletions(-)

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



diff --git a/manifests/role/icinga.pp b/manifests/role/icinga.pp
index 30ac371..1c1adbd 100644
--- a/manifests/role/icinga.pp
+++ b/manifests/role/icinga.pp
@@ -23,7 +23,6 @@
 include icinga::monitor::legal
 include icinga::monitor::certs
 include icinga::monitor::gsb
-include icinga::monitor::git
 include icinga::monitor::commons
 include lvs::monitor
 include role::authdns::monitoring
diff --git a/modules/icinga/manifests/monitor/git.pp 
b/modules/icinga/manifests/monitor/git.pp
deleted file mode 100644
index e2b3474..000
--- a/modules/icinga/manifests/monitor/git.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# monitoring of git.wikimedia.org
-class icinga::monitor::git {
-
-@monitoring::host { 'git.wikimedia.org':
-host_fqdn => 'git.wikimedia.org'
-}
-
-monitoring::service { 'git.wikimedia.org':
-description   => 'git.wikimedia.org',
-check_command => 
'check_http_url!git.wikimedia.org!/tree/mediawiki%2Fvendor.git',
-host  => 'git.wikimedia.org',
-contact_group => 'admins',
-}
-
-}
diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index 32d7932..4b89e6f 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -50,13 +50,6 @@
 'be_opts'  => merge($app_def_be_opts, { 'port' =>  }),
 'req_host' => 'hue.wikimedia.org',
 },
-'antimony' => {
-'dynamic'  => 'no',
-'type' => 'random',
-'backends' => ['antimony.wikimedia.org'],
-'be_opts'  => merge($app_def_be_opts, { 'port' => 8080 }),
-'req_host' => 'git.wikimedia.org',
-},
 'bromine' => { # ganeti VM for misc. static HTML sites
 'dynamic'  => 'no',
 'type' => 'random',
@@ -136,7 +129,8 @@
 'phabricator.wikimedia.org',
 'phab.wmfusercontent.org',
 'bugzilla.wikimedia.org',
-'bugs.wikimedia.org'
+'bugs.wikimedia.org',
+'git.wikimedia.org'
 ],
 },
 'krypton' => { # ganeti VM for misc. PHP apps
diff --git a/modules/varnish/files/tests/misc/02-git.w.o-x-forwarded.vtc 
b/modules/varnish/files/tests/misc/02-git.w.o-x-forwarded.vtc
deleted file mode 100644
index e09f90d..000
--- a/modules/varnish/files/tests/misc/02-git.w.o-x-forwarded.vtc
+++ /dev/null
@@ -1,22 +0,0 @@
-varnishtest "git.wikimedia.org expects X-Forwarded-{Proto,Port}"
-
-server s1 {
-rxreq
-expect req.http.X-Forwarded-Proto == "https"
-expect req.http.X-Forwarded-Port == "443"
-txresp
-} -start
-
-varnish v1 -arg "-p vcc_err_unref=false" -vcl+backend {
-backend vtc_backend {
-.host = "${s1_addr}"; .port = "${s1_port}";
-}
-
-include "/usr/share/varnish/tests/wikimedia_misc-frontend.vcl";
-} -start
-
-client c1 {
-txreq -hdr "Host: git.wikimedia.org" -hdr "X-Forwarded-Proto: https"
-rxresp
-expect resp.status == 200
-} -run
diff --git a/templates/varnish/misc-frontend.inc.vcl.erb 
b/templates/varnish/misc-frontend.inc.vcl.erb
index 8a82db3..4d06a60 100644
--- a/templates/varnish/misc-frontend.inc.vcl.erb
+++ b/templates/varnish/misc-frontend.inc.vcl.erb
@@ -15,11 +15,6 @@
 unset req.http.X-WEBAUTH-USER;
 }
 
-if (req.http.Host == "git.wikimedia.org") {
-// gitblit requires this and X-F-P:https
-set req.http.X-Forwarded-Port = "443";
-}
-
 // STS-preload checker doesn't like [45]xx responses, but 3xx is OK, so
 // re-use the TLS-redirector code and send them to the wikimedia site.
 if (req.http.Host == "wmfusercontent.org") {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8dad592e3f16736bc8eb0d6806be1b53feb94fe

[MediaWiki-commits] [Gerrit] Add labs-hosts1-b-codfw and labs-support1-b-codfw - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Add labs-hosts1-b-codfw and labs-support1-b-codfw
..


Add labs-hosts1-b-codfw and labs-support1-b-codfw

Our network::subnets stanza missed labs-hosts1-b-codfw and
labs-support1-b-codfw. Add those

Change-Id: Id0ef85ffe8dbbd4db56fd0034db7fc36beb72db2
---
M hieradata/common/network.yaml
M modules/network/spec/fixtures/hieradata/common.yaml
2 files changed, 12 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/common/network.yaml b/hieradata/common/network.yaml
index 1603f06..4ba7d3f 100644
--- a/hieradata/common/network.yaml
+++ b/hieradata/common/network.yaml
@@ -83,6 +83,12 @@
 private1-d-codfw:
   ipv4: 10.192.48.0/22
   ipv6: 2620:0:860:104::/64
+labs-hosts1-b-codfw:
+  ipv4: 10.192.20.0/24
+  ipv6: 2620:0:860:118::/64
+labs-support1-b-codfw:
+  ipv4: 10.192.21.0/24
+  ipv6: 2620:0:860:122::/64
 esams:
   public:
 public1-esams:
diff --git a/modules/network/spec/fixtures/hieradata/common.yaml 
b/modules/network/spec/fixtures/hieradata/common.yaml
index 606330a..fb63041 100644
--- a/modules/network/spec/fixtures/hieradata/common.yaml
+++ b/modules/network/spec/fixtures/hieradata/common.yaml
@@ -85,6 +85,12 @@
 private1-d-codfw:
   ipv4: 10.192.48.0/22
   ipv6: 2620:0:860:104::/64
+labs-hosts1-b-codfw:
+  ipv4: 10.192.20.0/24
+  ipv6: 2620:0:860:118::/64
+labs-support1-b-codfw:
+  ipv4: 10.192.21.0/24
+  ipv6: 2620:0:860:122::/64
 esams:
   public:
 public1-esams:

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

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

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

[MediaWiki-commits] [Gerrit] Picture of the day - change (mediawiki...mobileapps)

[jenkins-bot (Code Review)]

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

Change subject: Picture of the day
..


Picture of the day

http://localhost:6927/en.wikipedia.org/v1/media/image/featured/2016/04/15

Bug: T132765
Change-Id: I45148c7915abab9cc1a1d84c8aa5e178c668c169
---
M lib/dateUtil.js
A lib/feed/featured-image.js
M lib/mobile-util.js
M lib/mwapi.js
M routes/aggregated.js
A routes/featured-image.js
M spec.yaml
A test/features/featured-image/pagecontent.js
8 files changed, 306 insertions(+), 3 deletions(-)

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



diff --git a/lib/dateUtil.js b/lib/dateUtil.js
index fc8d7d0..2ac33ac 100644
--- a/lib/dateUtil.js
+++ b/lib/dateUtil.js
@@ -51,6 +51,21 @@
 return number;
 }
 
+/**
+ * Returns a String formatted in ISO date format -- just the date. Timezone is 
UTC.
+ * This is similar to Date.toISOString() but without the time and time zone 
portions.
+ *
+ * Example: "2016-05-16"
+ *
+ * @param {Date} date date to be used
+ * @return {String} formatted date string
+ */
+function formatISODate(date) {
+return date.getUTCFullYear() +
+'-' + pad(date.getUTCMonth() + 1) +
+'-' + pad(date.getUTCDate());
+}
+
 function yesterday(req) {
 var date = getRequestedDate(req),
 yesterday = new Date(date - ONE_DAY);
@@ -65,6 +80,7 @@
 getRequestedDate: getRequestedDate,
 dateStringFrom: dateStringFrom,
 iso8601DateFrom: iso8601DateFrom,
+formatISODate: formatISODate,
 pad: pad,
 yesterday: yesterday,
 ONE_DAY: ONE_DAY
diff --git a/lib/feed/featured-image.js b/lib/feed/featured-image.js
new file mode 100644
index 000..7bfbbfe
--- /dev/null
+++ b/lib/feed/featured-image.js
@@ -0,0 +1,117 @@
+/**
+ * To retrieve the picture of the day for a given date.
+ */
+
+'use strict';
+
+var preq = require('preq');
+var api = require('../api-util');
+var dateUtil = require('../dateUtil');
+var mwapi = require('../mwapi');
+var mUtil = require('../mobile-util');
+var sUtil = require('../util');
+var HTTPError = sUtil.HTTPError;
+
+
+/**
+ * Builds the request to get the Picture of the day of a given date.
+ *
+ * @param {Object} app the application object
+ * @param {String} domain the requested domain, e.g. 'de.wikipedia.org'
+ * @param {Date} date for which day the featured image of theday is requested
+ * @return {Promise} a promise resolving as an JSON object containing the 
response
+ */
+function requestPictureOfTheDay(app, domain, date) {
+var isoDate = dateUtil.formatISODate(date);
+var lang = mUtil.getLanguageFromDomain(domain);
+return api.mwApiGet(app, 'commons.wikimedia.org', {
+action: 'query',
+format: 'json',
+formatversion: 2,
+generator: 'images',
+prop: 'imageinfo|revisions',
+iiextmetadatafilter: 'ImageDescription',
+iiextmetadatalanguage: lang,
+iiprop: 'url|extmetadata|dimensions',
+iiurlwidth: mwapi.CARD_THUMB_FEATURE_SIZE,
+rawcontinue: '',
+titles: `Template:Potd/${isoDate}_(${lang})`
+});
+}
+
+// -- functions dealing with responses:
+
+function getPageObject(response, dontThrow) {
+if (response.body.query && response.body.query.pages[0]) {
+var page = response.body.query.pages[0];
+if (!page.pageid || page.missing === true) {
+if (dontThrow) {
+page.notfound = true;
+return page;
+} else {
+throw new HTTPError({
+status: 404,
+type: 'not_found',
+title: 'No picture of the day for this date',
+detail: 'There is no picture of the day for this date.'
+});
+}
+}
+return page;
+} else {
+if (!dontThrow) {
+throw new HTTPError({
+status: 500,
+type: 'unknown_backend_response',
+title: 'Unexpected backend response',
+detail: 'The backend responded with gibberish.'
+});
+}
+}
+}
+
+function buildPayload(page) {
+if (!page || page.notfound) {
+return undefined;
+}
+
+let imageinfo = page.imageinfo && page.imageinfo[0];
+return {
+title: page.title,
+thumbnail: {
+source: imageinfo && imageinfo.thumburl,
+width: imageinfo && imageinfo.thumbwidth,
+height: imageinfo && imageinfo.thumbheight
+},
+// the full res image:
+image: {
+source: imageinfo.url,
+width: imageinfo.width,
+height: imageinfo.height
+},
+description: imageinfo.extmetadata && 
imageinfo.extmetadata.ImageDescription.value
+};
+}
+
+function buildEtag(page) {
+return page
+&& page.pageid + '/' + mwapi.getRevisionFromExtract(page);
+}
+
+function promise(app, req) {
+return 

[MediaWiki-commits] [Gerrit] Add labs-hosts1-b-codfw and labs-support1-b-codfw - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Add labs-hosts1-b-codfw and labs-support1-b-codfw
..

Add labs-hosts1-b-codfw and labs-support1-b-codfw

Our network::subnets stanza missed labs-hosts1-b-codfw and
labs-support1-b-codfw. Add those

Change-Id: Id0ef85ffe8dbbd4db56fd0034db7fc36beb72db2
---
M hieradata/common/network.yaml
M modules/network/spec/fixtures/hieradata/common.yaml
2 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/296610/1

diff --git a/hieradata/common/network.yaml b/hieradata/common/network.yaml
index 1603f06..4ba7d3f 100644
--- a/hieradata/common/network.yaml
+++ b/hieradata/common/network.yaml
@@ -83,6 +83,12 @@
 private1-d-codfw:
   ipv4: 10.192.48.0/22
   ipv6: 2620:0:860:104::/64
+labs-hosts1-b-codfw:
+  ipv4: 10.192.20.0/24
+  ipv6: 2620:0:860:118::/64
+labs-support1-b-codfw:
+  ipv4: 10.192.21.0/24
+  ipv6: 2620:0:860:122::/64
 esams:
   public:
 public1-esams:
diff --git a/modules/network/spec/fixtures/hieradata/common.yaml 
b/modules/network/spec/fixtures/hieradata/common.yaml
index 606330a..fb63041 100644
--- a/modules/network/spec/fixtures/hieradata/common.yaml
+++ b/modules/network/spec/fixtures/hieradata/common.yaml
@@ -85,6 +85,12 @@
 private1-d-codfw:
   ipv4: 10.192.48.0/22
   ipv6: 2620:0:860:104::/64
+labs-hosts1-b-codfw:
+  ipv4: 10.192.20.0/24
+  ipv6: 2620:0:860:118::/64
+labs-support1-b-codfw:
+  ipv4: 10.192.21.0/24
+  ipv6: 2620:0:860:122::/64
 esams:
   public:
 public1-esams:

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

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

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

[MediaWiki-commits] [Gerrit] Rewrite rules for git.wikimedia.org - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Rewrite rules for git.wikimedia.org
..


Rewrite rules for git.wikimedia.org

Redirect gitblit urls to phabricator (diffusion) equivalents.

Bug: T137224
Change-Id: I73873258a5f3acc21d0db4689dee2f18ca38aff6
---
M modules/phabricator/manifests/init.pp
A modules/phabricator/templates/gitblit_vhost.conf.erb
M modules/phabricator/templates/phabricator-default.conf.erb
M modules/role/manifests/phabricator/main.pp
4 files changed, 127 insertions(+), 10 deletions(-)

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



diff --git a/modules/phabricator/manifests/init.pp 
b/modules/phabricator/manifests/init.pp
index 6eafb2d..146cbbe 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -27,8 +27,8 @@
 # Requires: mysql_admin_user
 #
 #
-# [*serveralias*]
-# Alternative domain on which to respond too
+# [*serveraliases*]
+# Alternative domains on which to respond too
 #
 # [*deploy_user*]
 # The username that is used for scap deployments
@@ -57,7 +57,7 @@
 $mysql_admin_user = '',
 $mysql_admin_pass = '',
 $serveradmin  = '',
-$serveralias  = '',
+$serveraliases= [],
 $deploy_user  = 'phab-deploy',
 $deploy_target= 'phabricator/deployment',
 ) {
@@ -117,8 +117,24 @@
 require => $base_requirements,
 }
 
+# git.wikimedia.org hosts rewrite rules to redirect old gitblit urls to
+# equivilent diffusion urls.
+
+$gitblit_servername = $phab_settings['gitblit.hostname']
+
+file { '/srv/git.wikimedia.org':
+ensure => 'directory',
+owner  => 'root',
+group  => 'root',
+}
+
+apache::site { 'git.wikimedia.org':
+content => template('phabricator/gitblit_vhost.conf.erb'),
+require => File['/srv/git.wikimedia.org'],
+}
+
 # Robots.txt disallowing to crawl the alias domain
-if $serveralias {
+if $serveraliases {
 file {"${phabdir}/robots.txt":
 ensure  => present,
 owner   => 'root',
diff --git a/modules/phabricator/templates/gitblit_vhost.conf.erb 
b/modules/phabricator/templates/gitblit_vhost.conf.erb
new file mode 100644
index 000..c317a1f
--- /dev/null
+++ b/modules/phabricator/templates/gitblit_vhost.conf.erb
@@ -0,0 +1,95 @@
+
+  ServerName <%= @gitblit_servername %>
+<% if !@serveradmin.empty? -%>
+  ServerAdmin <%= @serveradmin %>
+<%- end %>
+  DocumentRoot /srv/git.wikimedia.org
+
+  # https://git.wikimedia.org -> 
https://phabricator.wikimedia.org/diffusion redirects
+  # @author [[meta:User:Danny B.]]
+  # Maniphest Task: https://phabricator.wikimedia.org/T137224
+
+  ### Directives
+
+  # logging
+  LogLevel warn
+  ErrorLog /var/log/apache2/git.wikimedia.org_error.log
+  CustomLog /var/log/apache2/git.wikimedia.org_access.log wmf
+  ServerSignature Off
+
+  # don't decode "%2F" in URL to "/"
+  AllowEncodedSlashes NoDecode
+
+  # allow URL rewriting
+  RewriteEngine On
+
+  ### Static links
+
+  # home page
+  RewriteRule ^/$ https://phabricator.wikimedia.org/diffusion [L,R=301]
+
+  # searches & lists
+  RewriteRule ^/activity/?$ 
https://phabricator.wikimedia.org/diffusion/query/active/ [L,R=301]
+  RewriteRule ^/lucene/?$ 
https://phabricator.wikimedia.org/diffusion/query/advanced/ [L,R=301]
+  RewriteRule ^/(projects|repositories)/?$ 
https://phabricator.wikimedia.org/diffusion/query/all/ [L,R=301]
+
+
+  ### Preformat
+
+  # ?r= -> /
+  RewriteCond %{QUERY_STRING} ^(.*&)?r=([0-9A-Za-z/_\.-]+).git(&.*)?$
+  RewriteRule 
^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/$ 
/$1/%2.git [NE]
+
+  # remove "refs%2Fheads%2F" and "refs%2Fremotes%2Forigin%2F"
+  RewriteRule ^(.*)refs\%2[Ff](heads|remotes\%2[Ff]origin)\%2[Ff](.*)$ $1$3
+
+  #  -> 
+  RewriteRule 
^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/([0-9A-Za-z/_\.-]+)\%2[Ff](.*)\.git(.*)$
 /$1/$2/$3.git$4 [N]
+
+  #  -> 
+  RewriteRule 
^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/([0-9A-Za-z/_\.-]+)\.git/([0-9A-Za-z_\.-]+)\%2[Ff]([^/]+)(.*)$
 /$1/$2.git/$3\%25252F$4$5 [N]
+
+  #  -> 
+  RewriteRule 
^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/([0-9A-Za-z/_\.-]+)\.git/([^/]+)/([0-9A-Za-z/_\.-]+)\%2[Ff]([^/]*)$
 /$1/$2.git/$3/$4/$5 [N]
+
+
+  ### /commit/
+  ### /commitdiff/
+  ### /patch/
+
+  # 
https://git.wikimedia.org//.git/
+  # -> 
https://git.wikimedia.org//.git/
+  # ---> 
https://phabricator.wikimedia.org/r/<(commit|patch)>/;
+  RewriteRule