date:20170912

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: CX1 MT: Unwrap the MT output if wrapped by legacy cxserver api

2017-09-12 Thread Santhosh (Code Review)

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

Change subject: CX1 MT: Unwrap the MT output if wrapped by legacy cxserver api
..

CX1 MT: Unwrap the MT output if wrapped by legacy cxserver api

cxserver /mt api won't wrap the output in unwanted  tag
since https://gerrit.wikimedia.org/r/#/c/374520/

Make the unwrapping conditional by checking the root tag of
the MT output recieved.

Change-Id: I014ced5bc306654053cf47c8cdfe4384ce90bdfb
---
M modules/tools/ext.cx.tools.mt.js
1 file changed, 13 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/07/377707/1

diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 44eacee..03449fc 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -346,19 +346,24 @@
} else {
this.getTranslatedSection( this.$sourceSection )
.done( function ( translation ) {
+   var $translation;
if ( !translation || 
!translation.length ) {
return self.useSource();
}
 
+   $translation = $( translation );
+   if ( $translation.is( 'div' ) && 
!self.$sourceSection.is( 'div' ) ) {
+   // Translation is wrapped in 
 tag. Legacy cxserver behavior. Unwrap it.
+   $translation = 
$translation.children();
+   }
+   $translation.attr( {
+   id: 'cx' + self.sourceId,
+   'data-source': self.sourceId,
+   'data-cx-state': 'mt',
+   'data-cx-mt-provider': 
self.provider
+   } );
// Use fresh copy
-   self.replaceSectionWith( $( translation 
)
-   .children()
-   .attr( {
-   id: 'cx' + 
self.sourceId,
-   'data-source': 
self.sourceId,
-   'data-cx-state': 'mt',
-   'data-cx-mt-provider': 
self.provider
-   } ) );
+   self.replaceSectionWith( $translation );
} ).fail( function () {
return self.useSource();
} ).always( function () {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I014ced5bc306654053cf47c8cdfe4384ce90bdfb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update cxserver to 3baaa36

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Update cxserver to 3baaa36
..


Update cxserver to 3baaa36

List of changes:
437bf39 Misc tweaks to comments
4286d4f Change the language-data node module source
4c68f97 Add 'use strict' to all js files for consistency
7c736c4 Upgrade eslint to 4.4.1 and use latest eslint-config-wikimedia
d6932b4 Add a sentence segment binary utility for debugging purposes
dc02b3a Fix the unwanted nesting of Segmenter and PageLoader modules
5093a6d Matxin Machine translation client
6c2fb33 Add default mwapi_req template configuration to config.yaml
e156687 Add be-ru language pair for Apertium
7b4d117 Update Apertium.languagenames.json for be and ru
c8fb848 Gallery adaptation and tests
655f481 Category adaptation and tests
0f69ee6 Fix the issue of no adaptation if MT provider is not specified
58b026a Refresh MT client modules as classes - ES6 upgrade
adb2aa2 registry: Add missing atj language in target
0774d77 Provide title info- description, image along with the adaptation
d446f41 Unit tests for MWLink translation unit class
0823bbe Avoid segmenting within certain types of tag
aab0e11 eslint: one-var configuration- Allow const and let not grouped
40ede12 Update Contextualizer to use Class semantics
bd563ad Update Adapter to use Class semantics
3075990 MWReference: add reference adaptation
a462d0b Tests: Group the segmentation tests per language
70dc9e3 bin/linearize: Accept input content from stdin
153805b bin/apertium-xhtml: Unbreak the Apertium path
432fbdc Move the plaintext or html check to utility method
e47a013 registry: Remove Matxin as of now
3baaa36 MT Sanitize: Add resource, src, srcset as whitelisted attributes
xxx Update node module dependencies

Change-Id: I5e93665e855d0f7e165fa5acd9e1ad18d760b80e
---
M node_modules/accepts/index.js
M node_modules/accepts/package.json
M node_modules/core-js/LICENSE
M node_modules/core-js/bower.json
M node_modules/core-js/build/build.ls
M node_modules/core-js/build/index.js
M node_modules/core-js/client/core.js
M node_modules/core-js/client/core.min.js
M node_modules/core-js/client/core.min.js.map
M node_modules/core-js/client/library.js
M node_modules/core-js/client/library.min.js
M node_modules/core-js/client/library.min.js.map
M node_modules/core-js/client/shim.js
M node_modules/core-js/client/shim.min.js
M node_modules/core-js/client/shim.min.js.map
M node_modules/core-js/fn/array/virtual/iterator.js
M node_modules/core-js/fn/array/virtual/values.js
M node_modules/core-js/fn/string/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/values.js
M node_modules/core-js/library/fn/string/virtual/iterator.js
M node_modules/core-js/library/modules/_core.js
M node_modules/core-js/library/modules/_promise-resolve.js
M node_modules/core-js/library/modules/es6.promise.js
M node_modules/core-js/library/modules/es6.symbol.js
M node_modules/core-js/library/modules/web.timers.js
M node_modules/core-js/modules/_core.js
M node_modules/core-js/modules/_promise-resolve.js
M node_modules/core-js/modules/es6.promise.js
M node_modules/core-js/modules/es6.symbol.js
M node_modules/core-js/modules/web.timers.js
M node_modules/core-js/package.json
M node_modules/kad/package.json
M node_modules/language-data/data/langdb.yaml
M node_modules/language-data/language-data.json
M node_modules/language-data/package.json
M node_modules/language-data/test/index.js
M node_modules/mime-db/db.json
M node_modules/mime-db/package.json
M node_modules/mime-types/package.json
M node_modules/msgpack5/dist/msgpack5.js
M node_modules/msgpack5/dist/msgpack5.min.js
M node_modules/msgpack5/package.json
M node_modules/msgpack5/test/levelup-encoding.js
M node_modules/nan/nan.h
M node_modules/nan/nan_converters.h
M node_modules/nan/nan_maybe_pre_43_inl.h
M node_modules/nan/package.json
M node_modules/swagger-ui/package.json
M node_modules/webidl-conversions/lib/index.js
M node_modules/webidl-conversions/package.json
M src
52 files changed, 5,092 insertions(+), 3,905 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e93665e855d0f7e165fa5acd9e1ad18d760b80e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] analytics...source[master]: Spark job to create session event log appears to be working.

2017-09-12 Thread Shilad Sen (Code Review)

Shilad Sen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377706 )

Change subject: Spark job to create session event log appears to be working.
..

Spark job to create session event log appears to be working.

Session event log is one session per line, with a list of page ids
viewed in that session ordered by tstamp.

simplewiki  2017-06-08 03:28:15.0   34242   9700
simplewiki  2017-06-08 03:14:49.0   31246
simplewiki  2017-06-08 03:14:22.0   34019   908481247   121

TODO:
* Benchmark on larger datasets
* Optimize if necessary (try broadcasting datastructure to avoid join)
* Compare data cleaning with Elery's scripts

Bug: T174796
Change-Id: I52103578d50d492eaeff2eeffc8629331a1260da
---
A 
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/vectors/SessionPagesBuilder.scala
1 file changed, 547 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/06/377706/1

diff --git 
a/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/vectors/SessionPagesBuilder.scala
 
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/vectors/SessionPagesBuilder.scala
new file mode 100644
index 000..d77a96a
--- /dev/null
+++ 
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/vectors/SessionPagesBuilder.scala
@@ -0,0 +1,547 @@
+package org.wikimedia.analytics.refinery.job.vectors
+
+import org.apache.log4j.{Level, LogManager}
+import org.apache.spark.Partitioner
+
+import scala.collection.mutable.ArrayBuffer
+import scala.util.hashing.MurmurHash3
+
+/**
+  * Process to create a page view session log.
+  *
+  * This create output files with one line per session.
+  * The first two tokens of each line are the session start timestamp and 
language edition.
+  * The following tokens are the page ids viewed in the session, in order.
+  **
+  * @author Shilad Sen
+  */
+object SessionPagesBuilder {
+
+
+  import org.apache.spark.sql.hive.HiveContext
+  import org.apache.spark.SparkConf
+  import org.apache.spark.sql.SaveMode
+  import org.apache.spark.SparkContext
+  import scopt.OptionParser
+  import org.apache.spark.rdd.RDD
+  import org.apache.spark.sql.SQLContext
+
+
+  case class SessionKey (wikiDb: String, userHash: Long, tstamp: Long)
+extends Ordered[SessionKey] {
+override def compare(that: SessionKey): Int = {
+  import scala.math.Ordered.orderingToOrdered
+
+  Ordering.Tuple3(Ordering.String, Ordering.Long, Ordering.Long).compare(
+(wikiDb, userHash, tstamp),
+(that.wikiDb, that.userHash, that.tstamp)
+  )
+}
+  }
+
+
+  class SessionPartitioner(partitions: Int) extends Partitioner {
+require(partitions >= 0, s"Number of partitions ($partitions) cannot be 
negative.")
+
+override def numPartitions: Int = partitions
+
+override def getPartition(key: Any): Int = {
+  val k = key.asInstanceOf[SessionKey]
+  Math.abs(k.wikiDb.hashCode() + k.userHash.asInstanceOf[Int]) % 
numPartitions
+}
+  }
+
+  object SessionKey {
+implicit def orderingByTimestamp[A <: SessionKey] : Ordering[A] = {
+  Ordering.by(fk => (fk.wikiDb, fk.userHash, fk.tstamp))
+}
+  }
+
+
+
+  case class PageInfo(
+   wikiDb: String,
+   pageId: Long,
+   pageTitle: String,
+   pageNamespace: Long,
+   pageIsRedirect: Boolean,
+   effectivePageId : Long// page id or redirected 
destination page id
+ )
+
+  case class Redirect(
+   wikiDb: String,
+   fromPageId: Long,
+   toPageId: Long
+ )
+
+  case class PageView(
+   wikiDb: String,
+   userHash: Long,
+   tstamp: Long,
+   pageNamespace: Long,
+   pageId: Long
+ )
+
+  def sameSession(v1: PageView, v2: PageView, timeoutMillis: Long) : Boolean = 
{
+(v1.wikiDb == v2.wikiDb) &&
+  (v1.userHash == v2.userHash) &&
+  (Math.abs(v1.tstamp - v2.tstamp) <= timeoutMillis)
+  }
+
+
+  /**
+* Given components associated with a distinct user , return a long hash
+* @param client_ip
+* @param user_agent
+* @param x_forwarded_for
+* @return
+*/
+  def userHash(
+   client_ip: String,
+   user_agent: String,
+   x_forwarded_for: String
+ ) : Long = {
+var s = client_ip + ":" + user_agent + ":" +  x_forwarded_for
+(MurmurHash3.stringHash(s).asInstanceOf[Long] << 32) |
+  (MurmurHash3.stringHash(s.reverse).asInstanceOf[Long] & 0xFFFL)
+  }
+
+  /**
+* Steps:
+*  - prepare raw tables:
+*- page: Keep only wiki_db, page_id, page_namespace, page_is_redirect,
+*

[MediaWiki-commits] [Gerrit] operations/puppet[production]: decommission: Set db1048 with a spare role

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: decommission: Set db1048 with a spare role
..


decommission: Set db1048 with a spare role

It is no longer serving traffic.

Bug: T175679
Change-Id: I78c46028d0d070b6dd6e7ed398694d34fee00a2a
---
M manifests/site.pp
M modules/role/files/prometheus/mysql-misc_eqiad.yaml
2 files changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 31330f6..854a481 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -596,11 +596,9 @@
 }
 
 node 'db1048.eqiad.wmnet' {
-class { '::role::mariadb::misc::phabricator':
-shard => 'm3',
-}
-include ::base::firewall
+role(spare::system)
 }
+
 node 'db1059.eqiad.wmnet' {
 class { '::role::mariadb::misc::phabricator':
 shard => 'm3',
diff --git a/modules/role/files/prometheus/mysql-misc_eqiad.yaml 
b/modules/role/files/prometheus/mysql-misc_eqiad.yaml
index 9ea7d6e..178fa39 100644
--- a/modules/role/files/prometheus/mysql-misc_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-misc_eqiad.yaml
@@ -26,7 +26,6 @@
 shard: m3
 role: slave
   targets:
-  - db1048:9104
   - db1059:9104
 
 - labels:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: decommission: Set db1048 with a spare role

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: decommission: Set db1048 with a spare role
..

decommission: Set db1048 with a spare role

It is no longer serving traffic.

Bug: T175679
Change-Id: I78c46028d0d070b6dd6e7ed398694d34fee00a2a
---
M manifests/site.pp
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/377705/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 31330f6..854a481 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -596,11 +596,9 @@
 }
 
 node 'db1048.eqiad.wmnet' {
-class { '::role::mariadb::misc::phabricator':
-shard => 'm3',
-}
-include ::base::firewall
+role(spare::system)
 }
+
 node 'db1059.eqiad.wmnet' {
 class { '::role::mariadb::misc::phabricator':
 shard => 'm3',

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator-mariadb: Add missing include

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: phabricator-mariadb: Add missing include
..


phabricator-mariadb: Add missing include

Followup to 32b27b13838835b2d7d2cb9d97a655c77bdd2a0f

Change-Id: Id58104f9580d4e470ea6f348ac9909ae40c6063a
---
M modules/role/manifests/mariadb.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/mariadb.pp 
b/modules/role/manifests/mariadb.pp
index db6441b..d407549 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -32,6 +32,7 @@
 include passwords::servermon
 include passwords::striker
 include passwords::labsdbaccounts
+include passwords::mysql::phabricator
 
 $root_pass   = $passwords::misc::scripts::mysql_root_pass
 $repl_pass   = $passwords::misc::scripts::mysql_repl_pass

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator-mariadb: Add missing include

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: phabricator-mariadb: Add missing include
..

phabricator-mariadb: Add missing include

Followup to 32b27b13838835b2d7d2cb9d97a655c77bdd2a0f

Change-Id: Id58104f9580d4e470ea6f348ac9909ae40c6063a
---
M modules/role/manifests/mariadb.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/377704/1

diff --git a/modules/role/manifests/mariadb.pp 
b/modules/role/manifests/mariadb.pp
index db6441b..d407549 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -32,6 +32,7 @@
 include passwords::servermon
 include passwords::striker
 include passwords::labsdbaccounts
+include passwords::mysql::phabricator
 
 $root_pass   = $passwords::misc::scripts::mysql_root_pass
 $repl_pass   = $passwords::misc::scripts::mysql_repl_pass

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb - phabricator: Remove public hashes from configurati...

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: mariadb - phabricator: Remove public hashes from configuration 
files
..


mariadb - phabricator: Remove public hashes from configuration files

These are handled on the private repo, not here anymore.

Bug: T163938
Change-Id: Iaac4706f63f6e46e23c4b00cb7449b87052bbaf9
---
M modules/role/manifests/mariadb.pp
M modules/role/templates/mariadb/grants/production-m3.sql.erb
2 files changed, 20 insertions(+), 14 deletions(-)

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



diff --git a/modules/role/manifests/mariadb.pp 
b/modules/role/manifests/mariadb.pp
index 4b86840..db6441b 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -67,6 +67,12 @@
 $labspuppet_pass = hiera('labspuppetbackend_mysql_password')
 $labsdbaccounts_pass = $passwords::labsdbaccounts::db_password
 $rddmarc_pass= $passwords::rddmarc::db_password
+$phab_admin_pass = $passwords::mysql::phabricator::admin_pass
+$phab_app_pass   = $passwords::mysql::phabricator::app_pass
+$phab_bz_pass= $passwords::mysql::phabricator::bz_pass
+$phab_rt_pass= $passwords::mysql::phabricator::rt_pass
+$phab_manifest_pass  = $passwords::mysql::phabricator::manifest_pass
+$phab_metrics_pass   = $passwords::mysql::phabricator::metrics_pass
 
 file { '/etc/mysql/production-grants-shard.sql':
 ensure  => present,
diff --git a/modules/role/templates/mariadb/grants/production-m3.sql.erb 
b/modules/role/templates/mariadb/grants/production-m3.sql.erb
index 68472bb..b0eba95 100644
--- a/modules/role/templates/mariadb/grants/production-m3.sql.erb
+++ b/modules/role/templates/mariadb/grants/production-m3.sql.erb
@@ -13,7 +13,7 @@
 
 GRANT USAGE
 ON *.* TO 'phadmin'@'10.64.16.8'
-IDENTIFIED BY PASSWORD '*4882BF5FB61F6C0D5935BFA407BB6B6086421A5F';
+IDENTIFIED BY '<%= @phab_admin_pass %>';
 
 GRANT ALL PRIVILEGES
 ON `phabricator%`.* TO 'phadmin'@'10.64.16.8';
@@ -21,7 +21,7 @@
 -- phadmin@dbproxy1003
 GRANT USAGE
 ON *.* TO 'phadmin'@'10.64.0.198'
-IDENTIFIED BY PASSWORD '*4882BF5FB61F6C0D5935BFA407BB6B6086421A5F';
+IDENTIFIED BY '<%= @phab_admin_pass %>';
 
 GRANT ALL PRIVILEGES
 ON `phabricator%`.* TO 'phadmin'@'10.64.0.198';
@@ -29,7 +29,7 @@
 -- phadmin@dbproxy1008
 GRANT USAGE
 ON *.* TO 'phadmin'@'10.64.32.157'
-IDENTIFIED BY PASSWORD '*4882BF5FB61F6C0D5935BFA407BB6B6086421A5F';
+IDENTIFIED BY '<%= @phab_admin_pass %>';
 
 GRANT ALL PRIVILEGES
 ON `phabricator%`.* TO 'phadmin'@'10.64.32.157';
@@ -38,7 +38,7 @@
 
 GRANT REPLICATION CLIENT
 ON *.* TO 'phuser'@'10.64.16.8'
-IDENTIFIED BY PASSWORD '*986DF0EF210E895FAAA2D71A8AF0F4EEA4D93E2A';
+IDENTIFIED BY '<%= @phab_app_pass %>';
 
 GRANT CREATE, DROP
 ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.16.8';
@@ -50,7 +50,7 @@
 
 GRANT REPLICATION CLIENT
 ON *.* TO 'phuser'@'10.64.0.198'
-IDENTIFIED BY PASSWORD '*986DF0EF210E895FAAA2D71A8AF0F4EEA4D93E2A';
+IDENTIFIED BY '<%= @phab_app_pass %>';
 
 GRANT CREATE, DROP
 ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.16.8';
@@ -62,7 +62,7 @@
 
 GRANT REPLICATION CLIENT
 ON *.* TO 'phuser'@'10.64.32.157'
-IDENTIFIED BY PASSWORD '*986DF0EF210E895FAAA2D71A8AF0F4EEA4D93E2A';
+IDENTIFIED BY '<%= @phab_app_pass %>';
 
 GRANT CREATE, DROP
 ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.32.157';
@@ -74,7 +74,7 @@
 
 GRANT USAGE
 ON *.* TO 'phstats'@'10.64.16.8'
-IDENTIFIED BY PASSWORD '*FB8AA9D0E19A01A13E7FB1037FC964F7887D22F5';
+IDENTIFIED BY '<%= @phab_metrics_pass %>';
 GRANT SELECT ON `phabricator_maniphest`.* TO 'phstats'@'10.64.16.8';
 GRANT SELECT ON `phabricator_user`.* TO 'phstats'@'10.64.16.8';
 GRANT SELECT ON `phabricator_project`.* TO 'phstats'@'10.64.16.8';
@@ -84,7 +84,7 @@
 
 GRANT USAGE
 ON *.* TO 'phstats'@'10.64.0.198'
-IDENTIFIED BY PASSWORD '*FB8AA9D0E19A01A13E7FB1037FC964F7887D22F5';
+IDENTIFIED BY '<%= @phab_metrics_pass %>';
 GRANT SELECT ON `phabricator_maniphest`.* TO 'phstats'@'10.64.0.198';
 GRANT SELECT ON `phabricator_user`.* TO 'phstats'@'10.64.0.198';
 GRANT SELECT ON `phabricator_project`.* TO 'phstats'@'10.64.0.198';
@@ -94,7 +94,7 @@
 
 GRANT USAGE
 ON *.* TO 'phstats'@'10.64.32.157'
-IDENTIFIED BY PASSWORD '*FB8AA9D0E19A01A13E7FB1037FC964F7887D22F5';
+IDENTIFIED BY '<%= @phab_metrics_pass %>';
 GRANT SELECT ON `phabricator_maniphest`.* TO 'phstats'@'10.64.32.157';
 GRANT SELECT ON `phabricator_user`.* TO 'phstats'@'10.64.32.157';
 GRANT SELECT ON `phabricator_project`.* TO 'phstats'@'10.64.32.157';
@@ -104,7 +104,7 @@
 
 GRANT USAGE
 ON *.* TO 'phmanifest'@'10.64.16.8'
-IDENTIFIED BY PASSWORD

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb - phabricator: Remove public hashes from configurati...

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: mariadb - phabricator: Remove public hashes from configuration 
files
..

mariadb - phabricator: Remove public hashes from configuration files

These are handled on the private repo, not here anymore.

Bug: T163938
Change-Id: Iaac4706f63f6e46e23c4b00cb7449b87052bbaf9
---
M modules/role/manifests/mariadb.pp
M modules/role/templates/mariadb/grants/production-m3.sql.erb
2 files changed, 20 insertions(+), 14 deletions(-)


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

diff --git a/modules/role/manifests/mariadb.pp 
b/modules/role/manifests/mariadb.pp
index 4b86840..db6441b 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -67,6 +67,12 @@
 $labspuppet_pass = hiera('labspuppetbackend_mysql_password')
 $labsdbaccounts_pass = $passwords::labsdbaccounts::db_password
 $rddmarc_pass= $passwords::rddmarc::db_password
+$phab_admin_pass = $passwords::mysql::phabricator::admin_pass
+$phab_app_pass   = $passwords::mysql::phabricator::app_pass
+$phab_bz_pass= $passwords::mysql::phabricator::bz_pass
+$phab_rt_pass= $passwords::mysql::phabricator::rt_pass
+$phab_manifest_pass  = $passwords::mysql::phabricator::manifest_pass
+$phab_metrics_pass   = $passwords::mysql::phabricator::metrics_pass
 
 file { '/etc/mysql/production-grants-shard.sql':
 ensure  => present,
diff --git a/modules/role/templates/mariadb/grants/production-m3.sql.erb 
b/modules/role/templates/mariadb/grants/production-m3.sql.erb
index 68472bb..b0eba95 100644
--- a/modules/role/templates/mariadb/grants/production-m3.sql.erb
+++ b/modules/role/templates/mariadb/grants/production-m3.sql.erb
@@ -13,7 +13,7 @@
 
 GRANT USAGE
 ON *.* TO 'phadmin'@'10.64.16.8'
-IDENTIFIED BY PASSWORD '*4882BF5FB61F6C0D5935BFA407BB6B6086421A5F';
+IDENTIFIED BY '<%= @phab_admin_pass %>';
 
 GRANT ALL PRIVILEGES
 ON `phabricator%`.* TO 'phadmin'@'10.64.16.8';
@@ -21,7 +21,7 @@
 -- phadmin@dbproxy1003
 GRANT USAGE
 ON *.* TO 'phadmin'@'10.64.0.198'
-IDENTIFIED BY PASSWORD '*4882BF5FB61F6C0D5935BFA407BB6B6086421A5F';
+IDENTIFIED BY '<%= @phab_admin_pass %>';
 
 GRANT ALL PRIVILEGES
 ON `phabricator%`.* TO 'phadmin'@'10.64.0.198';
@@ -29,7 +29,7 @@
 -- phadmin@dbproxy1008
 GRANT USAGE
 ON *.* TO 'phadmin'@'10.64.32.157'
-IDENTIFIED BY PASSWORD '*4882BF5FB61F6C0D5935BFA407BB6B6086421A5F';
+IDENTIFIED BY '<%= @phab_admin_pass %>';
 
 GRANT ALL PRIVILEGES
 ON `phabricator%`.* TO 'phadmin'@'10.64.32.157';
@@ -38,7 +38,7 @@
 
 GRANT REPLICATION CLIENT
 ON *.* TO 'phuser'@'10.64.16.8'
-IDENTIFIED BY PASSWORD '*986DF0EF210E895FAAA2D71A8AF0F4EEA4D93E2A';
+IDENTIFIED BY '<%= @phab_app_pass %>';
 
 GRANT CREATE, DROP
 ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.16.8';
@@ -50,7 +50,7 @@
 
 GRANT REPLICATION CLIENT
 ON *.* TO 'phuser'@'10.64.0.198'
-IDENTIFIED BY PASSWORD '*986DF0EF210E895FAAA2D71A8AF0F4EEA4D93E2A';
+IDENTIFIED BY '<%= @phab_app_pass %>';
 
 GRANT CREATE, DROP
 ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.16.8';
@@ -62,7 +62,7 @@
 
 GRANT REPLICATION CLIENT
 ON *.* TO 'phuser'@'10.64.32.157'
-IDENTIFIED BY PASSWORD '*986DF0EF210E895FAAA2D71A8AF0F4EEA4D93E2A';
+IDENTIFIED BY '<%= @phab_app_pass %>';
 
 GRANT CREATE, DROP
 ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.32.157';
@@ -74,7 +74,7 @@
 
 GRANT USAGE
 ON *.* TO 'phstats'@'10.64.16.8'
-IDENTIFIED BY PASSWORD '*FB8AA9D0E19A01A13E7FB1037FC964F7887D22F5';
+IDENTIFIED BY '<%= @phab_metrics_pass %>';
 GRANT SELECT ON `phabricator_maniphest`.* TO 'phstats'@'10.64.16.8';
 GRANT SELECT ON `phabricator_user`.* TO 'phstats'@'10.64.16.8';
 GRANT SELECT ON `phabricator_project`.* TO 'phstats'@'10.64.16.8';
@@ -84,7 +84,7 @@
 
 GRANT USAGE
 ON *.* TO 'phstats'@'10.64.0.198'
-IDENTIFIED BY PASSWORD '*FB8AA9D0E19A01A13E7FB1037FC964F7887D22F5';
+IDENTIFIED BY '<%= @phab_metrics_pass %>';
 GRANT SELECT ON `phabricator_maniphest`.* TO 'phstats'@'10.64.0.198';
 GRANT SELECT ON `phabricator_user`.* TO 'phstats'@'10.64.0.198';
 GRANT SELECT ON `phabricator_project`.* TO 'phstats'@'10.64.0.198';
@@ -94,7 +94,7 @@
 
 GRANT USAGE
 ON *.* TO 'phstats'@'10.64.32.157'
-IDENTIFIED BY PASSWORD '*FB8AA9D0E19A01A13E7FB1037FC964F7887D22F5';
+IDENTIFIED BY '<%= @phab_metrics_pass %>';
 GRANT SELECT ON `phabricator_maniphest`.* TO 'phstats'@'10.64.32.157';
 GRANT SELECT ON `phabricator_user`.* TO 'phstats'@'10.64.32.157';
 GRANT SELECT ON `phabricator_project`.* TO 'phstats'@'10.64.32.157';
@@ -104,7 +104,7 @@
 
 GRANT USAGE
 ON *.* TO 'phmanifest'@'10.64.16.8'
-IDENTIFIED BY PASSWORD

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: ApiReview: Don't use $wgUser

2017-09-12 Thread Legoktm (Code Review)

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

Change subject: ApiReview: Don't use $wgUser
..

ApiReview: Don't use $wgUser

All of the other deprecated stuff should get removed too, but this is a
start...

Change-Id: I4769a33783a473dfc0a702d6a5aa09ceabc1
---
M api/actions/ApiReview.php
1 file changed, 5 insertions(+), 6 deletions(-)


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

diff --git a/api/actions/ApiReview.php b/api/actions/ApiReview.php
index 8a80692..4e224de 100644
--- a/api/actions/ApiReview.php
+++ b/api/actions/ApiReview.php
@@ -33,21 +33,20 @@
 * except that it generates the template and image parameters itself.
 */
public function execute() {
-   global $wgUser;
$params = $this->extractRequestParams();
// Check basic permissions
if ( is_callable( [ $this, 'checkUserRightsAny' ] ) ) {
$this->checkUserRightsAny( 'review' );
} else {
-   if ( !$wgUser->isAllowed( 'review' ) ) {
+   if ( !$this->getUser()->isAllowed( 'review' ) ) {
$this->dieUsage( "You don't have the right to 
review revisions.",
'permissiondenied' );
}
}
 
-   if ( $wgUser->isBlocked( false ) ) {
+   if ( $this->getUser()->isBlocked( false ) ) {
if ( is_callable( [ $this, 'dieBlocked' ] ) ) {
-   $this->dieBlocked( $wgUser->getBlock() );
+   $this->dieBlocked( $this->getUser()->getBlock() 
);
} else {
$this->dieUsageMsg( [ 'blockedtext' ] );
}
@@ -66,7 +65,7 @@
$title = $rev->getTitle();
 
// Construct submit form...
-   $form = new RevisionReviewForm( $wgUser );
+   $form = new RevisionReviewForm( $this->getUser() );
$form->setPage( $title );
$form->setOldId( $revid );
$form->setApprove( empty( $params['unapprove'] ) );
@@ -94,7 +93,7 @@
}
// Now get the template and image parameters needed
list( $templateIds, $fileTimeKeys ) =
-   FRInclusionCache::getRevIncludes( $article, 
$rev, $wgUser );
+   FRInclusionCache::getRevIncludes( $article, 
$rev, $this->getUser() );
// Get version parameters for review submission (flat 
strings)
list( $templateParams, $imageParams, $fileParam ) =
RevisionReviewForm::getIncludeParams( 
$templateIds, $fileTimeKeys, $fileVer );

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: misc dbs: Repoint m3-slave to the new replica server db1059

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: misc dbs: Repoint m3-slave to the new replica server db1059
..


misc dbs: Repoint m3-slave to the new replica server db1059

Bug: T175679
Change-Id: I5bcf1d33ed3ab2f1b695196e6df91329f29a8fe7
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index 23232c5..1007565 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -46,7 +46,7 @@
 m2-master   5M  IN CNAMEdbproxy1002.eqiad.wmnet.
 m2-slave5M  IN CNAMEdb2011.codfw.wmnet.
 m3-master   5M  IN CNAMEdbproxy1003.eqiad.wmnet.
-m3-slave5M  IN CNAMEdbproxy1003.eqiad.wmnet.
+m3-slave5M  IN CNAMEdb1059.eqiad.wmnet.
 m4-master   5M  IN CNAMEdbproxy1004.eqiad.wmnet.
 m5-master   5M  IN CNAMEdb1009.eqiad.wmnet.
 m5-slave5M  IN CNAMEdb2030.codfw.wmnet.

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb/phabricator: update GRANTS from iridium to phab1001

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: mariadb/phabricator: update GRANTS from iridium to phab1001
..


mariadb/phabricator: update GRANTS from iridium to phab1001

The goal here is to replace iridium.eqiad.wmnet with
phab1001.eqiad.wmnet as the Phabricator server.

So it was just replace the IP where i find it.

10.64.32.150 = iridium.eqiad.wmnet
10.64.16.8   = phab1001.eqiad.wmnet

This hashes have to go away, they will be removed on a separate
ticket to match actual production passwords.

Bug: T163938
Change-Id: I821146a5d01382b934b928da251e3529b064666a
---
M modules/role/templates/mariadb/grants/production-m3.sql.erb
1 file changed, 18 insertions(+), 17 deletions(-)

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



diff --git a/modules/role/templates/mariadb/grants/production-m3.sql.erb 
b/modules/role/templates/mariadb/grants/production-m3.sql.erb
index 1b02471..68472bb 100644
--- a/modules/role/templates/mariadb/grants/production-m3.sql.erb
+++ b/modules/role/templates/mariadb/grants/production-m3.sql.erb
@@ -1,3 +1,4 @@
+-- start updating grants
 -- haproxy@dbproxy1003
 
 GRANT USAGE
@@ -8,14 +9,14 @@
 GRANT USAGE
 ON *.* TO 'haproxy'@'10.64.32.157';
 
--- phadmin@iridium
+-- phadmin@phab1001
 
 GRANT USAGE
-ON *.* TO 'phadmin'@'10.64.32.150'
+ON *.* TO 'phadmin'@'10.64.16.8'
 IDENTIFIED BY PASSWORD '*4882BF5FB61F6C0D5935BFA407BB6B6086421A5F';
 
 GRANT ALL PRIVILEGES
-ON `phabricator%`.* TO 'phadmin'@'10.64.32.150';
+ON `phabricator%`.* TO 'phadmin'@'10.64.16.8';
 
 -- phadmin@dbproxy1003
 GRANT USAGE
@@ -33,17 +34,17 @@
 GRANT ALL PRIVILEGES
 ON `phabricator%`.* TO 'phadmin'@'10.64.32.157';
 
--- phuser@iridium
+-- phuser@phab1001
 
 GRANT REPLICATION CLIENT
-ON *.* TO 'phuser'@'10.64.32.150'
+ON *.* TO 'phuser'@'10.64.16.8'
 IDENTIFIED BY PASSWORD '*986DF0EF210E895FAAA2D71A8AF0F4EEA4D93E2A';
 
 GRANT CREATE, DROP
-ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.32.150';
+ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.16.8';
 
 GRANT DELETE, EXECUTE, INSERT, SELECT, SHOW VIEW, UPDATE
-ON `phabricator%`.* TO 'phuser'@'10.64.32.150';
+ON `phabricator%`.* TO 'phuser'@'10.64.16.8';
 
 -- phuser@dbproxy1003
 
@@ -52,7 +53,7 @@
 IDENTIFIED BY PASSWORD '*986DF0EF210E895FAAA2D71A8AF0F4EEA4D93E2A';
 
 GRANT CREATE, DROP
-ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.0.198';
+ON `phabricator_cache`.`cache_markupcache` TO 'phuser'@'10.64.16.8';
 
 GRANT DELETE, EXECUTE, INSERT, SELECT, SHOW VIEW, UPDATE
 ON `phabricator%`.* TO 'phuser'@'10.64.0.198';
@@ -69,15 +70,15 @@
 GRANT DELETE, EXECUTE, INSERT, SELECT, SHOW VIEW, UPDATE
 ON `phabricator%`.* TO 'phuser'@'10.64.32.157';
 
--- phstats@iridium
+-- phstats@phab1001
 
 GRANT USAGE
-ON *.* TO 'phstats'@'10.64.32.150'
+ON *.* TO 'phstats'@'10.64.16.8'
 IDENTIFIED BY PASSWORD '*FB8AA9D0E19A01A13E7FB1037FC964F7887D22F5';
-GRANT SELECT ON `phabricator_maniphest`.* TO 'phstats'@'10.64.32.150';
-GRANT SELECT ON `phabricator_user`.* TO 'phstats'@'10.64.32.150';
-GRANT SELECT ON `phabricator_project`.* TO 'phstats'@'10.64.32.150';
-GRANT SELECT ON `phabricator_differential`.* TO 'phstats'@'10.64.32.150';
+GRANT SELECT ON `phabricator_maniphest`.* TO 'phstats'@'10.64.16.8';
+GRANT SELECT ON `phabricator_user`.* TO 'phstats'@'10.64.16.8';
+GRANT SELECT ON `phabricator_project`.* TO 'phstats'@'10.64.16.8';
+GRANT SELECT ON `phabricator_differential`.* TO 'phstats'@'10.64.16.8';
 
 -- phstats@dbproxy1003
 
@@ -99,14 +100,14 @@
 GRANT SELECT ON `phabricator_project`.* TO 'phstats'@'10.64.32.157';
 GRANT SELECT ON `phabricator_differential`.* TO 'phstats'@'10.64.32.157';
 
--- phmanifest@iridium
+-- phmanifest@phab1001
 
 GRANT USAGE
-ON *.* TO 'phmanifest'@'10.64.32.150'
+ON *.* TO 'phmanifest'@'10.64.16.8'
 IDENTIFIED BY PASSWORD '*57879C423C685FDF9F3F4E3DB71207E76A8384C4';
 
 GRANT SELECT
-ON `phabricator_maniphest`.* TO 'phmanifest'@'10.64.32.150';
+ON `phabricator_maniphest`.* TO 'phmanifest'@'10.64.16.8';
 
 -- phmanifest@dbproxy1003
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I821146a5d01382b934b928da251e3529b064666a
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: HakanIST 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] operations/dns[master]: misc dbs: Repoint m3-slave to the new replica server db1059

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: misc dbs: Repoint m3-slave to the new replica server db1059
..

misc dbs: Repoint m3-slave to the new replica server db1059

Bug: T175679
Change-Id: I5bcf1d33ed3ab2f1b695196e6df91329f29a8fe7
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/01/377701/1

diff --git a/templates/wmnet b/templates/wmnet
index 23232c5..1007565 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -46,7 +46,7 @@
 m2-master   5M  IN CNAMEdbproxy1002.eqiad.wmnet.
 m2-slave5M  IN CNAMEdb2011.codfw.wmnet.
 m3-master   5M  IN CNAMEdbproxy1003.eqiad.wmnet.
-m3-slave5M  IN CNAMEdbproxy1003.eqiad.wmnet.
+m3-slave5M  IN CNAMEdb1059.eqiad.wmnet.
 m4-master   5M  IN CNAMEdbproxy1004.eqiad.wmnet.
 m5-master   5M  IN CNAMEdb1009.eqiad.wmnet.
 m5-slave5M  IN CNAMEdb2030.codfw.wmnet.

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 to wmf.18

2017-09-12 Thread Chad (Code Review)

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

Change subject: group1 to wmf.18
..

group1 to wmf.18

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


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

diff --git a/php b/php
index 7de0bf8..010c482 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.17
\ No newline at end of file
+php-1.30.0-wmf.18
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index c33a5f5..b41916c 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.17",
-"aawikibooks": "php-1.30.0-wmf.17",
-"aawiktionary": "php-1.30.0-wmf.17",
+"aawikibooks": "php-1.30.0-wmf.18",
+"aawiktionary": "php-1.30.0-wmf.18",
 "abwiki": "php-1.30.0-wmf.17",
-"abwiktionary": "php-1.30.0-wmf.17",
+"abwiktionary": "php-1.30.0-wmf.18",
 "acewiki": "php-1.30.0-wmf.17",
-"advisorywiki": "php-1.30.0-wmf.17",
+"advisorywiki": "php-1.30.0-wmf.18",
 "adywiki": "php-1.30.0-wmf.17",
 "afwiki": "php-1.30.0-wmf.17",
-"afwikibooks": "php-1.30.0-wmf.17",
-"afwikiquote": "php-1.30.0-wmf.17",
-"afwiktionary": "php-1.30.0-wmf.17",
+"afwikibooks": "php-1.30.0-wmf.18",
+"afwikiquote": "php-1.30.0-wmf.18",
+"afwiktionary": "php-1.30.0-wmf.18",
 "akwiki": "php-1.30.0-wmf.17",
-"akwikibooks": "php-1.30.0-wmf.17",
-"akwiktionary": "php-1.30.0-wmf.17",
+"akwikibooks": "php-1.30.0-wmf.18",
+"akwiktionary": "php-1.30.0-wmf.18",
 "alswiki": "php-1.30.0-wmf.17",
-"alswikibooks": "php-1.30.0-wmf.17",
-"alswikiquote": "php-1.30.0-wmf.17",
-"alswiktionary": "php-1.30.0-wmf.17",
+"alswikibooks": "php-1.30.0-wmf.18",
+"alswikiquote": "php-1.30.0-wmf.18",
+"alswiktionary": "php-1.30.0-wmf.18",
 "amwiki": "php-1.30.0-wmf.17",
-"amwikiquote": "php-1.30.0-wmf.17",
-"amwiktionary": "php-1.30.0-wmf.17",
+"amwikiquote": "php-1.30.0-wmf.18",
+"amwiktionary": "php-1.30.0-wmf.18",
 "angwiki": "php-1.30.0-wmf.17",
-"angwikibooks": "php-1.30.0-wmf.17",
-"angwikiquote": "php-1.30.0-wmf.17",
-"angwikisource": "php-1.30.0-wmf.17",
-"angwiktionary": "php-1.30.0-wmf.17",
+"angwikibooks": "php-1.30.0-wmf.18",
+"angwikiquote": "php-1.30.0-wmf.18",
+"angwikisource": "php-1.30.0-wmf.18",
+"angwiktionary": "php-1.30.0-wmf.18",
 "anwiki": "php-1.30.0-wmf.17",
-"anwiktionary": "php-1.30.0-wmf.17",
+"anwiktionary": "php-1.30.0-wmf.18",
 "arbcom_cswiki": "php-1.30.0-wmf.17",
 "arbcom_dewiki": "php-1.30.0-wmf.17",
 "arbcom_enwiki": "php-1.30.0-wmf.17",
@@ -35,880 +35,880 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.17",
 "arcwiki": "php-1.30.0-wmf.17",
 "arwiki": "php-1.30.0-wmf.17",
-"arwikibooks": "php-1.30.0-wmf.17",
-"arwikimedia": "php-1.30.0-wmf.17",
-"arwikinews": "php-1.30.0-wmf.17",
-"arwikiquote": "php-1.30.0-wmf.17",
-"arwikisource": "php-1.30.0-wmf.17",
-"arwikiversity": "php-1.30.0-wmf.17",
-"arwiktionary": "php-1.30.0-wmf.17",
+"arwikibooks": "php-1.30.0-wmf.18",
+"arwikimedia": "php-1.30.0-wmf.18",
+"arwikinews": "php-1.30.0-wmf.18",
+"arwikiquote": "php-1.30.0-wmf.18",
+"arwikisource": "php-1.30.0-wmf.18",
+"arwikiversity": "php-1.30.0-wmf.18",
+"arwiktionary": "php-1.30.0-wmf.18",
 "arzwiki": "php-1.30.0-wmf.17",
 "astwiki": "php-1.30.0-wmf.17",
-"astwikibooks": "php-1.30.0-wmf.17",
-"astwikiquote": "php-1.30.0-wmf.17",
-"astwiktionary": "php-1.30.0-wmf.17",
+"astwikibooks": "php-1.30.0-wmf.18",
+"astwikiquote": "php-1.30.0-wmf.18",
+"astwiktionary": "php-1.30.0-wmf.18",
 "aswiki": "php-1.30.0-wmf.17",
-"aswikibooks": "php-1.30.0-wmf.17",
-"aswikisource": "php-1.30.0-wmf.17",
-"aswiktionary": "php-1.30.0-wmf.17",
+"aswikibooks": "php-1.30.0-wmf.18",
+"aswikisource": "php-1.30.0-wmf.18",
+"aswiktionary": "php-1.30.0-wmf.18",
 "atjwiki": "php-1.30.0-wmf.17",
-"auditcomwiki": "php-1.30.0-wmf.17",
+"auditcomwiki": "php-1.30.0-wmf.18",
 "avwiki": "php-1.30.0-wmf.17",
-"avwiktionary": "php-1.30.0-wmf.17",
+"avwiktionary": "php-1.30.0-wmf.18",
 "aywiki": "php-1.30.0-wmf.17",
-"aywikibooks": "php-1.30.0-wmf.17",
-"aywiktionary": "php-1.30.0-wmf.17",
+"aywikibooks": "php-1.30.0-wmf.18",
+"aywiktionary": "php-1.30.0-wmf.18",
 "azbwiki": "php-1.30.0-wmf.17",
 "azwiki": "php-1.30.0-wmf.17",
-"azwikibooks": "php-1.30.0-wmf.17",
-"azwikiquote": "php-1.30.0-wmf.17",
-"azwikisource": "php-1.30.0-wmf.17",
-"azwiktionary": "php-1.30.0-wmf.17",
+"azwikibooks": "php-1.30.0-wmf.18",
+"azwikiquote": "php-1.30.0-wmf.18",
+"azwikisource": "php-1.30.0-wmf.18",

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

+ eb551b92f01ad73aa6d2cb611070ba7e3a6217b3 Update Omnimail plugin to allow 
setting offset
+ 2d36e706cfd611373fde26b191d83bef2c8ad776 Another attempt - Update Omnimail 
plugin to allow setting offset
+ ff49612f65668c5df4d470a4150ec3f3cd0d245a Update Omnimail to use offset

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9daf09bf23897d99f473b9df557641ea12c1fe28
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

+ eb551b92f01ad73aa6d2cb611070ba7e3a6217b3 Update Omnimail plugin to allow 
setting offset
+ 2d36e706cfd611373fde26b191d83bef2c8ad776 Another attempt - Update Omnimail 
plugin to allow setting offset
+ ff49612f65668c5df4d470a4150ec3f3cd0d245a Update Omnimail to use offset

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/99/377699/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9daf09bf23897d99f473b9df557641ea12c1fe28
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update vendor submodule, latest Omnimail

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Update vendor submodule, latest Omnimail
..


Update vendor submodule, latest Omnimail

Change-Id: Ie982fa553e240f3c6a8591261df86cfd4635565e
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/vendor b/vendor
index 64c114f..be2dd22 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 64c114fea74d934cd29b3d9e37409576161409c7
+Subproject commit be2dd22d4cfc5cfa04af1b6766775bf960cdc32a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie982fa553e240f3c6a8591261df86cfd4635565e
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update vendor submodule, latest Omnimail

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Update vendor submodule, latest Omnimail
..

Update vendor submodule, latest Omnimail

Change-Id: Ie982fa553e240f3c6a8591261df86cfd4635565e
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/98/377698/1

diff --git a/vendor b/vendor
index 64c114f..be2dd22 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 64c114fea74d934cd29b3d9e37409576161409c7
+Subproject commit be2dd22d4cfc5cfa04af1b6766775bf960cdc32a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie982fa553e240f3c6a8591261df86cfd4635565e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: add an exim sender blocklist

2017-09-12 Thread BryanDavis (Code Review)

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

Change subject: tools: add an exim sender blocklist
..

tools: add an exim sender blocklist

Add an /etc/exim4/deny_senders.list file that can be used to selectively
deny sending outbound mail based on the envelope sender's address.

Change-Id: Ifc3c017ec84ff9645bc265f8ecd420c260aa44a8
---
M modules/toollabs/manifests/mailrelay.pp
M modules/toollabs/templates/mail-relay.exim4.conf.erb
2 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/377697/1

diff --git a/modules/toollabs/manifests/mailrelay.pp 
b/modules/toollabs/manifests/mailrelay.pp
index 4fb54f6..8803c78 100644
--- a/modules/toollabs/manifests/mailrelay.pp
+++ b/modules/toollabs/manifests/mailrelay.pp
@@ -25,6 +25,17 @@
 '/usr/local/sbin/maintainers'],
 }
 
+# Outbound sender blocklist
+file { '/etc/exim4/deny_senders.list':
+ensure  => present,
+owner   => 'root',
+group   => 'Debian-exim',
+mode=> '0440',
+replace => false,
+require => Package['exim4-config'],
+notify  => Service['exim4'],
+}
+
 file { '/usr/local/sbin/localuser':
 ensure => file,
 owner  => 'root',
diff --git a/modules/toollabs/templates/mail-relay.exim4.conf.erb 
b/modules/toollabs/templates/mail-relay.exim4.conf.erb
index 2b6d93a..7422a1e 100644
--- a/modules/toollabs/templates/mail-relay.exim4.conf.erb
+++ b/modules/toollabs/templates/mail-relay.exim4.conf.erb
@@ -51,6 +51,7 @@
 
 acl_smtp_rcpt = acl_check_rcpt
 acl_smtp_data = acl_check_data
+acl_smtp_mail = acl_check_mail
 
 never_users = root
 
@@ -99,6 +100,10 @@
 acl_check_data:
   accept
 
+acl_check_mail:
+  deny senders = /etc/exim4/deny_senders.list
+  accept
+
 ###
 # Routers #
 ###

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

+ eb551b92f01ad73aa6d2cb611070ba7e3a6217b3 Update Omnimail plugin to allow 
setting offset
+ 2d36e706cfd611373fde26b191d83bef2c8ad776 Another attempt - Update Omnimail 
plugin to allow setting offset
+ ff49612f65668c5df4d470a4150ec3f3cd0d245a Update Omnimail to use offset

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/96/377696/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36b6dd8779e18bf5cad5a14abc253b697cf450cf
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update Omnimail to use offset

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Update Omnimail to use offset
..


Update Omnimail to use offset

Bug: T175665

Change-Id: Ieb84390d195a5340dd171af4bab0118da569b163
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
4 files changed, 138 insertions(+), 13 deletions(-)

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



diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
index e38e65f..3e8c48f 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
@@ -41,6 +41,13 @@
 }
 
 $request = Omnimail::create($params['mail_provider'], 
$mailerCredentials)->getGroupMembers($jobParameters);
+$offset = CRM_Utils_Array::value('offset', $jobSettings, 0);
+if (isset($params['options']['offset'])) {
+  $offset = $params['options']['offset'];
+}
+if ($offset) {
+  $request->setOffset((int) $offset);
+}
 
 $startTimestamp = self::getStartTimestamp($params, $jobSettings);
 $this->endTimeStamp = 
self::getEndTimestamp(CRM_Utils_Array::value('end_date', $params), $settings, 
$startTimestamp);
@@ -58,6 +65,7 @@
 $request->setGroupIdentifier($params['group_identifier']);
 
 $result = $request->getResponse();
+$this->setRetrievalParameters($result->getRetrievalParameters());
 for ($i = 0; $i < $settings['omnimail_job_retry_number']; $i++) {
   if ($result->isCompleted()) {
 $data = $result->getData();
@@ -69,7 +77,7 @@
 }
 
 throw new CRM_Omnimail_IncompleteDownloadException('Download incomplete', 
0, array(
-  'retrieval_parameters' => $result->getRetrievalParameters(),
+  'retrieval_parameters' => $this->getRetrievalParameters(),
   'mail_provider' => $params['mail_provider'],
   'end_date' => $this->endTimeStamp,
 ));
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
index b372980..04a548f 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
@@ -26,6 +26,26 @@
*/
   public $endTimeStamp;
 
+
+  /**
+   * @var array
+   */
+  protected $retrievalParameters;
+
+  /**
+   * @return array
+   */
+  public function getRetrievalParameters() {
+return $this->retrievalParameters;
+  }
+
+  /**
+   * @param array $retrievalParameters
+   */
+  public function setRetrievalParameters($retrievalParameters) {
+$this->retrievalParameters = $retrievalParameters;
+  }
+
   /**
* Get the timestamp to start from.
*
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
index 7744a1a..6ce2547 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
@@ -22,17 +22,18 @@
   $rowsLeftBeforeThrottle = $throttleCount;
 
   $job = new CRM_Omnimail_Omnigroupmembers();
+  $jobSettings = $job->getJobSettings($params);
   try {
 $contacts = $job->getResult($params);
   }
   catch (CRM_Omnimail_IncompleteDownloadException $e) {
-$jobSettings = $job->getJobSettings($params);
 civicrm_api3('Setting', 'create', array(
   'omnimail_omnigroupmembers_load' => array(
 $params['mail_provider'] => array(
   'last_timestamp' => $jobSettings['last_timestamp'],
   'retrieval_parameters' => $e->getRetrievalParameters(),
   'progress_end_date' => $e->getEndTimestamp(),
+  'offset' => 0,
 ),
   ),
 ));
@@ -42,7 +43,31 @@
   $defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
   $locationTypeID = $defaultLocationType->id;
 
+  if (isset($params['options']['offset'])) {
+$offset = $params['options']['offset'];
+  }
+  else {
+$offset = CRM_Utils_Array::value('offset', $jobSettings, 0);
+  }
+  $limit = (isset($params['options']['limit'])) ? $params['options']['limit'] 
: NULL;
+  $count = 0;
+
   foreach ($contacts as $contact) {
+if ($count === $limit) {
+

[MediaWiki-commits] [Gerrit] marvin[master]: WIP: Chore: add page summary models and unmarshallers

2017-09-12 Thread Niedzielski (Code Review)

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

Change subject: WIP: Chore: add page summary models and unmarshallers
..

WIP: Chore: add page summary models and unmarshallers

Bug: T173323
Change-Id: Ib9d03bb247f4e97c1933a4bcce03ff5f0eee29ce
---
A src/common/marshallers/page-restbase-mount-everest.test.json
A src/common/marshallers/page-unmarshaller.test.ts
A src/common/marshallers/page-unmarshaller.ts
A src/common/models/page.ts
M src/common/routers/router.ts
5 files changed, 190 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/95/377695/1

diff --git a/src/common/marshallers/page-restbase-mount-everest.test.json 
b/src/common/marshallers/page-restbase-mount-everest.test.json
new file mode 100644
index 000..95940a3
--- /dev/null
+++ b/src/common/marshallers/page-restbase-mount-everest.test.json
@@ -0,0 +1,26 @@
+{
+  "title": "Mount Everest",
+  "displaytitle": "Mount Everest",
+  "pageid": 42179,
+  "extract": "Mount Everest, known in Nepali as Sagarmāthā and in Tibetan as 
Chomolungma, is Earth's highest mountain, located in the Mahalangur Himal 
sub-range of the Himalayas. The international border between China (Tibet 
Autonomous Region) and Nepal runs across its summit point.\nThe current 
official height of 8,848 m (29,029 ft), recognised by China and Nepal, was 
established by a 1955 Indian survey and subsequently confirmed by a Chinese 
survey in 1975. In 2005, China remeasured the rock height of the mountain, with 
a result of 8844.43 m. There followed an argument between China and Nepal as to 
whether the official height should be the rock height (8,844 m., China) or the 
snow height (8,848 m., Nepal). In 2010, an agreement was reached by both sides 
that the height of Everest is 8,848 m, and Nepal recognises China's claim that 
the rock height of Everest is 8,844 m.\nIn 1865, Everest was given its official 
English name by the Royal Geographical Society, upon a recommendation by Andrew 
Waugh, the British Surveyor General of India.",
+  "extract_html": "Mount Everest, known in Nepali as 
Sagarmāthā and in Tibetan as Chomolungma, is Earth's highest 
mountain, located in the Mahalangur Himal sub-range of the Himalayas. The 
international border between China (Tibet Autonomous Region) and Nepal runs 
across its summit point.\nThe current official height of 8,848 m (29,029 
ft), recognised by China and Nepal, was established by a 1955 Indian survey and 
subsequently confirmed by a Chinese survey in 1975. In 2005, China remeasured 
the rock height of the mountain, with a result of 8844.43 m. There followed an 
argument between China and Nepal as to whether the official height should be 
the rock height (8,844 m., China) or the snow height (8,848 m., Nepal). In 
2010, an agreement was reached by both sides that the height of Everest is 
8,848 m, and Nepal recognises China's claim that the rock height of Everest is 
8,844 m.\nIn 1865, Everest was given its official English name by the 
Royal Geographical Society, upon a recommendation by Andrew Waugh, the British 
Surveyor General of India.",
+  "thumbnail": {
+"source": 
"https://upload.wikimedia.org/wikipedia/commons/thumb/c/c7/Mount-Everest.jpg/320px-Mount-Everest.jpg;,
+"width": 320,
+"height": 213,
+"original": 
"http://upload.wikimedia.org/wikipedia/commons/c/c7/Mount-Everest.jpg;
+  },
+  "originalimage": {
+"source": 
"https://upload.wikimedia.org/wikipedia/commons/c/c7/Mount-Everest.jpg;,
+"width": 2679,
+"height": 1781
+  },
+  "lang": "en",
+  "dir": "ltr",
+  "timestamp": "2017-09-11T16:00:59Z",
+  "description": "Earth's highest mountain, with a peak at 8,848 metres 
(29,029 feet) above sea level, part of the Himalaya mountain range between 
Nepal and China",
+  "coordinates": {
+"lat": 27.98805556,
+"lon": 86.92527778
+  }
+}
diff --git a/src/common/marshallers/page-unmarshaller.test.ts 
b/src/common/marshallers/page-unmarshaller.test.ts
new file mode 100644
index 000..9b2aac0
--- /dev/null
+++ b/src/common/marshallers/page-unmarshaller.test.ts
@@ -0,0 +1,43 @@
+import * as assert from "assert";
+import { PageSummary } from "../models/page";
+import { unmarshalPageSummary } from "./page-unmarshaller";
+
+describe("page-unmarshaller", () => {
+  it("unmarshalPageSummary() unmarshals", () => {
+const json = require("./page-restbase-mount-everest.test.json");
+const result = unmarshalPageSummary(json);
+const expected: PageSummary = {
+  titleText: "Mount Everest",
+  titleHTML: "Mount Everest",
+  pageID: 42179,
+  extractText:
+"Mount Everest, known in Nepali as Sagarmāthā and in Tibetan as 
Chomolungma, is Earth's highest mountain, located in the Mahalangur Himal 
sub-range of the Himalayas. The international border between China (Tibet 
Autonomous Region) and Nepal runs across its summit point.\nThe

[MediaWiki-commits] [Gerrit] marvin[master]: Fix: Prettier ESLint plugin parser

2017-09-12 Thread Niedzielski (Code Review)

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

Change subject: Fix: Prettier ESLint plugin parser
..

Fix: Prettier ESLint plugin parser

The Prettier ESLint plugin has been chomping down most TypeScript
without issue. However, certain keywords such as `namespace` and
certain typings have shown that it was misconfigured. Revert the parser
setting to the correct configuration in fc5d0dc and fix the offenders
that crept in.

Change-Id: Id0748005ff869d8d475c486565e690f8b3a2a050
---
M .eslintrc.json
M src/common/components/link.tsx
M src/common/components/with-context.ts
M src/common/pages/wiki.tsx
M src/common/routers/route.ts
M src/common/routers/router.ts
M src/server/assets/manifest.ts
M src/server/components/page.tsx
8 files changed, 31 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/94/377694/1

diff --git a/.eslintrc.json b/.eslintrc.json
index 55ca5e1..6d6b60b 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -7,7 +7,7 @@
 "prettier"
   ],
   "rules": {
-"prettier/prettier": "warn",
+"prettier/prettier": ["warn", { "parser": "typescript" }],
 "max-len": [
   "warn",
   {
diff --git a/src/common/components/link.tsx b/src/common/components/link.tsx
index 0b0a43a..60dc612 100644
--- a/src/common/components/link.tsx
+++ b/src/common/components/link.tsx
@@ -2,7 +2,7 @@
 import { History } from "history";
 
 export interface Props extends ComponentProps {
-  href: string
+  href: string;
 }
 
 /**
diff --git a/src/common/components/with-context.ts 
b/src/common/components/with-context.ts
index c0316c9..53e594c 100644
--- a/src/common/components/with-context.ts
+++ b/src/common/components/with-context.ts
@@ -2,8 +2,8 @@
 import { History } from "history";
 
 export interface Props {
-  history: History,
-  children?: JSX.Element[]
+  history: History;
+  children?: JSX.Element[];
 }
 
 export class WithContext extends Component {
diff --git a/src/common/pages/wiki.tsx b/src/common/pages/wiki.tsx
index 2035cc6..995f443 100644
--- a/src/common/pages/wiki.tsx
+++ b/src/common/pages/wiki.tsx
@@ -3,11 +3,11 @@
 import { RouteParameters } from "../routers/route";
 
 export interface Parameters extends RouteParameters {
-  title: string
+  title: string;
 }
 
 export interface Props extends ComponentProps {
-  title: string
+  title: string;
 }
 
 export const initialProps = ({ title }: Parameters): Promise => {
diff --git a/src/common/routers/route.ts b/src/common/routers/route.ts
index 8f5daf5..fd49c66 100644
--- a/src/common/routers/route.ts
+++ b/src/common/routers/route.ts
@@ -1,23 +1,23 @@
 import { AnyComponent } from "preact";
 
 export interface RouteParameters {
-  [name: string]: string
+  [name: string]: string;
 }
 
 export interface Endpoint {
   /** A Preact view component. */
-  Component: AnyComponent,
+  Component: AnyComponent;
 
   /**
* A function that returns a Promise for the dependencies needed to construct
* the view component such as a remote resource.
*/
-  initialProps?: (parameters: RouteParameters) => Promise
+  initialProps?: (parameters: RouteParameters) => Promise;
 }
 
 export interface Route {
-  path: string,
-  endpoint: () => Promise>,
-  chunkName: string,
-  status: number
+  path: string;
+  endpoint: () => Promise>;
+  chunkName: string;
+  status: number;
 }
diff --git a/src/common/routers/router.ts b/src/common/routers/router.ts
index 653e7c0..2f7c852 100644
--- a/src/common/routers/router.ts
+++ b/src/common/routers/router.ts
@@ -3,24 +3,24 @@
 import { AnyComponent } from "preact";
 
 export interface RouteResponse {
-  chunkName: string,
-  status: number,
-  Component: AnyComponent,
+  chunkName: string;
+  status: number;
+  Component: AnyComponent;
   props: {
-path: string,
-url: string,
-parameters: { [name: string]: string }
-  },
-  initialProps: any
+path: string;
+url: string;
+parameters: { [name: string]: string };
+  };
+  initialProps: any;
 }
 
 export interface Router {
-  route(url: string): Promise>
+  route(url: string): Promise>;
 }
 
 interface ParsedRoute extends Route {
-  parameterNames: pathToRegExp.Key[],
-  regularExpression: RegExp
+  parameterNames: pathToRegExp.Key[];
+  regularExpression: RegExp;
 }
 
 const parseRoutes = (routes: Route[]) =>
diff --git a/src/server/assets/manifest.ts b/src/server/assets/manifest.ts
index 63b1826..9ce6079 100644
--- a/src/server/assets/manifest.ts
+++ b/src/server/assets/manifest.ts
@@ -4,9 +4,9 @@
 export type Manifest = Assets | string;
 
 export interface AssetParameters {
-  manifest: Manifest,
-  entry: string,
-  extension: string
+  manifest: Manifest;
+

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Another attempt - Update Omnimail plugin to allow setting of...

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Another attempt - Update Omnimail plugin to allow setting offset
..


Another attempt - Update Omnimail plugin to allow setting offset

Bug T175665

Change-Id: I144d51459682650feeaae919bc0f97e531a9a391
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 2e7daf7..a2467ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1864,7 +1864,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "c3248b3932e62cd2812aa3502d875b7c12c25c66"
+"reference": "45eaa193c3353bcceb27bb2676da08598fd57686"
 },
 "require": {
 "league/csv": "^8.0",
@@ -1903,7 +1903,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-07-27 02:53:46"
+"time": "2017-09-12 23:04:53"
 },
 {
 "name": "wikimedia/smash-pig",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I144d51459682650feeaae919bc0f97e531a9a391
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptly: support https

2017-09-12 Thread Dzahn (Code Review)

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

Change subject: aptly: support https
..


aptly: support https

Change-Id: I92c73424634e21ece9e9779f70b256630d5c448b
---
M modules/aptly/manifests/client.pp
M modules/role/manifests/aptly/client.pp
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/modules/aptly/manifests/client.pp 
b/modules/aptly/manifests/client.pp
index 52cb61a..1e78a0a 100644
--- a/modules/aptly/manifests/client.pp
+++ b/modules/aptly/manifests/client.pp
@@ -2,9 +2,10 @@
 $servername,
 $source=false,
 $components='main',
+$protocol='http',
 ) {
 apt::repository { 'project-aptly':
-uri=> "http://${servername}/repo;,
+uri=> "${protocol}://${servername}/repo",
 dist   => "${::lsbdistcodename}-${::labsproject}",
 components => $components,
 source => $source,
diff --git a/modules/role/manifests/aptly/client.pp 
b/modules/role/manifests/aptly/client.pp
index 13b74dc..38899d5 100644
--- a/modules/role/manifests/aptly/client.pp
+++ b/modules/role/manifests/aptly/client.pp
@@ -4,9 +4,11 @@
 class role::aptly::client(
 $servername = 
"${::labsproject}-packages.${::labsproject}.${::site}.wmflabs",
 $components = 'main',
+$protocol = 'http',
 ) {
 class { '::aptly::client':
 servername => $servername,
 components => $components,
+protocol   => $protocol,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92c73424634e21ece9e9779f70b256630d5c448b
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator/mariadb: Update database configuration for stret...

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: phabricator/mariadb: Update database configuration for 
stretch/10.1
..

phabricator/mariadb: Update database configuration for stretch/10.1

Bug: T175679
Change-Id: I40a2d8b21e09825d7426183ce2d633fea6a4ce70
---
M modules/role/manifests/mariadb/misc/phabricator.pp
M modules/role/templates/mariadb/mysqld_config/phabricator.my.cnf.erb
2 files changed, 4 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/377693/1

diff --git a/modules/role/manifests/mariadb/misc/phabricator.pp 
b/modules/role/manifests/mariadb/misc/phabricator.pp
index 35ae252..0adc728 100644
--- a/modules/role/manifests/mariadb/misc/phabricator.pp
+++ b/modules/role/manifests/mariadb/misc/phabricator.pp
@@ -7,7 +7,6 @@
 $snapshot  = false,
 $ssl   = 'puppet-cert',
 $p_s   = 'on',
-$mariadb10 = true,
 ) {
 
 system::role { 'mariadb::misc':
@@ -25,13 +24,13 @@
 
 include role::mariadb::monitor
 include passwords::misc::scripts
+include ::base::firewall
 include role::mariadb::ferm
 
 class { 'role::mariadb::groups':
 mysql_group => 'misc',
 mysql_shard => $shard,
 mysql_role  => $mysql_role,
-socket  => '/tmp/mysql.sock',
 }
 
 $read_only = $master ? {
@@ -85,7 +84,6 @@
 shard  => $shard,
 datacenter => $::site,
 enabled=> $master,
-socket => '/tmp/mysql.sock',
 }
 
 unless $master {
@@ -93,7 +91,6 @@
 is_critical   => false,
 contact_group => 'admins',
 multisource   => false,
-socket=> '/tmp/mysql.sock',
 }
 }
 }
diff --git 
a/modules/role/templates/mariadb/mysqld_config/phabricator.my.cnf.erb 
b/modules/role/templates/mariadb/mysqld_config/phabricator.my.cnf.erb
index cc00ab7..42c535e 100644
--- a/modules/role/templates/mariadb/mysqld_config/phabricator.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/phabricator.my.cnf.erb
@@ -2,7 +2,7 @@
 
 [client]
 port   = 3306
-socket = /tmp/mysql.sock
+socket = <%= @socket %>
 <% if @ssl == 'on' %>
 # ssl
 ssl-ca=/etc/mysql/ssl/cacert.pem
@@ -22,7 +22,7 @@
 [mysqld]
 
 user   = mysql
-socket = /tmp/mysql.sock
+socket = <%= @socket %> 
 port   = 3306
 extra_port = 3307
 basedir= <%= @basedir %>
@@ -100,20 +100,7 @@
 # dump and load innodb buffer at start and stop
 innodb_buffer_pool_load_at_startup  = 1
 innodb_buffer_pool_dump_at_shutdown = 1
-<% if @kernelversion < "3.19" %>
-# Until kernel 3.16 http://www.spinics.net/lists/stable/msg61873.html
-# At least, I think so. For now we need to avoid the an assertion failure on 
Trusty w/ 3.13
-innodb_use_native_aio  = 0
-innodb_read_io_threads = 16
-innodb_write_io_threads= 8
-<% end %>
-<% if @ssl == 'on' %>
-# ssl
-ssl-ca=/etc/mysql/ssl/cacert.pem
-ssl-cert=/etc/mysql/ssl/server-cert.pem
-ssl-key=/etc/mysql/ssl/server-key.pem
-ssl-cipher=TLSv1.2
-<% elsif @ssl == 'puppet-cert' %>
+<% if @ssl == 'on' or @ssl == 'puppet-cert' %>
 # ssl
 ssl-ca=/etc/ssl/certs/Puppet_Internal_CA.pem
 ssl-cert=/etc/mysql/ssl/cert.pem
@@ -155,4 +142,3 @@
 quick
 max_allowed_packet = 32M
 
-#!includedir /etc/mysql/conf.d/

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fixed double-click handling for OpenLayers, Leaflet

2017-09-12 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377690 )

Change subject: Fixed double-click handling for OpenLayers, Leaflet
..


Fixed double-click handling for OpenLayers, Leaflet

Change-Id: Ib862cf25a5d6b72855d475cb69b4badb4b16ea7a
---
M libs/PF_maps.js
M libs/PF_maps.offline.js
2 files changed, 57 insertions(+), 14 deletions(-)

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



diff --git a/libs/PF_maps.js b/libs/PF_maps.js
index 96d2f9e..9302ad5 100644
--- a/libs/PF_maps.js
+++ b/libs/PF_maps.js
@@ -6,6 +6,8 @@
 
 function setupMapFormInput( inputDiv, mapService ) {
var map, marker, markers, mapCanvas, mapOptions;
+   var numClicks = 0, timer = null;
+
if ( mapService === "Google Maps" ) {
mapCanvas = inputDiv.find('.pfMapCanvas')[0];
mapOptions = {
@@ -14,18 +16,17 @@
};
map = new google.maps.Map(mapCanvas, mapOptions);
var geocoder = new google.maps.Geocoder();
-   var update_timeout;
 
// Let a click set the marker, while keeping the default
// behavior (zoom and center) for double clicks.
// Code copied from http://stackoverflow.com/a/8417447
google.maps.event.addListener( map, 'click', function( event ) {
-   update_timeout = setTimeout( function() {
+   timer = setTimeout( function() {
googleMapsSetMarker( event.latLng );
}, 200 );
});
google.maps.event.addListener( map, 'dblclick', function( event 
) {
-   clearTimeout( update_timeout );
+   clearTimeout( timer );
});
} else if (mapService === "Leaflet") {
mapCanvas = inputDiv.find('.pfMapCanvas').get(0);
@@ -41,7 +42,19 @@
new 
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', 
layerOptions).addTo(map);
 
map.on( 'click', function( event ) {
-   leafletSetMarker( event.latlng );
+   // Place/move the marker only on a single click, not a
+   // double click (double clicks do a zoom).
+   // Code based on https://stackoverflow.com/a/7845282
+   numClicks++;
+   if (numClicks === 1) {
+   timer = setTimeout( function() {
+   leafletSetMarker( event.latlng );
+   numClicks = 0;
+   });
+   } else {
+   clearTimeout(timer);
+   numClicks = 0;
+   }
});
} else { // if ( mapService === "OpenLayers" ) {
var mapCanvasID = inputDiv.find('.pfMapCanvas').attr('id');
@@ -52,9 +65,18 @@
map.addLayer( markers );
 
map.events.register("click", map, function(e) {
-   var opx = map.getLayerPxFromViewPortPx(e.xy) ;
-   var loc = map.getLonLatFromPixel( opx );
-   openLayersSetMarker( loc );
+   numClicks++;
+   if (numClicks === 1) {
+   timer = setTimeout( function() {
+   var opx = 
map.getLayerPxFromViewPortPx(e.xy) ;
+   var loc = map.getLonLatFromPixel( opx );
+   openLayersSetMarker( loc );
+   numClicks = 0;
+   });
+   } else {
+   clearTimeout(timer);
+   numClicks = 0;
+   }
});
}
 
diff --git a/libs/PF_maps.offline.js b/libs/PF_maps.offline.js
index 6535748..342b55c 100644
--- a/libs/PF_maps.offline.js
+++ b/libs/PF_maps.offline.js
@@ -16,6 +16,7 @@
}
 
var map, marker, markers, mapCanvas, mapOptions;
+   var numClicks = 0, timer = null;
 
var coordsInput = inputDiv.find('.pfCoordsInput');
 
@@ -92,18 +93,17 @@
};
map = new google.maps.Map( mapCanvas, mapOptions );
var geocoder = new google.maps.Geocoder();
-   var update_timeout;
 
// Let a click set the marker, while keeping the default
// behavior (zoom and center) for double clicks.
// Code copied from http://stackoverflow.com/a/8417447
google.maps.event.addListener( map, 'click', function( event ) {
-   update_timeout = setTimeout( function(){

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptly: support components for clients

2017-09-12 Thread Dzahn (Code Review)

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

Change subject: aptly: support components for clients
..


aptly: support components for clients

'main' is hardcoded which prevents use of different components on the
client side.

Change-Id: I3cbdc3d7d3e64ffeb60ac76acfcbfc6d0693212a
---
M modules/aptly/manifests/client.pp
M modules/role/manifests/aptly/client.pp
2 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/modules/aptly/manifests/client.pp 
b/modules/aptly/manifests/client.pp
index c012b03..52cb61a 100644
--- a/modules/aptly/manifests/client.pp
+++ b/modules/aptly/manifests/client.pp
@@ -1,11 +1,12 @@
 class aptly::client(
 $servername,
-$source=false
+$source=false,
+$components='main',
 ) {
 apt::repository { 'project-aptly':
 uri=> "http://${servername}/repo;,
 dist   => "${::lsbdistcodename}-${::labsproject}",
-components => 'main',
+components => $components,
 source => $source,
 trust_repo => true,
 }
diff --git a/modules/role/manifests/aptly/client.pp 
b/modules/role/manifests/aptly/client.pp
index 7e426f5..13b74dc 100644
--- a/modules/role/manifests/aptly/client.pp
+++ b/modules/role/manifests/aptly/client.pp
@@ -3,8 +3,10 @@
 # Sets up a simple deb package that points to the project's aptly server
 class role::aptly::client(
 $servername = 
"${::labsproject}-packages.${::labsproject}.${::site}.wmflabs",
+$components = 'main',
 ) {
 class { '::aptly::client':
 servername => $servername,
+components => $components,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3cbdc3d7d3e64ffeb60ac76acfcbfc6d0693212a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Another attempt - Update Omnimail plugin to allow setting of...

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Another attempt - Update Omnimail plugin to allow setting offset
..

Another attempt - Update Omnimail plugin to allow setting offset

Bug T175665

Change-Id: I144d51459682650feeaae919bc0f97e531a9a391
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/92/377692/1

diff --git a/composer.lock b/composer.lock
index 2e7daf7..a2467ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1864,7 +1864,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "c3248b3932e62cd2812aa3502d875b7c12c25c66"
+"reference": "45eaa193c3353bcceb27bb2676da08598fd57686"
 },
 "require": {
 "league/csv": "^8.0",
@@ -1903,7 +1903,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-07-27 02:53:46"
+"time": "2017-09-12 23:04:53"
 },
 {
 "name": "wikimedia/smash-pig",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I144d51459682650feeaae919bc0f97e531a9a391
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fixed double-click handling for OpenLayers, Leaflet

2017-09-12 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377690 )

Change subject: Fixed double-click handling for OpenLayers, Leaflet
..

Fixed double-click handling for OpenLayers, Leaflet

Change-Id: Ib862cf25a5d6b72855d475cb69b4badb4b16ea7a
---
M libs/PF_maps.js
M libs/PF_maps.offline.js
2 files changed, 57 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/90/377690/2

diff --git a/libs/PF_maps.js b/libs/PF_maps.js
index 96d2f9e..9302ad5 100644
--- a/libs/PF_maps.js
+++ b/libs/PF_maps.js
@@ -6,6 +6,8 @@
 
 function setupMapFormInput( inputDiv, mapService ) {
var map, marker, markers, mapCanvas, mapOptions;
+   var numClicks = 0, timer = null;
+
if ( mapService === "Google Maps" ) {
mapCanvas = inputDiv.find('.pfMapCanvas')[0];
mapOptions = {
@@ -14,18 +16,17 @@
};
map = new google.maps.Map(mapCanvas, mapOptions);
var geocoder = new google.maps.Geocoder();
-   var update_timeout;
 
// Let a click set the marker, while keeping the default
// behavior (zoom and center) for double clicks.
// Code copied from http://stackoverflow.com/a/8417447
google.maps.event.addListener( map, 'click', function( event ) {
-   update_timeout = setTimeout( function() {
+   timer = setTimeout( function() {
googleMapsSetMarker( event.latLng );
}, 200 );
});
google.maps.event.addListener( map, 'dblclick', function( event 
) {
-   clearTimeout( update_timeout );
+   clearTimeout( timer );
});
} else if (mapService === "Leaflet") {
mapCanvas = inputDiv.find('.pfMapCanvas').get(0);
@@ -41,7 +42,19 @@
new 
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', 
layerOptions).addTo(map);
 
map.on( 'click', function( event ) {
-   leafletSetMarker( event.latlng );
+   // Place/move the marker only on a single click, not a
+   // double click (double clicks do a zoom).
+   // Code based on https://stackoverflow.com/a/7845282
+   numClicks++;
+   if (numClicks === 1) {
+   timer = setTimeout( function() {
+   leafletSetMarker( event.latlng );
+   numClicks = 0;
+   });
+   } else {
+   clearTimeout(timer);
+   numClicks = 0;
+   }
});
} else { // if ( mapService === "OpenLayers" ) {
var mapCanvasID = inputDiv.find('.pfMapCanvas').attr('id');
@@ -52,9 +65,18 @@
map.addLayer( markers );
 
map.events.register("click", map, function(e) {
-   var opx = map.getLayerPxFromViewPortPx(e.xy) ;
-   var loc = map.getLonLatFromPixel( opx );
-   openLayersSetMarker( loc );
+   numClicks++;
+   if (numClicks === 1) {
+   timer = setTimeout( function() {
+   var opx = 
map.getLayerPxFromViewPortPx(e.xy) ;
+   var loc = map.getLonLatFromPixel( opx );
+   openLayersSetMarker( loc );
+   numClicks = 0;
+   });
+   } else {
+   clearTimeout(timer);
+   numClicks = 0;
+   }
});
}
 
diff --git a/libs/PF_maps.offline.js b/libs/PF_maps.offline.js
index 6535748..342b55c 100644
--- a/libs/PF_maps.offline.js
+++ b/libs/PF_maps.offline.js
@@ -16,6 +16,7 @@
}
 
var map, marker, markers, mapCanvas, mapOptions;
+   var numClicks = 0, timer = null;
 
var coordsInput = inputDiv.find('.pfCoordsInput');
 
@@ -92,18 +93,17 @@
};
map = new google.maps.Map( mapCanvas, mapOptions );
var geocoder = new google.maps.Geocoder();
-   var update_timeout;
 
// Let a click set the marker, while keeping the default
// behavior (zoom and center) for double clicks.
// Code copied from http://stackoverflow.com/a/8417447
google.maps.event.addListener( map, 'click', function( event ) {
-   update_timeout =

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Preference length is in bytes, so use $.byteLimit

2017-09-12 Thread Mattflaschen (Code Review)

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

Change subject: RCFilters: Preference length is in bytes, so use $.byteLimit
..

RCFilters: Preference length is in bytes, so use $.byteLimit

Change-Id: I0f93edb0cb61a057da5ce0876b74cd17179c6587
---
M resources/Resources.php
M resources/src/jquery/jquery.byteLength.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
3 files changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/resources/Resources.php b/resources/Resources.php
index f0aa9ec..ca922a3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1772,6 +1772,7 @@

'resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js',
],
'dependencies' => [
+   'jquery.byteLength',
'oojs',
'mediawiki.api',
'mediawiki.api.options',
diff --git a/resources/src/jquery/jquery.byteLength.js 
b/resources/src/jquery/jquery.byteLength.js
index 7fe25ee..58719b7 100644
--- a/resources/src/jquery/jquery.byteLength.js
+++ b/resources/src/jquery/jquery.byteLength.js
@@ -11,7 +11,7 @@
  * @static
  * @inheritable
  * @param {string} str
- * @return {string}
+ * @return {Number}
  */
 jQuery.byteLength = function ( str ) {
// This basically figures out how many bytes a UTF-16 string (which is 
what js sees)
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index f37229f..ee74ac5 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -863,7 +863,7 @@
// Stringify state
stringified = JSON.stringify( state );
 
-   if ( stringified.length > 65535 ) {
+   if ( $.byteLength( stringified ) > 65535 ) {
// Sanity check, since the preference can only hold 
that.
return;
}

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Hygiene: Remove dead config variable

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: Remove dead config variable
..


Hygiene: Remove dead config variable

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

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



diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 1fcd38d..3bb3233 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -67,9 +67,6 @@
 
$wgMFEnableBeta = true;
 
-   // Allow editing for non-JavaScript users
-   $wgMFAllowNonJavaScriptEditing = true;
-
// Turn on volunteer recruitment
$wgMFEnableJSConsoleRecruitment = true;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c3ae7e0e7bbd5c173c37a4fbc82fb63ae82bd52
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Repoint m3 secondary host (replica) to db1059

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Repoint m3 secondary host (replica) to db1059
..


mariadb: Repoint m3 secondary host (replica) to db1059

Bug: T175679
Change-Id: Ide4ebfeba413debf8fe4248dc3c2a7ef915ef109
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 64eeb84..31330f6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -717,8 +717,8 @@
 shard  => 'm3',
 primary_name   => 'db1043',
 primary_addr   => '10.64.16.32',
-secondary_name => 'db1048',
-secondary_addr => '10.64.16.37',
+secondary_name => 'db1059',
+secondary_addr => '10.64.32.29',
 }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: hhvm: use '', not undef for light_process_file_prefix

2017-09-12 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377688 )

Change subject: hhvm: use '', not undef for light_process_file_prefix
..

hhvm: use '', not undef for light_process_file_prefix

Otherwise it is interpolated as
  hhvm.server.light_process_file_prefix = undef
with the future parser on the deployment servers.

Change-Id: I985129e3c959dfde4b8b449141ba8c7eaf833bdf
---
M hieradata/role/common/deployment_server.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/377688/1

diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index 72ed5e0..ee5dfa7 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -27,12 +27,12 @@
   hhvm:
 server:
   light_process_count: 0
-  light_process_file_prefix:
+  light_process_file_prefix: ''
 hhvm::extra::cli:
   hhvm:
 server:
   light_process_count: 0
-  light_process_file_prefix:
+  light_process_file_prefix: ''
 # Default scap::server configuration.  This is used in production.
 # If you are setting up scap::server in labs, these will be used
 # unless you override them for your labs project.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I985129e3c959dfde4b8b449141ba8c7eaf833bdf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: scap: do scope lookups in mw-deployment-vars.erb

2017-09-12 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377689 )

Change subject: scap: do scope lookups in mw-deployment-vars.erb
..

scap: do scope lookups in mw-deployment-vars.erb

mw-deployment-vars.erb gets included from scap::scripts, but refers to
variables like $common_path, $rsync_host etc. from scap::master, without
doing an out-of-scope lookup. This is unsupported in the future parser.
Convert to scope.lookupvar()s for now as a quick fix while we think
about a longer-term fix (maybe fold scap::scripts into scap::master?)

Change-Id: I254e363b38359a202d5235a9b4c9bb8c5887d250
---
M modules/scap/templates/mw-deployment-vars.erb
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/377689/1

diff --git a/modules/scap/templates/mw-deployment-vars.erb 
b/modules/scap/templates/mw-deployment-vars.erb
index abd8da3..eb464e3 100644
--- a/modules/scap/templates/mw-deployment-vars.erb
+++ b/modules/scap/templates/mw-deployment-vars.erb
@@ -1,14 +1,14 @@
 # This file should be BASH / Python polyglot.
 
-MEDIAWIKI_DEPLOYMENT_DIR="<%= @common_path %>"
-MEDIAWIKI_STAGING_DIR="<%= @common_source_path %>"
+MEDIAWIKI_DEPLOYMENT_DIR="<%= scope.lookupvar('scap::master::common_path') %>"
+MEDIAWIKI_STAGING_DIR="<%= scope.lookupvar('scap::master::common_source_path') 
%>"
 
 # Back-compat aliases
 MW_COMMON="$MEDIAWIKI_DEPLOYMENT_DIR"
 MW_COMMON_SOURCE="$MEDIAWIKI_STAGING_DIR"
 
-MW_RSYNC_HOST="<%= @rsync_host %>"
+MW_RSYNC_HOST="<%= scope.lookupvar('scap::master::rsync_host') %>"
 MW_DSH_ARGS=('-cM' '-g' 'mediawiki-installation' '-o' '-oSetupTimeout=30' 
'-F30')
 MW_RSYNC_ARGS=('-a' '--delete-delay' '--delay-updates' '--compress' '--delete' 
'--exclude=**/.svn/lock' '--exclude=**/.git/objects' 
'--exclude=**/.git/**/objects' '--exclude=**/cache/l10n/*.cdb' '--no-perms')
-MW_STATSD_HOST="<%= @statsd_host %>"
-MW_STATSD_PORT=<%= @statsd_port %>
+MW_STATSD_HOST="<%= scope.lookupvar('scap::master::statsd_host') %>"
+MW_STATSD_PORT=<%= scope.lookupvar('scap::master::statsd_port') %>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I254e363b38359a202d5235a9b4c9bb8c5887d250
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Repoint m3 secondary host (replica) to db1059

2017-09-12 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Repoint m3 secondary host (replica) to db1059
..

mariadb: Repoint m3 secondary host (replica) to db1059

Bug: T175679
Change-Id: Ide4ebfeba413debf8fe4248dc3c2a7ef915ef109
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 64eeb84..31330f6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -717,8 +717,8 @@
 shard  => 'm3',
 primary_name   => 'db1043',
 primary_addr   => '10.64.16.32',
-secondary_name => 'db1048',
-secondary_addr => '10.64.16.37',
+secondary_name => 'db1059',
+secondary_addr => '10.64.32.29',
 }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Add back eventlogging since we're doing the landing page onc...

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Add back eventlogging since we're doing the landing page once 
more
..


Add back eventlogging since we're doing the landing page once more

Bug: T175756
Change-Id: Ibd9515c68696f53dd1f195bf7579979e0d743f93
---
M extension.json
M includes/Hooks.php
A modules/ext.acw.eventlogging.js
3 files changed, 53 insertions(+), 4 deletions(-)

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



diff --git a/extension.json b/extension.json
index 77506ea..7b53a0e 100644
--- a/extension.json
+++ b/extension.json
@@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "ArticleCreationWorkflow",
"type": "other",
-   "author": [ "Max Semenik" ],
+   "author": [ "Max Semenik", "Niharika Kohli" ],
"url": 
"https://www.mediawiki.org/wiki/Extension:ArticleCreationWorkflow;,
"descriptionmsg": "acw-desc",
"license-name": "MIT",
@@ -11,7 +11,8 @@
},
"Hooks": {
"CustomEditor": 
"ArticleCreationWorkflow\\Hooks::onCustomEditor",
-   "ShowMissingArticle": 
"ArticleCreationWorkflow\\Hooks::onShowMissingArticle"
+   "ShowMissingArticle": 
"ArticleCreationWorkflow\\Hooks::onShowMissingArticle",
+   "BeforePageDisplay": 
"ArticleCreationWorkflow\\Hooks::onBeforePageDisplay"
},
"AutoloadClasses": {
"ArticleCreationWorkflow\\Hooks": "includes/Hooks.php",
@@ -22,6 +23,17 @@
"i18n"
]
},
+   "ResourceFileModulePaths": {
+   "localBasePath": "modules",
+   "remoteExtPath": "ArticleCreationWorkflow/modules"
+   },
+   "ResourceModules": {
+   "ext.acw.eventlogging": {
+   "scripts": [
+   "ext.acw.eventlogging.js"
+   ]
+   }
+   },
"config": {
"ArticleCreationWorkflows": {
"description": "Describes conditions when new page 
creation should be intercepted. See doc/config.txt for details.",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 7d0460c..5c92238 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -5,6 +5,7 @@
 use MediaWiki\MediaWikiServices;
 use Article;
 use User;
+use OutputPage;
 
 /**
  * Hook handlers
@@ -32,7 +33,7 @@
$redirTo = $workflow->getLandingPageTitle();
$output = $article->getContext()->getOutput();
$output->redirect( $redirTo->getFullURL(
-   [ 'page' => $title->getPrefixedText(), 'wprov' 
=> 'acww1' ]
+   [ 'page' => $title->getPrefixedText() ]
) );
return false;
}
@@ -63,8 +64,24 @@
$redirTo = $workflow->getLandingPageTitle();
$output = $article->getContext()->getOutput();
$output->redirect( $redirTo->getFullURL(
-   [ 'page' => $title->getPrefixedText(), 'wprov' 
=> 'acww1' ]
+   [ 'page' => $title->getPrefixedText() ]
) );
}
}
+
+   /**
+* BeforePageDisplay hook handler
+* If user is landing on our landing page, we add eventlogging
+*
+* @param OutputPage $out OutputPage instance
+*/
+   public static function onBeforePageDisplay( OutputPage $out ) {
+   $config = MediaWikiServices::getInstance()
+   ->getConfigFactory()
+   ->makeConfig( 'ArticleCreationWorkflow' );
+   $workflow = new Workflow( $config );
+   if ( $out->getPageTitle() == $workflow->getLandingPageTitle() ) 
{
+   $out->addModules( 'ext.acw.eventlogging' );
+   }
+   }
 }
diff --git a/modules/ext.acw.eventlogging.js b/modules/ext.acw.eventlogging.js
new file mode 100644
index 000..308d0f9
--- /dev/null
+++ b/modules/ext.acw.eventlogging.js
@@ -0,0 +1,20 @@
+/*
+ Track link clicks on landing page created for ACTRIAL
+ */
+
+( function ( $, mw ) {
+
+   function trackData( interactionType, link, sampling ) {
+   mw.track( 'event.ArticleCreationWorkflow', {
+   interactionType: interactionType,
+   link: link,
+   sampling: sampling || 1
+   } );
+   }
+
+   $( 'html' ).on( 'click', '#bodyContent a', function ( event ) {
+   var link = $( this ).attr( 'href' );
+   trackData( 'click', link );
+   } );
+
+} ( jQuery, mediaWiki ) );

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: snapshot: do a proper scope lookup for apachedir

2017-09-12 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377686 )

Change subject: snapshot: do a proper scope lookup for apachedir
..


snapshot: do a proper scope lookup for apachedir

wikidump.conf.erb refered to @apachedir, but this variable is only
defined in snapshot::dumps::configs and this fails with the future
parser. Do an out-of-scope lookup, like we were already doing with
$datadir.

Change-Id: I34fe21f4227321aaca3972c92a4bff220f9cb1b8
---
M modules/snapshot/templates/dumps/wikidump.conf.erb
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/snapshot/templates/dumps/wikidump.conf.erb 
b/modules/snapshot/templates/dumps/wikidump.conf.erb
index 2d72cfc..6e580d7 100644
--- a/modules/snapshot/templates/dumps/wikidump.conf.erb
+++ b/modules/snapshot/templates/dumps/wikidump.conf.erb
@@ -5,11 +5,11 @@
 
 [wiki]
 dblist=<%= @config[@configtype]['dblist'] %>
-privatelist=<%= @apachedir -%>/dblists/private.dblist
-closedlist=<%= @apachedir -%>/dblists/closed.dblist
+privatelist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') 
-%>/dblists/private.dblist
+closedlist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') 
-%>/dblists/closed.dblist
 skipdblist=<%= @config[@configtype]['skipdblist'] %>
-flowlist=<%= @apachedir -%>/dblists/flow.dblist
-dir=<%= @apachedir %>
+flowlist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') 
-%>/dblists/flow.dblist
+dir=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') %>
 adminsettings=private/PrivateSettings.php
 tablejobs=<%= scope.lookupvar('snapshot::dumps::dirs::confsdir') 
-%>/table_jobs.yaml
 

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update Omnimail

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Update Omnimail
..


Update Omnimail

Change-Id: I375ef21ca7952bc29516064f4b90f06aa9bb24bc
---
M composer/installed.json
M wikimedia/omnimail-silverpop/src/Requests/ExportListRequest.php
M wikimedia/omnimail-silverpop/src/Requests/SilverpopBaseRequest.php
M wikimedia/omnimail-silverpop/src/Responses/BaseResponse.php
M wikimedia/omnimail-silverpop/src/Responses/GroupMembersResponse.php
5 files changed, 156 insertions(+), 49 deletions(-)

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



diff --git a/composer/installed.json b/composer/installed.json
index 318094c..2e30e19 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1276,55 +1276,6 @@
 "homepage": "http://github.com/c9s/GetOptionKit;
 },
 {
-"name": "wikimedia/omnimail-silverpop",
-"version": "dev-master",
-"version_normalized": "999-dev",
-"source": {
-"type": "git",
-"url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "c3248b3932e62cd2812aa3502d875b7c12c25c66"
-},
-"require": {
-"league/csv": "^8.0",
-"mrmarkfrench/silverpop-php-connector": "dev-master",
-"omnimail/omnimail": "dev-master",
-"phpseclib/phpseclib": "~2.0"
-},
-"require-dev": {
-"guzzlehttp/guzzle": "*"
-},
-"time": "2017-07-27T02:53:46+00:00",
-"type": "library",
-"installation-source": "source",
-"autoload": {
-"psr-4": {
-"Omnimail\\Silverpop\\": "src"
-}
-},
-"autoload-dev": {
-"psr-4": {
-"Omnimail\\Silverpop\\Tests\\": "test/tests"
-}
-},
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Eileen McNaughton",
-"email": "emcnaugh...@wikimedia.org"
-}
-],
-"description": "Silverpop plugin for Omnimail",
-"keywords": [
-"delivery",
-"email",
-"mail",
-"omnimail",
-"silverpop"
-]
-},
-{
 "name": "wikimedia/smash-pig",
 "version": "dev-master",
 "version_normalized": "999-dev",
@@ -2018,5 +1969,114 @@
 "GPL-2.0"
 ],
 "description": "Wikimedia Foundation payment processing library"
+},
+{
+"name": "symfony/polyfill-php54",
+"version": "v1.5.0",
+"version_normalized": "1.5.0.0",
+"source": {
+"type": "git",
+"url": "https://github.com/symfony/polyfill-php54.git;,
+"reference": "b7763422a5334c914ef0298ed21b253d25913a6e"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/symfony/polyfill-php54/zipball/b7763422a5334c914ef0298ed21b253d25913a6e;,
+"reference": "b7763422a5334c914ef0298ed21b253d25913a6e",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.3"
+},
+"time": "2017-06-14T15:44:48+00:00",
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "1.5-dev"
+}
+},
+"installation-source": "dist",
+"autoload": {
+"psr-4": {
+"Symfony\\Polyfill\\Php54\\": ""
+},
+"files": [
+"bootstrap.php"
+],
+"classmap": [
+"Resources/stubs"
+]
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Nicolas Grekas",
+"email": "p...@tchwork.com"
+},
+{
+"name": "Symfony Community",
+"homepage": "https://symfony.com/contributors;
+}
+],
+"description": "Symfony polyfill backporting some PHP 5.4+ features to 
lower PHP versions",
+"homepage": "https://symfony.com;,
+"keywords": [
+"compatibility",
+"polyfill",
+"portable",
+"shim"
+]
+},
+{
+"name": "wikimedia/omnimail-silverpop",
+"version": "dev-master",
+"version_normalized": "999-dev",
+"source": {
+"type": "git",
+"url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
+"reference": "45eaa193c3353bcceb27bb2676da08598fd57686"
+},
+"require": {
+"league/csv": "^8.0",
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: snapshot: do a proper scope lookup for apachedir

2017-09-12 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377686 )

Change subject: snapshot: do a proper scope lookup for apachedir
..

snapshot: do a proper scope lookup for apachedir

wikidump.conf.erb refered to @apachedir, but this variable is only
defined in snapshot::dumps::configs and this fails with the future
parser. Do an out-of-scope lookup, like we were already doing with
$datadir.

Change-Id: I34fe21f4227321aaca3972c92a4bff220f9cb1b8
---
M modules/snapshot/templates/dumps/wikidump.conf.erb
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/modules/snapshot/templates/dumps/wikidump.conf.erb 
b/modules/snapshot/templates/dumps/wikidump.conf.erb
index 2d72cfc..6e580d7 100644
--- a/modules/snapshot/templates/dumps/wikidump.conf.erb
+++ b/modules/snapshot/templates/dumps/wikidump.conf.erb
@@ -5,11 +5,11 @@
 
 [wiki]
 dblist=<%= @config[@configtype]['dblist'] %>
-privatelist=<%= @apachedir -%>/dblists/private.dblist
-closedlist=<%= @apachedir -%>/dblists/closed.dblist
+privatelist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') 
-%>/dblists/private.dblist
+closedlist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') 
-%>/dblists/closed.dblist
 skipdblist=<%= @config[@configtype]['skipdblist'] %>
-flowlist=<%= @apachedir -%>/dblists/flow.dblist
-dir=<%= @apachedir %>
+flowlist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') 
-%>/dblists/flow.dblist
+dir=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') %>
 adminsettings=private/PrivateSettings.php
 tablejobs=<%= scope.lookupvar('snapshot::dumps::dirs::confsdir') 
-%>/table_jobs.yaml
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34fe21f4227321aaca3972c92a4bff220f9cb1b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: grafana: quote reserved word 'type'

2017-09-12 Thread Dzahn (Code Review)

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

Change subject: grafana: quote reserved word 'type'
..

grafana: quote reserved word 'type'

The future parser has an Erron krypton, saying:

Error: Use of reserved word: type, must be quoted
   if intended to be a String value

Change-Id: I3d75d89beef96d06f6c174a3b2fdadf95f1c0eac
---
M modules/role/manifests/grafana/base.pp
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/modules/role/manifests/grafana/base.pp 
b/modules/role/manifests/grafana/base.pp
index ba5c255..9c3bcb5 100644
--- a/modules/role/manifests/grafana/base.pp
+++ b/modules/role/manifests/grafana/base.pp
@@ -41,7 +41,11 @@
 # sqlite3 is the default, and it's perfectly adequate.
 'database'   => {
 'type' => 'sqlite3',
+<<< HEAD
 'path' => 'grafana.db',
+===
+path   => 'grafana.db',
+>>> 1e6c5fe7f2... grafana: quote reserved word 'type'
 },
 
 'security'   => {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::snapshot::common: properly scope included classes

2017-09-12 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377493 )

Change subject: role::snapshot::common: properly scope included classes
..


role::snapshot::common: properly scope included classes

While the old parser would search classes within the current namespace
if their name is not absolute, the future parser does not.

So, fix the unfortunate clash of namespaces we had here.

Bug: T171704
Change-Id: If41ff38295121de3b09cf97abda1edfd655825e6
---
M modules/role/manifests/snapshot/common.pp
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/modules/role/manifests/snapshot/common.pp 
b/modules/role/manifests/snapshot/common.pp
index a038d1a..7ee5723 100644
--- a/modules/role/manifests/snapshot/common.pp
+++ b/modules/role/manifests/snapshot/common.pp
@@ -6,9 +6,8 @@
 # mw packages and dependencies, dataset server nfs mount,
 # config files, stages files, dblists, html templates
 include ::role::mediawiki::common
-include snapshot::dumps
+include ::snapshot::dumps
 
 # scap3 deployment of dump scripts
-include snapshot::deployment
+include ::role::snapshot::deployment
 }
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If41ff38295121de3b09cf97abda1edfd655825e6
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: salt: change roots/runner_dir from Array to String

2017-09-12 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377676 )

Change subject: salt: change roots/runner_dir from Array to String
..


salt: change roots/runner_dir from Array to String

In the salt::master class, these parameters are defined like that:
- $salt_runner_dirs= ['/srv/runners']
- $salt_state_roots= { 'base' => ['/srv/salt'] }
- $salt_file_roots = { 'base' => ['/srv/salt'] }
- $salt_pillar_roots   = { 'base' => ['/srv/pillars'] }
- $salt_module_roots   = { 'base' => ['/srv/salt/_modules'] }
- $salt_returner_roots = { 'base' => ['/srv/salt/_returners'] }

We actually never use more than one element in those arrays for any of
these anywhere, and the manifests are actually pretty broken if one
attempts to do that (e.g. they're being interpolated in some places and
passed as arguments to defined() in salt::master_environment), something
that the future parser caught.

Rather than attempt to fix the manifests to expect arrays everywhere,
convert those arrays into strings and call it a day. The days of those
manifests are fortunately numbered.

Change-Id: Iab10c654d8631e61e0f3a929d4d52189e53b0d81
---
M modules/role/manifests/salt/masters/labs.pp
M modules/role/manifests/salt/masters/labs/project_master.pp
M modules/role/manifests/salt/masters/production.pp
M modules/salt/manifests/master.pp
M modules/salt/templates/master.erb
5 files changed, 33 insertions(+), 33 deletions(-)

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



diff --git a/modules/role/manifests/salt/masters/labs.pp 
b/modules/role/manifests/salt/masters/labs.pp
index ac8cf55..98adb6b 100644
--- a/modules/role/manifests/salt/masters/labs.pp
+++ b/modules/role/manifests/salt/masters/labs.pp
@@ -3,14 +3,14 @@
 
 $puppet_master = hiera('labs_puppet_master')
 
-$salt_state_roots= { 'base' => ['/srv/salt'] }
-$salt_file_roots = { 'base' => ['/srv/salt'] }
-$salt_pillar_roots   = { 'base' => ['/srv/pillars'] }
-$salt_module_roots   = { 'base' => ['/srv/salt/_modules'] }
-$salt_returner_roots = { 'base' => ['/srv/salt/_returners'] }
+$salt_state_roots= { 'base' => '/srv/salt' }
+$salt_file_roots = { 'base' => '/srv/salt' }
+$salt_pillar_roots   = { 'base' => '/srv/pillars' }
+$salt_module_roots   = { 'base' => '/srv/salt/_modules' }
+$salt_returner_roots = { 'base' => '/srv/salt/_returners' }
 
 class { 'salt::master':
-salt_runner_dirs=> ['/srv/runners'],
+salt_runner_dir => '/srv/runners',
 salt_file_roots => $salt_file_roots,
 salt_pillar_roots   => $salt_pillar_roots,
 salt_worker_threads => '50',
diff --git a/modules/role/manifests/salt/masters/labs/project_master.pp 
b/modules/role/manifests/salt/masters/labs/project_master.pp
index 0b0262b..2a2ad9d 100644
--- a/modules/role/manifests/salt/masters/labs/project_master.pp
+++ b/modules/role/manifests/salt/masters/labs/project_master.pp
@@ -3,14 +3,14 @@
 # filtertags: labs-project-servermon labs-project-debdeploy 
labs-project-integration labs-project-ttmserver
 class role::salt::masters::labs::project_master {
 
-$salt_state_roots= { 'base' => ['/srv/salt'] }
-$salt_file_roots = { 'base' => ['/srv/salt'] }
-$salt_pillar_roots   = { 'base' => ['/srv/pillars'] }
-$salt_module_roots   = { 'base' => ['/srv/salt/_modules'] }
-$salt_returner_roots = { 'base' => ['/srv/salt/_returners'] }
+$salt_state_roots= { 'base' => '/srv/salt' }
+$salt_file_roots = { 'base' => '/srv/salt' }
+$salt_pillar_roots   = { 'base' => '/srv/pillars' }
+$salt_module_roots   = { 'base' => '/srv/salt/_modules' }
+$salt_returner_roots = { 'base' => '/srv/salt/_returners' }
 
 class { 'salt::master':
-salt_runner_dirs=> ['/srv/runners'],
+salt_runner_dir => '/srv/runners',
 # For simplicity of test/dev we trust all of labs
 # to run deploy module calls, but rely on security groups
 # to secure this.
diff --git a/modules/role/manifests/salt/masters/production.pp 
b/modules/role/manifests/salt/masters/production.pp
index 3b3ebf8..fd63d74 100644
--- a/modules/role/manifests/salt/masters/production.pp
+++ b/modules/role/manifests/salt/masters/production.pp
@@ -1,15 +1,15 @@
 class role::salt::masters::production {
 
-$salt_state_roots= { 'base' => ['/srv/salt'] }
-$salt_file_roots = { 'base' => ['/srv/salt'] }
-$salt_pillar_roots   = { 'base' => ['/srv/pillars'] }
-$salt_module_roots   = { 'base' => ['/srv/salt/_modules'] }
-$salt_returner_roots = { 'base' => ['/srv/salt/_returners'] }
+$salt_state_roots= { 'base' => '/srv/salt' }
+$salt_file_roots = { 'base' => '/srv/salt' }
+$salt_pillar_roots   = { 'base' =>

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update Omnimail

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Update Omnimail
..

Update Omnimail

Change-Id: I375ef21ca7952bc29516064f4b90f06aa9bb24bc
---
M composer/installed.json
M wikimedia/omnimail-silverpop/src/Requests/ExportListRequest.php
M wikimedia/omnimail-silverpop/src/Requests/SilverpopBaseRequest.php
M wikimedia/omnimail-silverpop/src/Responses/BaseResponse.php
M wikimedia/omnimail-silverpop/src/Responses/GroupMembersResponse.php
5 files changed, 156 insertions(+), 49 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor 
refs/changes/84/377684/1

diff --git a/composer/installed.json b/composer/installed.json
index 318094c..2e30e19 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1276,55 +1276,6 @@
 "homepage": "http://github.com/c9s/GetOptionKit;
 },
 {
-"name": "wikimedia/omnimail-silverpop",
-"version": "dev-master",
-"version_normalized": "999-dev",
-"source": {
-"type": "git",
-"url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "c3248b3932e62cd2812aa3502d875b7c12c25c66"
-},
-"require": {
-"league/csv": "^8.0",
-"mrmarkfrench/silverpop-php-connector": "dev-master",
-"omnimail/omnimail": "dev-master",
-"phpseclib/phpseclib": "~2.0"
-},
-"require-dev": {
-"guzzlehttp/guzzle": "*"
-},
-"time": "2017-07-27T02:53:46+00:00",
-"type": "library",
-"installation-source": "source",
-"autoload": {
-"psr-4": {
-"Omnimail\\Silverpop\\": "src"
-}
-},
-"autoload-dev": {
-"psr-4": {
-"Omnimail\\Silverpop\\Tests\\": "test/tests"
-}
-},
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Eileen McNaughton",
-"email": "emcnaugh...@wikimedia.org"
-}
-],
-"description": "Silverpop plugin for Omnimail",
-"keywords": [
-"delivery",
-"email",
-"mail",
-"omnimail",
-"silverpop"
-]
-},
-{
 "name": "wikimedia/smash-pig",
 "version": "dev-master",
 "version_normalized": "999-dev",
@@ -2018,5 +1969,114 @@
 "GPL-2.0"
 ],
 "description": "Wikimedia Foundation payment processing library"
+},
+{
+"name": "symfony/polyfill-php54",
+"version": "v1.5.0",
+"version_normalized": "1.5.0.0",
+"source": {
+"type": "git",
+"url": "https://github.com/symfony/polyfill-php54.git;,
+"reference": "b7763422a5334c914ef0298ed21b253d25913a6e"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/symfony/polyfill-php54/zipball/b7763422a5334c914ef0298ed21b253d25913a6e;,
+"reference": "b7763422a5334c914ef0298ed21b253d25913a6e",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.3"
+},
+"time": "2017-06-14T15:44:48+00:00",
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "1.5-dev"
+}
+},
+"installation-source": "dist",
+"autoload": {
+"psr-4": {
+"Symfony\\Polyfill\\Php54\\": ""
+},
+"files": [
+"bootstrap.php"
+],
+"classmap": [
+"Resources/stubs"
+]
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Nicolas Grekas",
+"email": "p...@tchwork.com"
+},
+{
+"name": "Symfony Community",
+"homepage": "https://symfony.com/contributors;
+}
+],
+"description": "Symfony polyfill backporting some PHP 5.4+ features to 
lower PHP versions",
+"homepage": "https://symfony.com;,
+"keywords": [
+"compatibility",
+"polyfill",
+"portable",
+"shim"
+]
+},
+{
+"name": "wikimedia/omnimail-silverpop",
+"version": "dev-master",
+"version_normalized": "999-dev",
+"source": {
+"type": "git",
+"url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
+"reference": "45eaa193c3353bcceb27bb2676da08598fd57686"
+},
+"require": {
+"league/csv": "^8.0",
+

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Create puppet resource for service domain alias pattern

2017-09-12 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377683 )

Change subject: Create puppet resource for service domain alias pattern
..

Create puppet resource for service domain alias pattern

Change-Id: I079c22e3922f4047622dc496d7e5740877faf60d
---
A puppet/modules/apache/manifests/port_alias.pp
R puppet/modules/apache/templates/port_alias.erb
M puppet/modules/electron/manifests/init.pp
D puppet/modules/electron/templates/apache-site.erb
M puppet/modules/ores/manifests/init.pp
M puppet/modules/sentry/manifests/init.pp
D puppet/modules/sentry/templates/apache-site.erb
M puppet/modules/wikilabels/manifests/init.pp
D puppet/modules/wikilabels/templates/apache-site-wikilabels.erb
9 files changed, 55 insertions(+), 62 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/83/377683/1

diff --git a/puppet/modules/apache/manifests/port_alias.pp 
b/puppet/modules/apache/manifests/port_alias.pp
new file mode 100644
index 000..6a0d3f1
--- /dev/null
+++ b/puppet/modules/apache/manifests/port_alias.pp
@@ -0,0 +1,46 @@
+# == Define: apache::port_alias
+#
+# Creates a domain alias for an internal port. Using domain aliases
+# avoids conflicts when multiple vagrant boxes with the same service role
+# are running. So e.g. if the service listens on port 1234, instead of
+# using localhost:1234 or dev.wiki.local.wmftest.net:1234 on the host
+# machine (would result in a port redirection conflict) or using
+# :1234 (inconvenient) one can just use
+# .local.wmftest.net:, with different boxes
+# using different ports.
+#
+# === Parameters
+#
+# [*alias*]
+#   Domain name prefix. E.g. 'restbase' will result in the service being
+#   reachable at restbase.local.wmftest.net: (where  is
+#   whatever was set via `vagrant config http_port`). Defaults to the
+#   resource name.
+#
+# [*port*]
+#   Internal port used by the service. All requests sent to the domain
+#   alias will be redirected here,
+#
+# === Examples
+#
+#  apache::port_alias { 'restbase':
+#port => ,
+#  }
+#
+define apache::port_alias(
+$domain_prefix = $title,
+$port,
+) {
+include ::mwv
+$base_domain = $::mwv::tld
+
+apache::site { $domain_prefix:
+ensure  => present,
+content => template('apache/port_alias.erb'),
+require => [
+  Class['::apache::mod::proxy'],
+  Class['::apache::mod::proxy_http'],
+  Class['::apache::mod::headers'],
+],
+}
+}
diff --git a/puppet/modules/ores/templates/apache-site-ores.erb 
b/puppet/modules/apache/templates/port_alias.erb
similarity index 86%
rename from puppet/modules/ores/templates/apache-site-ores.erb
rename to puppet/modules/apache/templates/port_alias.erb
index ba10199..76eb54a 100644
--- a/puppet/modules/ores/templates/apache-site-ores.erb
+++ b/puppet/modules/apache/templates/port_alias.erb
@@ -2,7 +2,7 @@
 ### THIS FILE IS MANAGED BY PUPPET
 #
 
-ServerName <%= @vhost_name %>
+ServerName <%= @domain_prefix %><%= @base_domain %>
 
 ProxyPass / http://localhost:<%= @port %>/
 ProxyPassReverse / http://localhost:<%= @port %>/
diff --git a/puppet/modules/electron/manifests/init.pp 
b/puppet/modules/electron/manifests/init.pp
index 4fbc6c9..4cf3749 100644
--- a/puppet/modules/electron/manifests/init.pp
+++ b/puppet/modules/electron/manifests/init.pp
@@ -75,13 +75,7 @@
 ],
 }
 
-# set up nice URL
-apache::site { 'electron':
-ensure  => present,
-content => template('electron/apache-site.erb'),
-require => [
-  Class['::apache::mod::proxy'],
-  Class['::apache::mod::proxy_http'],
-],
+apache::port_alias { 'electron':
+port => $port,
 }
 }
diff --git a/puppet/modules/electron/templates/apache-site.erb 
b/puppet/modules/electron/templates/apache-site.erb
deleted file mode 100644
index 599bd4b..000
--- a/puppet/modules/electron/templates/apache-site.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-#
-
-ServerName <%= @vhost_name %>
-
-ProxyPass / http://localhost:<%= @port %>/
-ProxyPassReverse / http://localhost:<%= @port %>/
-ProxyPreserveHost On
diff --git a/puppet/modules/ores/manifests/init.pp 
b/puppet/modules/ores/manifests/init.pp
index 08f247e..a4b3e7f 100644
--- a/puppet/modules/ores/manifests/init.pp
+++ b/puppet/modules/ores/manifests/init.pp
@@ -49,14 +49,8 @@
 }
 $repo_dir = "${deploy_dir}/src/ores"
 
-apache::site { 'ores':
-ensure  => present,
-content => template('ores/apache-site-ores.erb'),
-require => [
-  Class['::apache::mod::proxy'],
-  Class['::apache::mod::proxy_http'],
-  Class['::apache::mod::headers'],
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: racktables: pass $racktables_host to module

2017-09-12 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377669 )

Change subject: racktables: pass $racktables_host to module
..


racktables: pass $racktables_host to module

$racktables_host is currently set in the role class, but used by the
module's template, and this kind of scope-jumping is unsupported with
the future parser and going forward.

Pass it as a class parameter instead, and while at it, remove the
default values of the existing parameters of module, making them all
required parameters.

Change-Id: Ia8f186479dc17824a460e15e7024e4fa186dc654
---
M modules/racktables/manifests/init.pp
M modules/role/manifests/racktables/server.pp
2 files changed, 2 insertions(+), 7 deletions(-)

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



diff --git a/modules/racktables/manifests/init.pp 
b/modules/racktables/manifests/init.pp
index d7223d2..3d9438a 100644
--- a/modules/racktables/manifests/init.pp
+++ b/modules/racktables/manifests/init.pp
@@ -3,11 +3,7 @@
 ## into its web directory root.  This means that puppet cannot fully automate
 ## the installation at this time & the actual tarball must be downloaded from
 ## http://racktables.org/ and unzipped into /srv/org/wikimedia/racktables
-class racktables (
-$racktables_db_host = 'm1-master.eqiad.wmnet',
-$racktables_db  = 'racktables',
-) {
-
+class racktables ($racktables_host, $racktables_db_host, $racktables_db) {
 include ::mysql
 include ::passwords::racktables
 include ::apache
diff --git a/modules/role/manifests/racktables/server.pp 
b/modules/role/manifests/racktables/server.pp
index 5302a68..4d0c82f 100644
--- a/modules/role/manifests/racktables/server.pp
+++ b/modules/role/manifests/racktables/server.pp
@@ -13,14 +13,13 @@
 include ::standard
 include ::base::firewall
 
-$racktables_host = hiera('racktables_host', $::fqdn)
-
 ferm::service { 'racktables-http':
 proto => 'tcp',
 port  => '80',
 }
 
 class { '::racktables':
+racktables_host=> hiera('racktables_host', $facts['fqdn']),
 racktables_db_host => 'm1-master.eqiad.wmnet',
 racktables_db  => 'racktables',
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8f186479dc17824a460e15e7024e4fa186dc654
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack2: use !~ instead of ! $title =~ /.../

2017-09-12 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377512 )

Change subject: openstack2: use !~ instead of ! $title =~ /.../
..


openstack2: use !~ instead of ! $title =~ /.../

Current form breaks with the future parser, probably due to operator
precedence. Almost identical to commit e643ade45d.

Change-Id: Ica701975f366fb57a96d25fc8838d377092bbece
---
M modules/openstack2/manifests/nova/compute/partition.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/openstack2/manifests/nova/compute/partition.pp 
b/modules/openstack2/manifests/nova/compute/partition.pp
index 9344368..168e33a 100644
--- a/modules/openstack2/manifests/nova/compute/partition.pp
+++ b/modules/openstack2/manifests/nova/compute/partition.pp
@@ -3,9 +3,9 @@
 #  what kind of a drive setup they have.
 define openstack2::nova::compute::partition(
 $partition_nr='1',
-) {
+) {
 
-if (! $title =~ /^\/dev\/([hvs]d[a-z]+|md[0-9]+)$/) {
+if ($title !~ /^\/dev\/([hvs]d[a-z]+|md[0-9]+)$/) {
 fail("unable to init ${title} for nova")
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica701975f366fb57a96d25fc8838d377092bbece
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Actually apply proper classes to grouped pages

2017-09-12 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Actually apply proper classes to grouped pages
..

RCFilters: Actually apply proper classes to grouped pages

Bug: T174734
Change-Id: Ie0a8f5587103c3caed31d29585db78017ac4ab4c
---
M includes/changes/EnhancedChangesList.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/82/377682/1

diff --git a/includes/changes/EnhancedChangesList.php 
b/includes/changes/EnhancedChangesList.php
index 8e24efe..a8e4bd9 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -383,7 +383,8 @@
) {
$classes[] = 'mw-enhanced-watched';
}
-   $classes = array_merge( $classes, 
$this->getHTMLClassesForFilters( $rcObj ) );
+
+   $classes = array_merge( $classes, $this->getHTMLClasses( $rcObj 
) );
 
$separator = ' . 
. ';
 

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update Omnimail plugin to allow setting offset

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Update Omnimail plugin to allow setting offset
..


Update Omnimail plugin to allow setting offset

Bug T175665

Change-Id: I54e5bac565e61407e5f5087e60b7fc8480327425
---
M sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
index 65a33d2..1424d0e 100644
--- a/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
+++ b/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
@@ -707,7 +707,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "e06e50192ae17fe93f1045ee7562aa286272cbcc"
+"reference": "45eaa193c3353bcceb27bb2676da08598fd57686"
 },
 "require": {
 "league/csv": "^8.0",
@@ -746,7 +746,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-07-05 04:12:48"
+"time": "2017-09-12 23:04:53"
 }
 ],
 "packages-dev": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I54e5bac565e61407e5f5087e60b7fc8480327425
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Sanitizer: Whitelist aria-level HTML attribute in wikitext

2017-09-12 Thread Matt Fitzpatrick (Code Review)

Matt Fitzpatrick has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377681 )

Change subject: Sanitizer: Whitelist aria-level HTML attribute in wikitext
..

Sanitizer: Whitelist aria-level HTML attribute in wikitext

Allows editors to identify a pseudo-heading as a heading of a given
hierarchical level to assistive technologies. Also allows levels 7
and deeper.

Example

See also https://www.w3.org/WAI/GL/wiki/Using_role%3Dheading

Change-Id: Ia465a076db334d08cd1f548f2363a0f7cafe7690
---
M RELEASE-NOTES-1.30
M includes/Sanitizer.php
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/81/377681/1

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 67a449a..352208b 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -70,6 +70,7 @@
 ** This is currently gated by $wgCommentTableSchemaMigrationStage. Most wikis
can set this to MIGRATION_NEW and run maintenance/migrateComments.php as
soon as any necessary extensions are updated.
+* Whitelisted the aria-level HTML attribute in wikitext.
 
 === External library changes in 1.30 ===
 
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 7d17cd1..864d87c 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -1760,6 +1760,7 @@
'aria-flowto',
'aria-label',
'aria-labelledby',
+   'aria-level',
'aria-owns',
'role',
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia465a076db334d08cd1f548f2363a0f7cafe7690
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matt Fitzpatrick 

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Hide RC/WL related preferences as appropriate

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Hide RC/WL related preferences as appropriate
..


Hide RC/WL related preferences as appropriate

If the new filters are enabled on the RC page, hide the RC-related
preferences. This was already being done, but the logic didn't
take the new opt-out preference into account.

If the new filters are enabled on the Watchlist, hide the WL-related
preferences too, except for the ones that also affect Contributions.

Bug: T175611
Change-Id: Ia9355fb95e82c72185d2df93d48115f718fabe99
---
M includes/Hooks.php
M includes/Hooks/PreferencesHookHandler.php
M tests/phpunit/includes/HooksTest.php
3 files changed, 46 insertions(+), 11 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index bc3d8ec..dc2597b 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -790,6 +790,18 @@
return $context->getTitle()->isSpecial( 'Watchlist' );
}
 
+   public static function isRCStructuredUiEnabled( IContextSource $context 
) {
+   $page = new SpecialRecentChanges();
+   $page->setContext( $context );
+   return $page->isStructuredFilterUiEnabled();
+   }
+
+   public static function isWLStructuredUiEnabled( IContextSource $context 
) {
+   $page = new SpecialWatchlist();
+   $page->setContext( $context );
+   return $page->isStructuredFilterUiEnabled();
+   }
+
/**
 * @param IContextSource $context
 * @return bool Whether highlights should be shown
@@ -812,16 +824,12 @@
}
 
if ( self::isRCPage( $context ) ) {
-   $page = new SpecialRecentChanges();
-   $page->setContext( $context );
-   return !$page->isStructuredFilterUiEnabled() &&
+   return !self::isRCStructuredUiEnabled( $context ) &&
$user->getBoolOption( 'ores-damaging-flag-rc' );
}
 
if ( self::isWLPage( $context ) ) {
-   $page = new SpecialWatchlist();
-   $page->setContext( $context );
-   return !$page->isStructuredFilterUiEnabled() &&
+   return !self::isWLStructuredUiEnabled( $context ) &&
$user->getBoolOption( 'oresHighlight' );
}
 
diff --git a/includes/Hooks/PreferencesHookHandler.php 
b/includes/Hooks/PreferencesHookHandler.php
index a0452ae..6b9250d 100644
--- a/includes/Hooks/PreferencesHookHandler.php
+++ b/includes/Hooks/PreferencesHookHandler.php
@@ -3,6 +3,9 @@
 namespace ORES\Hooks;
 
 use ORES\Hooks;
+use DerivativeContext;
+use DerivativeRequest;
+use RequestContext;
 use User;
 
 class PreferencesHookHandler {
@@ -72,14 +75,23 @@
'section' => 'rc/advancedrc',
'label-message' => 'ores-pref-rc-hidenondamaging',
];
-   // Hide RC prefs if enhanced filters are enabled
-   if ( $user->getBoolOption( 'rcenhancedfilters' ) ) {
-   // HACK: Note that this only hides the preferences on 
the preferences page,
-   // it does not cause them to behave as if they're set 
to their default value,
-   // because this hook only runs on the preferences page.
+
+   // Hide RC/wL prefs if enhanced filters are enabled
+   $context = new DerivativeContext( RequestContext::getMain() );
+   $context->setUser( $user );
+   $context->setRequest( new DerivativeRequest( 
$context->getRequest(), [] ) );
+   $rcFiltersEnabled = Hooks::isRCStructuredUiEnabled( $context );
+   $wlFiltersEnabled = Hooks::isWLStructuredUiEnabled( $context );
+   // HACK: Note that this only hides the preferences on the 
preferences page,
+   // it does not cause them to behave as if they're set to their 
default value,
+   // because this hook only runs on the preferences page.
+   if ( $rcFiltersEnabled ) {
$wgHiddenPrefs[] = 'oresRCHideNonDamaging';
$wgHiddenPrefs[] = 'ores-damaging-flag-rc';
}
+   if ( $wlFiltersEnabled ) {
+   $wgHiddenPrefs[] = 'oresWatchlistHideNonDamaging';
+   }
}
 
 }
diff --git a/tests/phpunit/includes/HooksTest.php 
b/tests/phpunit/includes/HooksTest.php
index e1f743a..7dff0a8 100644
--- a/tests/phpunit/includes/HooksTest.php
+++ b/tests/phpunit/includes/HooksTest.php
@@ -3,9 +3,11 @@
 namespace ORES\Tests;
 
 use ChangesList;
+use Config;
 use ContribsPager;
 use EnhancedChangesList;
 use

[MediaWiki-commits] [Gerrit] operations/dns[master]: add wikimania2019

2017-09-12 Thread Dzahn (Code Review)

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

Change subject: add wikimania2019
..

add wikimania2019

Ellie Young has just mailed wikimania-l about the steering
committee and WMF seeking parties interested in hosting
Wikimania in 2019.

Therefore, adding to DNS now.

Change-Id: Ic317a0124825cddf8005c3fae1df5a99143c7f89
---
M templates/wikimedia.org
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/80/377680/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 429e101..089b8e7 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -362,6 +362,7 @@
 wikimania2016.m 600 IN DYNA geoip!text-addrs
 wikimania2017.m 600 IN DYNA geoip!text-addrs
 wikimania2018.m 600 IN DYNA geoip!text-addrs
+wikimania2019.m 600 IN DYNA geoip!text-addrs
 
 ; Networking
 cr1-eqiad   1H  IN A208.80.154.196
@@ -671,7 +672,9 @@
 wikimania2016600 IN DYNA geoip!text-addrs
 wikimania2017600 IN DYNA geoip!text-addrs
 wikimania2018600 IN DYNA geoip!text-addrs
+wikimania2019600 IN DYNA geoip!text-addrs
 wikimaniateam600 IN DYNA geoip!text-addrs
+
 www  600 IN DYNA geoip!text-addrs
 zero 600 IN DYNA geoip!text-addrs
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: TFA: add scowiki

2017-09-12 Thread BearND (Code Review)

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

Change subject: TFA: add scowiki
..

TFA: add scowiki

Bug: T175759
Change-Id: I1114324a29b5443446b5dc2e8cf3a17ad4594b4b
---
M lib/feed/featured.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/feed/featured.js b/lib/feed/featured.js
index e448d36..b4096a3 100644
--- a/lib/feed/featured.js
+++ b/lib/feed/featured.js
@@ -18,7 +18,7 @@
 const HTTPError = sUtil.HTTPError;
 
 const supportedLangs = [ "bg", "cs", "de", "el", "en", "fa", "fr", "he", "hu", 
"ja", "la", "no",
-"ur", "vi" ];
+"sco", "ur", "vi" ];
 
 
 const isSupported = (domain) => {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1114324a29b5443446b5dc2e8cf3a17ad4594b4b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update Omnimail plugin to allow setting offset

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Update Omnimail plugin to allow setting offset
..

Update Omnimail plugin to allow setting offset

Bug T175665

Change-Id: I54e5bac565e61407e5f5087e60b7fc8480327425
---
M composer.lock
M sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/78/377678/1

diff --git a/composer.lock b/composer.lock
index 2e7daf7..a2467ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1864,7 +1864,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "c3248b3932e62cd2812aa3502d875b7c12c25c66"
+"reference": "45eaa193c3353bcceb27bb2676da08598fd57686"
 },
 "require": {
 "league/csv": "^8.0",
@@ -1903,7 +1903,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-07-27 02:53:46"
+"time": "2017-09-12 23:04:53"
 },
 {
 "name": "wikimedia/smash-pig",
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
index 65a33d2..1424d0e 100644
--- a/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
+++ b/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
@@ -707,7 +707,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "e06e50192ae17fe93f1045ee7562aa286272cbcc"
+"reference": "45eaa193c3353bcceb27bb2676da08598fd57686"
 },
 "require": {
 "league/csv": "^8.0",
@@ -746,7 +746,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-07-05 04:12:48"
+"time": "2017-09-12 23:04:53"
 }
 ],
 "packages-dev": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54e5bac565e61407e5f5087e60b7fc8480327425
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: tests.aspects.TestCase.has_site_user: Support '*' as family ...

2017-09-12 Thread Dalba (Code Review)

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

Change subject: tests.aspects.TestCase.has_site_user: Support '*' as family name
..

tests.aspects.TestCase.has_site_user: Support '*' as family name

Pywikibot supports '*' as family name since a10cbb30ed58085c754519e066c72d.
Tests that require a username should support this new method of specifying
usernames in userconfig.py and should not be skipped.

Bug: T120334
Change-Id: I278d70127bfc4f8d26035b74c3ae88dda62e37de
---
M tests/aspects.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/77/377677/1

diff --git a/tests/aspects.py b/tests/aspects.py
index 76fd2b5..9a60cfc 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -1018,7 +1018,8 @@
 
 usernames = config.sysopnames if sysop else config.usernames
 
-return code in usernames[family] or '*' in usernames[family]
+return (code in usernames[family] or '*' in usernames[family] or
+code in usernames['*'] or '*' in usernames['*'])
 
 def __init__(self, *args, **kwargs):
 """Constructor."""

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: salt: change roots/runner_dir from Array to String

2017-09-12 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377676 )

Change subject: salt: change roots/runner_dir from Array to String
..

salt: change roots/runner_dir from Array to String

In the salt::master class, these parameters are defined like that:
- $salt_runner_dirs= ['/srv/runners']
- $salt_state_roots= { 'base' => ['/srv/salt'] }
- $salt_file_roots = { 'base' => ['/srv/salt'] }
- $salt_pillar_roots   = { 'base' => ['/srv/pillars'] }
- $salt_module_roots   = { 'base' => ['/srv/salt/_modules'] }
- $salt_returner_roots = { 'base' => ['/srv/salt/_returners'] }

We actually never use more than one element in those arrays for any of
these anywhere, and the manifests are actually pretty broken if one
attempts to do that (e.g. they're being interpolated in some places and
passed as arguments to defined() in salt::master_environment), something
that the future parser caught.

Rather than attempt to fix the manifests to expect arrays everywhere,
convert those arrays into strings and call it a day. The days of those
manifests are fortunately numbered.

Change-Id: Iab10c654d8631e61e0f3a929d4d52189e53b0d81
---
M modules/role/manifests/salt/masters/labs.pp
M modules/role/manifests/salt/masters/labs/project_master.pp
M modules/role/manifests/salt/masters/production.pp
M modules/salt/manifests/master.pp
M modules/salt/templates/master.erb
5 files changed, 33 insertions(+), 33 deletions(-)


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

diff --git a/modules/role/manifests/salt/masters/labs.pp 
b/modules/role/manifests/salt/masters/labs.pp
index ac8cf55..98adb6b 100644
--- a/modules/role/manifests/salt/masters/labs.pp
+++ b/modules/role/manifests/salt/masters/labs.pp
@@ -3,14 +3,14 @@
 
 $puppet_master = hiera('labs_puppet_master')
 
-$salt_state_roots= { 'base' => ['/srv/salt'] }
-$salt_file_roots = { 'base' => ['/srv/salt'] }
-$salt_pillar_roots   = { 'base' => ['/srv/pillars'] }
-$salt_module_roots   = { 'base' => ['/srv/salt/_modules'] }
-$salt_returner_roots = { 'base' => ['/srv/salt/_returners'] }
+$salt_state_roots= { 'base' => '/srv/salt' }
+$salt_file_roots = { 'base' => '/srv/salt' }
+$salt_pillar_roots   = { 'base' => '/srv/pillars' }
+$salt_module_roots   = { 'base' => '/srv/salt/_modules' }
+$salt_returner_roots = { 'base' => '/srv/salt/_returners' }
 
 class { 'salt::master':
-salt_runner_dirs=> ['/srv/runners'],
+salt_runner_dir => '/srv/runners',
 salt_file_roots => $salt_file_roots,
 salt_pillar_roots   => $salt_pillar_roots,
 salt_worker_threads => '50',
diff --git a/modules/role/manifests/salt/masters/labs/project_master.pp 
b/modules/role/manifests/salt/masters/labs/project_master.pp
index 0b0262b..2a2ad9d 100644
--- a/modules/role/manifests/salt/masters/labs/project_master.pp
+++ b/modules/role/manifests/salt/masters/labs/project_master.pp
@@ -3,14 +3,14 @@
 # filtertags: labs-project-servermon labs-project-debdeploy 
labs-project-integration labs-project-ttmserver
 class role::salt::masters::labs::project_master {
 
-$salt_state_roots= { 'base' => ['/srv/salt'] }
-$salt_file_roots = { 'base' => ['/srv/salt'] }
-$salt_pillar_roots   = { 'base' => ['/srv/pillars'] }
-$salt_module_roots   = { 'base' => ['/srv/salt/_modules'] }
-$salt_returner_roots = { 'base' => ['/srv/salt/_returners'] }
+$salt_state_roots= { 'base' => '/srv/salt' }
+$salt_file_roots = { 'base' => '/srv/salt' }
+$salt_pillar_roots   = { 'base' => '/srv/pillars' }
+$salt_module_roots   = { 'base' => '/srv/salt/_modules' }
+$salt_returner_roots = { 'base' => '/srv/salt/_returners' }
 
 class { 'salt::master':
-salt_runner_dirs=> ['/srv/runners'],
+salt_runner_dir => '/srv/runners',
 # For simplicity of test/dev we trust all of labs
 # to run deploy module calls, but rely on security groups
 # to secure this.
diff --git a/modules/role/manifests/salt/masters/production.pp 
b/modules/role/manifests/salt/masters/production.pp
index 3b3ebf8..fd63d74 100644
--- a/modules/role/manifests/salt/masters/production.pp
+++ b/modules/role/manifests/salt/masters/production.pp
@@ -1,15 +1,15 @@
 class role::salt::masters::production {
 
-$salt_state_roots= { 'base' => ['/srv/salt'] }
-$salt_file_roots = { 'base' => ['/srv/salt'] }
-$salt_pillar_roots   = { 'base' => ['/srv/pillars'] }
-$salt_module_roots   = { 'base' => ['/srv/salt/_modules'] }
-$salt_returner_roots = { 'base' => ['/srv/salt/_returners'] }
+$salt_state_roots= { 'base' => '/srv/salt' }
+$salt_file_roots = { 'base' => '/srv/salt' }
+$salt_pillar_roots   = { 'base' => '/srv/pillars' }
+$salt_module_roots   = { 'base' =>

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update Omnimail plugin to allow setting offset

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Update Omnimail plugin to allow setting offset
..


Update Omnimail plugin to allow setting offset

Bug T175665

Change-Id: I0b20be3e9bc01d3517acc4471da60c069f15acd5
---
M composer.lock
M sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 2e7daf7..a2467ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1864,7 +1864,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "c3248b3932e62cd2812aa3502d875b7c12c25c66"
+"reference": "45eaa193c3353bcceb27bb2676da08598fd57686"
 },
 "require": {
 "league/csv": "^8.0",
@@ -1903,7 +1903,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-07-27 02:53:46"
+"time": "2017-09-12 23:04:53"
 },
 {
 "name": "wikimedia/smash-pig",
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
index 65a33d2..1424d0e 100644
--- a/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
+++ b/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
@@ -707,7 +707,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "e06e50192ae17fe93f1045ee7562aa286272cbcc"
+"reference": "45eaa193c3353bcceb27bb2676da08598fd57686"
 },
 "require": {
 "league/csv": "^8.0",
@@ -746,7 +746,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-07-05 04:12:48"
+"time": "2017-09-12 23:04:53"
 }
 ],
 "packages-dev": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b20be3e9bc01d3517acc4471da60c069f15acd5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update Omnimail plugin to allow setting offset

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Update Omnimail plugin to allow setting offset
..

Update Omnimail plugin to allow setting offset

Bug T175665

Change-Id: I0b20be3e9bc01d3517acc4471da60c069f15acd5
---
M composer.lock
M sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/75/377675/1

diff --git a/composer.lock b/composer.lock
index 2e7daf7..a2467ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1864,7 +1864,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "c3248b3932e62cd2812aa3502d875b7c12c25c66"
+"reference": "45eaa193c3353bcceb27bb2676da08598fd57686"
 },
 "require": {
 "league/csv": "^8.0",
@@ -1903,7 +1903,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-07-27 02:53:46"
+"time": "2017-09-12 23:04:53"
 },
 {
 "name": "wikimedia/smash-pig",
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
index 65a33d2..1424d0e 100644
--- a/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
+++ b/sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
@@ -707,7 +707,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "e06e50192ae17fe93f1045ee7562aa286272cbcc"
+"reference": "45eaa193c3353bcceb27bb2676da08598fd57686"
 },
 "require": {
 "league/csv": "^8.0",
@@ -746,7 +746,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-07-05 04:12:48"
+"time": "2017-09-12 23:04:53"
 }
 ],
 "packages-dev": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b20be3e9bc01d3517acc4471da60c069f15acd5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] analytics/dashiki[master]: Add page creation dashboard configuration

2017-09-12 Thread Nuria (Code Review)

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

Change subject: Add page creation dashboard configuration
..


Add page creation dashboard configuration

Per T170850, adding the page creation dashboard configuration to
config.yaml.

Bug: T170850
Change-Id: I31c4daade45a02315345d09f97aa29187d718e33
---
M config.yaml
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/config.yaml b/config.yaml
index b9660b9..e80420d 100644
--- a/config.yaml
+++ b/config.yaml
@@ -55,3 +55,11 @@
 piwikId:
 hostname: flow-reportcard.wmflabs.org
 subfolder:
+
+page-creation:
+layout: metrics-by-project
+config: Dashiki:PageCreations
+piwikHost:
+piwikId:
+hostname: page-creation.wmflabs.org
+subfolder:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31c4daade45a02315345d09f97aa29187d718e33
Gerrit-PatchSet: 2
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Nettrom 
Gerrit-Reviewer: Nuria 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix correct wiki name for wgPageLanguageUseDB on www.wikisou...

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Fix correct wiki name for wgPageLanguageUseDB on 
www.wikisource.org
..


Fix correct wiki name for wgPageLanguageUseDB on www.wikisource.org

The database name for www.wikisource.org is 'sourceswiki', using
'wikisource', the change was going to be enabled on *.wikisource.org
(excepted on the multilingual wikisource).

This is a follow-up for ed35fe0711d.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f6d6af3..bf460ef 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11979,7 +11979,7 @@
 
 'wgPageLanguageUseDB' => [
'default' => false,
-   'wikisource' => true, // T175622
+   'sourceswiki' => true, // T175622
// overridden to true in CommonSettings for wikis using the Translate 
extension
 ],
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix correct wiki name for wgPageLanguageUseDB on www.wikisou...

2017-09-12 Thread Dereckson (Code Review)

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

Change subject: Fix correct wiki name for wgPageLanguageUseDB on 
www.wikisource.org
..

Fix correct wiki name for wgPageLanguageUseDB on www.wikisource.org

The database name for www.wikisource.org is 'sourceswiki', using
'wikisource', the change was going to be enabled on *.wikisource.org
(excepted on the multilingual wikisource).

This is a follow-up for ed35fe0711d.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f6d6af3..bf460ef 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11979,7 +11979,7 @@
 
 'wgPageLanguageUseDB' => [
'default' => false,
-   'wikisource' => true, // T175622
+   'sourceswiki' => true, // T175622
// overridden to true in CommonSettings for wikis using the Translate 
extension
 ],
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7638632842d5ae7b0daedd68ae6c755162f98f70
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] mediawiki/core[master]: Use db query builder not raw sql

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Use db query builder not raw sql
..


Use db query builder not raw sql

Change-Id: I8e26932e28fdda9a52e0486c5d2eb269eb9ecae5
Follows-up: Ice1bdae3d16cf365da14c6df0e8d91d2b914e064
---
M maintenance/populateIpChanges.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/maintenance/populateIpChanges.php 
b/maintenance/populateIpChanges.php
index eb60f80..e086c5e 100644
--- a/maintenance/populateIpChanges.php
+++ b/maintenance/populateIpChanges.php
@@ -67,12 +67,12 @@
$this->output( "Copying IP revisions to ip_changes, from rev_id 
$start to rev_id $end\n" );
 
while ( $blockStart <= $end ) {
-   $cond = "rev_id >= $blockStart AND rev_user = 0 ORDER 
BY rev_id ASC LIMIT " . $this->mBatchSize;
$rows = $dbw->select(
'revision',
[ 'rev_id', 'rev_timestamp', 'rev_user_text' ],
-   $cond,
-   __METHOD__
+   [ "rev_id >= $blockStart", 'rev_user' => 0 ],
+   __METHOD__,
+   [ 'ORDER BY' => 'rev_id ASC', 'LIMIT' => 
$this->mBatchSize ]
);
 
if ( !$rows || $rows->numRows() === 0 ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e26932e28fdda9a52e0486c5d2eb269eb9ecae5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule update

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Submodule update
..


Submodule update

e2f8f43 CRM-21109 only clear caches once on cli script, consolidate code
b700baf CRM-20722: 'Lock wait timeout exceeded' error triggered on smart group 
cache rebuild

Change-Id: I57eb704df4df20dd8b111304b977c41b3c2480ac
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/civicrm b/civicrm
index 5e39e69..e2f8f43 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit 5e39e69fe48cc147157b46ce52bf92b4cfb0b7a4
+Subproject commit e2f8f433e69acff100e72a9830d8f7521a160655

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57eb704df4df20dd8b111304b977c41b3c2480ac
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Special:PageLanguage on mul.wikisource

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Enable Special:PageLanguage on mul.wikisource
..


Enable Special:PageLanguage on mul.wikisource

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5602176..f6d6af3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11979,6 +11979,7 @@
 
 'wgPageLanguageUseDB' => [
'default' => false,
+   'wikisource' => true, // T175622
// overridden to true in CommonSettings for wikis using the Translate 
extension
 ],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief7b02a5b2237f01ddd6fb5f0b849fad8dadd85a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule update

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Submodule update
..

Submodule update

e2f8f43 CRM-21109 only clear caches once on cli script, consolidate code
b700baf CRM-20722: 'Lock wait timeout exceeded' error triggered on smart group 
cache rebuild

Change-Id: I57eb704df4df20dd8b111304b977c41b3c2480ac
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/73/377673/1

diff --git a/civicrm b/civicrm
index 5e39e69..e2f8f43 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit 5e39e69fe48cc147157b46ce52bf92b4cfb0b7a4
+Subproject commit e2f8f433e69acff100e72a9830d8f7521a160655

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57eb704df4df20dd8b111304b977c41b3c2480ac
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Don't deploy Timeless on fr.wiktionary for now"

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Don't deploy Timeless on fr.wiktionary for now"
..


Revert "Don't deploy Timeless on fr.wiktionary for now"

Wordmark can be configured on wiki, so it's not a blocker to deploy this.

This reverts commit df3ee8e44c2dcd6f15ed2cc6f2e63fc388b49042.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 844c035..5602176 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19474,6 +19474,7 @@
'frwikinews' => true, // T154371
'frwikisource' => true,
'frwikiversity' => true,
+   'frwiktionary' => true,
 ],
 
 // T175725

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04c12400fd49fb3918428186165bfe10fcfa059b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Quote $default in PostgresUpdater::setDefault

2017-09-12 Thread Reedy (Code Review)

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

Change subject: Quote $default in PostgresUpdater::setDefault
..

Quote $default in PostgresUpdater::setDefault

Bug: T175439
Change-Id: Id5f5f4f34c7b9ff9af4b706e3e126ba8fda6a0d5
(cherry picked from commit bc12345f4bb7893030c31e1133abc4b20153f59b)
---
M includes/installer/PostgresUpdater.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/71/377671/1

diff --git a/includes/installer/PostgresUpdater.php 
b/includes/installer/PostgresUpdater.php
index 790fbe7..2b1f062 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -746,7 +746,8 @@
$info = $this->db->fieldInfo( $table, $field );
if ( $info->defaultValue() !== $default ) {
$this->output( "Changing '$table.$field' default 
value\n" );
-   $this->db->query( "ALTER TABLE $table ALTER $field SET 
DEFAULT " . $default );
+   $this->db->query( "ALTER TABLE $table ALTER $field SET 
DEFAULT "
+   . $this->db->addQuotes( $default ) );
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5f5f4f34c7b9ff9af4b706e3e126ba8fda6a0d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Quote $default in PostgresUpdater::setDefault

2017-09-12 Thread Reedy (Code Review)

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

Change subject: Quote $default in PostgresUpdater::setDefault
..

Quote $default in PostgresUpdater::setDefault

Bug: T175439
Change-Id: Id5f5f4f34c7b9ff9af4b706e3e126ba8fda6a0d5
(cherry picked from commit bc12345f4bb7893030c31e1133abc4b20153f59b)
---
M includes/installer/PostgresUpdater.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/377672/1

diff --git a/includes/installer/PostgresUpdater.php 
b/includes/installer/PostgresUpdater.php
index 39cb89c..ff96efb 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -755,7 +755,8 @@
$info = $this->db->fieldInfo( $table, $field );
if ( $info->defaultValue() !== $default ) {
$this->output( "Changing '$table.$field' default 
value\n" );
-   $this->db->query( "ALTER TABLE $table ALTER $field SET 
DEFAULT " . $default );
+   $this->db->query( "ALTER TABLE $table ALTER $field SET 
DEFAULT "
+   . $this->db->addQuotes( $default ) );
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5f5f4f34c7b9ff9af4b706e3e126ba8fda6a0d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Quote $default in PostgresUpdater::setDefault

2017-09-12 Thread Reedy (Code Review)

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

Change subject: Quote $default in PostgresUpdater::setDefault
..

Quote $default in PostgresUpdater::setDefault

Bug: T175439
Change-Id: Id5f5f4f34c7b9ff9af4b706e3e126ba8fda6a0d5
(cherry picked from commit bc12345f4bb7893030c31e1133abc4b20153f59b)
---
M includes/installer/PostgresUpdater.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/377670/1

diff --git a/includes/installer/PostgresUpdater.php 
b/includes/installer/PostgresUpdater.php
index a3b50ac..162cd12 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -736,7 +736,8 @@
$info = $this->db->fieldInfo( $table, $field );
if ( $info->defaultValue() !== $default ) {
$this->output( "Changing '$table.$field' default 
value\n" );
-   $this->db->query( "ALTER TABLE $table ALTER $field SET 
DEFAULT " . $default );
+   $this->db->query( "ALTER TABLE $table ALTER $field SET 
DEFAULT "
+   . $this->db->addQuotes( $default ) );
}
}
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Quote $default in PostgresUpdater::setDefault

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Quote $default in PostgresUpdater::setDefault
..


Quote $default in PostgresUpdater::setDefault

Bug: T175439
Change-Id: Id5f5f4f34c7b9ff9af4b706e3e126ba8fda6a0d5
---
M includes/installer/PostgresUpdater.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/installer/PostgresUpdater.php 
b/includes/installer/PostgresUpdater.php
index e5a5c94..07aeb13 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -783,7 +783,8 @@
$info = $this->db->fieldInfo( $table, $field );
if ( $info->defaultValue() !== $default ) {
$this->output( "Changing '$table.$field' default 
value\n" );
-   $this->db->query( "ALTER TABLE $table ALTER $field SET 
DEFAULT " . $default );
+   $this->db->query( "ALTER TABLE $table ALTER $field SET 
DEFAULT "
+   . $this->db->addQuotes( $default ) );
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5f5f4f34c7b9ff9af4b706e3e126ba8fda6a0d5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: racktables: pass $racktables_host to module

2017-09-12 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377669 )

Change subject: racktables: pass $racktables_host to module
..

racktables: pass $racktables_host to module

$racktables_host is currently set in the role class, but used by the
module's template, and this kind of scope-jumping is unsupported with
the future parser and going forward.

Pass it as a class parameter instead, and while at it, remove the
default values of the existing parameters of module, making them all
required parameters.

Change-Id: Ia8f186479dc17824a460e15e7024e4fa186dc654
---
M modules/racktables/manifests/init.pp
M modules/role/manifests/racktables/server.pp
2 files changed, 2 insertions(+), 7 deletions(-)


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

diff --git a/modules/racktables/manifests/init.pp 
b/modules/racktables/manifests/init.pp
index d7223d2..3d9438a 100644
--- a/modules/racktables/manifests/init.pp
+++ b/modules/racktables/manifests/init.pp
@@ -3,11 +3,7 @@
 ## into its web directory root.  This means that puppet cannot fully automate
 ## the installation at this time & the actual tarball must be downloaded from
 ## http://racktables.org/ and unzipped into /srv/org/wikimedia/racktables
-class racktables (
-$racktables_db_host = 'm1-master.eqiad.wmnet',
-$racktables_db  = 'racktables',
-) {
-
+class racktables ($racktables_host, $racktables_db_host, $racktables_db) {
 include ::mysql
 include ::passwords::racktables
 include ::apache
diff --git a/modules/role/manifests/racktables/server.pp 
b/modules/role/manifests/racktables/server.pp
index 5302a68..4d0c82f 100644
--- a/modules/role/manifests/racktables/server.pp
+++ b/modules/role/manifests/racktables/server.pp
@@ -13,14 +13,13 @@
 include ::standard
 include ::base::firewall
 
-$racktables_host = hiera('racktables_host', $::fqdn)
-
 ferm::service { 'racktables-http':
 proto => 'tcp',
 port  => '80',
 }
 
 class { '::racktables':
+racktables_host=> hiera('racktables_host', $facts['fqdn']),
 racktables_db_host => 'm1-master.eqiad.wmnet',
 racktables_db  => 'racktables',
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8f186479dc17824a460e15e7024e4fa186dc654
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add more wikis to the list of the dumped

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Add more wikis to the list of the dumped
..


Add more wikis to the list of the dumped

Added all 1M+ wikis plus ones in group1 and a couple of others.
That may be interesting to test.

If that goes well, will publish a call for wiki communities to nominate
their wikis for inclusion.

Bug: T171807
Change-Id: Ie6bd56982136d949c56078591d004de7432be927
---
M dblists/categories-rdf.dblist
1 file changed, 17 insertions(+), 0 deletions(-)

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



diff --git a/dblists/categories-rdf.dblist b/dblists/categories-rdf.dblist
index 286f697..3626987 100644
--- a/dblists/categories-rdf.dblist
+++ b/dblists/categories-rdf.dblist
@@ -1,2 +1,19 @@
 testwiki
 test2wiki
+enwiki
+dewiki
+frwiki
+hewiki
+cawiki
+eswiki
+ruwiki
+itwiki
+zhwiki
+jawiki
+nlwiki
+plwiki
+cebwiki
+svwiki
+viwiki
+warwiki
+mediawikiwiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6bd56982136d949c56078591d004de7432be927
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Lydia Pintscher 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove @covers from private Sanitizer method

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Remove @covers from private Sanitizer method
..


Remove @covers from private Sanitizer method

Breaks mediawiki-core-code-coverage

https://integration.wikimedia.org/ci/job/mediawiki-core-code-coverage/3003/console

Change-Id: I3204289c1d45e5ea0bee5c4bb6869434152e6017
---
M tests/phpunit/includes/SanitizerTest.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/tests/phpunit/includes/SanitizerTest.php 
b/tests/phpunit/includes/SanitizerTest.php
index 7472fb9..350cb70 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -432,7 +432,6 @@
 * @covers Sanitizer::escapeIdForLink()
 * @covers Sanitizer::escapeIdForExternalInterwiki()
 * @covers Sanitizer::escapeIdInternal()
-* @covers Sanitizer::urlEscapeId()
 *
 * @param string $stuff
 * @param string[] $config

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3204289c1d45e5ea0bee5c4bb6869434152e6017
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Chinese Conversion Table Update 2017-4

2017-09-12 Thread jenkins-bot (Code Review)

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

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


Chinese Conversion Table Update 2017-4

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

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

Change-Id: Ic66546d3a47e4dd946ae67c636a638ca181b0ca1
---
M languages/data/ZhConversion.php
M maintenance/language/zhtable/toCN.manual
M maintenance/language/zhtable/toHK.manual
M maintenance/language/zhtable/toSimp.manual
M maintenance/language/zhtable/toTW.manual
M maintenance/language/zhtable/trad2simp.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
8 files changed, 82 insertions(+), 10 deletions(-)

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



diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index 03ebe21..64cce78 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -3155,6 +3155,7 @@
 '上签约' => '上簽約',
 '上签署' => '上簽署',
 '上签订' => '上簽訂',
+'上签证' => '上簽證',
 '上签' => '上籤',
 '上系上' => '上繫上',
 '上课钟' => '上課鐘',
@@ -3172,6 +3173,7 @@
 '下签约' => '下簽約',
 '下签署' => '下簽署',
 '下签订' => '下簽訂',
+'下签证' => '下簽證',
 '下签' => '下籤',
 '下课钟' => '下課鐘',
 '不干不净' => '不乾不淨',
@@ -3247,6 +3249,7 @@
 '中签约' => '中簽約',
 '中签署' => '中簽署',
 '中签订' => '中簽訂',
+'中签证' => '中簽證',
 '中签' => '中籤',
 '中风后' => '中風後',
 '丰仪' => '丰儀',
@@ -4322,7 +4325,6 @@
 '台子女' => '台子女',
 '台子孙' => '台子孫',
 '台州' => '台州',
-'台布景' => '台布景',
 '台历史' => '台歷史',
 '台钟' => '台鐘',
 '台风奖' => '台風獎',
@@ -4867,6 +4869,8 @@
 '尸祝' => '尸祝',
 '尸祿' => '尸祿',
 '尸禄' => '尸祿',
+'尸罗' => '尸羅',
+'尸羅' => '尸羅',
 '尸罗精舍' => '尸羅精舍',
 '尸羅精舍' => '尸羅精舍',
 '尸臣' => '尸臣',
@@ -5883,6 +5887,7 @@
 '星历' => '星曆',
 '星期后' => '星期後',
 '星历史' => '星歷史',
+'星露谷物语' => '星露谷物語',
 '春游' => '春遊',
 '春香斗学' => '春香鬥學',
 '昭惠后' => '昭惠后',
@@ -6034,6 +6039,7 @@
 '架钟' => '架鐘',
 '某只' => '某隻',
 '染殿后' => '染殿后',
+'染发生' => '染發生',
 '染发' => '染髮',
 '柜上' => '柜上',
 '柜子' => '柜子',
@@ -6063,7 +6069,6 @@
 '杆菌' => '桿菌',
 '梁上君子' => '梁上君子',
 '梁启超' => '梁啓超',
-'条干' => '條幹',
 '条文里' => '條文裡',
 '梨干' => '梨乾',
 '梯冲' => '梯衝',
@@ -6139,7 +6144,6 @@
 '横征暴敛' => '橫徵暴斂',
 '横梁' => '橫樑',
 '横冲' => '橫衝',
-'台布' => '檯布',
 '台历' => '檯曆',
 '台灯' => '檯燈',
 '台球' => '檯球',
@@ -8494,6 +8498,10 @@
 '闯荡' => '闖蕩',
 '闯炼' => '闖鍊',
 '关系' => '關係',
+'关系列' => '關系列',
+'关系所' => '關系所',
+'关系科' => '關系科',
+'关系统' => '關系統',
 '辟佛' => '闢佛',
 '辟作' => '闢作',
 '辟划' => '闢劃',
@@ -9710,6 +9718,7 @@
 '圞' => 'ꢮ',
 '坿' => '附',
 '垜' => '垛',
+'垻' => '坝',
 '埡' => '垭',
 '執' => '执',
 '堅' => '坚',
@@ -13498,6 +13507,7 @@
 '崑崙' => '昆仑',
 '崑劇' => '昆剧',
 '崑山' => '昆山',
+'崑島' => '昆岛',
 '崑曲' => '昆曲',
 '崑腔' => '昆腔',
 '崑蘇' => '昆苏',
@@ -13875,6 +13885,9 @@
 '哥特式' => '哥德式',
 '哥斯达黎加' => '哥斯大黎加',
 '哥斯達黎加' => '哥斯大黎加',
+'唐纳德·特朗普' => '唐納·川普',
+'當勞·特朗普' => '唐納·川普',
+'當奴·特朗普' => '唐納·川普',
 '卡拉奇' => '喀拉蚩',
 '乔治·奥威尔' => '喬治·歐威爾',
 '佐治亚' => '喬治亞',
@@ -13951,6 +13964,7 @@
 '尼日尔' => '尼日',
 '尼日爾' => '尼日',
 '雅马哈' => '山葉',
+'特朗普' => '川普',
 '机床' => '工具機',
 '機床' => '工具機',
 '珍寶客機' => '巨無霸客機',
@@ -14105,6 +14119,7 @@
 '奥巴马' => '歐巴馬',
 '奧巴馬' => '歐巴馬',
 '正在叱咤' => '正在叱咤',
+'圣佩德罗苏拉' => '汕埠',
 '文莱' => '汶萊',
 '沙律' => '沙拉',
 '沙地阿拉伯' => '沙烏地阿拉伯',
@@ -14270,7 +14285,8 @@
 '毛里塔尼亞' => '茅利塔尼亞',
 '霍尔木兹' => '荷姆茲',
 '霍爾木茲' => '荷姆茲',
-'荷李活道' => '荷李活道',
+'荷里活廣場' => '荷里活廣場',
+'荷里活道' => '荷里活道',
 '莫桑比克' => '莫三比克',
 '瓦文萨' => '華勒沙',
 '華里沙' => '華勒沙',
@@ -14349,6 +14365,8 @@
 '屏幕' => '螢幕',
 '行人路权' => '行人路權',
 '行人路權' => '行人路權',
+'流動作業系統' => '行動作業系統',
+'移动操作系统' => '行動作業系統',
 '流動網絡' => '行動網路',
 '移动网络' => '行動網路',
 '流動電話' => '行動電話',
@@ -14840,6 +14858,7 @@
 '占高枝' => '佔高枝',
 '維德角' => '佛得角',
 '作品里' => '作品裏',
+'操作系统' => '作業系統',
 '來著' => '來着',
 '來著作' => '來著作',
 '來著名' => '來著名',
@@ -15843,6 +15862,8 @@
 '數碼訊號' => '數碼訊號',
 '数字电视' => '數碼電視',
 '數位電視' => '數碼電視',
+'数字音乐' => '數碼音樂',
+'數位音樂' => '數碼音樂',
 '數著作' => '數著作',
 '數著名' => '數著名',
 '數著稱' => '數著稱',
@@ -15974,7 +15995,6 @@
 '枕著述' => '枕著述',
 '枕著錄' => '枕著錄',
 '檯' => '枱',
-'台布' => '枱布',
 '台历' => '枱曆',
 '台灯' => '枱燈',
 '台面上' => '枱面上',
@@ -16101,6 +16121,8 @@
 '活著者' => '活著者',
 '活著述' => '活著述',
 '活著錄' => '活著錄',
+'移动操作系统' => '流動作業系統',
+'行動作業系統' => '流動作業系統',
 '移动网络' => '流動網絡',
 '行動網路' => '流動網絡',
 '移动电话' => '流動電話',
@@ -16313,6 +16335,8 @@
 '畫著稱' => '畫著稱',
 '畫著者' => '畫著者',
 '画里' => '畫裏',
+'唐納·川普' => '當勞·特朗普',
+'唐纳德·特朗普' => '當勞·特朗普',
 '當著' => '當着',
 '當著作' => '當著作',
 '過著作' => '當著作',
@@ -18118,6 +18142,9 @@
 '哭著稱' => '哭著称',
 '哭著者' => '哭著者',
 '哭著述' => '哭著述',
+'唐納·川普' => '唐纳德·特朗普',
+'當勞·特朗普' => '唐纳德·特朗普',
+'當奴·特朗普' => '唐纳德·特朗普',
 '唱著' => '唱着',
 '唱著書' => '唱著书',
 '唱著作' => '唱著作',
@@ -18180,6 +18207,7 @@
 '土魯斯' => '图卢兹',
 '吐瓦魯' => '图瓦卢',
 '原子筆' => '圆珠笔',
+'汕埠' => '圣佩德罗苏拉',
 '聖露西亞' => '圣卢西亚',
 '聖克里斯多福及尼維斯' => '圣基茨和尼维斯',

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Split off remaining helper classes for special pages to sepa...

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Split off remaining helper classes for special pages to 
separate files
..


Split off remaining helper classes for special pages to separate files

includes/specials/formfields/
* EditWatchlistCheckboxSeriesField (for SpecialEditWatchlist)
* UploadSourceField(for SpecialUpload)
* Licenses (for SpecialUpload)

includes/specials/forms/
* EditWatchlistNormalHTMLForm  (for SpecialEditWatchlist)
* PreferencesForm  (for SpecialPreferences)
* UploadForm   (for SpecialUpload)

includes/specials/helpers/
* ImportReporter   (for SpecialImport)
* License  (for SpecialUpload)

Change-Id: I58abcbb44dbf9bf1762b4252555f7552bfa7c253
---
M autoload.php
M includes/Preferences.php
M includes/specials/SpecialEditWatchlist.php
M includes/specials/SpecialImport.php
M includes/specials/SpecialUpload.php
A includes/specials/formfields/EditWatchlistCheckboxSeriesField.php
R includes/specials/formfields/Licenses.php
A includes/specials/formfields/UploadSourceField.php
A includes/specials/forms/EditWatchlistNormalHTMLForm.php
A includes/specials/forms/PreferencesForm.php
A includes/specials/forms/UploadForm.php
A includes/specials/helpers/ImportReporter.php
A includes/specials/helpers/License.php
13 files changed, 974 insertions(+), 831 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 4448204..61fd192 100644
--- a/autoload.php
+++ b/autoload.php
@@ -421,8 +421,8 @@
'EditAction' => __DIR__ . '/includes/actions/EditAction.php',
'EditCLI' => __DIR__ . '/maintenance/edit.php',
'EditPage' => __DIR__ . '/includes/EditPage.php',
-   'EditWatchlistCheckboxSeriesField' => __DIR__ . 
'/includes/specials/SpecialEditWatchlist.php',
-   'EditWatchlistNormalHTMLForm' => __DIR__ . 
'/includes/specials/SpecialEditWatchlist.php',
+   'EditWatchlistCheckboxSeriesField' => __DIR__ . 
'/includes/specials/formfields/EditWatchlistCheckboxSeriesField.php',
+   'EditWatchlistNormalHTMLForm' => __DIR__ . 
'/includes/specials/forms/EditWatchlistNormalHTMLForm.php',
'EmailConfirmation' => __DIR__ . 
'/includes/specials/SpecialConfirmemail.php',
'EmailInvalidation' => __DIR__ . 
'/includes/specials/SpecialEmailInvalidate.php',
'EmailNotification' => __DIR__ . '/includes/mail/EmailNotification.php',
@@ -633,7 +633,7 @@
'ImageQueryPage' => __DIR__ . 
'/includes/specialpage/ImageQueryPage.php',
'ImportImages' => __DIR__ . '/maintenance/importImages.php',
'ImportLogFormatter' => __DIR__ . 
'/includes/logging/ImportLogFormatter.php',
-   'ImportReporter' => __DIR__ . '/includes/specials/SpecialImport.php',
+   'ImportReporter' => __DIR__ . 
'/includes/specials/helpers/ImportReporter.php',
'ImportSiteScripts' => __DIR__ . '/maintenance/importSiteScripts.php',
'ImportSites' => __DIR__ . '/maintenance/importSites.php',
'ImportSource' => __DIR__ . '/includes/import/ImportSource.php',
@@ -746,8 +746,8 @@
'Languages' => __DIR__ . '/maintenance/language/languages.inc',
'LayeredParameterizedPassword' => __DIR__ . 
'/includes/password/LayeredParameterizedPassword.php',
'LegacyLogFormatter' => __DIR__ . '/includes/logging/LogFormatter.php',
-   'License' => __DIR__ . '/includes/Licenses.php',
-   'Licenses' => __DIR__ . '/includes/Licenses.php',
+   'License' => __DIR__ . '/includes/specials/helpers/License.php',
+   'Licenses' => __DIR__ . '/includes/specials/formfields/Licenses.php',
'LinkBatch' => __DIR__ . '/includes/cache/LinkBatch.php',
'LinkCache' => __DIR__ . '/includes/cache/LinkCache.php',
'LinkFilter' => __DIR__ . '/includes/LinkFilter.php',
@@ -1135,7 +1135,7 @@
'PostgresInstaller' => __DIR__ . 
'/includes/installer/PostgresInstaller.php',
'PostgresUpdater' => __DIR__ . 
'/includes/installer/PostgresUpdater.php',
'Preferences' => __DIR__ . '/includes/Preferences.php',
-   'PreferencesForm' => __DIR__ . '/includes/Preferences.php',
+   'PreferencesForm' => __DIR__ . 
'/includes/specials/forms/PreferencesForm.php',
'PrefixSearch' => __DIR__ . '/includes/PrefixSearch.php',
'PreprocessDump' => __DIR__ . '/maintenance/preprocessDump.php',
'Preprocessor' => __DIR__ . '/includes/parser/Preprocessor.php',
@@ -1532,14 +1532,14 @@
'UploadChunkVerificationException' => __DIR__ . 
'/includes/upload/UploadFromChunks.php',
'UploadChunkZeroLengthFileException' => __DIR__ . 
'/includes/upload/UploadFromChunks.php',
'UploadDumper' => __DIR__ .

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Followup Newsletter talk: Must be numeric

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Followup Newsletter talk: Must be numeric
..


Followup Newsletter talk: Must be numeric

Must use numeric ID here to avoid ordering dependencies

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b3248af..844c035 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17347,7 +17347,6 @@
NS_TEMPLATE_TALK,
NS_HELP_TALK,
NS_CATEGORY_TALK,
-   NS_NEWSLETTER_TALK,
101, /* Manual talk */
103, /* Extension talk */
105, /* API talk */
@@ -17357,6 +17356,7 @@
1199, /* Translations talk */
2301, /* Gadget talk */
2303, /* Gadget definition talk */
+   5501, /* Newsletter talk from Newsletter extension */
],
'officewiki' => [
NS_TALK,

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Followup Newsletter talk: Must be numeric

2017-09-12 Thread Mattflaschen (Code Review)

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

Change subject: Followup Newsletter talk: Must be numeric
..

Followup Newsletter talk: Must be numeric

Must use numeric ID here to avoid ordering dependencies

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b3248af..844c035 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17347,7 +17347,6 @@
NS_TEMPLATE_TALK,
NS_HELP_TALK,
NS_CATEGORY_TALK,
-   NS_NEWSLETTER_TALK,
101, /* Manual talk */
103, /* Extension talk */
105, /* API talk */
@@ -17357,6 +17356,7 @@
1199, /* Translations talk */
2301, /* Gadget talk */
2303, /* Gadget definition talk */
+   5501, /* Newsletter talk from Newsletter extension */
],
'officewiki' => [
NS_TALK,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Stopping event collection for PageCreation events

2017-09-12 Thread Nuria (Code Review)

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

Change subject: Stopping event collection for PageCreation events
..

Stopping event collection for PageCreation events

Bug: T171629
Change-Id: Ib38c63f81dce57b3921a5ff864e84b5b3e395106
---
M hieradata/common.yaml
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 801e8ee..6eaf8af 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -321,7 +321,8 @@
 #   * Analytics so we can use it for testing throughput
 #   * CentralNoticeBannerHistory because it can't be inserted into mysql with 
its array property
 #   * ImageMetrics see T141407, these tables are no longer used and yet some 
cached code is still sending events
-eventlogging_valid_mixed_schema_blacklist: 
^(Analytics|CentralNoticeBannerHistory|ImageMetricsLoadingTime|ImageMetricsCorsSupport)$
+#   * PageCreation see T171629, data is available in several other ways
+eventlogging_valid_mixed_schema_blacklist: 
^(Analytics|CentralNoticeBannerHistory|ImageMetricsLoadingTime|ImageMetricsCorsSupport|PageCreation)$
 # Used to specify writer handler for eventlogging processor producer.
 eventlogging_kafka_producer_scheme: "kafka-confluent://"
 

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update Omnimail to use offset

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Update Omnimail to use offset
..

Update Omnimail to use offset

Bug: T175665

Change-Id: Ieb84390d195a5340dd171af4bab0118da569b163
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
4 files changed, 137 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/66/377666/1

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
index e38e65f..3e8c48f 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
@@ -41,6 +41,13 @@
 }
 
 $request = Omnimail::create($params['mail_provider'], 
$mailerCredentials)->getGroupMembers($jobParameters);
+$offset = CRM_Utils_Array::value('offset', $jobSettings, 0);
+if (isset($params['options']['offset'])) {
+  $offset = $params['options']['offset'];
+}
+if ($offset) {
+  $request->setOffset((int) $offset);
+}
 
 $startTimestamp = self::getStartTimestamp($params, $jobSettings);
 $this->endTimeStamp = 
self::getEndTimestamp(CRM_Utils_Array::value('end_date', $params), $settings, 
$startTimestamp);
@@ -58,6 +65,7 @@
 $request->setGroupIdentifier($params['group_identifier']);
 
 $result = $request->getResponse();
+$this->setRetrievalParameters($result->getRetrievalParameters());
 for ($i = 0; $i < $settings['omnimail_job_retry_number']; $i++) {
   if ($result->isCompleted()) {
 $data = $result->getData();
@@ -69,7 +77,7 @@
 }
 
 throw new CRM_Omnimail_IncompleteDownloadException('Download incomplete', 
0, array(
-  'retrieval_parameters' => $result->getRetrievalParameters(),
+  'retrieval_parameters' => $this->getRetrievalParameters(),
   'mail_provider' => $params['mail_provider'],
   'end_date' => $this->endTimeStamp,
 ));
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
index b372980..04a548f 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
@@ -26,6 +26,26 @@
*/
   public $endTimeStamp;
 
+
+  /**
+   * @var array
+   */
+  protected $retrievalParameters;
+
+  /**
+   * @return array
+   */
+  public function getRetrievalParameters() {
+return $this->retrievalParameters;
+  }
+
+  /**
+   * @param array $retrievalParameters
+   */
+  public function setRetrievalParameters($retrievalParameters) {
+$this->retrievalParameters = $retrievalParameters;
+  }
+
   /**
* Get the timestamp to start from.
*
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
index 7744a1a..6ce2547 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
@@ -22,17 +22,18 @@
   $rowsLeftBeforeThrottle = $throttleCount;
 
   $job = new CRM_Omnimail_Omnigroupmembers();
+  $jobSettings = $job->getJobSettings($params);
   try {
 $contacts = $job->getResult($params);
   }
   catch (CRM_Omnimail_IncompleteDownloadException $e) {
-$jobSettings = $job->getJobSettings($params);
 civicrm_api3('Setting', 'create', array(
   'omnimail_omnigroupmembers_load' => array(
 $params['mail_provider'] => array(
   'last_timestamp' => $jobSettings['last_timestamp'],
   'retrieval_parameters' => $e->getRetrievalParameters(),
   'progress_end_date' => $e->getEndTimestamp(),
+  'offset' => 0,
 ),
   ),
 ));
@@ -42,7 +43,31 @@
   $defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
   $locationTypeID = $defaultLocationType->id;
 
+  if (isset($params['options']['offset'])) {
+$offset = $params['options']['offset'];
+  }
+  else {
+$offset = CRM_Utils_Array::value('offset', $jobSettings, 0);
+  }
+  $limit = (isset($params['options']['limit'])) ? $params['options']['limit'] 
: NULL;
+  $count = 0;
+
   foreach ($contacts as $contact) {
+if ($count ===

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Flow on Newsletter_talk on mediawiki.org

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Enable Flow on Newsletter_talk on mediawiki.org
..


Enable Flow on Newsletter_talk on mediawiki.org

All talk namespaces are Flow on mediawiki.org, and there is a request
for this.

Also:

* Relevant link for populateContentModel.php
* Fix unrelated Newsletter typo.

Bug: T175502
Change-Id: Ica8860aaf70a01413e20bb721a28894466a02a58
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 371472f..3e89c98 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -702,7 +702,7 @@
 $wgGrantPermissions['editpage']['property-term'] = true;
 $wgGrantPermissions['editpage']['item-redirect'] = true;
 
-// Extension:NeswsLetter, so that they are available for global groups --MA 
2017.09.09
+// Extension:Newsletter, so that they are available for global groups --MA 
2017.09.09
 $wgAvailableRights[] = 'newsletter-create';
 $wgAvailableRights[] = 'newsletter-delete';
 $wgAvailableRights[] = 'newsletter-manage';
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8784e72..b3248af 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17334,7 +17334,8 @@
 ],
 
 // Before updating wmgFlowNamespaces, you must run populateContentModel.php 
(from core) on
-// the affected namespaces.
+// the affected namespaces.  See
+// https://www.mediawiki.org/wiki/Extension:Flow#Enabling_or_disabling_Flow
 'wmgFlowNamespaces' => [
'default' => [],
'mediawikiwiki' => [
@@ -17346,6 +17347,7 @@
NS_TEMPLATE_TALK,
NS_HELP_TALK,
NS_CATEGORY_TALK,
+   NS_NEWSLETTER_TALK,
101, /* Manual talk */
103, /* Extension talk */
105, /* API talk */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica8860aaf70a01413e20bb721a28894466a02a58
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: compsuggest: Handle edge case of empty index

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: compsuggest: Handle edge case of empty index
..


compsuggest: Handle edge case of empty index

In prod we have a some closed wikis (akwiktionary, probably others)
that have no content pages. As such their titlesuggest index is also
empty. It seems that when the titlesuggest index is empty elasticsearch
short-circuits it's regular response handling and doesn't return the
empty suggest keys that it usually does.

Change-Id: Ifa9ee4eb7f76a1864c5e786c5680d07e487b6e70
---
M includes/CompletionSuggester.php
M tests/unit/CompletionSuggesterTest.php
2 files changed, 11 insertions(+), 1 deletion(-)

Approvals:
  Smalyshev: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/CompletionSuggester.php b/includes/CompletionSuggester.php
index d923e40..625ea8e 100644
--- a/includes/CompletionSuggester.php
+++ b/includes/CompletionSuggester.php
@@ -368,7 +368,13 @@
 */
protected function postProcessSuggest( \Elastica\Response $response, 
$profiles, CompletionRequestLog $log ) {
$log->setResponse( $response );
-   $data = $response->getData()['suggest'];
+   $fullResponse = $response->getData();
+   if ( !isset( $fullResponse['suggest'] ) ) {
+   // Edge case where the index contains 0 documents and 
does not even return the 'suggest' field
+   return SearchSuggestionSet::emptySuggestionSet();
+   }
+
+   $data = $fullResponse['suggest'];
 
$limit = $this->getHardLimit();
$suggestionsByDocId = [];
diff --git a/tests/unit/CompletionSuggesterTest.php 
b/tests/unit/CompletionSuggesterTest.php
index 3047b43..363bae2 100644
--- a/tests/unit/CompletionSuggesterTest.php
+++ b/tests/unit/CompletionSuggesterTest.php
@@ -300,6 +300,10 @@
$resp,
5, 200, null, null, 0, 300
],
+   'Empty index' => [
+   new \Elastica\Response( [] ),
+   5, 200, null, null, 0, 50
+   ],
];
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa9ee4eb7f76a1864c5e786c5680d07e487b6e70
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Change favicon to "magnifying glass" image

2017-09-12 Thread Smalyshev (Code Review)

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

Change subject: Change favicon to "magnifying glass" image
..

Change favicon to "magnifying glass" image

Bug: T168041
Change-Id: I508320b2dd16feaa4499ed551a942f0c287b66e1
---
M Gruntfile.js
M embed.html
M index.html
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/65/377665/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 099158e..9ddec2d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -109,7 +109,7 @@
cwd: './',
src: [

'*.html',
-   
'logo.svg', 'logo-embed.svg', 'robots.txt'
+   
'logo.svg', 'logo-embed.svg', 'robots.txt', 'favicon.ico'
],
dest: buildFolder
},{
diff --git a/embed.html b/embed.html
index 93e6771..553a14b 100644
--- a/embed.html
+++ b/embed.html
@@ -20,7 +20,7 @@
 
 
 
-
+
 
 
 
diff --git a/index.html b/index.html
index dd55f21..16b436d 100644
--- a/index.html
+++ b/index.html
@@ -31,7 +31,7 @@


 
-   
+   




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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I508320b2dd16feaa4499ed551a942f0c287b66e1
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
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] wikimedia...crm[master]: Update Omnimail plugin to allow setting offset

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Update Omnimail plugin to allow setting offset
..

Update Omnimail plugin to allow setting offset

Bug T175665

Change-Id: I0b20be3e9bc01d3517acc4471da60c069f15acd5
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/63/377663/1

diff --git a/composer.lock b/composer.lock
index 2e7daf7..fa1ca4b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1864,7 +1864,7 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/eileenmcnaughton/omnimail-silverpop.git;,
-"reference": "c3248b3932e62cd2812aa3502d875b7c12c25c66"
+"reference": "aac29243defa1dfc78cff7f51bbb4f2c30de39ec"
 },
 "require": {
 "league/csv": "^8.0",
@@ -1903,7 +1903,7 @@
 "omnimail",
 "silverpop"
 ],
-"time": "2017-07-27 02:53:46"
+"time": "2017-09-12 13:57:41"
 },
 {
 "name": "wikimedia/smash-pig",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b20be3e9bc01d3517acc4471da60c069f15acd5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update Omnimail to use offset

2017-09-12 Thread Eileen (Code Review)

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

Change subject: Update Omnimail to use offset
..

Update Omnimail to use offset

Bug: T175665
Change-Id: If520df67b3a00a557ec849bc367406d0ec22b330
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
M sites/default/civicrm/extensions/org.wikimedia.omnimail/composer.lock
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
5 files changed, 139 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/64/377664/1

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
index e38e65f..3e8c48f 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
@@ -41,6 +41,13 @@
 }
 
 $request = Omnimail::create($params['mail_provider'], 
$mailerCredentials)->getGroupMembers($jobParameters);
+$offset = CRM_Utils_Array::value('offset', $jobSettings, 0);
+if (isset($params['options']['offset'])) {
+  $offset = $params['options']['offset'];
+}
+if ($offset) {
+  $request->setOffset((int) $offset);
+}
 
 $startTimestamp = self::getStartTimestamp($params, $jobSettings);
 $this->endTimeStamp = 
self::getEndTimestamp(CRM_Utils_Array::value('end_date', $params), $settings, 
$startTimestamp);
@@ -58,6 +65,7 @@
 $request->setGroupIdentifier($params['group_identifier']);
 
 $result = $request->getResponse();
+$this->setRetrievalParameters($result->getRetrievalParameters());
 for ($i = 0; $i < $settings['omnimail_job_retry_number']; $i++) {
   if ($result->isCompleted()) {
 $data = $result->getData();
@@ -69,7 +77,7 @@
 }
 
 throw new CRM_Omnimail_IncompleteDownloadException('Download incomplete', 
0, array(
-  'retrieval_parameters' => $result->getRetrievalParameters(),
+  'retrieval_parameters' => $this->getRetrievalParameters(),
   'mail_provider' => $params['mail_provider'],
   'end_date' => $this->endTimeStamp,
 ));
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
index b372980..04a548f 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
@@ -26,6 +26,26 @@
*/
   public $endTimeStamp;
 
+
+  /**
+   * @var array
+   */
+  protected $retrievalParameters;
+
+  /**
+   * @return array
+   */
+  public function getRetrievalParameters() {
+return $this->retrievalParameters;
+  }
+
+  /**
+   * @param array $retrievalParameters
+   */
+  public function setRetrievalParameters($retrievalParameters) {
+$this->retrievalParameters = $retrievalParameters;
+  }
+
   /**
* Get the timestamp to start from.
*
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
index 7744a1a..6ce2547 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Load.php
@@ -22,17 +22,18 @@
   $rowsLeftBeforeThrottle = $throttleCount;
 
   $job = new CRM_Omnimail_Omnigroupmembers();
+  $jobSettings = $job->getJobSettings($params);
   try {
 $contacts = $job->getResult($params);
   }
   catch (CRM_Omnimail_IncompleteDownloadException $e) {
-$jobSettings = $job->getJobSettings($params);
 civicrm_api3('Setting', 'create', array(
   'omnimail_omnigroupmembers_load' => array(
 $params['mail_provider'] => array(
   'last_timestamp' => $jobSettings['last_timestamp'],
   'retrieval_parameters' => $e->getRetrievalParameters(),
   'progress_end_date' => $e->getEndTimestamp(),
+  'offset' => 0,
 ),
   ),
 ));
@@ -42,7 +43,31 @@
   $defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
   $locationTypeID = $defaultLocationType->id;
 
+  if (isset($params['options']['offset'])) {
+$offset = $params['options']['offset'];
+  }
+  else {
+$offset = CRM_Utils_Array::value('offset', $jobSettings, 0);
+  }
+  $limit = (isset($params['options']['limit'])) ? $params['options']['limit'] 
: NULL;
+

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Sort common.yaml alphabetically

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Sort common.yaml alphabetically
..


Sort common.yaml alphabetically

Change-Id: I5be5a719ed6cfda170c55a81a710afe5113b4e6e
---
M puppet/hieradata/common.yaml
1 file changed, 57 insertions(+), 64 deletions(-)

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



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 82915ab..b2290ee 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -4,15 +4,6 @@
   - '::role::mediawiki'
   - '::puppet::agent'
 
-mwv::files_dir: /srv
-mwv::etc_dir: /etc/mw-vagrant
-mwv::services_dir: /vagrant/srv
-mwv::vendor_dir: /srv
-mwv::tld: '.local.wmftest.net'
-mwv::cachefilesd::enable: true
-
-three_d::three_d_2png_dir: /srv/3d2png
-
 apache::docroot: /var/www
 arcanist::deploy_dir: "%{hiera('mwv::services_dir')}"
 
@@ -28,7 +19,6 @@
 
 citoid::port: '1970'
 citoid::log_level: info
-role::citoid::url: 
"//%{hiera('role::mediawiki::hostname')}:%{hiera('citoid::port')}/api"
 
 changeprop::port: 7272
 
@@ -46,7 +36,6 @@
 contenttranslation::intarget: false
 contenttranslation::namespace: 'Main'
 contenttranslation::suggestions: true
-
 contenttranslation::wikis:
   en:
 category_keyword: 'Category'
@@ -149,7 +138,6 @@
 hack:
   lang:
 iconv_ignore_correct: true
-
 hhvm::fcgi_settings:
   max_execution_time: 180
   hhvm:
@@ -161,7 +149,6 @@
 enable: 1
 remote_connect_back: 1
 remote_enable: 1
-
 hhvm::docroot: "%{hiera('apache::docroot')}"
 hhvm::hhbc_dir: /var/cache/hhvm
 hhvm::logroot: /vagrant/logs
@@ -176,18 +163,11 @@
 logstash::output::elasticsearch::manage_indices: true
 logstash::output::elasticsearch::priority: 90
 
-mathoid::port: 10042
-mathoid::svg: true
-mathoid::img: true
-mathoid::png: true
-mathoid::texvcinfo: true
-mathoid::speak_text: true
-mathoid::render_no_check: true
-
-mobilecontentservice::port: 
-
 graphoid::port: 11042
-
+graphoid::headers:
+  'Cache-Control': 'public, s-maxage=3600, max-age=3600'
+graphoid::error_headers:
+  'Cache-Control': 'public, s-maxage=300, max-age=300'
 # These settings should match the puppet/modules/role/manifests/graph.pp 
(ideally they should be the same)
 graphoid::allowed_domains:
   http:
@@ -212,13 +192,6 @@
   wikidatasparql:
 - query.wikidata.org
 - wdqs-test.wmflabs.org
-graphoid::headers:
-  'Cache-Control': 'public, s-maxage=3600, max-age=3600'
-graphoid::error_headers:
-  'Cache-Control': 'public, s-maxage=300, max-age=300'
-
-php::sessionclean::ensure: present
-php::xhprof::profile_storage_dir: /vagrant/profiles
 
 iegreview::vhost_name: "iegreview%{hiera('mwv::tld')}"
 iegreview::db_name: iegreview
@@ -229,6 +202,14 @@
 iegreview::log_file: /vagrant/logs/iegreview.log
 iegreview::smtp_server: 127.0.0.1
 iegreview::parsoid_url: "http://127.0.0.1:%{::parsoid::port}/localhost/;
+
+mathoid::port: 10042
+mathoid::svg: true
+mathoid::img: true
+mathoid::png: true
+mathoid::texvcinfo: true
+mathoid::speak_text: true
+mathoid::render_no_check: true
 
 mediawiki::wiki_name: devwiki
 mediawiki::dir: /vagrant/mediawiki
@@ -245,7 +226,6 @@
 
 mediawiki::apache::docroot: "%{hiera('apache::docroot')}"
 mediawiki::apache::php5_site_name: "php5%{hiera('mwv::tld')}"
-
 
 mediawiki::jobrunner::enable: true
 mediawiki::jobrunner::dir: "%{hiera('mwv::services_dir')}/jobrunner"
@@ -271,17 +251,19 @@
 mediawiki::mwrepl::default_db_name: "%{hiera('mediawiki::db_name')}"
 mediawiki::mwrepl::script_dir: "%{hiera('mediawiki::multiwiki::script_dir')}"
 
-parsoid::port: 8000
-parsoid::domain: "%{hiera('role::mediawiki::hostname')}"
-parsoid::uri: "http://localhost%{::port_fragment}/w/api.php;
-parsoid::use_php_preprocessor: true
-parsoid::use_selser: true
-parsoid::allow_cors: '*'
-
 mysql::host: '127.0.0.1'
 mysql::default_db_name: wiki
 mysql::root_password: vagrant
 mysql::grant_host_name: 'localhost'
+
+mobilecontentservice::port: 
+
+mwv::files_dir: /srv
+mwv::etc_dir: /etc/mw-vagrant
+mwv::services_dir: /vagrant/srv
+mwv::vendor_dir: /srv
+mwv::tld: '.local.wmftest.net'
+mwv::cachefilesd::enable: true
 
 nginx::variant: extras
 
@@ -291,30 +273,24 @@
 ores::vhost_name: "ores%{hiera('mwv::tld')}"
 ores::port: 18880
 
+parsoid::port: 8000
+parsoid::domain: "%{hiera('role::mediawiki::hostname')}"
+parsoid::uri: "http://localhost%{::port_fragment}/w/api.php;
+parsoid::use_php_preprocessor: true
+parsoid::use_selser: true
+parsoid::allow_cors: '*'
+
+payments::branch: fundraising/REL1_27
+payments::dir: /vagrant/mediawiki-fr
+
 phabricator::deploy_dir: "%{hiera('mwv::services_dir')}"
 phabricator::log_dir: "/vagrant/logs/phd"
 phabricator::vhost_name: "phabricator%{hiera('mwv::tld')}"
 phabricator::remote: https://secure.phabricator.com/diffusion/P/phabricator.git
 
-role::iabot::deploy_dir: "%{hiera('mwv::services_dir')}"

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Sort common.yaml alphabetically

2017-09-12 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377662 )

Change subject: Sort common.yaml alphabetically
..

Sort common.yaml alphabetically

Change-Id: I5be5a719ed6cfda170c55a81a710afe5113b4e6e
---
M puppet/hieradata/common.yaml
1 file changed, 57 insertions(+), 64 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/62/377662/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 82915ab..b2290ee 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -4,15 +4,6 @@
   - '::role::mediawiki'
   - '::puppet::agent'
 
-mwv::files_dir: /srv
-mwv::etc_dir: /etc/mw-vagrant
-mwv::services_dir: /vagrant/srv
-mwv::vendor_dir: /srv
-mwv::tld: '.local.wmftest.net'
-mwv::cachefilesd::enable: true
-
-three_d::three_d_2png_dir: /srv/3d2png
-
 apache::docroot: /var/www
 arcanist::deploy_dir: "%{hiera('mwv::services_dir')}"
 
@@ -28,7 +19,6 @@
 
 citoid::port: '1970'
 citoid::log_level: info
-role::citoid::url: 
"//%{hiera('role::mediawiki::hostname')}:%{hiera('citoid::port')}/api"
 
 changeprop::port: 7272
 
@@ -46,7 +36,6 @@
 contenttranslation::intarget: false
 contenttranslation::namespace: 'Main'
 contenttranslation::suggestions: true
-
 contenttranslation::wikis:
   en:
 category_keyword: 'Category'
@@ -149,7 +138,6 @@
 hack:
   lang:
 iconv_ignore_correct: true
-
 hhvm::fcgi_settings:
   max_execution_time: 180
   hhvm:
@@ -161,7 +149,6 @@
 enable: 1
 remote_connect_back: 1
 remote_enable: 1
-
 hhvm::docroot: "%{hiera('apache::docroot')}"
 hhvm::hhbc_dir: /var/cache/hhvm
 hhvm::logroot: /vagrant/logs
@@ -176,18 +163,11 @@
 logstash::output::elasticsearch::manage_indices: true
 logstash::output::elasticsearch::priority: 90
 
-mathoid::port: 10042
-mathoid::svg: true
-mathoid::img: true
-mathoid::png: true
-mathoid::texvcinfo: true
-mathoid::speak_text: true
-mathoid::render_no_check: true
-
-mobilecontentservice::port: 
-
 graphoid::port: 11042
-
+graphoid::headers:
+  'Cache-Control': 'public, s-maxage=3600, max-age=3600'
+graphoid::error_headers:
+  'Cache-Control': 'public, s-maxage=300, max-age=300'
 # These settings should match the puppet/modules/role/manifests/graph.pp 
(ideally they should be the same)
 graphoid::allowed_domains:
   http:
@@ -212,13 +192,6 @@
   wikidatasparql:
 - query.wikidata.org
 - wdqs-test.wmflabs.org
-graphoid::headers:
-  'Cache-Control': 'public, s-maxage=3600, max-age=3600'
-graphoid::error_headers:
-  'Cache-Control': 'public, s-maxage=300, max-age=300'
-
-php::sessionclean::ensure: present
-php::xhprof::profile_storage_dir: /vagrant/profiles
 
 iegreview::vhost_name: "iegreview%{hiera('mwv::tld')}"
 iegreview::db_name: iegreview
@@ -229,6 +202,14 @@
 iegreview::log_file: /vagrant/logs/iegreview.log
 iegreview::smtp_server: 127.0.0.1
 iegreview::parsoid_url: "http://127.0.0.1:%{::parsoid::port}/localhost/;
+
+mathoid::port: 10042
+mathoid::svg: true
+mathoid::img: true
+mathoid::png: true
+mathoid::texvcinfo: true
+mathoid::speak_text: true
+mathoid::render_no_check: true
 
 mediawiki::wiki_name: devwiki
 mediawiki::dir: /vagrant/mediawiki
@@ -245,7 +226,6 @@
 
 mediawiki::apache::docroot: "%{hiera('apache::docroot')}"
 mediawiki::apache::php5_site_name: "php5%{hiera('mwv::tld')}"
-
 
 mediawiki::jobrunner::enable: true
 mediawiki::jobrunner::dir: "%{hiera('mwv::services_dir')}/jobrunner"
@@ -271,17 +251,19 @@
 mediawiki::mwrepl::default_db_name: "%{hiera('mediawiki::db_name')}"
 mediawiki::mwrepl::script_dir: "%{hiera('mediawiki::multiwiki::script_dir')}"
 
-parsoid::port: 8000
-parsoid::domain: "%{hiera('role::mediawiki::hostname')}"
-parsoid::uri: "http://localhost%{::port_fragment}/w/api.php;
-parsoid::use_php_preprocessor: true
-parsoid::use_selser: true
-parsoid::allow_cors: '*'
-
 mysql::host: '127.0.0.1'
 mysql::default_db_name: wiki
 mysql::root_password: vagrant
 mysql::grant_host_name: 'localhost'
+
+mobilecontentservice::port: 
+
+mwv::files_dir: /srv
+mwv::etc_dir: /etc/mw-vagrant
+mwv::services_dir: /vagrant/srv
+mwv::vendor_dir: /srv
+mwv::tld: '.local.wmftest.net'
+mwv::cachefilesd::enable: true
 
 nginx::variant: extras
 
@@ -291,30 +273,24 @@
 ores::vhost_name: "ores%{hiera('mwv::tld')}"
 ores::port: 18880
 
+parsoid::port: 8000
+parsoid::domain: "%{hiera('role::mediawiki::hostname')}"
+parsoid::uri: "http://localhost%{::port_fragment}/w/api.php;
+parsoid::use_php_preprocessor: true
+parsoid::use_selser: true
+parsoid::allow_cors: '*'
+
+payments::branch: fundraising/REL1_27
+payments::dir: /vagrant/mediawiki-fr
+
 phabricator::deploy_dir: "%{hiera('mwv::services_dir')}"
 phabricator::log_dir: "/vagrant/logs/phd"
 phabricator::vhost_name: "phabricator%{hiera('mwv::tld')}"
 phabricator::remote: https://secure.phabricator.com/diffusion/P/phabricator.git
 
-role::iabot::deploy_dir: "%{hiera('mwv::services_dir')}"

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: compsuggest: Handle edge case of empty index

2017-09-12 Thread EBernhardson (Code Review)

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

Change subject: compsuggest: Handle edge case of empty index
..

compsuggest: Handle edge case of empty index

In prod we have a some closed wikis (akwiktionary, probably others)
that have no content pages. As such their titlesuggest index is also
empty. It seems that when the titlesuggest index is empty elasticsearch
short-circuits it's regular response handling and doesn't return the
empty suggest keys that it usually does.

Change-Id: Ifa9ee4eb7f76a1864c5e786c5680d07e487b6e70
TODO: Test if this is a regression or what...
---
M includes/CompletionSuggester.php
M tests/unit/CompletionSuggesterTest.php
2 files changed, 11 insertions(+), 1 deletion(-)


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

diff --git a/includes/CompletionSuggester.php b/includes/CompletionSuggester.php
index d923e40..625ea8e 100644
--- a/includes/CompletionSuggester.php
+++ b/includes/CompletionSuggester.php
@@ -368,7 +368,13 @@
 */
protected function postProcessSuggest( \Elastica\Response $response, 
$profiles, CompletionRequestLog $log ) {
$log->setResponse( $response );
-   $data = $response->getData()['suggest'];
+   $fullResponse = $response->getData();
+   if ( !isset( $fullResponse['suggest'] ) ) {
+   // Edge case where the index contains 0 documents and 
does not even return the 'suggest' field
+   return SearchSuggestionSet::emptySuggestionSet();
+   }
+
+   $data = $fullResponse['suggest'];
 
$limit = $this->getHardLimit();
$suggestionsByDocId = [];
diff --git a/tests/unit/CompletionSuggesterTest.php 
b/tests/unit/CompletionSuggesterTest.php
index 3047b43..363bae2 100644
--- a/tests/unit/CompletionSuggesterTest.php
+++ b/tests/unit/CompletionSuggesterTest.php
@@ -300,6 +300,10 @@
$resp,
5, 200, null, null, 0, 300
],
+   'Empty index' => [
+   new \Elastica\Response( [] ),
+   5, 200, null, null, 0, 50
+   ],
];
}
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Put default search namespaces in content index

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Put default search namespaces in content index
..


Put default search namespaces in content index

Part of the benefit of splitting our data between content and
general indices, besides frequency counts, is offering better
performance by querying a much smaller dataset. A variety of wikis
though may configure their default search namespaces to include
more than just content namespaces. Adjust our handling so all
namespaces searched by default are included in the content
index.

After deployment this will require a run of the saneitizer on
all wikis that have additional namespaces in their
wgNamespacesToBeSearchedDefault.

Change-Id: Iba8b8e1f204958ccdf2cab562dc34e0008fe97ea
---
M includes/Api/ConfigDump.php
M includes/Connection.php
M includes/Search/RescoreBuilders.php
M includes/SearchConfig.php
M tests/unit/ConnectionTest.php
M tests/unit/RescoreBuilderTest.php
M tests/unit/SearcherTest.php
7 files changed, 49 insertions(+), 15 deletions(-)

Approvals:
  Smalyshev: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  DCausse: Looks good to me, but someone else must approve



diff --git a/includes/Api/ConfigDump.php b/includes/Api/ConfigDump.php
index 14dd3ef..aba3420 100644
--- a/includes/Api/ConfigDump.php
+++ b/includes/Api/ConfigDump.php
@@ -122,6 +122,7 @@
'CirrusSearchMaxPhraseTokens',
'LanguageCode',
'ContentNamespaces',
+   'NamespacesToBeSearchedDefault',
];
 
public function execute() {
diff --git a/includes/Connection.php b/includes/Connection.php
index 128985d..c2a4da0 100644
--- a/includes/Connection.php
+++ b/includes/Connection.php
@@ -265,6 +265,10 @@
if ( isset( $mappings[$namespace] ) ) {
return $mappings[$namespace];
}
+   $defaultSearch = $this->config->get( 
'NamespacesToBeSearchedDefault' );
+   if ( isset( $defaultSearch[$namespace] ) && 
$defaultSearch[$namespace] ) {
+   return self::CONTENT_INDEX_TYPE;
+   }
 
return MWNamespace::isContent( $namespace ) ?
self::CONTENT_INDEX_TYPE : self::GENERAL_INDEX_TYPE;
@@ -282,14 +286,29 @@
}
 
$mappings = $this->config->get( 'CirrusSearchNamespaceMappings' 
);
-   $count = count( array_keys( $mappings, $indexType ) );
+   $inIndexType = [];
+   foreach ( $mappings as $ns => $type ) {
+   if ( $indexType === $type ) {
+   $inIndexType[$ns] = true;
+   }
+   }
if ( $indexType === self::CONTENT_INDEX_TYPE ) {
// The content namespace includes everything set in the 
mappings to content (count right now)
// Plus everything in wgContentNamespaces that isn't 
already in namespace mappings
$contentNamespaces = $this->config->get( 
'ContentNamespaces' );
-   $count += count( array_diff( $contentNamespaces, 
array_keys( $mappings ) ) );
+   foreach ( $contentNamespaces as $ns ) {
+   if ( !isset( $mappings[$ns] ) ) {
+   $inIndexType[$ns] = true;
+   }
+   }
+   $defaultSearch = $this->config->get( 
'NamespacesToBeSearchedDefault' );
+   foreach ( $defaultSearch as $ns => $shouldSearch ) {
+   if ( $shouldSearch && !isset( $mappings[$ns] ) 
) {
+   $inIndexType[$ns] = true;
+   }
+   }
}
-   return $count;
+   return count( $inIndexType );
}
 
/**
diff --git a/includes/Search/RescoreBuilders.php 
b/includes/Search/RescoreBuilders.php
index 2650c52..16f5fbc 100644
--- a/includes/Search/RescoreBuilders.php
+++ b/includes/Search/RescoreBuilders.php
@@ -222,6 +222,13 @@
return true;
case 'content':
$profileNs = $this->context->getConfig()->get( 
'ContentNamespaces' );
+   // Default search namespaces are also 
considered content
+   $defaultSearch = 
$this->context->getConfig()->get( 'NamespacesToBeSearchedDefault' );
+   foreach ( $defaultSearch as $ns => $isDefault ) 
{
+   if ( $isDefault ) {
+   $profileNs[] = $ns;
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use db query builder not raw sql

2017-09-12 Thread Reedy (Code Review)

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

Change subject: Use db query builder not raw sql
..

Use db query builder not raw sql

Change-Id: I8e26932e28fdda9a52e0486c5d2eb269eb9ecae5
Follows-up: Ice1bdae3d16cf365da14c6df0e8d91d2b914e064
---
M maintenance/populateIpChanges.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/377660/1

diff --git a/maintenance/populateIpChanges.php 
b/maintenance/populateIpChanges.php
index eb60f80..cf6826d 100644
--- a/maintenance/populateIpChanges.php
+++ b/maintenance/populateIpChanges.php
@@ -67,12 +67,12 @@
$this->output( "Copying IP revisions to ip_changes, from rev_id 
$start to rev_id $end\n" );
 
while ( $blockStart <= $end ) {
-   $cond = "rev_id >= $blockStart AND rev_user = 0 ORDER 
BY rev_id ASC LIMIT " . $this->mBatchSize;
$rows = $dbw->select(
'revision',
[ 'rev_id', 'rev_timestamp', 'rev_user_text' ],
-   $cond,
-   __METHOD__
+   [ "rev_id >= $blockStart", 'rev_user' => 0 ],
+   __METHOD__,
+   [ 'ORDER BY' => 'rev_id ASC, 'LIMIT' => 
$this->mBatchSize ]
);
 
if ( !$rows || $rows->numRows() === 0 ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: [WIP] Update Parsoid to generate modern IDs w/ legacy fallback

2017-09-12 Thread C. Scott Ananian (Code Review)

C. Scott Ananian has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377659 )

Change subject: [WIP] Update Parsoid to generate modern IDs w/ legacy fallback
..

[WIP] Update Parsoid to generate modern IDs w/ legacy fallback

Bug: T152540
Bug: T103714
Change-Id: I12b2a148f7170d20bd9aacd3b5b8ee1965859592
---
M lib/utils/DOMUtils.js
M lib/wt2html/DOMPostProcessor.js
M lib/wt2html/pp/handlers/headings.js
M lib/wt2html/tt/Sanitizer.js
M tests/parserTests.txt
5 files changed, 83 insertions(+), 26 deletions(-)


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

diff --git a/lib/utils/DOMUtils.js b/lib/utils/DOMUtils.js
index e073bde..7f99867 100644
--- a/lib/utils/DOMUtils.js
+++ b/lib/utils/DOMUtils.js
@@ -2563,11 +2563,6 @@
throw new Error("normalizeOut input is not in standard 
serialized form");
}
 
-   // Normalize headings by stripping out Parsoid-added ids so that we 
don't
-   // have to add these ids to every parser test that uses headings.
-   // We will test the id generation scheme separately via mocha tests.
-   out = out.replace(/(]*>)/g, '$1$2');
-
if (parsoidOnly) {
// unnecessary attributes, we don't need to check these
// style is in there because we should only check classes.
@@ -2589,6 +2584,11 @@
return out;
}
 
+   // Normalize headings by stripping out Parsoid-added ids so that we 
don't
+   // have to add these ids to every parser test that uses headings.
+   // We will test the id generation scheme separately via mocha tests.
+   out = out.replace(/(]*>)/g, '$1$2');
+
// strip meta/link elements
out = out.
replace(/<\/?(?:meta|link)(?: 
[^\0-\cZ\s"'>\/=]+(?:=(?:"[^"]*"|'[^']*'))?)*\/?>/g, '');
diff --git a/lib/wt2html/DOMPostProcessor.js b/lib/wt2html/DOMPostProcessor.js
index 895cd97..2c190df 100644
--- a/lib/wt2html/DOMPostProcessor.js
+++ b/lib/wt2html/DOMPostProcessor.js
@@ -181,6 +181,46 @@
domVisitor.addHandler(null, headings.genAnchors);
domVisitor.addHandler(null, CleanUp.cleanupAndSaveDataParsoid);
addPP('cleanupAndSaveDP', domVisitor.traverse.bind(domVisitor));
+
+   // Make heading IDs unique
+   domVisitor = new DOMTraverser(env);
+   var seenIds = new Set();
+   domVisitor.addHandler(null, function(node, env) {
+   // NOTE: This is not completely compliant with how PHP parser 
does it.
+   // If there is an id in the doc elsewhere, this will assign
+   // the heading a suffixed id, whereas the PHP parser processes
+   // headings in textual order and can introduce duplicate ids
+   // in a document in the process.
+   //
+   // However, we believe this implemention behavior is more
+   // consistent when handling this edge case, and in the common
+   // case (where heading ids won't conflict with ids elsewhere),
+   // matches PHP parser behavior.
+   if (!node.hasAttribute) { return true; /* not an Element */ }
+   if (!node.hasAttribute('id')) { return true; }
+   // Must be case-insensitively unique (T12721)
+   // ...but note that PHP uses strtolower, which only does A-Z :(
+   var key = node.getAttribute('id');
+   key = key.replace(/[A-Z]+/g, function(s) { return 
s.toLowerCase(); });
+   if (!seenIds.has(key)) {
+   seenIds.add(key);
+   return true;
+   }
+   // Only update headings and legacy links (first children of 
heading)
+   if (
+   /^H\d$/.test(node.nodeName) ||
+   node.getAttribute('typeof')==='mw:LegacyId'
+   ) {
+   var suffix = 2;
+   while (seenIds.has(key+'_'+suffix)) {
+   suffix++;
+   }
+   node.setAttribute('id', node.getAttribute('id') + '_' + 
suffix);
+   seenIds.add(key + '_' + suffix);
+   }
+   return true;
+   });
+   addPP('heading id uniqueness', domVisitor.traverse.bind(domVisitor));
 }
 
 // Inherit from EventEmitter
diff --git a/lib/wt2html/pp/handlers/headings.js 
b/lib/wt2html/pp/handlers/headings.js
index 966c568..39ee773 100644
--- a/lib/wt2html/pp/handlers/headings.js
+++ b/lib/wt2html/pp/handlers/headings.js
@@ -46,29 +46,23 @@
);
 
// Create an anchor with a sanitized id
-   var anchorId = Sanitizer.escapeId(anchorText, { noninitial: true });
+   var anchorId = Sanitizer.escapeId(anchorText, { /* html5 */ });
+   var legacyId =

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: postEdit: Use standard close icon

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: postEdit: Use standard close icon
..


postEdit: Use standard close icon

Making use of standard close icon and also prevent screenreaders
from reading 'x' if they ever come across the message.
Also slightly bumping `font-size` to better harmonize
with close icon and clean-up CSS.

Bug: T50067
Change-Id: I82cdad23462f62d5e8ab2eef8632a2b3ac35e93f
---
A resources/src/mediawiki.action/images/close.png
A resources/src/mediawiki.action/images/close.svg
M resources/src/mediawiki.action/mediawiki.action.view.postEdit.less
3 files changed, 25 insertions(+), 21 deletions(-)

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



diff --git a/resources/src/mediawiki.action/images/close.png 
b/resources/src/mediawiki.action/images/close.png
new file mode 100644
index 000..80dde95
--- /dev/null
+++ b/resources/src/mediawiki.action/images/close.png
Binary files differ
diff --git a/resources/src/mediawiki.action/images/close.svg 
b/resources/src/mediawiki.action/images/close.svg
new file mode 100644
index 000..7f75511
--- /dev/null
+++ b/resources/src/mediawiki.action/images/close.svg
@@ -0,0 +1,5 @@
+
+http://www.w3.org/2000/svg; width="20" height="20" viewBox="0 0 20 
20">
+   
+   
+
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less 
b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less
index e1fa925..d19f098 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less
+++ b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less
@@ -7,7 +7,7 @@
height: 0;
left: 50%;
z-index: 1000;
-   font-size: 13px;
+   font-size: 14px;
cursor: pointer;
 }
 
@@ -19,6 +19,24 @@
opacity: 1;
.transition( opacity 250ms );
 
+   &:after {
+   content: '';
+   background: no-repeat center center;
+   .background-image-svg( 'images/close.svg', 'images/close.png' );
+   background-size: 12px 12px;
+   position: absolute;
+   right: 0.4em;
+   top: 0;
+   bottom: 0;
+   min-width: 32px;
+   min-height: 32px;
+   opacity: 0.87;
+
+   &:hover {
+   opacity: 1;
+   }
+   }
+
&.mw-notification {
padding-right: 3em;
}
@@ -29,32 +47,13 @@
 }
 
 .postedit-icon {
-   padding-left: 41px; /* 25 + 8 + 8 */
+   padding-left: 25px;
/* like min-height, but old IE compatible and keeps text vertically 
aligned, too */
line-height: 25px;
background-repeat: no-repeat;
-   background-position: 8px 50%;
 }
 
 .postedit-icon-checkmark {
/* @embed */
background-image: url( images/green-checkmark.png );
-   background-position: left;
-}
-
-.postedit:after {
-   content: '×';
-   position: absolute;
-   padding: 0 0.8em;
-   right: 0;
-   top: 0;
-   font-size: 1.25em;
-   font-weight: bold;
-   line-height: 2.3em;
-   text-shadow: 0 0.0625em 0 #fff;
-   opacity: 0.2;
-}
-
-.postedit:hover:after {
-   opacity: 0.4;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82cdad23462f62d5e8ab2eef8632a2b3ac35e93f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Add back eventlogging since we're doing the landing page onc...

2017-09-12 Thread Niharika29 (Code Review)

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

Change subject: Add back eventlogging since we're doing the landing page once 
more
..

Add back eventlogging since we're doing the landing page once more

Bug: T175613
Change-Id: Ibd9515c68696f53dd1f195bf7579979e0d743f93
---
M extension.json
M includes/Hooks.php
A modules/ext.acw.eventlogging.js
3 files changed, 34 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow 
refs/changes/58/377658/1

diff --git a/extension.json b/extension.json
index 77506ea..cd99f50 100644
--- a/extension.json
+++ b/extension.json
@@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "ArticleCreationWorkflow",
"type": "other",
-   "author": [ "Max Semenik" ],
+   "author": [ "Max Semenik", "Niharika Kohli" ],
"url": 
"https://www.mediawiki.org/wiki/Extension:ArticleCreationWorkflow;,
"descriptionmsg": "acw-desc",
"license-name": "MIT",
@@ -22,6 +22,17 @@
"i18n"
]
},
+   "ResourceFileModulePaths": {
+   "localBasePath": "modules",
+   "remoteExtPath": "ArticleCreationWorkflow/modules"
+   },
+   "ResourceModules": {
+   "ext.acw.eventlogging": {
+   "scripts": [
+   "ext.acw.eventlogging.js"
+   ]
+   }
+   },
"config": {
"ArticleCreationWorkflows": {
"description": "Describes conditions when new page 
creation should be intercepted. See doc/config.txt for details.",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 7d0460c..49e9693 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -31,6 +31,7 @@
// If the landing page didn't exist, we wouldn't have 
intercepted.
$redirTo = $workflow->getLandingPageTitle();
$output = $article->getContext()->getOutput();
+   $output->addModules( 'ext.acw.eventlogging' );
$output->redirect( $redirTo->getFullURL(
[ 'page' => $title->getPrefixedText(), 'wprov' 
=> 'acww1' ]
) );
@@ -62,6 +63,7 @@
// If the landing page didn't exist, we wouldn't have 
intercepted.
$redirTo = $workflow->getLandingPageTitle();
$output = $article->getContext()->getOutput();
+   $output->addModules( 'ext.acw.eventlogging' );
$output->redirect( $redirTo->getFullURL(
[ 'page' => $title->getPrefixedText(), 'wprov' 
=> 'acww1' ]
) );
diff --git a/modules/ext.acw.eventlogging.js b/modules/ext.acw.eventlogging.js
new file mode 100644
index 000..23e08dd
--- /dev/null
+++ b/modules/ext.acw.eventlogging.js
@@ -0,0 +1,20 @@
+/*
+ Track link clicks on Special:CreatePage
+ */
+
+( function ( $, mw ) {
+
+   function trackData( interactionType, link, sampling ) {
+   mw.track( 'event.ArticleCreationWorkflow', {
+   interactionType: interactionType,
+   link: link,
+   sampling: sampling || 1
+   } );
+   }
+
+   $( 'html' ).on( 'click', '#bodyContent a', function ( event ) {
+   var link = $( this ).attr( 'href' );
+   trackData( 'click', link );
+   } );
+
+} ( jQuery, mediaWiki ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd9515c68696f53dd1f195bf7579979e0d743f93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Niharika29 

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

[MediaWiki-commits] [Gerrit] operations...cumin[master]: Clustershell: make call to tqdm.write() explicit

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Clustershell: make call to tqdm.write() explicit
..


Clustershell: make call to tqdm.write() explicit

* Fix a call to tqdm.write() that was not specifying where to send the
  output, relying on tqdm's default.

Change-Id: Ieb67f9154770d335f08f6c98608ada3bfd26a25c
---
M cumin/tests/unit/transports/test_clustershell.py
M cumin/transports/clustershell.py
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/cumin/tests/unit/transports/test_clustershell.py 
b/cumin/tests/unit/transports/test_clustershell.py
index 5f770ad..f889e2d 100644
--- a/cumin/tests/unit/transports/test_clustershell.py
+++ b/cumin/tests/unit/transports/test_clustershell.py
@@ -281,7 +281,7 @@
 self.worker.current_node = self.target.hosts[0]
 self.worker.current_msg = output
 self.handler.ev_read(self.worker)
-tqdm.write.assert_has_calls([mock.call(output)])
+assert tqdm.write.call_args[0][0] == output
 
 def test_ev_timeout(self):
 """Calling ev_timeout() should increase the counters for the timed out 
hosts."""
diff --git a/cumin/transports/clustershell.py b/cumin/transports/clustershell.py
index 441d44c..aec3ca7 100644
--- a/cumin/transports/clustershell.py
+++ b/cumin/transports/clustershell.py
@@ -242,7 +242,7 @@
 if self.deduplicate_output:
 return
 
-tqdm.write(worker.current_msg)
+tqdm.write(worker.current_msg, file=sys.stdout)
 
 def ev_timeout(self, worker):
 """Worker has timed out.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb67f9154770d335f08f6c98608ada3bfd26a25c
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/cumin
Gerrit-Branch: master
Gerrit-Owner: Volans 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Flow on Newsletter_talk on mediawiki.org

2017-09-12 Thread Mattflaschen (Code Review)

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

Change subject: Enable Flow on Newsletter_talk on mediawiki.org
..

Enable Flow on Newsletter_talk on mediawiki.org

All talk namespaces are Flow on mediawiki.org, and there is a request
for this.

Fix unrelated Newsletter typo.

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 371472f..3e89c98 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -702,7 +702,7 @@
 $wgGrantPermissions['editpage']['property-term'] = true;
 $wgGrantPermissions['editpage']['item-redirect'] = true;
 
-// Extension:NeswsLetter, so that they are available for global groups --MA 
2017.09.09
+// Extension:Newsletter, so that they are available for global groups --MA 
2017.09.09
 $wgAvailableRights[] = 'newsletter-create';
 $wgAvailableRights[] = 'newsletter-delete';
 $wgAvailableRights[] = 'newsletter-manage';
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8784e72..f95f083 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17346,6 +17346,7 @@
NS_TEMPLATE_TALK,
NS_HELP_TALK,
NS_CATEGORY_TALK,
+   NS_NEWSLETTER_TALK,
101, /* Manual talk */
103, /* Extension talk */
105, /* API talk */

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

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

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

[MediaWiki-commits] [Gerrit] operations...cumin[master]: Clustershell: make call to tqdm.write() explicit

2017-09-12 Thread Volans (Code Review)

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

Change subject: Clustershell: make call to tqdm.write() explicit
..

Clustershell: make call to tqdm.write() explicit

* Fix a call to tqdm.write() that was not specifying where to send the
  output, relying on tqdm's default.

Change-Id: Ieb67f9154770d335f08f6c98608ada3bfd26a25c
---
M cumin/tests/unit/transports/test_clustershell.py
M cumin/transports/clustershell.py
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/cumin 
refs/changes/56/377656/1

diff --git a/cumin/tests/unit/transports/test_clustershell.py 
b/cumin/tests/unit/transports/test_clustershell.py
index 39c6112..900de93 100644
--- a/cumin/tests/unit/transports/test_clustershell.py
+++ b/cumin/tests/unit/transports/test_clustershell.py
@@ -273,7 +273,7 @@
 self.worker.current_node = self.target.hosts[0]
 self.worker.current_msg = output
 self.handler.ev_read(self.worker)
-tqdm.write.assert_has_calls([mock.call(output)])
+assert tqdm.write.call_args[0][0] == output
 
 def test_ev_timeout(self):
 """Calling ev_timeout() should increase the counters for the timed out 
hosts."""
diff --git a/cumin/transports/clustershell.py b/cumin/transports/clustershell.py
index c2b5c30..742a57f 100644
--- a/cumin/transports/clustershell.py
+++ b/cumin/transports/clustershell.py
@@ -238,7 +238,7 @@
 if self.deduplicate_output:
 return
 
-tqdm.write(worker.current_msg)
+tqdm.write(worker.current_msg, file=sys.stdout)
 
 def ev_timeout(self, worker):
 """Worker has timed out.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb67f9154770d335f08f6c98608ada3bfd26a25c
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/cumin
Gerrit-Branch: master
Gerrit-Owner: Volans 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: dev-requirements.txt: Avoide double-requirement

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: dev-requirements.txt: Avoide double-requirement
..


dev-requirements.txt: Avoide double-requirement

Mentioning the inverse python_version of line 11 in line 12 prevents
double-requirement situation which may occure under Python 2.6 and Windows OS.

Bug: T175669
Change-Id: Iadf7191b7794ea4a0863424a36d138d2fe2dbd16
---
M dev-requirements.txt
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/dev-requirements.txt b/dev-requirements.txt
index d25f4a7..8bfa279 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -9,7 +9,7 @@
 pytest-attrib
 pytest-httpbin
 httpbin<0.6.0 ; python_version < '2.7'
-httpbin!=0.6.0,!=0.6.1 ; os_name != 'posix'
+httpbin!=0.6.0,!=0.6.1 ; os_name != 'posix' and python_version >= '2.7'
 
 six
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadf7191b7794ea4a0863424a36d138d2fe2dbd16
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Update test whitespace to rm false failure

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Update test whitespace to rm false failure
..


Update test whitespace to rm false failure

 * Follows 5b25ad3

Change-Id: I99c92f53e733e39056ef7d261cd82d1b4e7e5427
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
2 files changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index c46a3de..583c919 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -575,7 +575,6 @@
 add("html2wt", "Definition Lists: Mixed Lists: Test 6", "#*: d1\n#*::: d3\n");
 add("html2wt", "Definition Lists: Mixed Lists: Test 9", "*; foo \n*: bar\n");
 add("html2wt", "Definition Lists: Mixed Lists: Test 10", "*#; foo \n*#: 
bar\n");
-add("html2wt", "Definition Lists: Mixed Lists: Test 11", "; a\n:* b\n");
 add("html2wt", "Definition Lists: Mixed Lists: Test 12", "\n*#*#;*;; foo 
:bar\n*#*#; boo :baz\n");
 add("html2wt", "Definition Lists: Weird Ones: Test 1", "\n*#;*::;; foo : bar 
(who uses this?)\n");
 add("html2wt", "Definition Lists: colons occurring in tags", "; a:b\n; 
'''a:b'''\n; a:b\n; a:b\n; a:b\n; a\n: b\n; 
{{echo|a:b}}\n; {{echo|''a:b''}}\n;;; ''a:b''\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index ff777e7..a291958 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -4338,12 +4338,12 @@
 !! test
 Definition Lists: Mixed Lists: Test 11
 !! wikitext
-;a
-:*b
-!! html
-a
+; a
+:* b
+!! html/*
+ a
 
-b
+ b
 
 !! end
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Start migration to HTML5 sections on test wikis

2017-09-12 Thread jenkins-bot (Code Review)

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

Change subject: Start migration to HTML5 sections on test wikis
..


Start migration to HTML5 sections on test wikis

Bug: T175725
Change-Id: Id18f8a8c2b402e4d3c22d6b5c15fc8abaacbf16a
---
M wmf-config/InitialiseSettings.php
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9db6fd7..8784e72 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19474,6 +19474,14 @@
'frwikiversity' => true,
 ],
 
+// T175725
+'wgFragmentMode' => [
+   'default' => [ 'legacy' ],
+   'testwiki' => [ 'legacy', 'html5' ],
+   'test2wiki' => [ 'legacy', 'html5' ],
+   'testwikidatawiki' => [ 'legacy', 'html5' ],
+],
+
 ];
 
 ### WMF Labs override #

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id18f8a8c2b402e4d3c22d6b5c15fc8abaacbf16a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Use the celery scoring backend

2017-09-12 Thread Awight (Code Review)

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

Change subject: Use the celery scoring backend
..

Use the celery scoring backend

This is closer to the production setup, and works around a bug with signal()
vs. the standalone scorer.

Bug: T159105
Change-Id: Ic6872785184f1efe514f3b31aaf2dd4989e15a28
---
M puppet/modules/ores/templates/ores.yaml.erb
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/55/377655/1

diff --git a/puppet/modules/ores/templates/ores.yaml.erb 
b/puppet/modules/ores/templates/ores.yaml.erb
index 17b51ef..da6fef5 100644
--- a/puppet/modules/ores/templates/ores.yaml.erb
+++ b/puppet/modules/ores/templates/ores.yaml.erb
@@ -1,5 +1,7 @@
 SERVER_NAME: <%= @vhost_name %>:<%= @port %>
 
+ores:
+  scoring_system: local_celery
 
 scoring_systems:
   defaults:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: First spike exploring usage of new RevisionStore class

2017-09-12 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377654 )

Change subject: First spike exploring usage of new RevisionStore class
..

First spike exploring usage of new RevisionStore class

Change-Id: Id34772d13b44d3c5be3d9abc891571075bdd7ce6
---
M includes/Revision.php
M includes/Title.php
M includes/api/ApiQueryAllDeletedRevisions.php
M includes/api/ApiQueryAllRevisions.php
M includes/api/ApiQueryDeletedRevisions.php
M includes/api/ApiQueryRevisions.php
M includes/api/ApiQueryRevisionsBase.php
M includes/api/ApiQueryUserContributions.php
M maintenance/Maintenance.php
M maintenance/rebuildtextindex.php
10 files changed, 52 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/54/377654/1

diff --git a/includes/Revision.php b/includes/Revision.php
index c282b2f..efc52e0 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -158,6 +158,7 @@
 * Returns null if no such revision can be found.
 *
 * @deprecated since 1.30, use RevisionStore::getRevisionById() instead.
+* @note No callers in core.
 *
 * @param IDatabase $db
 * @param int $id
@@ -175,6 +176,7 @@
 * to that page, will return null.
 *
 * @deprecated since 1.30, use RevisionStore::getRevisionByPageId() 
instead.
+* @note No callers in core.
 *
 * @param IDatabase $db
 * @param int $pageid
@@ -434,7 +436,7 @@
 * @param Title $title
 */
public function setTitle( $title ) {
-   // FIXME!
+   // FIXME! Quite a few callers!
throw new LogicException( 'Not implemented: ' . __METHOD__ );
}
 
diff --git a/includes/Title.php b/includes/Title.php
index 0687a15..062545c 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4144,7 +4144,8 @@
]
);
if ( $row ) {
-   return new Revision( $row );
+   $revStore = 
MediaWikiServices::getInstance()->getRevisionStore();
+   return $revStore->newRevisionFromRow( $row );
}
}
return null;
diff --git a/includes/api/ApiQueryAllDeletedRevisions.php 
b/includes/api/ApiQueryAllDeletedRevisions.php
index b22bb1f..725cd95 100644
--- a/includes/api/ApiQueryAllDeletedRevisions.php
+++ b/includes/api/ApiQueryAllDeletedRevisions.php
@@ -24,6 +24,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * Query module to enumerate all deleted revisions.
@@ -342,7 +343,8 @@
$generated[] = $row->ar_rev_id;
}
} else {
-   $revision = Revision::newFromArchiveRow( $row );
+   $revisionStore = 
MediaWikiServices::getInstance()->getRevisionStore();
+   $revision = 
$revisionStore->newRevisionFromArchiveRow( $row );
$rev = $this->extractRevisionInfo( $revision, 
$row );
 
if ( !isset( 
$pageMap[$row->ar_namespace][$row->ar_title] ) ) {
diff --git a/includes/api/ApiQueryAllRevisions.php 
b/includes/api/ApiQueryAllRevisions.php
index 8f7d6eb..d8d4a3b 100644
--- a/includes/api/ApiQueryAllRevisions.php
+++ b/includes/api/ApiQueryAllRevisions.php
@@ -21,6 +21,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * Query module to enumerate all revisions.
@@ -198,7 +199,8 @@
$generated[] = $row->rev_id;
}
} else {
-   $revision = Revision::newFromRow( $row );
+   $revisionStore = 
MediaWikiServices::getInstance()->getRevisionStore();
+   $revision = $revisionStore->newRevisionFromRow( 
$row );
$rev = $this->extractRevisionInfo( $revision, 
$row );
 
if ( !isset( $pageMap[$row->rev_page] ) ) {
diff --git a/includes/api/ApiQueryDeletedRevisions.php 
b/includes/api/ApiQueryDeletedRevisions.php
index 8e4752e..d4f6cb6 100644
--- a/includes/api/ApiQueryDeletedRevisions.php
+++ b/includes/api/ApiQueryDeletedRevisions.php
@@ -24,6 +24,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * Query module to enumerate deleted revisions for pages.
@@ -227,9 +228,11 @@
);
}
 
+   $revisionStore = 
MediaWikiServices::getInstance()->getRevisionStore();
+   $revision = 
$revisionStore->newRevisionFromArchiveRow( $row );

1 2 3 4 >

1 - 100 of 399 matches

Mail list logo