date:20171205

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [IMPR] use contextlib.closing for closing a file

2017-12-05 Thread Xqt (Code Review)

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

Change subject: [IMPR] use contextlib.closing for closing a file
..

[IMPR] use contextlib.closing for closing a file

Change-Id: Ic2c0b043d23065b95d34d9034eb27e3a3822f069
---
M scripts/data_ingestion.py
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/97/395697/1

diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py
index a6628c1..8057a60 100755
--- a/scripts/data_ingestion.py
+++ b/scripts/data_ingestion.py
@@ -16,6 +16,7 @@
 
 import base64
 import codecs
+from contextlib import closing
 import hashlib
 import io
 import os
@@ -291,7 +292,7 @@
 pywikibot.error('%s could not be opened: %s' % (filename, e))
 continue
 
-try:
+with closing(f):
 files = CSVReader(f, urlcolumn='url',
   site=config_page.site,
   dialect=configuration['csvDialect'],
@@ -303,8 +304,6 @@
site=None)
 
 bot.run()
-finally:
-f.close()
 
 
 if __name__ == "__main__":

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [IMPR] code cleanup

2017-12-05 Thread Xqt (Code Review)

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

Change subject: [IMPR] code cleanup
..

[IMPR] code cleanup

- remove obsolete pass statements
- fix dicstring in imageuncat.py
- use context manager to open a file in solve_disambiguation.py

Change-Id: I5d0c862a9cdb11ce4bd12d9d68b397b19c62d602
---
M pywikibot/date.py
M pywikibot/page.py
M pywikibot/throttle.py
M scripts/cfd.py
M scripts/imageuncat.py
M scripts/makecat.py
M scripts/redirect.py
M scripts/solve_disambiguation.py
M scripts/upload.py
M scripts/welcome.py
M tests/aspects.py
M tests/ui_tests.py
12 files changed, 20 insertions(+), 40 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/96/395696/1

diff --git a/pywikibot/date.py b/pywikibot/date.py
index a9b0e39..f3ec6fb 100644
--- a/pywikibot/date.py
+++ b/pywikibot/date.py
@@ -7,7 +7,7 @@
 # (C) Andre Engels, 2004-2005
 # (C) Yuri Astrakhan, 2005-2006 (@gmail.com)
 #   (years/decades/centuries/millenniums str <=> int conversions)
-# (C) Pywikibot team, 2004-2016
+# (C) Pywikibot team, 2004-2017
 #
 # Distributed under the terms of the MIT license.
 #
@@ -377,10 +377,10 @@
 decoders = []
 for s in _reParameters.split(pattern):
 if s is None:
-pass
-elif (len(s) in (2, 3) and s[0] == '%' and
-  s[-1] in _digitDecoders and
-  (len(s) == 2 or s[1] in _decimalDigits)):
+continue
+if (len(s) in (2, 3) and s[0] == '%' and
+s[-1] in _digitDecoders and
+(len(s) == 2 or s[1] in _decimalDigits)):
 # Must match a "%2d" or "%d" style
 dec = _digitDecoders[s[-1]]
 if isinstance(dec, basestring):
diff --git a/pywikibot/page.py b/pywikibot/page.py
index ad87584..d9580b6 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -5978,6 +5978,5 @@
 except UnicodeError as ex:
 if not firstException:
 firstException = ex
-pass
 # Couldn't convert, raise the original exception
 raise firstException
diff --git a/pywikibot/throttle.py b/pywikibot/throttle.py
index 71c0da8..0f82b68 100644
--- a/pywikibot/throttle.py
+++ b/pywikibot/throttle.py
@@ -89,9 +89,7 @@
 try:
 f = open(self.ctrlfilename, 'r')
 except IOError:
-if not pid:
-pass
-else:
+if pid:
 raise
 else:
 now = time.time()
diff --git a/scripts/cfd.py b/scripts/cfd.py
index b09db1f..7a56747 100755
--- a/scripts/cfd.py
+++ b/scripts/cfd.py
@@ -178,11 +178,7 @@
 robot = CategoryMoveBot(oldcat=src, batch=True, comment=summary,
 deletion_comment=action_summary,
 inplace=True)
-else:
-# This line does not fit any of our regular expressions,
-# so ignore it.
-pass
-if summary != "" and robot is not None:
+if summary and robot is not None:
 pywikibot.stdout(summary)
 # Run, robot, run!
 robot.run()
diff --git a/scripts/imageuncat.py b/scripts/imageuncat.py
index 315f839..f285299 100755
--- a/scripts/imageuncat.py
+++ b/scripts/imageuncat.py
@@ -1294,7 +1294,7 @@
 Add the uncat template to the page.
 
 @param page: Page to be modified
-@rtype: Page
+@type page: pywikibot.Page
 """
 newtext = page.get() + puttext
 pywikibot.showDiff(page.get(), newtext)
diff --git a/scripts/makecat.py b/scripts/makecat.py
index c4c6f1b..0f647ad 100755
--- a/scripts/makecat.py
+++ b/scripts/makecat.py
@@ -79,7 +79,6 @@
 pass
 except pywikibot.IsRedirectPage:
 cl = True
-pass
 else:
 cats = [x for x in pl.categories()]
 if workingcat not in cats:
diff --git a/scripts/redirect.py b/scripts/redirect.py
index 4ce593a..4fd4448 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -291,7 +291,6 @@
 pass
 except KeyError:
 result = None
-pass
 yield (redirect, result, target, final)
 
 def retrieve_broken_redirects(self):
@@ -513,10 +512,8 @@
 pywikibot.warning(
 u'Redirect target %s is not a valid page title.'
 % str(e)[10:])
-pass
 except pywikibot.InvalidTitle:
 pywikibot.exception()
-pass
 except pywikibot.NoPage:
 movedTarget = None
 try:
@@ -611,8 +608,7 @@
 u'Skipping: Redirect target %s is not a redirect.'
 % newRedir.title(asLink=True))

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmflib: use string for parameter of package, not symbol

2017-12-05 Thread Giuseppe Lavagetto (Code Review)

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

Change subject: wmflib: use string for parameter of package, not symbol
..

wmflib: use string for parameter of package, not symbol

In the stricter puppet version 4, the use of a symbol raises a log line;
let's get rid of those.

Change-Id: Ifd1e66e3fcc115401c0de104328d896658e72dfb
---
M modules/wmflib/lib/puppet/parser/functions/require_package.rb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/395695/1

diff --git a/modules/wmflib/lib/puppet/parser/functions/require_package.rb 
b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
index dacf820..4e01e28 100644
--- a/modules/wmflib/lib/puppet/parser/functions/require_package.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
@@ -45,7 +45,7 @@
   begin
 host_scope = compiler.topscope.class_scope(host)
 host_scope.call_function(:create_resources,
- ['package', { package_name => { :ensure => 
:present } }])
+ ['package', { package_name => { :ensure => 
'present' } }])
   rescue Puppet::Resource::Catalog::DuplicateResourceError
   end
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add cron job for purging ReadingLists data

2017-12-05 Thread Code Review

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

Change subject: Add cron job for purging ReadingLists data
..

Add cron job for purging ReadingLists data

Periodically hard-deletes expired soft-deleted data in the
ReadingLists extension.

Bug: T181107
Change-Id: Idb3f9f730f97fcbf2ba3d312d68cd115ee37d3df
Depends-On: I083e3f25989fb3706f1eee4b7b1e609c6204ce32
---
M modules/cdh
A modules/mediawiki/manifests/maintenance/readinglists.pp
M modules/profile/manifests/mediawiki/maintenance.pp
3 files changed, 17 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/395694/1

diff --git a/modules/cdh b/modules/cdh
index f239789..1d5b40f 16
--- a/modules/cdh
+++ b/modules/cdh
@@ -1 +1 @@
-Subproject commit f2397899a766cc30300574bb7ed3c546610e966e
+Subproject commit 1d5b40f8adf3e9e9698494d32c610bae2952734b
diff --git a/modules/mediawiki/manifests/maintenance/readinglists.pp 
b/modules/mediawiki/manifests/maintenance/readinglists.pp
new file mode 100644
index 000..8c49cab
--- /dev/null
+++ b/modules/mediawiki/manifests/maintenance/readinglists.pp
@@ -0,0 +1,15 @@
+class mediawiki::maintenance::readinglists( $ensure = present ) {
+
+require ::mediawiki
+
+system::role { 'mediawiki::maintenance::readinglists': description => 
'Mediawiki Maintenance Server: purge old deleted data from ReadingLists 
extension' }
+
+cron { 'readinglists_purge':
+ensure   => $ensure,
+user => $::mediawiki::users::web,
+minute   => 42,
+hour => 2,
+command  => '/usr/local/bin/mwscript 
extensions/ReadingLists/maintenance/purge.php metawiki > 
/var/log/mediawiki/readinglists_purge.log',
+}
+}
+
diff --git a/modules/profile/manifests/mediawiki/maintenance.pp 
b/modules/profile/manifests/mediawiki/maintenance.pp
index bd067d6..dc3c7b5 100644
--- a/modules/profile/manifests/mediawiki/maintenance.pp
+++ b/modules/profile/manifests/mediawiki/maintenance.pp
@@ -37,6 +37,7 @@
 class { 'mediawiki::maintenance::generatecaptcha': ensure => $ensure }
 class { 'mediawiki::maintenance::pageassessments': ensure => $ensure }
 class { 'mediawiki::maintenance::uploads': ensure => $ensure }
+class { 'mediawiki::maintenance::readinglists': ensure => $ensure }
 
 # Include the cache warmup script; requires node and conftool
 require ::profile::conftool::client

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb3f9f730f97fcbf2ba3d312d68cd115ee37d3df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] operations/software[master]: s7.hosts: Add db1098:3317

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

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

Change subject: s7.hosts: Add db1098:3317
..


s7.hosts: Add db1098:3317

db1098 now replicates s7 as well

Bug: T178359
Change-Id: I0f283b5308377eb68e345a85980eb94d79e36f5c
---
M dbtools/s7.hosts
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/dbtools/s7.hosts b/dbtools/s7.hosts
index 0c62922..182be0d 100644
--- a/dbtools/s7.hosts
+++ b/dbtools/s7.hosts
@@ -19,5 +19,6 @@
 db1079.eqiad.wmnet 3306
 db1086.eqiad.wmnet 3306
 db1094.eqiad.wmnet 3306
+db1098.eqiad.wmnet 3317
 db1101.eqiad.wmnet 3317
 db1062.eqiad.wmnet 3306

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

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

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

[MediaWiki-commits] [Gerrit] operations/software[master]: s7.hosts: Add db1098:3317

2017-12-05 Thread Marostegui (Code Review)

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

Change subject: s7.hosts: Add db1098:3317
..

s7.hosts: Add db1098:3317

db1098 now replicates s7 as well

Bug: T178359
Change-Id: I0f283b5308377eb68e345a85980eb94d79e36f5c
---
M dbtools/s7.hosts
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/93/395693/1

diff --git a/dbtools/s7.hosts b/dbtools/s7.hosts
index 0c62922..182be0d 100644
--- a/dbtools/s7.hosts
+++ b/dbtools/s7.hosts
@@ -19,5 +19,6 @@
 db1079.eqiad.wmnet 3306
 db1086.eqiad.wmnet 3306
 db1094.eqiad.wmnet 3306
+db1098.eqiad.wmnet 3317
 db1101.eqiad.wmnet 3317
 db1062.eqiad.wmnet 3306

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f283b5308377eb68e345a85980eb94d79e36f5c
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Early exit when the gadget wikEd is enabled

2017-12-05 Thread Fomafix (Code Review)

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

Change subject: Early exit when the gadget wikEd is enabled
..

Early exit when the gadget wikEd is enabled

This change prevents that a semi-functional button is shown in the
toolbar.

Bug: T182157
Change-Id: Idfee99a8216633a337e6daac286575c2cd19cd03
---
M resources/ext.CodeMirror.js
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror 
refs/changes/92/395692/1

diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 03a84f0..1218194 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -2,7 +2,12 @@
var origTextSelection, useCodeMirror, codeMirror, api, 
originHooksTextarea,
wikiEditorToolbarEnabled, enableContentEditable = true;
 
-   if ( mw.config.get( 'wgCodeEditorCurrentLanguage' ) ) { // If the 
CodeEditor is used then just exit;
+   // Early exit when there is another editor that replaces the textarea.
+   // FIXME: Would be good to replace the wikEd check with something more 
generic.
+   if (
+   mw.config.get( 'wgCodeEditorCurrentLanguage' ) || // CodeEditor
+   mw.user.options.get( 'gadget-wikEd' ) > 0 // wikEd
+   ) {
return;
}
 
@@ -300,9 +305,7 @@
selectionEnd = $textbox1.prop( 'selectionEnd' ),
scrollTop = $textbox1.scrollTop();
 
-   // If CodeMirror is already loaded or wikEd gadget is 
enabled, abort. See T178348.
-   // FIXME: Would be good to replace the wikEd check with 
something more generic.
-   if ( codeMirror || mw.user.options.get( 'gadget-wikEd' 
) > 0 ) {
+   if ( codeMirror ) { // Already loaded
return;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfee99a8216633a337e6daac286575c2cd19cd03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: eqsin: basics

2017-12-05 Thread BBlack (Code Review)

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

Change subject: eqsin: basics
..


eqsin: basics

This is only basic site definitions and network ranges.  Does not
cover specific hosts to-be-installed, some site parameters use
remote sites for bootstrapping, no cache/lvs/bast/ipsec yet,
etc...

Bug: T156027
Change-Id: If75ab4cb1990caa400be55a8c552d4db7d7e9ef1
---
M hieradata/common.yaml
M hieradata/common/monitoring.yaml
A hieradata/eqsin/confd.yaml
M hieradata/hosts/einsteinium.yaml
M hieradata/hosts/iron.yaml
M hieradata/hosts/palladium.yaml
M hieradata/hosts/tegmen.yaml
M hieradata/labs/puppet3-diffs/common.yaml
M hieradata/role/common/bastionhost/general.yaml
M hieradata/role/common/prometheus/ops.yaml
M manifests/realm.pp
M modules/authdns/files/discovery-map
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/subnets/private1-eqsin.cfg
A modules/install_server/files/autoinstall/subnets/public1-eqsin.cfg
M modules/install_server/files/dhcpd/dhcpd.conf
M modules/mariadb/files/check_mariadb.py
M modules/network/data/data.yaml
M modules/profile/manifests/pmacct.pp
M modules/profile/manifests/puppetmaster/backend.pp
M modules/profile/manifests/puppetmaster/frontend.pp
M modules/profile/templates/cumin/aliases.yaml.erb
M modules/puppetmaster/manifests/init.pp
M modules/role/manifests/librenms.pp
M modules/role/manifests/ntp.pp
M modules/role/templates/exim/exim4.conf.mx.erb
M modules/standard/manifests/ntp.pp
M modules/standard/manifests/ntp/client.pp
M modules/standard/manifests/ntp/timesyncd.pp
M typos
30 files changed, 149 insertions(+), 23 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 35b407c..4b8594c 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -4,6 +4,7 @@
   - codfw
   - esams
   - ulsfo
+  - eqsin
 
 # Main statsd instance
 statsd: statsd.eqiad.wmnet:8125
diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml
index 83b5296..be206a9 100644
--- a/hieradata/common/monitoring.yaml
+++ b/hieradata/common/monitoring.yaml
@@ -20,6 +20,8 @@
 description: esams text Varnish
   cache_text_ulsfo:
 description: ulsfo text Varnish
+  cache_text_eqsin:
+description: eqsin text Varnish
   cache_upload_codfw:
 description: codfw upload Varnish
   cache_upload_eqiad:
@@ -28,6 +30,8 @@
 description: esams upload Varnish
   cache_upload_ulsfo:
 description: ulsfo upload Varnish
+  cache_upload_eqsin:
+description: eqsin upload Varnish
   cache_misc_codfw:
 description: Misc caches codfw
   cache_misc_eqiad:
@@ -120,6 +124,8 @@
 description: ulsfo LVS servers
   lvs_esams:
 description: esams LVS servers
+  lvs_eqsin:
+description: eqsin LVS servers
 
 # Logstash
   logstash_eqiad:
@@ -245,6 +251,8 @@
 description: esams misc servers
   misc_ulsfo:
 description: ulsfo misc servers
+  misc_eqsin:
+description: eqsin misc servers
 
 # Facilities
   pdus:
diff --git a/hieradata/eqsin/confd.yaml b/hieradata/eqsin/confd.yaml
new file mode 100644
index 000..58bfc74
--- /dev/null
+++ b/hieradata/eqsin/confd.yaml
@@ -0,0 +1 @@
+confd::srv_dns: 'eqsin.wmnet'
diff --git a/hieradata/hosts/einsteinium.yaml b/hieradata/hosts/einsteinium.yaml
index b2491d8..968cdfaf 100644
--- a/hieradata/hosts/einsteinium.yaml
+++ b/hieradata/hosts/einsteinium.yaml
@@ -4,6 +4,7 @@
   - codfw.wmnet
   - esams.wmnet
   - ulsfo.wmnet
+  - eqsin.wmnet
 role::icinga::partner: tegmen.wikimedia.org
 # Note that our paging infrastructure (AQL as of 20161101) may need an update 
of it's sender whitelist
 role::tcpircbot::ensure: present
diff --git a/hieradata/hosts/iron.yaml b/hieradata/hosts/iron.yaml
index d656abf..78ca4dd 100644
--- a/hieradata/hosts/iron.yaml
+++ b/hieradata/hosts/iron.yaml
@@ -4,5 +4,6 @@
   - codfw.wmnet
   - esams.wmnet
   - ulsfo.wmnet
+  - eqsin.wmnet
 admin::groups:
   - datacenter-ops
diff --git a/hieradata/hosts/palladium.yaml b/hieradata/hosts/palladium.yaml
index a398352..b3e0545 100644
--- a/hieradata/hosts/palladium.yaml
+++ b/hieradata/hosts/palladium.yaml
@@ -4,3 +4,4 @@
   - codfw.wmnet
   - esams.wmnet
   - ulsfo.wmnet
+  - eqsin.wmnet
diff --git a/hieradata/hosts/tegmen.yaml b/hieradata/hosts/tegmen.yaml
index 9504215..5400a14da 100644
--- a/hieradata/hosts/tegmen.yaml
+++ b/hieradata/hosts/tegmen.yaml
@@ -4,6 +4,7 @@
   - codfw.wmnet
   - esams.wmnet
   - ulsfo.wmnet
+  - eqsin.wmnet
 role::icinga::partner: einsteinium.wikimedia.org
 # Note that our paging infrastructure (AQL as of 20161101) may need an update 
of it's sender whitelist
 # tegmen is the backup icinga server. All these flags need to be converted 
accordingly for it to assume the identity of the primary
diff --git a/hieradata/labs/puppet3-diffs/common.yaml

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Update jquery.uls from upstream

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

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

Change subject: Update jquery.uls from upstream
..


Update jquery.uls from upstream

* Localisation updates only.

Change-Id: I77d7f5aa907f4498ddcf5f890a826e51fcee3d76
---
M lib/jquery.uls/i18n/cop.json
A lib/jquery.uls/i18n/roa-tara.json
2 files changed, 22 insertions(+), 0 deletions(-)

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



diff --git a/lib/jquery.uls/i18n/cop.json b/lib/jquery.uls/i18n/cop.json
index 7bc5889..c6a16cc 100644
--- a/lib/jquery.uls/i18n/cop.json
+++ b/lib/jquery.uls/i18n/cop.json
@@ -8,5 +8,6 @@
"uls-region-AF": "ⲁϥⲣⲓⲕⲏ",
"uls-region-EU": "ⲉⲩⲣⲱⲡⲏ",
"uls-region-AS": "ⲁⲥⲓⲁ",
+   "uls-region-ME": "ⲡⲓⲉⲃⲧ `ⲛⲑⲙⲏϯ",
"uls-region-all": "ⲁⲥⲡⲓ ⲛⲓⲃⲉⲛ"
 }
diff --git a/lib/jquery.uls/i18n/roa-tara.json 
b/lib/jquery.uls/i18n/roa-tara.json
new file mode 100644
index 000..f020f88
--- /dev/null
+++ b/lib/jquery.uls/i18n/roa-tara.json
@@ -0,0 +1,21 @@
+{
+   "@metadata": {
+   "authors": [
+   "Joetaras"
+   ]
+   },
+   "uls-region-WW": "Tutte 'u munne",
+   "uls-region-SP": "Speciale",
+   "uls-region-AM": "Americhe",
+   "uls-region-AF": "Afriche",
+   "uls-region-EU": "Europe",
+   "uls-region-AS": "Asia",
+   "uls-region-ME": "Medie oriende",
+   "uls-region-PA": "Pacifeche",
+   "uls-region-all": "Tutte le lènghe",
+   "uls-no-results-found": "Nisciune resultate acchiate",
+   "uls-common-languages": "Lènghe suggerite",
+   "uls-no-results-suggestion-title": "Puè essere 'nderessate a:",
+   "uls-search-help": "Puè cercà pe nome d'a lènghe, nome d'u script, 
codece ISO d'a lènghe o puè navegà passanne pa reggione.",
+   "uls-search-placeholder": "Cirche 'na lènghe"
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77d7f5aa907f4498ddcf5f890a826e51fcee3d76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: Siebrand 
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...UniversalLanguageSelector[master]: Add Runic and Gothic to use Junicode webfont

2017-12-05 Thread KartikMistry (Code Review)

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

Change subject: Add Runic and Gothic to use Junicode webfont
..

Add Runic and Gothic to use Junicode webfont

Bug: T37408
Change-Id: I39e8b1271ec3ac7ab75a4c86e2bb3cf3f7fabb94
---
M data/fontrepo/fonts/Junicode/font.ini
M resources/js/ext.uls.webfonts.repository.js
2 files changed, 6 insertions(+), 1 deletion(-)


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

diff --git a/data/fontrepo/fonts/Junicode/font.ini 
b/data/fontrepo/fonts/Junicode/font.ini
index 610d8e7..2f8258e 100644
--- a/data/fontrepo/fonts/Junicode/font.ini
+++ b/data/fontrepo/fonts/Junicode/font.ini
@@ -1,5 +1,5 @@
 [Junicode]
-languages=ang
+languages=ang, got, runr
 version=2013-01-17
 license=OFL-1.1
 licensefile=OFL.txt
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index 74fcbaa..f6e8454 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -157,6 +157,7 @@
],
"got": [
"system",
+   "Junicode",
"Skeirs II"
],
"grc": [
@@ -307,6 +308,10 @@
"system",
"OpenDyslexic"
],
+   "runr": [
+   "system",
+   "Junicode"
+   ],
"saz": [
"Pagul"
],

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Migrate from flake8-putty to flake8-per-file-ignores

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

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

Change subject: Migrate from flake8-putty to flake8-per-file-ignores
..


Migrate from flake8-putty to flake8-per-file-ignores

This will allow us to use flake8 3 and its new features.

- flake8-per-file-ignores is not fully compatible with flake8-putty. Update
tox.ini accordingly.
- Fix the new E722 errors (do not use bare except) by using `Exception`.
- Replace all `flake8: disable=X` inline markers with `noqa:X`. This is a new
feature in flake8 3 and there is no need to rely on flake8-putty for it
anymore.[1]

[1]: http://flake8.pycqa.org/en/3.1.1/user/ignoring-errors.html
Change-Id: I6116089cb0b332f8dbd0cc454b0b02d7f919af2a
---
M generate_user_files.py
M pwb.py
M pywikibot/__init__.py
M pywikibot/config2.py
M pywikibot/data/api.py
M pywikibot/date.py
M pywikibot/logentries.py
M pywikibot/logging.py
M pywikibot/page.py
M pywikibot/pagegenerators.py
M pywikibot/proofreadpage.py
M pywikibot/site.py
M pywikibot/tools/__init__.py
M pywikibot/tools/djvu.py
M pywikibot/tools/ip.py
M pywikibot/userinterfaces/gui.py
M pywikibot/version.py
M scripts/casechecker.py
M scripts/category.py
M scripts/category_redirect.py
M scripts/flickrripper.py
M scripts/followlive.py
M scripts/interwiki.py
M scripts/maintenance/cache.py
M scripts/maintenance/make_i18n_dict.py
M scripts/makecat.py
M scripts/noreferences.py
M scripts/patrol.py
M scripts/script_wui.py
M scripts/weblinkchecker.py
M tests/replacebot_tests.py
M tests/tools_tests.py
M tox.ini
33 files changed, 95 insertions(+), 87 deletions(-)

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



diff --git a/generate_user_files.py b/generate_user_files.py
index 4de8a47..faf7cda 100755
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -295,10 +295,10 @@
   config_text=config_text))
 
 pywikibot.output(u"'%s' written." % _fnc)
-except:
+except Exception:
 try:
 os.remove(_fnc)
-except:
+except Exception:
 pass
 raise
 
diff --git a/pwb.py b/pwb.py
index cd99f5f..51e6632 100755
--- a/pwb.py
+++ b/pwb.py
@@ -78,7 +78,7 @@
 remove_modules()
 
 os.environ['PYWIKIBOT2_NO_USER_CONFIG'] = '2'
-import pywikibot  # flake8: disable=E402
+import pywikibot  # noqa: E402
 pwb = pywikibot
 
 
@@ -211,7 +211,7 @@
 'scripts.maintenance',
 'scripts.archive',
 'scripts.userscripts']
-from pywikibot import config  # flake8: disable=E402
+from pywikibot import config  # noqa: E402
 if config.user_script_paths:
 if isinstance(config.user_script_paths, (tuple, list)):
 script_paths = config.user_script_paths + script_paths
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 6404b19..ede1369 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -164,7 +164,7 @@
 return self.replace(microsecond=self.microsecond)
 
 @classproperty
-def ISO8601Format(cls):  # flake8: disable=N805
+def ISO8601Format(cls):  # noqa: N805
 """ISO8601 format string class property for compatibility purpose."""
 return cls._ISO8601Format()
 
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 35f248d..e42c75c 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -418,7 +418,7 @@
 console_encoding = sys.stdout.encoding
 else:
 console_encoding = sys.stdout.encoding.decode('ascii')
-except:
+except Exception:
 # When using pywikibot inside a daemonized twisted application,
 # we get "StdioOnnaStick instance has no attribute 'encoding'"
 console_encoding = None
@@ -474,7 +474,7 @@
 try:
 # Don't print colorized when the output is, for example, piped to a file.
 colorized_output = sys.stdout.isatty()
-except:
+except Exception:
 colorized_output = False
 
 # An indication of the size of your screen, or rather the size of the screen
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index b0f3865..cdbcfea 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -1998,7 +1998,7 @@
 self._params[param] = [str(int(value) // 2)]
 pywikibot.output(u"Set %s = %s"
  % (param, self._params[param]))
-except:
+except Exception:
 pass
 self.wait()
 continue
diff --git a/pywikibot/date.py b/pywikibot/date.py
index c1e2a49..a9b0e39 100644
--- a/pywikibot/date.py
+++ b/pywikibot/date.py
@@ -67,7 +67,7 @@
 res = func(value)
 if pred(res):

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: add another example case to WANObjectCache::get...

2017-12-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395690 )

Change subject: objectcache: add another example case to 
WANObjectCache::getWithSetCallback()
..

objectcache: add another example case to WANObjectCache::getWithSetCallback()

Change-Id: I4beb1441790f5371d9fe55ca05cd17dc9fcdcf80
---
M includes/libs/objectcache/WANObjectCache.php
1 file changed, 31 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/395690/1

diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index 8f2c72a..80ea87d 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -901,6 +901,37 @@
 * );
 * @endcode
 *
+* Example usage (key holding an LRU subkey:value map without 
per-subkey TTLs)
+* @code
+* $commonCatScenarioChecks = $this->cache->getWithSetCallback(
+* $this->cache->makeKey( 'cat-constraint-checks', 
$constraintId ),
+* WANObjectCache::TTL_DAY,
+* function ( $cacheMap ) use ( $constraintId, $hashOfScenario, 
$scenario ) {
+* $lruCache = MapCacheLRU::newFromArray( $cacheMap ?: [], 
self::CACHE_SIZE );
+* if ( $lruCache->has( $hashOfScenario ) ) {
+* $lruCache->get( $hashOfScenario ); // trigger LRU 
bump
+* } else {
+* $result = $this->checkAgainstContraint( 
$constraintId, $scenario );
+* $lruCache->set( $hashOfScenario, $result, 3 / 8 );
+* }
+* // Save the new LRU cache map and reset the TTL
+* return $lruCache->toArray();
+* },
+* [
+* // Once map is > 1 sec old, consider refreshing
+* 'ageNew' => 1,
+* // Update 5 seconds after "ageNew" given a 1 query/sec 
cache check rate
+* 'hotTTR' => 5,
+* // Avoid querying cache servers multiple times in a 
request; this also means
+* // that a request can only alter the value of any given 
constraint key once
+* 'pcTTL' => WANObjectCache::TTL_PROC_LONG,
+* ]
+* );
+* $checkResult = isset( $commonCatScenarioChecks[ $hashOfScenario 
] )
+* ? $commonCatScenarioChecks[ $hashOfScenario ]
+* : $this->checkAgainstContraint( $constraintId, $scenario );
+* @endcode
+*
 * @see WANObjectCache::get()
 * @see WANObjectCache::set()
 *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4beb1441790f5371d9fe55ca05cd17dc9fcdcf80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: WIP: T182170: Linter: Detect multiple-unclosed-formatting-ta...

2017-12-05 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395689 )

Change subject: WIP: T182170: Linter: Detect multiple-unclosed-formatting-tag 
linter errors
..

WIP: T182170: Linter: Detect multiple-unclosed-formatting-tag linter errors

* Quick POC.
* Need tests + discussing if this is the best approach.
* Works on itwiki:Hubert_H._Humphrey_Metrodome

---
[info/lint/multiple-unclosed-formatting-tag][itwiki/Hubert_H._Humphrey_Metrodome?oldid=93017491]
{"type":"multiple-unclosed-formatting-tag","params":{"name":"small"},"dsr":[4999,5046,7,0]}
---

Change-Id: I334738c77b3677b59c91792b9dc2e7ec8fa829e5
---
M lib/logger/LintLogger.js
1 file changed, 29 insertions(+), 0 deletions(-)


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

diff --git a/lib/logger/LintLogger.js b/lib/logger/LintLogger.js
index 89f1c6e..0114d0a 100644
--- a/lib/logger/LintLogger.js
+++ b/lib/logger/LintLogger.js
@@ -36,6 +36,35 @@
console.assert(false, 'Why are we here? Linting is 
disabled.');
}
 
+   var firstUnclosedTag = {
+   small: null,
+   big: null,
+   };
+   var multiUnclosedTagName = null;
+   enabledBuffer.filter(function(item) {
+   if (item.type === 'missing-end-tag') {
+   if (item.params.name === 'small' || 
item.params.name === 'big') {
+   var tagName = item.params.name;
+   if (!firstUnclosedTag[tagName]) {
+   firstUnclosedTag[tagName] = 
item;
+   } else {
+   multiUnclosedTagName = tagName;
+   return true;
+   }
+   }
+   }
+   return false;
+   });
+   if (multiUnclosedTagName) {
+   var item = firstUnclosedTag[multiUnclosedTagName];
+   enabledBuffer.push({
+   type: 'multiple-unclosed-formatting-tag',
+   params: item.params,
+   dsr: item.dsr,
+   templateInfo: item.templateInfo,
+   });
+   }
+
this.buffer = [];
 
if (env.page.id % env.conf.parsoid.linter.apiSampling !== 0) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I334738c77b3677b59c91792b9dc2e7ec8fa829e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Use restify instead of lowlevel sockets

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

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

Change subject: Use restify instead of lowlevel sockets
..


Use restify instead of lowlevel sockets

Probably overkill but dealing with request boudaries seemed a bit hard
to do when working directly on sockets.
Also I'm wondering if we could not use the filesystem as a locking
mechanism rather than creating a child process.
Not entirely sure but using restify I'm unable to keep the process
running when onComplete runs leading to errors preventing the unix
socket to be closed (added a hack to unlink it).

Change-Id: Ic0473887c4eb10d3dca3b7cfafabf3ab31654b1d
---
M package.json
M tests/integration/config/wdio.conf.js
M tests/integration/features/support/world.js
M tests/integration/lib/tracker.js
4 files changed, 99 insertions(+), 147 deletions(-)

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



diff --git a/package.json b/package.json
index aabf898..cf4a6b3 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,9 @@
 "stylelint": "7.8.0",
 "stylelint-config-wikimedia": "0.4.1",
 "wdio-cucumber-framework": "^1.0.1",
-"webdriverio": "^4.8.0"
+"webdriverio": "^4.8.0",
+"restify": "^6.3.4",
+"request": "^2.83.0",
+"request-promise-native": "^1.0.5"
   }
 }
diff --git a/tests/integration/config/wdio.conf.js 
b/tests/integration/config/wdio.conf.js
index 1af44b6..3f537ef 100644
--- a/tests/integration/config/wdio.conf.js
+++ b/tests/integration/config/wdio.conf.js
@@ -7,13 +7,15 @@
 'use strict';
 
 const child_process = require( 'child_process' ),
-   path = require( 'path' );
+   path = require( 'path' ),
+   fs = require('fs');
 
 function relPath( foo ) {
return path.resolve( __dirname, '../..', foo );
 }
 
-var forkedTracker;
+let forkedTracker;
+let unixSocket;
 
 exports.config = {
 
@@ -217,7 +219,7 @@
// Gets executed once before all workers get launched.
onPrepare: function ( config ) {
forkedTracker = child_process.fork( relPath( 
'./integration/lib/tracker.js' ) );
-   forkedTracker.send( { config: config } );
+   unixSocket = config.trackerPath;
return new Promise( ( resolve, reject ) => {
forkedTracker.on( 'message', ( msg ) => {
if ( msg.initialized ) {
@@ -226,6 +228,7 @@
reject( msg.error );
}
} );
+   forkedTracker.send( { config: config } );
} );
},
//
@@ -288,6 +291,12 @@
// possible to defer the end of the process using a promise.
onComplete: function() {
// TODO: Is this method being called a guarantee, or should we 
handle signals to be sure?
-   forkedTracker.send( { exit: true } );
+   try {
+   forkedTracker.send({exit: true});
+   } catch (err) {
+   console.log( `Failed to send exit signal to tracker: 
${err}`);
+   // Force unlinking the socket
+   fs.unlinkSync(unixSocket);
+   }
}
 };
diff --git a/tests/integration/features/support/world.js 
b/tests/integration/features/support/world.js
index 56c12bb..7b95499 100644
--- a/tests/integration/features/support/world.js
+++ b/tests/integration/features/support/world.js
@@ -11,7 +11,7 @@
  * keeps a user/login state).
  */
 const {defineSupportCode} = require( 'cucumber' ),
-   net = require( 'net' ),
+   request = require('request-promise-native'),
log = require( 'semlog' ).log,
Bot = require( 'mwbot' ),
StepHelpers = require( '../step_definitions/page_step_helpers' ),
@@ -24,29 +24,8 @@
 class TagClient {
constructor( options ) {
this.tags = {};
-   this.connection = new net.Socket();
-   this.connection.connect( options.trackerPath );
-   this.nextRequestId = 0;
-   this.pendingResponses = {};
+   this.unixSocketPath = options.trackerPath;
this.silentLog = options.logLevel !== 'verbose';
-   this.connection.on( 'data', ( data ) => {
-   let parsed = JSON.parse( data );
-   log( `[D] TAG << ${parsed.requestId}: ${data}`, 
this.silentLog );
-   if ( parsed && this.pendingResponses[parsed.requestId] 
) {
-   this.pendingResponses[parsed.requestId]( parsed 
);
-   delete this.pendingResponses[parsed.requestId];
-   }
-   } );
-   }
-
-   request( req ) {
-

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Small adjustments to nodejs integration tests

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

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

Change subject: Small adjustments to nodejs integration tests
..


Small adjustments to nodejs integration tests

Adjust some timeouts
Be more precise in smoke test to avoid failures

Change-Id: Ie4a4fa65763c1be3c224b89c8f3e0891e5c21558
---
M tests/integration/features/smoke.feature
M tests/integration/features/step_definitions/page_step_helpers.js
M tests/integration/features/support/hooks.js
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/tests/integration/features/smoke.feature 
b/tests/integration/features/smoke.feature
index ddef238..5e74243 100644
--- a/tests/integration/features/smoke.feature
+++ b/tests/integration/features/smoke.feature
@@ -15,7 +15,7 @@
   @en.wikipedia.beta.wmflabs.org
   Scenario: Search suggestions
 Given I am at a random page
-When I type main into the search box
+When I type main p into the search box
 Then suggestions should appear
 And Main Page is the first suggestion
 
diff --git a/tests/integration/features/step_definitions/page_step_helpers.js 
b/tests/integration/features/step_definitions/page_step_helpers.js
index 0b37135..73829bb 100644
--- a/tests/integration/features/step_definitions/page_step_helpers.js
+++ b/tests/integration/features/step_definitions/page_step_helpers.js
@@ -145,7 +145,7 @@
return new Promise( ( resolve ) => setTimeout( resolve, ms ) );
}
 
-   waitForOperation( operation, title, timeoutMs = 3 ) {
+   waitForOperation( operation, title, timeoutMs = 6 ) {
return Promise.coroutine( function* () {
let start = new Date();
if ( ( operation === 'upload' || operation === 
'uploadOverwrite' ) && title.substr( 0, 5 ) !== 'File:' ) {
diff --git a/tests/integration/features/support/hooks.js 
b/tests/integration/features/support/hooks.js
index 1591c23..3f79285 100644
--- a/tests/integration/features/support/hooks.js
+++ b/tests/integration/features/support/hooks.js
@@ -483,7 +483,7 @@
}
} ) );
 
-   BeforeOnce( { tags: "@go or @options", timeout: 6 }, runBatchFn( {
+   BeforeOnce( { tags: "@go or @options", timeout: 12 }, runBatchFn( {
edit: {
'son Nearmatchflattentest': 'son Nearmatchflattentest',
'Son Nearmatchflattentest': 'Son Nearmatchflattentest',
@@ -544,7 +544,7 @@
}
} ) );
 
-   BeforeOnce( { tags: "@relevancy" }, runBatchFn( {
+   BeforeOnce( { tags: "@relevancy", timeout: 12 }, runBatchFn( {
edit: {
'Relevancytest': 'it is not relevant',
'Relevancytestviaredirect': 'not relevant',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4a4fa65763c1be3c224b89c8f3e0891e5c21558
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
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] mediawiki...parsoid[master]: Improve parameter aliases handling when ordering template pa...

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

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

Change subject: Improve parameter aliases handling when ordering template 
parameters
..


Improve parameter aliases handling when ordering template parameters

The original implementation treated aliases as parameters ordered after
their canonical form.  This could distort the "distance" metric used to
group new parameters near parameters in the original wikitext, causing
new parameters to bind "less tight" to templatedata parameters with
many aliases.

Here is an implementation which avoids this distortion by being more
careful to distinguish canonical parameter keys from aliased keys.

Change-Id: Id4d9b50868066a15407e72797aec7372ac9ff4b5
---
M lib/html2wt/WikitextSerializer.js
1 file changed, 26 insertions(+), 13 deletions(-)

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



diff --git a/lib/html2wt/WikitextSerializer.js 
b/lib/html2wt/WikitextSerializer.js
index ad503fc..bdaba5e 100644
--- a/lib/html2wt/WikitextSerializer.js
+++ b/lib/html2wt/WikitextSerializer.js
@@ -418,26 +418,35 @@
var newOrder = new Map(Array.from(dataMwKeys).map(function(key, i) {
return [key, { order: i }];
}));
-   // Record order of parameters in original wikitext (from data-parsoid)
-   var origOrder = new Map(dpArgInfo.map(function(argInfo, i) {
-   return [argInfo.k, { order: i, dist: 0 }];
-   }));
// Record order of parameters in templatedata (if present)
var tplDataOrder = new Map();
+   var aliasMap = new Map();
var keys = [];
if (tplData && Array.isArray(tplData.paramOrder)) {
var params = tplData.params;
tplData.paramOrder.forEach(function(k, i) {
-   tplDataOrder.set(k, { order: keys.length });
+   tplDataOrder.set(k, { order: i });
+   aliasMap.set(k, { key: k, order: -1 });
keys.push(k);
// Aliases have the same sort order as the main name.
var aliases = params && params[k] && params[k].aliases;
-   (aliases || []).forEach(function(a) {
-   tplDataOrder.set(a, { order: keys.length });
-   keys.push(a);
+   (aliases || []).forEach(function(a, j) {
+   aliasMap.set(a, { key: k, order: j });
});
});
}
+   // Record order of parameters in original wikitext (from data-parsoid)
+   var origOrder = new Map(dpArgInfo.map(function(argInfo, i) {
+   return [argInfo.k, { order: i, dist: 0 }];
+   }));
+   // Canonical parameter key gets the same order as an alias parameter
+   // found in the original wikitext.
+   dpArgInfo.forEach(function(argInfo, i) {
+   var canon = aliasMap.get(argInfo.k);
+   if (canon && !origOrder.has(canon.key)) {
+   origOrder.set(canon.key, origOrder.get(argInfo.k));
+   }
+   });
// Find the closest "original parameter" for each templatedata 
parameter,
// so that newly-added parameters are placed near the parameters which
// templatedata says they should be adjacent to.
@@ -459,18 +468,22 @@
// Helper function to return a large number if the given key isn't
// in the sort order map
var big = Math.max(nearestOrder.size, newOrder.size);
-   var defaultGet = function(map, key) {
+   var defaultGet = function(map, key1, key2) {
+   var key = ((!key2) || map.has(key1)) ? key1 : key2;
return map.has(key) ? map.get(key).order : big;
};
 
return function cmp(a, b) {
+   var acanon = aliasMap.get(a) || { key: a, order: -1 };
+   var bcanon = aliasMap.get(b) || { key: b, order: -1 };
// primary key is `nearestOrder` (nearest original parameter)
-   var aOrder = defaultGet(nearestOrder, a);
-   var bOrder = defaultGet(nearestOrder, b);
+   var aOrder = defaultGet(nearestOrder, a, acanon.key);
+   var bOrder = defaultGet(nearestOrder, b, bcanon.key);
if (aOrder !== bOrder) { return aOrder - bOrder; }
// secondary key is templatedata order
-   aOrder = defaultGet(tplDataOrder, a);
-   bOrder = defaultGet(tplDataOrder, b);
+   if (acanon.key === bcanon.key) { return acanon.order - 
bcanon.order; }
+   aOrder = defaultGet(tplDataOrder, acanon.key);
+   bOrder = defaultGet(tplDataOrder, bcanon.key);
if (aOrder !== bOrder) { return aOrder - bOrder; }
// tertiary key is original input order (makes

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Preserve original transclusion's parameter order

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

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

Change subject: Preserve original transclusion's parameter order
..


Preserve original transclusion's parameter order

* Parameters that were previously present aren't reordered.
  Any updates to params are made in place.

* Newly introduced parameters are sorted in between the original
  parameters at a place where they preserve templateData order
  partially.

* In the absence of templatedata, they will be serialized
  in the order in which they were added by VE into data-mw.

* Updated mocha tests.

Change-Id: I2b269d5bfb08efbe56b9293c2aa3e810fb1b29da
---
M lib/html2wt/WikitextSerializer.js
M tests/mocha/templatedata.js
M tests/mockAPI.js
3 files changed, 96 insertions(+), 53 deletions(-)

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



diff --git a/lib/html2wt/WikitextSerializer.js 
b/lib/html2wt/WikitextSerializer.js
index 2fc2a1a..ad503fc 100644
--- a/lib/html2wt/WikitextSerializer.js
+++ b/lib/html2wt/WikitextSerializer.js
@@ -413,6 +413,72 @@
});
 };
 
+function createParamComparator(dpArgInfo, tplData, dataMwKeys) {
+   // Record order of parameters in new data-mw
+   var newOrder = new Map(Array.from(dataMwKeys).map(function(key, i) {
+   return [key, { order: i }];
+   }));
+   // Record order of parameters in original wikitext (from data-parsoid)
+   var origOrder = new Map(dpArgInfo.map(function(argInfo, i) {
+   return [argInfo.k, { order: i, dist: 0 }];
+   }));
+   // Record order of parameters in templatedata (if present)
+   var tplDataOrder = new Map();
+   var keys = [];
+   if (tplData && Array.isArray(tplData.paramOrder)) {
+   var params = tplData.params;
+   tplData.paramOrder.forEach(function(k, i) {
+   tplDataOrder.set(k, { order: keys.length });
+   keys.push(k);
+   // Aliases have the same sort order as the main name.
+   var aliases = params && params[k] && params[k].aliases;
+   (aliases || []).forEach(function(a) {
+   tplDataOrder.set(a, { order: keys.length });
+   keys.push(a);
+   });
+   });
+   }
+   // Find the closest "original parameter" for each templatedata 
parameter,
+   // so that newly-added parameters are placed near the parameters which
+   // templatedata says they should be adjacent to.
+   var nearestOrder = new Map(origOrder);
+   var reduceF = function(acc, val, i) {
+   if (origOrder.has(val)) {
+   acc = origOrder.get(val);
+   }
+   if (!(nearestOrder.has(val) && nearestOrder.get(val).dist < 
acc.dist)) {
+   nearestOrder.set(val, acc);
+   }
+   return { order: acc.order, dist: acc.dist + 1 };
+   };
+   // Find closest original parameter before the key.
+   keys.reduce(reduceF, { order: -1, dist: 2 * keys.length });
+   // Find closest original parameter after the key.
+   keys.reduceRight(reduceF, { order: origOrder.size, dist: keys.length });
+
+   // Helper function to return a large number if the given key isn't
+   // in the sort order map
+   var big = Math.max(nearestOrder.size, newOrder.size);
+   var defaultGet = function(map, key) {
+   return map.has(key) ? map.get(key).order : big;
+   };
+
+   return function cmp(a, b) {
+   // primary key is `nearestOrder` (nearest original parameter)
+   var aOrder = defaultGet(nearestOrder, a);
+   var bOrder = defaultGet(nearestOrder, b);
+   if (aOrder !== bOrder) { return aOrder - bOrder; }
+   // secondary key is templatedata order
+   aOrder = defaultGet(tplDataOrder, a);
+   bOrder = defaultGet(tplDataOrder, b);
+   if (aOrder !== bOrder) { return aOrder - bOrder; }
+   // tertiary key is original input order (makes sort stable)
+   aOrder = defaultGet(newOrder, a);
+   bOrder = defaultGet(newOrder, b);
+   return aOrder - bOrder;
+   };
+}
+
 // See 
https://github.com/wikimedia/mediawiki-extensions-TemplateData/blob/master/Specification.md
 // for the templatedata specification.
 WSP.serializePart = Promise.method(function(node, type, part, tplData) {
@@ -540,34 +606,8 @@
kvMap.set(k, { serializeAsNamed: serializeAsNamed, 
name: name, value: value });
});
}).then(function() {
-   var paramOrder = [];
-   if (tplData && Array.isArray(tplData.paramOrder)) {
-   var params = tplData.params;
-

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable ReadingLists on all SUL wikis

2017-12-05 Thread Code Review

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

Change subject: Enable ReadingLists on all SUL wikis
..

Enable ReadingLists on all SUL wikis

Bug: T181107
Change-Id: I083e3f25989fb3706f1eee4b7b1e609c6204ce32
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e8bac96..8d4ad5d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19911,8 +19911,7 @@
 ],
 
 'wmgUseReadingLists' => [
-   'default' => false,
-   'testwiki' => true,
+   'default' => true,
'private' => false,
'fishbowl' => false,
'nonglobal' => false,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I083e3f25989fb3706f1eee4b7b1e609c6204ce32
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Refactor RevisionSlider toggle button CSS

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

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

Change subject: Refactor RevisionSlider toggle button CSS
..


Refactor RevisionSlider toggle button CSS

including:
- Using LESS for nested CSS
- Overrule `margin` of frameless OOUI `mw-revslider-toggle-button`
- Removing CSS that had no effect since some time
- Removing `!important` where not longer needed

Change-Id: I1ba01061ebafe799ca62dbb6ce5e79459612af23
---
M extension.json
D modules/ext.RevisionSlider.lazy.css
A modules/ext.RevisionSlider.lazy.less
3 files changed, 46 insertions(+), 47 deletions(-)

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



diff --git a/extension.json b/extension.json
index 176ae47..0fbf0db 100644
--- a/extension.json
+++ b/extension.json
@@ -32,7 +32,7 @@
"ResourceModules": {
"ext.RevisionSlider.lazyCss": {
"styles": [
-   "modules/ext.RevisionSlider.lazy.css"
+   "modules/ext.RevisionSlider.lazy.less"
],
"position": "top"
},
diff --git a/modules/ext.RevisionSlider.lazy.css 
b/modules/ext.RevisionSlider.lazy.css
deleted file mode 100644
index 62228d8..000
--- a/modules/ext.RevisionSlider.lazy.css
+++ /dev/null
@@ -1,46 +0,0 @@
-@media print {
-   .mw-revslider-container {
-   display: none;
-   }
-}
-
-.mw-revslider-container {
-   /* This will flip with CSSJanus in case */
-   /* the interface is in RTL */
-   direction: ltr;
-   position: relative;
-   border: 1px solid #c8ccd1;
-}
-
-.mw-revslider-slider-wrapper {
-   min-height: 142px;
-   border-top: 1px solid #c8ccd1;
-   padding: 20px 10px;
-}
-
-.mw-revslider-placeholder .oo-ui-progressBarWidget {
-   margin: 60px auto;
-}
-
-.mw-revslider-toggle-button {
-   width: 100%;
-   text-align: center;
-   margin: 0 !important; /* stylelint-disable-line 
declaration-no-important */
-}
-
-.mw-revslider-toggle-button .oo-ui-buttonElement-button {
-   min-height: 0;
-   min-width: 0;
-   width: 100%;
-}
-
-.mw-revslider-toggle-button .oo-ui-iconElement-icon {
-   left: auto !important; /* stylelint-disable-line 
declaration-no-important */
-   right: 0;
-   /* For OOUI-Apex */
-   position: absolute;
-}
-
-.mw-revslider-toggle-button .oo-ui-labelElement-label {
-   line-height: 1.875em;
-}
diff --git a/modules/ext.RevisionSlider.lazy.less 
b/modules/ext.RevisionSlider.lazy.less
new file mode 100644
index 000..14a04a9
--- /dev/null
+++ b/modules/ext.RevisionSlider.lazy.less
@@ -0,0 +1,45 @@
+@media print {
+   .mw-revslider-container {
+   display: none;
+   }
+}
+
+.mw-revslider-container {
+   /* This will flip with CSSJanus in case */
+   /* the interface is in RTL */
+   direction: ltr;
+   position: relative;
+   border: 1px solid #c8ccd1;
+
+   
.mw-revslider-toggle-button.oo-ui-buttonElement-frameless.oo-ui-labelElement {
+   width: 100%;
+   text-align: center;
+   /* Overrule OOUI frameless button `margin` */
+   margin-left: 0;
+   margin-right: 0;
+   }
+}
+
+.mw-revslider-toggle-button {
+   .oo-ui-buttonElement-button {
+   width: 100%;
+   }
+
+   .oo-ui-iconElement-icon {
+   /* Overrule OOUI iconElement `left` */
+   left: auto !important; /* stylelint-disable-line 
declaration-no-important */
+   right: 0;
+   /* For OOUI-Apex */
+   position: absolute;
+   }
+}
+
+.mw-revslider-slider-wrapper {
+   min-height: 142px;
+   border-top: 1px solid #c8ccd1;
+   padding: 20px 10px;
+}
+
+.mw-revslider-placeholder .oo-ui-progressBarWidget {
+   margin: 60px auto;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ba01061ebafe799ca62dbb6ce5e79459612af23
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Support changing icon variants on hover"

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

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

Change subject: Revert "Support changing icon variants on hover"
..


Revert "Support changing icon variants on hover"

This reverts commit 46c62ff5f474c6fe7a409863058e81bb678229b2. After 
reconsidering menu item treatment under UI Standardization perspective, we 
don't need and shouldn't use such pattern.

Bug: T110051
Change-Id: I0e8b6035f516e6629010b4f18471445c8833156e
---
M includes/resourceloader/ResourceLoaderOOUIImageModule.php
1 file changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/includes/resourceloader/ResourceLoaderOOUIImageModule.php 
b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
index ee87d8d..5c9e1d9 100644
--- a/includes/resourceloader/ResourceLoaderOOUIImageModule.php
+++ b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
@@ -98,11 +98,8 @@
// Extra selectors to allow using the same icons for old-style 
MediaWiki UI code
if ( substr( $module, 0, 5 ) === 'icons' ) {
$definition['selectorWithoutVariant'] = 
'.oo-ui-icon-{name}, .mw-ui-icon-{name}:before';
-   $definition['selectorWithVariant'] = '
-   .oo-ui-image-{variant}.oo-ui-icon-{name}, 
.mw-ui-icon-{name}-{variant}:before,
-   /* Hack for Flow, see T110051 */
-   .mw-ui-hovericon:hover 
.mw-ui-icon-{name}-{variant}-hover:before,
-   
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before';
+   $definition['selectorWithVariant'] = 
'.oo-ui-image-{variant}.oo-ui-icon-{name}, ' .
+   '.mw-ui-icon-{name}-{variant}:before';
}
 
// Fields from module definition silently override keys from 
JSON files

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e8b6035f516e6629010b4f18471445c8833156e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jdlrobson 
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] operations/mediawiki-config[master]: Deploy ReadingLists to production

2017-12-05 Thread Code Review

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

Change subject: Deploy ReadingLists to production
..

Deploy ReadingLists to production

Bug: T181107
Change-Id: I1a984e16d6e2017436b4c140cc3cea550ec1f767
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
6 files changed, 28 insertions(+), 8 deletions(-)


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 4844d73..64619c9 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -340,13 +340,6 @@
};
 }
 
-if ( $wmgUseReadingLists ) {
-   wfLoadExtension( 'ReadingLists' );
-   $wgReadingListsCentralWiki = 'metawiki';
-   // no clusters in Beta; let's just pick a random wiki DB and use that
-   $wgReadingListsDatabase = 'metawiki';
-}
-
 if ( $wmgUseLoginNotify ) {
$wgLoginNotifyAttemptsKnownIP = 10;
$wgLoginNotifyAttemptsNewIP = 1;
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d806b58..f22043a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3638,6 +3638,10 @@
$wg3dProcessor = [ '/usr/bin/xvfb-run', '-a', '-s', '-ac -screen 0 
1280x1024x24' ,'/srv/deployment/3d2png/deploy/src/3d2png.js' ];
 }
 
+if ( $wmgUseReadingLists ) {
+   wfLoadExtension( 'ReadingLists' );
+}
+
 if ( $wmfRealm === 'labs' ) {
require "$wmfConfigDir/CommonSettings-labs.php";
 }
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 383c120..a94e15c 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -672,6 +672,15 @@
'wmgUseReadingLists' => [
'default' => true,
],
+   'wgReadingListsCluster' => [
+   'default' => false,
+   ],
+   'wgReadingListsDatabase' => [
+   'default' => 'metawiki',
+   ],
+   'wgReadingListsCentralWiki' => [
+   'default' => 'metawiki',
+   ],
 
// TODO(T166759): Remove this setting once it is also
// the default for production.
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 088a25e..863f3cc 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19910,6 +19910,20 @@
'default' => MIGRATION_OLD,
 ],
 
+'wmgUseReadingLists' => [
+   'default' => true,
+   'private' => false,
+   'fishbowl' => false,
+   'nonglobal' => false,
+],
+'wgReadingListsCluster' => [
+   'default' => 'extension1',
+],
+'wgReadingListsDatabase' => [
+   'default' => 'wikishared',
+],
+'wgReadingListsCentralWiki' => [
+   'default' => 'metawiki',
 ];
 
 ### WMF Labs override #
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 9a9c685..9a26554 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -113,6 +113,7 @@
 $IP/extensions/PoolCounter/extension.json
 $IP/extensions/QuickSurveys/extension.json
 $IP/extensions/Quiz/extension.json
+$IP/extensions/ReadingLists/extension.json
 $IP/extensions/RelatedArticles/extension.json
 $IP/extensions/RelatedSites/extension.json
 $IP/extensions/Renameuser/extension.json
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index f4fd45c..85139d2 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -2,6 +2,5 @@
 $IP/extensions/FileImporter/extension.json
 $IP/extensions/FileExporter/extension.json
 $IP/extensions/PerformanceInspector/extension.json
-$IP/extensions/ReadingLists/extension.json
 $IP/extensions/Sentry/extension.json
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a984e16d6e2017436b4c140cc3cea550ec1f767
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Remove unique, inconsistent treatment of menu items

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

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

Change subject: Remove unique, inconsistent treatment of menu items
..


Remove unique, inconsistent treatment of menu items

Special treatment of overflow, flagged menu items of solely
two items is not only inconsistent with icon menus elsewhere,
it also adds to payload on every page with added OOUI icon packs
in RL. We are removing the treatment here and also provide a
follow-up patch in core.

Bug: T110051
Change-Id: I644ab66e8ca17d614247cda730fb16c72e8d1349
---
M handlebars/compiled/flow_block_board-history.handlebars.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topic_history.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_moderation_actions_list.partial.handlebars
8 files changed, 127 insertions(+), 127 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I644ab66e8ca17d614247cda730fb16c72e8d1349
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Catrope 
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...CheckUser[master]: Start on basic unit tests for CheckUser extension

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

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

Change subject: Start on basic unit tests for CheckUser extension
..


Start on basic unit tests for CheckUser extension

This patch only adds test coverage for CheckUser::getIpConds, in
response to the regression T175898. More test coverage will hopefully
follow.

Bug: T175920
Change-Id: Id0b0837ab3bb0604c99a2bc04d0fccf157620642
---
A tests/phpunit/CheckUserTest.php
1 file changed, 83 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/CheckUserTest.php b/tests/phpunit/CheckUserTest.php
new file mode 100644
index 000..48472f8
--- /dev/null
+++ b/tests/phpunit/CheckUserTest.php
@@ -0,0 +1,83 @@
+tablesUsed = array_merge(
+   $this->tablesUsed,
+   [
+   'page',
+   'revision',
+   'ip_changes',
+   'text',
+   'archive',
+   'recentchanges',
+   'logging',
+   'page_props',
+   'cu_changes',
+   ]
+   );
+   }
+
+   protected function setUp() {
+   parent::setUp();
+
+   $this->setMwGlobals( [
+   'wgCheckUserCIDRLimit' => [
+   'IPv4' => 16,
+   'IPv6' => 32,
+   ]
+   ] );
+   }
+
+   /**
+* @covers CheckUser::getIpConds
+* @dataProvider provideGetIpConds
+*/
+   public function testGetIpConds( $target, $expected ) {
+   $dbr = wfGetDB( DB_REPLICA );
+
+   $this->assertEquals(
+   $expected,
+   CheckUser::getIpConds( $dbr, $target )
+   );
+   }
+
+   /**
+* Test cases for CheckUser::getIpConds
+* @return array
+*/
+   public function provideGetIpConds() {
+   return [
+   [
+   '212.35.31.121',
+   [ 'cuc_ip_hex' => 'D4231F79' ],
+   ],
+   [
+   '212.35.31.121/32',
+   [ 0 => 'cuc_ip_hex BETWEEN \'D4231F79\' AND 
\'D4231F79\'' ],
+   ],
+   [
+   '::e:f:2001',
+   [ 'cuc_ip_hex' => 
'v6-000E000F2001' ],
+   ],
+   [
+   '::e:f:2001/96',
+   [ 0 => 'cuc_ip_hex BETWEEN 
\'v6-000E\'' .
+   ' AND 
\'v6-000E\'' ],
+   ],
+   [ '0.17.184.5/15', false ],
+   [ '2000::/31', false ],
+   ];
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0b0837ab3bb0604c99a2bc04d0fccf157620642
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: MusikAnimal 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Huji 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MusikAnimal 
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...ReadingLists[master]: Use lazy connection references

2017-12-05 Thread Code Review

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

Change subject: Use lazy connection references
..

Use lazy connection references

Since we always create both read and write DB handles, but most
endpoints only use one of them, we make unnecessary connections
and cause some logspam. Using lazy references should fix that.

Change-Id: Ifd4ff81b9b04132512866300157316f8b95d2665
---
M src/Utils.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReadingLists 
refs/changes/86/395686/1

diff --git a/src/Utils.php b/src/Utils.php
index 46d3fff..10136b9 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -26,7 +26,7 @@
$loadBalancer = $cluster
? $loadBalancerFactory->getExternalLB( $cluster )
: $loadBalancerFactory->getMainLB( $database );
-   return $loadBalancer->getConnectionRef( $db, [], $database );
+   return $loadBalancer->getLazyConnectionRef( $db, [], $database 
);
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd4ff81b9b04132512866300157316f8b95d2665
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Add extra data from extensions to runSearch result

2017-12-05 Thread Smalyshev (Code Review)

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

Change subject: Add extra data from extensions to runSearch result
..

Add extra data from extensions to runSearch result

Bug: T182145
Change-Id: Ia56123837434f3efbd936baa7ce5c69a232d14f6
---
M maintenance/runSearch.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/maintenance/runSearch.php b/maintenance/runSearch.php
index e5d01dc..3321484 100644
--- a/maintenance/runSearch.php
+++ b/maintenance/runSearch.php
@@ -157,6 +157,7 @@
'category' => 
$result->getCategorySnippet(),
],
'explanation' => $result->getExplanation(),
+   'extra' => $result->getExtensionData(),
];
$result = $value->next();
}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: deployment_server, debug_proxy, dumps, notebook, pmacct: rm ganglia

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: deployment_server,debug_proxy,dumps,notebook,pmacct: rm ganglia
..


deployment_server,debug_proxy,dumps,notebook,pmacct: rm ganglia

Bug: T177225
Change-Id: I21b19f78a048652974ea263372a64182a8178e4e
---
A hieradata/role/common/debug_proxy.yaml
M hieradata/role/common/deployment_server.yaml
A hieradata/role/common/dumps/generation/server/fallback.yaml
A hieradata/role/common/dumps/generation/server/primary.yaml
M hieradata/role/common/dumps/web/htmldumps.yaml
M hieradata/role/common/paws_internal/jupyterhub.yaml
M hieradata/role/common/pmacct.yaml
7 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/role/common/debug_proxy.yaml 
b/hieradata/role/common/debug_proxy.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/debug_proxy.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index 7c55e05..4f899a6 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -3,7 +3,7 @@
   - eqiad.wmnet
   - codfw.wmnet
 cluster: misc
-
+standard::has_ganglia: false
 admin::groups:
   - deployment
   - deploy-service
diff --git a/hieradata/role/common/dumps/generation/server/fallback.yaml 
b/hieradata/role/common/dumps/generation/server/fallback.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/generation/server/fallback.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/generation/server/primary.yaml 
b/hieradata/role/common/dumps/generation/server/primary.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/generation/server/primary.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/web/htmldumps.yaml 
b/hieradata/role/common/dumps/web/htmldumps.yaml
index aaac6aa..0472f75 100644
--- a/hieradata/role/common/dumps/web/htmldumps.yaml
+++ b/hieradata/role/common/dumps/web/htmldumps.yaml
@@ -1,2 +1,3 @@
 admin::groups:
   - htmldumps-admin
+standard::has_ganglia: false
diff --git a/hieradata/role/common/paws_internal/jupyterhub.yaml 
b/hieradata/role/common/paws_internal/jupyterhub.yaml
index a02eb90..0cde64c 100644
--- a/hieradata/role/common/paws_internal/jupyterhub.yaml
+++ b/hieradata/role/common/paws_internal/jupyterhub.yaml
@@ -3,4 +3,5 @@
   - researchers
   - statistics-privatedata-users
   - analytics-privatedata-users
+standard::has_ganglia: false
 jupyterhub::web_proxy: http://webproxy.eqiad.wmnet:8080
diff --git a/hieradata/role/common/pmacct.yaml 
b/hieradata/role/common/pmacct.yaml
index cd57b82..92e1b70 100644
--- a/hieradata/role/common/pmacct.yaml
+++ b/hieradata/role/common/pmacct.yaml
@@ -1,2 +1,3 @@
 profile::pmacct::kafka_cluster: 'jumbo-eqiad'
-profile::pmacct::librdkafka_config: []
\ No newline at end of file
+profile::pmacct::librdkafka_config: []
+standard::has_ganglia: false

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to ...

2017-12-05 Thread VolkerE (Code Review)

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

Change subject: [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be 
removed
..

[DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be removed

Bug: T145163
Change-Id: Id73c673704ba9528a8b2a98f4a896905468beec3
---
M demos/pages/icons.js
M src/themes/apex/icons-alerts.json
M src/themes/wikimediaui/icons-alerts.json
3 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/84/395684/1

diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 8ae0e63..824b65b 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -37,7 +37,6 @@
alerts: [
'alert',
'bell',
-   'bellOn',
'comment',
'message',
'notice',
diff --git a/src/themes/apex/icons-alerts.json 
b/src/themes/apex/icons-alerts.json
index 880f765..9bef0a1 100644
--- a/src/themes/apex/icons-alerts.json
+++ b/src/themes/apex/icons-alerts.json
@@ -7,7 +7,9 @@
"bellOn": { "file": {
"ltr": "images/icons/bellOn-ltr.svg",
"rtl": "images/icons/bellOn-rtl.svg"
-   } },
+   },
+   "deprecated": "This will be removed in v0.26.0."
+   },
"comment": { "file": "images/icons/comment.svg" },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",
diff --git a/src/themes/wikimediaui/icons-alerts.json 
b/src/themes/wikimediaui/icons-alerts.json
index 0d45a51..ee79a2e 100644
--- a/src/themes/wikimediaui/icons-alerts.json
+++ b/src/themes/wikimediaui/icons-alerts.json
@@ -27,7 +27,9 @@
"bellOn": { "file": {
"ltr": "images/icons/bellOn-ltr.svg",
"rtl": "images/icons/bellOn-rtl.svg"
-   } },
+   },
+   "deprecated": "This will be removed in v0.26.0."
+   },
"comment": { "file": "images/icons/comment.svg" },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: deployment_server, debug_proxy, dumps, notebook, pmacct: rm ganglia

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: deployment_server,debug_proxy,dumps,notebook,pmacct: rm ganglia
..

deployment_server,debug_proxy,dumps,notebook,pmacct: rm ganglia

Bug: T177225
Change-Id: I21b19f78a048652974ea263372a64182a8178e4e
---
A hieradata/role/common/debug_proxy.yaml
M hieradata/role/common/deployment_server.yaml
A hieradata/role/common/dumps/generation/server/fallback.yaml
A hieradata/role/common/dumps/generation/server/primary.yaml
M hieradata/role/common/dumps/web/htmldumps.yaml
M hieradata/role/common/paws_internal/jupyterhub.yaml
M hieradata/role/common/pmacct.yaml
7 files changed, 8 insertions(+), 2 deletions(-)


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

diff --git a/hieradata/role/common/debug_proxy.yaml 
b/hieradata/role/common/debug_proxy.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/debug_proxy.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index 7c55e05..4f899a6 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -3,7 +3,7 @@
   - eqiad.wmnet
   - codfw.wmnet
 cluster: misc
-
+standard::has_ganglia: false
 admin::groups:
   - deployment
   - deploy-service
diff --git a/hieradata/role/common/dumps/generation/server/fallback.yaml 
b/hieradata/role/common/dumps/generation/server/fallback.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/generation/server/fallback.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/generation/server/primary.yaml 
b/hieradata/role/common/dumps/generation/server/primary.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/generation/server/primary.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/web/htmldumps.yaml 
b/hieradata/role/common/dumps/web/htmldumps.yaml
index aaac6aa..0472f75 100644
--- a/hieradata/role/common/dumps/web/htmldumps.yaml
+++ b/hieradata/role/common/dumps/web/htmldumps.yaml
@@ -1,2 +1,3 @@
 admin::groups:
   - htmldumps-admin
+standard::has_ganglia: false
diff --git a/hieradata/role/common/paws_internal/jupyterhub.yaml 
b/hieradata/role/common/paws_internal/jupyterhub.yaml
index a02eb90..0cde64c 100644
--- a/hieradata/role/common/paws_internal/jupyterhub.yaml
+++ b/hieradata/role/common/paws_internal/jupyterhub.yaml
@@ -3,4 +3,5 @@
   - researchers
   - statistics-privatedata-users
   - analytics-privatedata-users
+standard::has_ganglia: false
 jupyterhub::web_proxy: http://webproxy.eqiad.wmnet:8080
diff --git a/hieradata/role/common/pmacct.yaml 
b/hieradata/role/common/pmacct.yaml
index cd57b82..92e1b70 100644
--- a/hieradata/role/common/pmacct.yaml
+++ b/hieradata/role/common/pmacct.yaml
@@ -1,2 +1,3 @@
 profile::pmacct::kafka_cluster: 'jumbo-eqiad'
-profile::pmacct::librdkafka_config: []
\ No newline at end of file
+profile::pmacct::librdkafka_config: []
+standard::has_ganglia: false

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add parameter for query/search to fetch augmented data.

2017-12-05 Thread Smalyshev (Code Review)

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

Change subject: Add parameter for query/search to fetch augmented data.
..

Add parameter for query/search to fetch augmented data.

Bug: T182145
Change-Id: I54b50a1474b885ebe52900fd50729d6353e07807
---
M includes/api/ApiQuerySearch.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
3 files changed, 11 insertions(+), 0 deletions(-)


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

diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index f0c4180..8460a60 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -272,6 +272,14 @@
if ( isset( $prop['isfilematch'] ) ) {
$vals['isfilematch'] = $result->isFileMatch();
}
+
+   if ( isset( $prop['extra'] ) ) {
+   $extra = $result->getExtensionData();
+   if ( $extra ) {
+   $vals['extra'] = $extra;
+   }
+   }
+
return $vals;
}
 
@@ -372,6 +380,7 @@
'categorysnippet',
'score', // deprecated
'hasrelated', // deprecated
+   'extra',
],
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_HELP_MSG_PER_VALUE => [],
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 91c3e18..c733e08 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -1153,6 +1153,7 @@
"apihelp-query+search-paramvalue-prop-sectiontitle": "Adds the title of 
the matching section.",
"apihelp-query+search-paramvalue-prop-categorysnippet": "Adds a parsed 
snippet of the matching category.",
"apihelp-query+search-paramvalue-prop-isfilematch": "Adds a boolean 
indicating if the search matched file content.",
+   "apihelp-query+search-paramvalue-prop-extra": "Adds extra data 
generated by extensions.",
"apihelp-query+search-paramvalue-prop-score": "Ignored.",
"apihelp-query+search-paramvalue-prop-hasrelated": "Ignored.",
"apihelp-query+search-param-limit": "How many total pages to return.",
diff --git a/includes/api/i18n/qqq.json b/includes/api/i18n/qqq.json
index 47afdc1..40f5809 100644
--- a/includes/api/i18n/qqq.json
+++ b/includes/api/i18n/qqq.json
@@ -1077,6 +1077,7 @@
"apihelp-query+search-paramvalue-prop-sectiontitle": 
"{{doc-apihelp-paramvalue|query+search|prop|sectiontitle}}",
"apihelp-query+search-paramvalue-prop-categorysnippet": 
"{{doc-apihelp-paramvalue|query+search|prop|categorysnippet}}",
"apihelp-query+search-paramvalue-prop-isfilematch": 
"{{doc-apihelp-paramvalue|query+search|prop|isfilematch}}",
+   "apihelp-query+search-paramvalue-prop-extra": 
"{{doc-apihelp-paramvalue|query+search|prop|extra}}",
"apihelp-query+search-paramvalue-prop-score": 
"{{doc-apihelp-paramvalue|query+search|prop|score}}\n{{Identical|Ignored}}",
"apihelp-query+search-paramvalue-prop-hasrelated": 
"{{doc-apihelp-paramvalue|query+search|prop|hasrelated}}\n{{Identical|Ignored}}",
"apihelp-query+search-param-limit": 
"{{doc-apihelp-param|query+search|limit}}",

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: etherpad, gerrit, lists, openldap, ores, url_downloader, yubiauth:...

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: etherpad,gerrit,lists,openldap,ores,url_downloader,yubiauth: rm 
ganglia
..


etherpad,gerrit,lists,openldap,ores,url_downloader,yubiauth: rm ganglia

Bug: T177225
Change-Id: Id6dfcce03dc36fcc3cc2702d33c9f68b02045d15
---
A hieradata/role/common/etherpad.yaml
M hieradata/role/common/gerrit.yaml
M hieradata/role/common/lists.yaml
A hieradata/role/common/openldap/corp.yaml
M hieradata/role/common/ores/stresstest.yaml
A hieradata/role/common/url_downloader.yaml
M hieradata/role/common/yubiauth_server.yaml
7 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/etherpad.yaml 
b/hieradata/role/common/etherpad.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/etherpad.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/gerrit.yaml 
b/hieradata/role/common/gerrit.yaml
index 0242cc1..ffb288b 100644
--- a/hieradata/role/common/gerrit.yaml
+++ b/hieradata/role/common/gerrit.yaml
@@ -2,6 +2,7 @@
   - gerrit-root
   - gerrit-admin
 
+standard::has_ganglia: false
 gerrit::server::host: 'gerrit.wikimedia.org'
 gerrit::server::slave_hosts:
 - 'gerrit-slave.wikimedia.org'
diff --git a/hieradata/role/common/lists.yaml b/hieradata/role/common/lists.yaml
index 0d9f2d0..32ea7fe 100644
--- a/hieradata/role/common/lists.yaml
+++ b/hieradata/role/common/lists.yaml
@@ -2,3 +2,4 @@
 mailman::lists_servername: 'lists.wikimedia.org'
 mailman::lists::ipv4: '208.80.154.21'
 mailman::lists::ipv6: '2620:0:861:1:208:80:154:21'
+standard::has_ganglia: false
diff --git a/hieradata/role/common/openldap/corp.yaml 
b/hieradata/role/common/openldap/corp.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/openldap/corp.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/ores/stresstest.yaml 
b/hieradata/role/common/ores/stresstest.yaml
index e3dd5da..946e233 100644
--- a/hieradata/role/common/ores/stresstest.yaml
+++ b/hieradata/role/common/ores/stresstest.yaml
@@ -1,6 +1,7 @@
 cluster: misc
 admin::groups:
 - ores-admin
+standard::has_ganglia: false
 profile::ores::web::redis_host: "ores1001.eqiad.wmnet"
 profile::ores::celery::workers: 150
 profile::ores::celery::queue_maxsize: 600
diff --git a/hieradata/role/common/url_downloader.yaml 
b/hieradata/role/common/url_downloader.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/url_downloader.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/yubiauth_server.yaml 
b/hieradata/role/common/yubiauth_server.yaml
index cecb3b8..f1f3a37 100644
--- a/hieradata/role/common/yubiauth_server.yaml
+++ b/hieradata/role/common/yubiauth_server.yaml
@@ -2,3 +2,4 @@
 yubiauth_servers:
   - auth1001.eqiad.wmnet
   - auth2001.codfw.wmnet
+standard::has_ganglia: false

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: etherpad, gerrit, lists, openldap, ores, url_downloader, yubiauth:...

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: etherpad,gerrit,lists,openldap,ores,url_downloader,yubiauth: rm 
ganglia
..

etherpad,gerrit,lists,openldap,ores,url_downloader,yubiauth: rm ganglia

Bug: T177225
Change-Id: Id6dfcce03dc36fcc3cc2702d33c9f68b02045d15
---
A hieradata/role/common/etherpad.yaml
M hieradata/role/common/gerrit.yaml
M hieradata/role/common/lists.yaml
A hieradata/role/common/openldap/corp.yaml
M hieradata/role/common/ores/stresstest.yaml
A hieradata/role/common/url_downloader.yaml
M hieradata/role/common/yubiauth_server.yaml
7 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/395681/1

diff --git a/hieradata/role/common/etherpad.yaml 
b/hieradata/role/common/etherpad.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/etherpad.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/gerrit.yaml 
b/hieradata/role/common/gerrit.yaml
index 0242cc1..ffb288b 100644
--- a/hieradata/role/common/gerrit.yaml
+++ b/hieradata/role/common/gerrit.yaml
@@ -2,6 +2,7 @@
   - gerrit-root
   - gerrit-admin
 
+standard::has_ganglia: false
 gerrit::server::host: 'gerrit.wikimedia.org'
 gerrit::server::slave_hosts:
 - 'gerrit-slave.wikimedia.org'
diff --git a/hieradata/role/common/lists.yaml b/hieradata/role/common/lists.yaml
index 0d9f2d0..32ea7fe 100644
--- a/hieradata/role/common/lists.yaml
+++ b/hieradata/role/common/lists.yaml
@@ -2,3 +2,4 @@
 mailman::lists_servername: 'lists.wikimedia.org'
 mailman::lists::ipv4: '208.80.154.21'
 mailman::lists::ipv6: '2620:0:861:1:208:80:154:21'
+standard::has_ganglia: false
diff --git a/hieradata/role/common/openldap/corp.yaml 
b/hieradata/role/common/openldap/corp.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/openldap/corp.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/ores/stresstest.yaml 
b/hieradata/role/common/ores/stresstest.yaml
index e3dd5da..946e233 100644
--- a/hieradata/role/common/ores/stresstest.yaml
+++ b/hieradata/role/common/ores/stresstest.yaml
@@ -1,6 +1,7 @@
 cluster: misc
 admin::groups:
 - ores-admin
+standard::has_ganglia: false
 profile::ores::web::redis_host: "ores1001.eqiad.wmnet"
 profile::ores::celery::workers: 150
 profile::ores::celery::queue_maxsize: 600
diff --git a/hieradata/role/common/url_downloader.yaml 
b/hieradata/role/common/url_downloader.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/url_downloader.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/yubiauth_server.yaml 
b/hieradata/role/common/yubiauth_server.yaml
index cecb3b8..f1f3a37 100644
--- a/hieradata/role/common/yubiauth_server.yaml
+++ b/hieradata/role/common/yubiauth_server.yaml
@@ -2,3 +2,4 @@
 yubiauth_servers:
   - auth1001.eqiad.wmnet
   - auth2001.codfw.wmnet
+standard::has_ganglia: false

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Support changing icon variants on hover"

2017-12-05 Thread VolkerE (Code Review)

Hello Bartosz Dziewoński, Jack Phoenix, Catrope, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Support changing icon variants on hover"
..

Revert "Support changing icon variants on hover"

This reverts commit 46c62ff5f474c6fe7a409863058e81bb678229b2. After 
reconsidering menu item treatment under UI Standardization perspective, we 
don't need and shouldn't use such pattern. 

Bug: T110051
Change-Id: I0e8b6035f516e6629010b4f18471445c8833156e
---
M resources/Resources.php
1 file changed, 15 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/80/395680/1

diff --git a/resources/Resources.php b/resources/Resources.php
index 94e3864..ae5b3f9 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1768,7 +1768,7 @@
'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
'data' => 'icons.json',
'selectorWithoutVariant' => '.oo-ui-icon-{name}, 
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
-   'selectorWithVariant' => '.oo-ui-image-{variant} 
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, 
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, 
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, 
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
+   'selectorWithVariant' => '.oo-ui-image-{variant} 
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, 
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before',
),
'oojs-ui.styles.indicators' => array(
'class' => 'ResourceLoaderImageModule',
@@ -1785,98 +1785,98 @@
'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
'data' => 'icons-alerts.json',
'selectorWithoutVariant' => '.oo-ui-icon-{name}, 
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
-   'selectorWithVariant' => '.oo-ui-image-{variant} 
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, 
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, 
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, 
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
+   'selectorWithVariant' => '.oo-ui-image-{variant} 
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, 
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before',
),
'oojs-ui.styles.icons-content' => array(
'class' => 'ResourceLoaderImageModule',
'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
'data' => 'icons-content.json',
'selectorWithoutVariant' => '.oo-ui-icon-{name}, 
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
-   'selectorWithVariant' => '.oo-ui-image-{variant} 
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, 
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, 
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, 
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
+   'selectorWithVariant' => '.oo-ui-image-{variant} 
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, 
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before',
),
'oojs-ui.styles.icons-editing-advanced' => array(
'class' => 'ResourceLoaderImageModule',
'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
'data' => 'icons-editing-advanced.json',
'selectorWithoutVariant' => '.oo-ui-icon-{name}, 
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
-   'selectorWithVariant' => '.oo-ui-image-{variant} 
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, 
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before, 
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, 
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
+   'selectorWithVariant' => '.oo-ui-image-{variant} 
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, 
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before',
),
'oojs-ui.styles.icons-editing-core' => array(
'class' => 'ResourceLoaderImageModule',
'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
'data' => 'icons-editing-core.json',
'selectorWithoutVariant' => '.oo-ui-icon-{name}, 
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
-   'selectorWithVariant' => '.oo-ui-image-{variant} 
.oo-ui-icon-{name},

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable description usage tracking for all wikis except commons

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

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

Change subject: Enable description usage tracking for all wikis except commons
..


Enable description usage tracking for all wikis except commons

Bug: T106287
Change-Id: I50db71c0d7a352ea5ce0ec0bf7d897cc3305ce6f
---
M wmf-config/InitialiseSettings.php
1 file changed, 3 insertions(+), 32 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 433eb8e..088a25e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18073,44 +18073,15 @@
 
 // T151717 and T177153
 'wmgWikibaseDisabledUsageAspects' => [
-   'default' => [ 'D' => 'O', 'C' => 'O' ],
+   'default' => [ 'C' => 'O' ],
// Statement + description usage tracking wikis
'cawiki' => [],
'cewiki' => [],
'elwiki' => [],
'kowiki' => [],
'trwiki' => [],
-   // Description usage tracking wikis
-   'dewiki' => [ 'C' => 'O' ],
-   'hewiki' => [ 'C' => 'O' ],
-   'lvwiki' => [ 'C' => 'O' ],
-   'mediawikiwiki' => [ 'C' => 'O' ],
-   'metawiki' => [ 'C' => 'O' ],
-   'nnwiki' => [ 'C' => 'O' ],
-   'nowiki' => [ 'C' => 'O' ],
-   'ruwikinews' => [ 'C' => 'O' ],
-   'zhwiki' => [ 'C' => 'O' ],
-   // First 20 small wikis with WikibaseClient (T177155)
-   'aawiki' => [ 'C' => 'O' ],
-   'aawikibooks' => [ 'C' => 'O' ],
-   'abwiki' => [ 'C' => 'O' ],
-   'adywiki' => [ 'C' => 'O' ],
-   'afwikibooks' => [ 'C' => 'O' ],
-   'afwikiquote' => [ 'C' => 'O' ],
-   'akwiki' => [ 'C' => 'O' ],
-   'akwikibooks' => [ 'C' => 'O' ],
-   'alswikibooks' => [ 'C' => 'O' ],
-   'alswikiquote' => [ 'C' => 'O' ],
-   'amwikiquote' => [ 'C' => 'O' ],
-   'angwikibooks' => [ 'C' => 'O' ],
-   'angwikiquote' => [ 'C' => 'O' ],
-   'angwikisource' => [ 'C' => 'O' ],
-   'arcwiki' => [ 'C' => 'O' ],
-   'astwikibooks' => [ 'C' => 'O' ],
-   'astwikiquote' => [ 'C' => 'O' ],
-   'aswikibooks' => [ 'C' => 'O' ],
-   'aswikisource' => [ 'C' => 'O' ],
-   'atjwiki' => [ 'C' => 'O' ],
+   // Description usage tracking for commons should be disabled
+   'commonswiki' => [ 'C' => 'O', 'D' => 'O' ],
 ],
 
 // T172914

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50db71c0d7a352ea5ce0ec0bf7d897cc3305ce6f
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
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]: snapshot, prometheus, maintenance, otrs, archiva: remove ganglia

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: snapshot,prometheus,maintenance,otrs,archiva: remove ganglia
..


snapshot,prometheus,maintenance,otrs,archiva: remove ganglia

Bug: T177225
Change-Id: Iaf75959210a13a75c4cf05ed2e53e11a406a6604
---
A hieradata/role/common/archiva.yaml
M hieradata/role/common/dumps/generation/worker/dumper.yaml
M hieradata/role/common/dumps/generation/worker/dumper_misc.yaml
M hieradata/role/common/mediawiki_maintenance.yaml
M hieradata/role/common/otrs.yaml
M hieradata/role/common/prometheus/ops.yaml
6 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/archiva.yaml 
b/hieradata/role/common/archiva.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/archiva.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/generation/worker/dumper.yaml 
b/hieradata/role/common/dumps/generation/worker/dumper.yaml
index d65cd67..acda036 100644
--- a/hieradata/role/common/dumps/generation/worker/dumper.yaml
+++ b/hieradata/role/common/dumps/generation/worker/dumper.yaml
@@ -2,3 +2,4 @@
   - udp2log-users
   - deployment
   - snapshot-admins
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/generation/worker/dumper_misc.yaml 
b/hieradata/role/common/dumps/generation/worker/dumper_misc.yaml
index d65cd67..acda036 100644
--- a/hieradata/role/common/dumps/generation/worker/dumper_misc.yaml
+++ b/hieradata/role/common/dumps/generation/worker/dumper_misc.yaml
@@ -2,3 +2,4 @@
   - udp2log-users
   - deployment
   - snapshot-admins
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki_maintenance.yaml 
b/hieradata/role/common/mediawiki_maintenance.yaml
index e89dadf..e80536d 100644
--- a/hieradata/role/common/mediawiki_maintenance.yaml
+++ b/hieradata/role/common/mediawiki_maintenance.yaml
@@ -21,3 +21,4 @@
 # whitelist maintenance servers from screen monitoring
 # many users have permanent sessions here (T165348)
 monitor_screens: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/otrs.yaml b/hieradata/role/common/otrs.yaml
index a8ecacd..118fa1e 100644
--- a/hieradata/role/common/otrs.yaml
+++ b/hieradata/role/common/otrs.yaml
@@ -7,3 +7,4 @@
 #profile::otrs::database_pass:
 #profile::otrs::exim_database_pass:
 standard::has_default_mail_relay: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/prometheus/ops.yaml 
b/hieradata/role/common/prometheus/ops.yaml
index a398352..59f2002 100644
--- a/hieradata/role/common/prometheus/ops.yaml
+++ b/hieradata/role/common/prometheus/ops.yaml
@@ -4,3 +4,4 @@
   - codfw.wmnet
   - esams.wmnet
   - ulsfo.wmnet
+standard::has_ganglia: false

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Do not load apply mw-ui-icon selector by default

2017-12-05 Thread Jdlrobson (Code Review)

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

Change subject: Do not load apply mw-ui-icon selector by default
..

Do not load apply mw-ui-icon selector by default

This keeps causing issues in the mobile site. For instance now
if you click the edit icon on the mobile site and close the editor
the download icon transforms into a new glyph.

Where mw-ui-icon is being used selectorWithoutVariant should be used
to override the default. This default is not helpful.

Change-Id: I8eeb4a26f8b829cd40650f9e5958bf8e1dbb4593
---
M includes/resourceloader/ResourceLoaderOOUIImageModule.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/395679/1

diff --git a/includes/resourceloader/ResourceLoaderOOUIImageModule.php 
b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
index ee87d8d..19499c9 100644
--- a/includes/resourceloader/ResourceLoaderOOUIImageModule.php
+++ b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
@@ -97,9 +97,9 @@
 
// Extra selectors to allow using the same icons for old-style 
MediaWiki UI code
if ( substr( $module, 0, 5 ) === 'icons' ) {
-   $definition['selectorWithoutVariant'] = 
'.oo-ui-icon-{name}, .mw-ui-icon-{name}:before';
+   $definition['selectorWithoutVariant'] = 
'.oo-ui-icon-{name}';
$definition['selectorWithVariant'] = '
-   .oo-ui-image-{variant}.oo-ui-icon-{name}, 
.mw-ui-icon-{name}-{variant}:before,
+   .oo-ui-image-{variant}.oo-ui-icon-{name},
/* Hack for Flow, see T110051 */
.mw-ui-hovericon:hover 
.mw-ui-icon-{name}-{variant}-hover:before,

.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before';

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Reduce noise in mocha testing by bumping the logger level to...

2017-12-05 Thread Arlolra (Code Review)

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

Change subject: Reduce noise in mocha testing by bumping the logger level to 
warn
..

Reduce noise in mocha testing by bumping the logger level to warn

Change-Id: Iee25de77fe6118786c31fa683ccfdffcf5b0a055
---
M tests/serviceWrapper.js
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/tests/serviceWrapper.js b/tests/serviceWrapper.js
index 43076db..bf4e087 100644
--- a/tests/serviceWrapper.js
+++ b/tests/serviceWrapper.js
@@ -99,9 +99,6 @@
// service-runner doesn't actually call close on the 
worker.
num_workers: 1,
worker_heartbeat_timeout: 2 * 60 * 1000,
-   logging: {
-   level: 'info',  // Default is 'warn'
-   },
services: services,
})
.then(function() {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Title is not optional in v3 of the http api

2017-12-05 Thread Arlolra (Code Review)

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

Change subject: Title is not optional in v3 of the http api
..

Title is not optional in v3 of the http api

Change-Id: I0df7d6204f01c0f73070ae370b9d66a879ef08bb
---
M lib/api/routes.js
1 file changed, 1 insertion(+), 6 deletions(-)


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

diff --git a/lib/api/routes.js b/lib/api/routes.js
index 7ca157f..b3c4754 100644
--- a/lib/api/routes.js
+++ b/lib/api/routes.js
@@ -54,7 +54,7 @@
 
routes.v3Middle = function(req, res, next) {
res.locals.titleMissing = !req.params.title;
-   res.locals.pageName = req.params.title || 'Main_Page';
+   res.locals.pageName = req.params.title;
res.locals.oldid = req.params.revision || null;
 
// "body_only" flag to return just the body (instead of the 
entire HTML doc)
@@ -343,11 +343,6 @@

startTimers.get('wt2html.init'));
startTimers.set('wt2html.wt.parse', 
Date.now());
metrics.timing('wt2html.wt.size.input', 
wikitext.length);
-   }
-
-   if (!res.locals.pageName) {
-   // clear default page name
-   env.page.name = '';
}
} else if (oldid) {
envOptions.pageWithOldid = true;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Reject lint requests if linting isn't enabled

2017-12-05 Thread Arlolra (Code Review)

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

Change subject: Reject lint requests if linting isn't enabled
..

Reject lint requests if linting isn't enabled

Change-Id: I41cf86d45466db75b07fb09ceffcacc72bc3f620
---
M lib/api/routes.js
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/lib/api/routes.js b/lib/api/routes.js
index d830061..7ca157f 100644
--- a/lib/api/routes.js
+++ b/lib/api/routes.js
@@ -43,8 +43,11 @@
 
var validGets = new Set(['wikitext', 'html', 'pagebundle']);
 
+   var wikitextTransforms = ['html', 'pagebundle'];
+   if (parsoidConfig.linting) { wikitextTransforms.push('lint'); }
+
var validTransforms = new Map(Object.entries({
-   'wikitext': ['html', 'pagebundle', 'lint'],
+   'wikitext': wikitextTransforms,
'html': ['wikitext'],
'pagebundle': ['wikitext', 'pagebundle'],
}));

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: s/RemexHTML/RemexHtml

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

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

Change subject: s/RemexHTML/RemexHtml
..


s/RemexHTML/RemexHtml

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 78d7519..433eb8e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19228,178 +19228,178 @@
'dewiki' => [ 'driver' => 'RemexHtml' ], // T181188
'itwiki' => [ 'driver' => 'RemexHtml' ], // T181190
 
-   // T182042: Enable RemexHTML on wikis with zero high-priority linter 
errors
-   'alswikiquote' => [ 'driver' => 'RemexHTML' ],
-   'alswiktionary' => [ 'driver' => 'RemexHTML' ],
-   'angwikisource' => [ 'driver' => 'RemexHTML' ],
-   'astwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'astwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'aswikibooks' => [ 'driver' => 'RemexHTML' ],
-   'aswiktionary' => [ 'driver' => 'RemexHTML' ],
-   'avwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'aywikibooks' => [ 'driver' => 'RemexHTML' ],
-   'bawikibooks' => [ 'driver' => 'RemexHTML' ],
-   'bhwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'biwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'biwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'bmwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'bmwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'bmwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'bowikibooks' => [ 'driver' => 'RemexHTML' ],
-   'bowiktionary' => [ 'driver' => 'RemexHTML' ],
-   'chowiki' => [ 'driver' => 'RemexHTML' ],
-   'chrwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'chwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'chwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'cowikibooks' => [ 'driver' => 'RemexHTML' ],
-   'cowikiquote' => [ 'driver' => 'RemexHTML' ],
-   'crwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'crwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'csbwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'cswikibooks' => [ 'driver' => 'RemexHTML' ],
-   'cswikinews' => [ 'driver' => 'RemexHTML' ],
-   'cswikiquote' => [ 'driver' => 'RemexHTML' ],
-   'dinwiki' => [ 'driver' => 'RemexHTML' ],
-   'donatewiki' => [ 'driver' => 'RemexHTML' ],
-   'dzwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'elwikinews' => [ 'driver' => 'RemexHTML' ],
-   'eowikiquote' => [ 'driver' => 'RemexHTML' ],
-   'fjwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'fowiktionary' => [ 'driver' => 'RemexHTML' ],
-   'gawikibooks' => [ 'driver' => 'RemexHTML' ],
-   'gawikiquote' => [ 'driver' => 'RemexHTML' ],
-   'gdwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'gnwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'gnwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'gotwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'guwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'hifwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'hiwikivoyage' => [ 'driver' => 'RemexHTML' ],
-   'howiki' => [ 'driver' => 'RemexHTML' ],
-   'htwikisource' => [ 'driver' => 'RemexHTML' ],
-   'huwikinews' => [ 'driver' => 'RemexHTML' ],
-   'hzwiki' => [ 'driver' => 'RemexHTML' ],
-   'iawiktionary' => [ 'driver' => 'RemexHTML' ],
-   'iewikibooks' => [ 'driver' => 'RemexHTML' ],
-   'iiwiki' => [ 'driver' => 'RemexHTML' ],
-   'ikwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'iswikisource' => [ 'driver' => 'RemexHTML' ],
-   'iuwiki' => [ 'driver' => 'RemexHTML' ],
-   'jamwiki' => [ 'driver' => 'RemexHTML' ],
-   'kbpwiki' => [ 'driver' => 'RemexHTML' ],
-   'kiwiki' => [ 'driver' => 'RemexHTML' ],
-   'kjwiki' => [ 'driver' => 'RemexHTML' ],
-   'kkwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'kkwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'knwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'krwiki' => [ 'driver' => 'RemexHTML' ],
-   'krwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'kswikibooks' => [ 'driver' => 'RemexHTML' ],
-   'kswikiquote' => [ 'driver' => 'RemexHTML' ],
-   'kwwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'ladwiki' => [ 'driver' => 'RemexHTML' ],
-   'lawiki' => [ 'driver' => 'RemexHTML' ],
-   'lawikibooks' => [ 'driver' => 'RemexHTML' ],
-   'lawikiquote' => [ 'driver' => 'RemexHTML' ],
-   'lbwiki' => [ 'driver' => 'RemexHTML' ],
-   'lbwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'lbwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'lbwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'lnwikibooks' => [ 'driver' =>

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: s/RemexHTML/RemexHtml

2017-12-05 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395675 )

Change subject: s/RemexHTML/RemexHtml
..

s/RemexHTML/RemexHtml

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 78d7519..433eb8e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19228,178 +19228,178 @@
'dewiki' => [ 'driver' => 'RemexHtml' ], // T181188
'itwiki' => [ 'driver' => 'RemexHtml' ], // T181190
 
-   // T182042: Enable RemexHTML on wikis with zero high-priority linter 
errors
-   'alswikiquote' => [ 'driver' => 'RemexHTML' ],
-   'alswiktionary' => [ 'driver' => 'RemexHTML' ],
-   'angwikisource' => [ 'driver' => 'RemexHTML' ],
-   'astwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'astwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'aswikibooks' => [ 'driver' => 'RemexHTML' ],
-   'aswiktionary' => [ 'driver' => 'RemexHTML' ],
-   'avwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'aywikibooks' => [ 'driver' => 'RemexHTML' ],
-   'bawikibooks' => [ 'driver' => 'RemexHTML' ],
-   'bhwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'biwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'biwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'bmwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'bmwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'bmwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'bowikibooks' => [ 'driver' => 'RemexHTML' ],
-   'bowiktionary' => [ 'driver' => 'RemexHTML' ],
-   'chowiki' => [ 'driver' => 'RemexHTML' ],
-   'chrwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'chwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'chwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'cowikibooks' => [ 'driver' => 'RemexHTML' ],
-   'cowikiquote' => [ 'driver' => 'RemexHTML' ],
-   'crwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'crwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'csbwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'cswikibooks' => [ 'driver' => 'RemexHTML' ],
-   'cswikinews' => [ 'driver' => 'RemexHTML' ],
-   'cswikiquote' => [ 'driver' => 'RemexHTML' ],
-   'dinwiki' => [ 'driver' => 'RemexHTML' ],
-   'donatewiki' => [ 'driver' => 'RemexHTML' ],
-   'dzwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'elwikinews' => [ 'driver' => 'RemexHTML' ],
-   'eowikiquote' => [ 'driver' => 'RemexHTML' ],
-   'fjwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'fowiktionary' => [ 'driver' => 'RemexHTML' ],
-   'gawikibooks' => [ 'driver' => 'RemexHTML' ],
-   'gawikiquote' => [ 'driver' => 'RemexHTML' ],
-   'gdwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'gnwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'gnwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'gotwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'guwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'hifwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'hiwikivoyage' => [ 'driver' => 'RemexHTML' ],
-   'howiki' => [ 'driver' => 'RemexHTML' ],
-   'htwikisource' => [ 'driver' => 'RemexHTML' ],
-   'huwikinews' => [ 'driver' => 'RemexHTML' ],
-   'hzwiki' => [ 'driver' => 'RemexHTML' ],
-   'iawiktionary' => [ 'driver' => 'RemexHTML' ],
-   'iewikibooks' => [ 'driver' => 'RemexHTML' ],
-   'iiwiki' => [ 'driver' => 'RemexHTML' ],
-   'ikwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'iswikisource' => [ 'driver' => 'RemexHTML' ],
-   'iuwiki' => [ 'driver' => 'RemexHTML' ],
-   'jamwiki' => [ 'driver' => 'RemexHTML' ],
-   'kbpwiki' => [ 'driver' => 'RemexHTML' ],
-   'kiwiki' => [ 'driver' => 'RemexHTML' ],
-   'kjwiki' => [ 'driver' => 'RemexHTML' ],
-   'kkwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'kkwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'knwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'krwiki' => [ 'driver' => 'RemexHTML' ],
-   'krwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'kswikibooks' => [ 'driver' => 'RemexHTML' ],
-   'kswikiquote' => [ 'driver' => 'RemexHTML' ],
-   'kwwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'ladwiki' => [ 'driver' => 'RemexHTML' ],
-   'lawiki' => [ 'driver' => 'RemexHTML' ],
-   'lawikibooks' => [ 'driver' => 'RemexHTML' ],
-   'lawikiquote' => [ 'driver' => 'RemexHTML' ],
-   'lbwiki' => [ 'driver' => 'RemexHTML' ],
-   'lbwikibooks' => [ 'driver' => 'RemexHTML' ],
-   'lbwikiquote' => [ 'driver' => 'RemexHTML' ],
-   'lbwiktionary' => [ 'driver' => 'RemexHTML' ],
-   'lnwikibooks'

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Remove unique, inconsistent treatment of menu items

2017-12-05 Thread VolkerE (Code Review)

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

Change subject: Remove unique, inconsistent treatment of menu items
..

Remove unique, inconsistent treatment of menu items

Special treatment of overflow, flagged menu items of solely
two items is not only inconsistent with icon menus elsewhere,
it also adds to payload on every page with added OOUI icon packs
in RL. We are removing the treatment here and also provide a
follow-up patch in core.

Bug: T110051
Change-Id: I644ab66e8ca17d614247cda730fb16c72e8d1349
---
M handlebars/flow_moderation_actions_list.partial.handlebars
1 file changed, 22 insertions(+), 22 deletions(-)


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

diff --git a/handlebars/flow_moderation_actions_list.partial.handlebars 
b/handlebars/flow_moderation_actions_list.partial.handlebars
index 19f905d..b5098e1 100644
--- a/handlebars/flow_moderation_actions_list.partial.handlebars
+++ b/handlebars/flow_moderation_actions_list.partial.handlebars
@@ -4,9 +4,9 @@
{{~#if actions.edit~}}

{{~noop~}}
-   
-   {{~#if moderationIcons}} {{/if~}}
+   {{~#if moderationIcons}} {{/if~}}
{{~l10n (concat 
"flow-topic-action-edit-title")~}}

{{~noop~}}
@@ -37,9 +37,9 @@
{{~#if actions.summarize~}}

{{~noop~}}
-   
-   {{~#if moderationIcons}} {{/if~}}
+   {{~#if moderationIcons}} {{/if~}}
{{~#if 
summary.revision.content.content~}}
{{~l10n (concat 
"flow-topic-action-resummarize-topic")~}}
{{else~}}
@@ -57,11 +57,11 @@
{{~#if actions.lock~}}

{{~noop~}}
-   
-   {{~#if moderationIcons}} {{/if~}}
+   {{~#if moderationIcons}} {{/if~}}
{{~l10n (concat "flow-" moderationType 
"-action-lock-topic")~}}

{{~noop~}}
@@ -70,11 +70,11 @@
{{~#if actions.unlock~}}

{{~noop~}}
-   
-   {{~#if moderationIcons}} {{/if~}}
+   {{~#if moderationIcons}} 
{{/if~}}
{{~l10n (concat "flow-" moderationType 
"-action-unlock-topic")~}}

{{~noop~}}
@@ -85,11 +85,11 @@
{{~#if actions.lock~}}

{{~noop~}}
-   
-   {{~#if moderationIcons}} {{/if~}}
+   {{~#if moderationIcons}} {{/if~}}
{{~l10n (concat "flow-" moderationType 
"-action-lock-topic")~}}

{{~noop~}}
@@ -98,11 +98,11 @@
{{~#if actions.unlock~}}

{{~noop~}}
-   
-   {{~#if moderationIcons}} {{/if~}}
+   {{~#if moderationIcons}} 
{{/if~}}
{{~l10n (concat "flow-" moderationType 
"-action-unlock-topic")~}}

{{~noop~}}
@@ -114,10 +114,10 @@
{{!-- Post only --}}
{{~#if actions.edit~}}

-   
-   {{~#if moderationIcons}} {{/if~}}
+   {{~#if moderationIcons}} {{/if~}}
{{~l10n "flow-post-action-edit-post"~}}


@@ -182,12 +182,12 @@
{{~#if actions.delete~}}

{{~noop~}}
-   
-   {{~#if moderationIcons}} 
{{/if~}}
+   {{~#if moderationIcons}} {{/if~}}
{{~l10n (concat "flow-" moderationType 
"-action-delete-" moderationTemplate)~}}

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Fix $.fn.hover is deprecated

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

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

Change subject: Fix $.fn.hover is deprecated
..


Fix $.fn.hover is deprecated

Bug: T180861
Change-Id: I6a2cfbd26535c3e778a811e2f8ed5939123d6571
---
M resources/dist/index.js
M resources/dist/index.js.json
M src/ui/renderer.js
3 files changed, 4 insertions(+), 3 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a2cfbd26535c3e778a811e2f8ed5939123d6571
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Albert221 
Gerrit-Reviewer: Albert221 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Phantom42 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable RemexHTML on wikis with zero high priority linter errors

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

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

Change subject: Enable RemexHTML on wikis with zero high priority linter errors
..


Enable RemexHTML on wikis with zero high priority linter errors

Bug: T182042

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a6b1634..78d7519 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19227,6 +19227,179 @@
'nowiki' => [ 'driver' => 'RemexHtml' ], // T177989
'dewiki' => [ 'driver' => 'RemexHtml' ], // T181188
'itwiki' => [ 'driver' => 'RemexHtml' ], // T181190
+
+   // T182042: Enable RemexHTML on wikis with zero high-priority linter 
errors
+   'alswikiquote' => [ 'driver' => 'RemexHTML' ],
+   'alswiktionary' => [ 'driver' => 'RemexHTML' ],
+   'angwikisource' => [ 'driver' => 'RemexHTML' ],
+   'astwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'astwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'aswikibooks' => [ 'driver' => 'RemexHTML' ],
+   'aswiktionary' => [ 'driver' => 'RemexHTML' ],
+   'avwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'aywikibooks' => [ 'driver' => 'RemexHTML' ],
+   'bawikibooks' => [ 'driver' => 'RemexHTML' ],
+   'bhwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'biwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'biwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'bmwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'bmwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'bmwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'bowikibooks' => [ 'driver' => 'RemexHTML' ],
+   'bowiktionary' => [ 'driver' => 'RemexHTML' ],
+   'chowiki' => [ 'driver' => 'RemexHTML' ],
+   'chrwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'chwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'chwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'cowikibooks' => [ 'driver' => 'RemexHTML' ],
+   'cowikiquote' => [ 'driver' => 'RemexHTML' ],
+   'crwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'crwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'csbwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'cswikibooks' => [ 'driver' => 'RemexHTML' ],
+   'cswikinews' => [ 'driver' => 'RemexHTML' ],
+   'cswikiquote' => [ 'driver' => 'RemexHTML' ],
+   'dinwiki' => [ 'driver' => 'RemexHTML' ],
+   'donatewiki' => [ 'driver' => 'RemexHTML' ],
+   'dzwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'elwikinews' => [ 'driver' => 'RemexHTML' ],
+   'eowikiquote' => [ 'driver' => 'RemexHTML' ],
+   'fjwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'fowiktionary' => [ 'driver' => 'RemexHTML' ],
+   'gawikibooks' => [ 'driver' => 'RemexHTML' ],
+   'gawikiquote' => [ 'driver' => 'RemexHTML' ],
+   'gdwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'gnwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'gnwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'gotwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'guwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'hifwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'hiwikivoyage' => [ 'driver' => 'RemexHTML' ],
+   'howiki' => [ 'driver' => 'RemexHTML' ],
+   'htwikisource' => [ 'driver' => 'RemexHTML' ],
+   'huwikinews' => [ 'driver' => 'RemexHTML' ],
+   'hzwiki' => [ 'driver' => 'RemexHTML' ],
+   'iawiktionary' => [ 'driver' => 'RemexHTML' ],
+   'iewikibooks' => [ 'driver' => 'RemexHTML' ],
+   'iiwiki' => [ 'driver' => 'RemexHTML' ],
+   'ikwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'iswikisource' => [ 'driver' => 'RemexHTML' ],
+   'iuwiki' => [ 'driver' => 'RemexHTML' ],
+   'jamwiki' => [ 'driver' => 'RemexHTML' ],
+   'kbpwiki' => [ 'driver' => 'RemexHTML' ],
+   'kiwiki' => [ 'driver' => 'RemexHTML' ],
+   'kjwiki' => [ 'driver' => 'RemexHTML' ],
+   'kkwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'kkwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'knwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'krwiki' => [ 'driver' => 'RemexHTML' ],
+   'krwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'kswikibooks' => [ 'driver' => 'RemexHTML' ],
+   'kswikiquote' => [ 'driver' => 'RemexHTML' ],
+   'kwwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'ladwiki' => [ 'driver' => 'RemexHTML' ],
+   'lawiki' => [ 'driver' => 'RemexHTML' ],
+   'lawikibooks' => [ 'driver' => 'RemexHTML' ],
+   'lawikiquote' => [ 'driver' => 'RemexHTML' ],
+   'lbwiki' => [ 'driver' =>

[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Increase rl_title length to account for namespace

2017-12-05 Thread Code Review

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

Change subject: Increase rl_title length to account for namespace
..

Increase rl_title length to account for namespace

Bug: T180092
Change-Id: I30c122b21eb0caf935fabff718eb6bc6f9fdf9fc
---
M i18n/en.json
A sql/patches/05-increase-rle_title-length.sql
M sql/readinglists.sql
M src/Doc/ReadingListEntryRow.php
M src/HookHandler.php
M src/ReadingListRepository.php
6 files changed, 19 insertions(+), 6 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index ce2fbaa..487064b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -76,7 +76,7 @@
"apihelp-readinglists+createentry-extended-description": "List entries 
must be unique. Pages are not limited to the wiki where the API is accessed. 
The user must have fewer than $1 (non-deleted) {{PLURAL:$1|entry|entries}} in 
the list.",
"apihelp-readinglists+createentry-param-list": "List ID.",
"apihelp-readinglists+createentry-param-project": "Project name of the 
wiki hosting the page. (Typically this is the domain name of the wiki.)",
-   "apihelp-readinglists+createentry-param-title": "Page title.",
+   "apihelp-readinglists+createentry-param-title": "Page title (including 
the localised namespace name). Human-readable format (spaces not underscores) 
is recommended. The API treats titles as raw strings; normalization (such as 
title casing) is left to the clients.",
"apihelp-readinglists+createentry-example-1": "Add the page 
Dog from project en.wikipedia.org to the list with ID 
33.",
"apihelp-readinglists+deleteentry-summary": "Delete a page from a list 
belonging to the current user.",
"apihelp-readinglists+deleteentry-param-entry": "Entry ID.",
diff --git a/sql/patches/05-increase-rle_title-length.sql 
b/sql/patches/05-increase-rle_title-length.sql
new file mode 100644
index 000..55a6ae4
--- /dev/null
+++ b/sql/patches/05-increase-rle_title-length.sql
@@ -0,0 +1,2 @@
+ALTER TABLE reading_list_entry
+MODIFY rle_title VARCHAR(383) BINARY NOT NULL;
\ No newline at end of file
diff --git a/sql/readinglists.sql b/sql/readinglists.sql
index bd61d74..854b4e4 100644
--- a/sql/readinglists.sql
+++ b/sql/readinglists.sql
@@ -48,10 +48,15 @@
 rle_user_id INTEGER UNSIGNED NOT NULL,
 -- Reference to reading_list_project.rlp_id.
 rle_rlp_id INTEGER UNSIGNED NOT NULL,
--- Page title.
+-- Page title (including localised namespace name).
 -- We can't easily use page ids due to the cross-wiki nature of the 
project;
 -- also, page ids don't age well when content is deleted/moved.
-rle_title VARCHAR(255) BINARY NOT NULL,
+-- We also can't easily use namespace IDs since most APIs expect the 
namespace name so that's
+-- what we need to provide to clients; and there is no easy way to map IDs 
to names of a
+-- different wiki.
+-- Titles are <=255 byte; we allow 128 more bytes for the namespace name, 
just to be on the
+-- safe side.
+rle_title VARCHAR(383) BINARY NOT NULL,
 -- Creation timestamp.
 rle_date_created BINARY(14) NOT NULL default '1970010100',
 -- Last modification timestamp.
diff --git a/src/Doc/ReadingListEntryRow.php b/src/Doc/ReadingListEntryRow.php
index 277c5e9..c19b637 100644
--- a/src/Doc/ReadingListEntryRow.php
+++ b/src/Doc/ReadingListEntryRow.php
@@ -33,9 +33,12 @@
public $rlp_project;
 
/**
-* Page title.
+* Page title (including the localised namespace name).
 * We can't easily use page ids due to the cross-wiki nature of the 
project;
 * also, page ids don't age well when content is deleted/moved.
+* We also can't easily use namespace IDs since most APIs expect the 
namespace name so that's
+* what we need to provide to clients; and there is no easy way to map 
IDs to names of a
+* different wiki.
 * @var string
 */
public $rle_title;
diff --git a/src/HookHandler.php b/src/HookHandler.php
index 5ef6357..5f10e8e 100644
--- a/src/HookHandler.php
+++ b/src/HookHandler.php
@@ -51,6 +51,8 @@
"$patchDir/03-add-sort-indexes.sql" );
$updater->dropExtensionField( 'reading_list', 
'rl_color',
"$patchDir/04-drop-metadata-columns.sql" );
+   $updater->modifyExtensionField( 'reading_list_entry', 
'rle_title',
+   "$patchDir/05-increase-rle_title-length.sql" );
}
return true;
}
diff --git a/src/ReadingListRepository.php b/src/ReadingListRepository.php
index f541074..edcac9d 100644
--- a/src/ReadingListRepository.php
+++ b/src/ReadingListRepository.php
@@ -47,7 +47,7 @@
'rl_name' => 255,

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T180930: Selser shouldn't reuse orig sep for autoinserted tags

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

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

Change subject: T180930: Selser shouldn't reuse orig sep for autoinserted tags
..


T180930: Selser shouldn't reuse orig sep for autoinserted tags

Change-Id: I76418f44bb078c5f70cf2ef6b7982dff58448491
---
M lib/html2wt/separators.js
M tests/parserTests-blacklist.js
2 files changed, 21 insertions(+), 34 deletions(-)

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



diff --git a/lib/html2wt/separators.js b/lib/html2wt/separators.js
index 0f341a8..9adc94f 100644
--- a/lib/html2wt/separators.js
+++ b/lib/html2wt/separators.js
@@ -462,6 +462,15 @@
return sep;
 }
 
+// Serializing auto inserted content should invalidate the original separator
+var handleAutoInserted = function(node) {
+   var dp = DU.getDataParsoid(node);
+   var dsr = Util.clone(dp.dsr);
+   if (dp.autoInsertedStart) { dsr[2] = null; }
+   if (dp.autoInsertedEnd) { dsr[3] = null; }
+   return dsr;
+};
+
 /**
  * Emit a separator based on the collected (and merged) constraints
  * and existing separator text. Called when new output is triggered.
@@ -500,7 +509,7 @@
prevNode.parentNode !== node &&
DU.getDataParsoid(prevNode.parentNode).dsr &&
DU.getDataParsoid(prevNode.parentNode).dsr[3] 
=== 0) {
-   dsrA = 
DU.getDataParsoid(prevNode.parentNode).dsr;
+   dsrA = handleAutoInserted(prevNode.parentNode);
} else if (prevNode.previousSibling &&
prevNode.previousSibling.nodeType === 
prevNode.ELEMENT_NODE &&
// FIXME: Not sure why we need this 
check because data-parsoid
@@ -522,7 +531,7 @@
}
}
} else {
-   dsrA = DU.getDataParsoid(prevNode).dsr;
+   dsrA = handleAutoInserted(prevNode);
}
 
if (!dsrA) {
@@ -570,7 +579,7 @@
 
// The top node could be a document fragment, which is 
not
// an element, and so getDataParsoid will return `null`.
-   dsrB = DU.isElt(node) ? DU.getDataParsoid(node).dsr : 
null;
+   dsrB = DU.isElt(node) ? handleAutoInserted(node) : null;
}
 
// FIXME: Maybe we shouldn't set dsr in the dsr pass if both 
aren't valid?
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 9fa5877..d9f5409 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -1591,39 +1591,17 @@
 add("selser", "HTML bullet list, closed tags (T7497) [[4,[2],3,0,0]]", 
"1ll4gfgwnpb5dOne\nTwo\n");
 add("selser", "HTML nested ordered list, open tags (T7497) [[2,3,4,[2,1],3]]", 
"1ph637d\nl97dbh1lg6gmxTwo:\n\nSub-one\nSub-two\n\n");
 add("selser", "Fuzz testing: Parser13 [2]", "1s3ei1s\n{| \n| http://a|");
-add("selser", "Fuzz testing: Parser13 [[0,[[1", "{| \n| 
data-foobar=\"nmk8w6\" http: / a ||}");
-add("selser", "Fuzz testing: Parser13 [1]", "{| data-foobar=\"13wllqe\" \n| 
http://a||}");
-add("selser", "Fuzz testing: Parser13 [[2,2]]", "{| 
\n| http://a||}");
-add("selser", "Fuzz testing: Parser13 [[4,2]]", 
"{|\n| http://a||}");
-add("selser", "Fuzz testing: Parser13 [[0,1]]", "{| \n| http://a||}");
-add("selser", "Fuzz testing: Parser13 [[0,2]]", "{| \n| 
http://a||}");
-add("selser", "Fuzz testing: Parser13 [[0,[1]]]", "{| \n| http://a||}");
-add("selser", "Fuzz testing: Parser13 [[2,[[1", "{| \n| 
data-foobar=\"cmzmng\" http: / a ||}");
-add("selser", "Fuzz testing: Parser13 [[4,[1]]]", "{|\n| 
http://a||}");
-add("selser", "Fuzz testing: Parser13 [[4,0]]", "{|\n| 
http://a||}");
-add("selser", "Fuzz testing: Parser13 [[2,0]]", "{| \n| 
http://a||}");
+add("selser", "Fuzz testing: Parser13 [1]", "{| data-foobar=\"13wllqe\" \n| 
http://a|\n|}");
+add("selser", "Fuzz testing: Parser13 [[2,2]]", "{| 
\n| http://a|\n|}");
+add("selser", "Fuzz testing: Parser13 [[4,2]]", 
"{|\n| http://a|\n|}");
+add("selser", "Fuzz testing: Parser13 [[0,1]]", "{| \n| http://a|\n|}");
+add("selser", "Fuzz testing: Parser13 [[0,2]]", "{| \n| 
http://a|\n|}");
+add("selser", "Fuzz testing: Parser13 [[0,[1]]]", "{| \n| http://a|\n|}");
+add("selser", "Fuzz testing: Parser13 [[4,[1]]]", "{|\n| 
http://a|\n|}");
+add("selser", "Fuzz testing: Parser13 [[4,0]]", "{|\n| 
http://a|\n|}");
+add("selser", "Fuzz testing: Parser13 [[2,0]]", "{| \n| 
http://a|\n|}");
 add("selser", "Fuzz testing: Parser16 [2]", "1jeb7ja\n{|\n!https://||");
-add("selser", "Fuzz testing: Parser16 [[0,[[0,2,0,0", 
"{|\n!https://\n!7nk0ln|||}");
-add("selser", "Fuzz testing: Parser16

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Make wikidata cronjobs use the Wikibase extension and not th...

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: Make wikidata cronjobs use the Wikibase extension and not the 
build
..


Make wikidata cronjobs use the Wikibase extension and not the build

The build is dead now: T173818
This is causing problems.

Bug: T182159
Change-Id: I5cb61c459ebfd664fd3e8626ff38d171351a8cfc
---
M modules/mediawiki/manifests/maintenance/wikidata.pp
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/mediawiki/manifests/maintenance/wikidata.pp 
b/modules/mediawiki/manifests/maintenance/wikidata.pp
index b5d984b..2da269d 100644
--- a/modules/mediawiki/manifests/maintenance/wikidata.pp
+++ b/modules/mediawiki/manifests/maintenance/wikidata.pp
@@ -20,7 +20,7 @@
 
 cron { 'wikibase-dispatch-changes-test':
 ensure  => $ensure_testwiki,
-command => '/usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dispatchChanges.php 
--wiki testwikidatawiki --max-time 900 --batch-size 200 --dispatch-interval 30 
>/dev/null 2>&1',
+command => '/usr/local/bin/mwscript 
extensions/Wikibase/repo/maintenance/dispatchChanges.php --wiki 
testwikidatawiki --max-time 900 --batch-size 200 --dispatch-interval 30 
>/dev/null 2>&1',
 user=> $::mediawiki::users::web,
 minute  => '*/15',
 }
@@ -28,7 +28,7 @@
 # Prune wb_changes entries no longer needed from (test)wikidata
 cron { 'wikibase-repo-prune2':
 ensure  => $ensure,
-command => '/usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/pruneChanges.php 
--wiki wikidatawiki --number-of-days=3 >> /var/log/wikidata/prune2.log 2>&1',
+command => '/usr/local/bin/mwscript 
extensions/Wikibase/repo/maintenance/pruneChanges.php --wiki wikidatawiki 
--number-of-days=3 >> /var/log/wikidata/prune2.log 2>&1',
 user=> $::mediawiki::users::web,
 minute  => [0,15,30,45],
 require => File['/var/log/wikidata'],
@@ -36,7 +36,7 @@
 
 cron { 'wikibase-repo-prune-test':
 ensure  => $ensure_testwiki,
-command => '/usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/pruneChanges.php 
--wiki testwikidatawiki --number-of-days=3 >> 
/var/log/wikidata/prune-testwikidata.log 2>&1',
+command => '/usr/local/bin/mwscript 
extensions/Wikibase/repo/maintenance/pruneChanges.php --wiki testwikidatawiki 
--number-of-days=3 >> /var/log/wikidata/prune-testwikidata.log 2>&1',
 user=> $::mediawiki::users::web,
 minute  => [0,15,30,45],
 require => File['/var/log/wikidata'],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Make wikidata cronjobs use the Wikibase extension and not th...

2017-12-05 Thread Ladsgroup (Code Review)

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

Change subject: Make wikidata cronjobs use the Wikibase extension and not the 
build
..

Make wikidata cronjobs use the Wikibase extension and not the build

The build is dead now: T173818
This is causing problems.

Bug: T182159
Change-Id: I5cb61c459ebfd664fd3e8626ff38d171351a8cfc
---
M modules/mediawiki/manifests/maintenance/wikidata.pp
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/mediawiki/manifests/maintenance/wikidata.pp 
b/modules/mediawiki/manifests/maintenance/wikidata.pp
index b5d984b..2da269d 100644
--- a/modules/mediawiki/manifests/maintenance/wikidata.pp
+++ b/modules/mediawiki/manifests/maintenance/wikidata.pp
@@ -20,7 +20,7 @@
 
 cron { 'wikibase-dispatch-changes-test':
 ensure  => $ensure_testwiki,
-command => '/usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dispatchChanges.php 
--wiki testwikidatawiki --max-time 900 --batch-size 200 --dispatch-interval 30 
>/dev/null 2>&1',
+command => '/usr/local/bin/mwscript 
extensions/Wikibase/repo/maintenance/dispatchChanges.php --wiki 
testwikidatawiki --max-time 900 --batch-size 200 --dispatch-interval 30 
>/dev/null 2>&1',
 user=> $::mediawiki::users::web,
 minute  => '*/15',
 }
@@ -28,7 +28,7 @@
 # Prune wb_changes entries no longer needed from (test)wikidata
 cron { 'wikibase-repo-prune2':
 ensure  => $ensure,
-command => '/usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/pruneChanges.php 
--wiki wikidatawiki --number-of-days=3 >> /var/log/wikidata/prune2.log 2>&1',
+command => '/usr/local/bin/mwscript 
extensions/Wikibase/repo/maintenance/pruneChanges.php --wiki wikidatawiki 
--number-of-days=3 >> /var/log/wikidata/prune2.log 2>&1',
 user=> $::mediawiki::users::web,
 minute  => [0,15,30,45],
 require => File['/var/log/wikidata'],
@@ -36,7 +36,7 @@
 
 cron { 'wikibase-repo-prune-test':
 ensure  => $ensure_testwiki,
-command => '/usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/pruneChanges.php 
--wiki testwikidatawiki --number-of-days=3 >> 
/var/log/wikidata/prune-testwikidata.log 2>&1',
+command => '/usr/local/bin/mwscript 
extensions/Wikibase/repo/maintenance/pruneChanges.php --wiki testwikidatawiki 
--number-of-days=3 >> /var/log/wikidata/prune-testwikidata.log 2>&1',
 user=> $::mediawiki::users::web,
 minute  => [0,15,30,45],
 require => File['/var/log/wikidata'],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: Add stretch check in init.pp around rawdogplugin

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: planet: Add stretch check in init.pp around rawdogplugin
..


planet: Add stretch check in init.pp around rawdogplugin

follows up 105b1b1ab7239caa3bf70345374d08b304629514

Change-Id: Iafa57318dc0a78cf65ab6f3629e2f851c3daaa8f
---
M modules/planet/manifests/init.pp
M modules/planet/templates/feeds_rawdog/plugins/rss.py.erb
2 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index dfe7136..ab83558 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -65,7 +65,9 @@
 # creates one planet theme (css/logo) per language
 planet::theme { $planet_languages_keys: }
 
-# creates RSS dir and plugin per language
-planet::rawdogplugin { $planet_languages_keys: }
+if os_version('debian >= stretch') {
+  # creates RSS dir and plugin per language
+  planet::rawdogplugin { $planet_languages_keys: }
+}
 }
 
diff --git a/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb 
b/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb
index 702a803..68734d2 100644
--- a/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb
+++ b/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 #
 # rawdog plugin to generate RSS, OPML and FOAF output
+# from 
https://cgit.kde.org/websites/planet-kde-org.git/tree/planetkde/plugins/rss.py
+# and http://offog.org/git/rawdog-plugins/rss.py
+#
 # Copyright 2008 Jonathan Riddell
 # Copyright 2009 Adam Sampson 
 # Copyright 2009 Kurt McKee 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafa57318dc0a78cf65ab6f3629e2f851c3daaa8f
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Legoktm 
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] apps...wikipedia[master]: Bump versionCode and minor version.

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

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

Change subject: Bump versionCode and minor version.
..


Bump versionCode and minor version.

For great justice.

Change-Id: Ib4c43fe2df8656ab01d550c8a05259ffce4a4895
---
M app/build.gradle
M scripts/make-release.py
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/app/build.gradle b/app/build.gradle
index 2fbdbba..e6f4d2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@
 }
 
 def computeVersionName(label) {
-return "2.6.${android.defaultConfig.versionCode}-${label}-${date}"
+return "2.7.${android.defaultConfig.versionCode}-${label}-${date}"
 }
 
 final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_8
@@ -55,7 +55,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 19
 targetSdkVersion 26
-versionCode 206
+versionCode 208
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true
diff --git a/scripts/make-release.py b/scripts/make-release.py
index bbe2298..af68f93 100755
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -41,7 +41,7 @@
 
 PATH_PREFIX = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 GRADLEW = './gradlew'
-VERSION_START = '2.6'
+VERSION_START = '2.7'
 
 
 def p(*path_fragments):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4c43fe2df8656ab01d550c8a05259ffce4a4895
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Sharvaniharan 
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]: planet: Add stretch check in rawdogplugin.pp

2017-12-05 Thread Paladox (Code Review)

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

Change subject: planet: Add stretch check in rawdogplugin.pp
..

planet: Add stretch check in rawdogplugin.pp

follows up 105b1b1ab7239caa3bf70345374d08b304629514

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


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


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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmasters eqiad: remove ganglia

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: puppetmasters eqiad: remove ganglia
..


puppetmasters eqiad: remove ganglia

Bug: T177225
Change-Id: Icca95380878c0a68cf8075ab637539b72b69a3bd
---
A hieradata/hosts/puppetmaster1001.yaml
A hieradata/hosts/puppetmaster1002.yaml
M hieradata/hosts/rhodium.yaml
3 files changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/puppetmaster1001.yaml 
b/hieradata/hosts/puppetmaster1001.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/hosts/puppetmaster1001.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/hosts/puppetmaster1002.yaml 
b/hieradata/hosts/puppetmaster1002.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/hosts/puppetmaster1002.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/hosts/rhodium.yaml b/hieradata/hosts/rhodium.yaml
index 13e2020..b89f90a 100644
--- a/hieradata/hosts/rhodium.yaml
+++ b/hieradata/hosts/rhodium.yaml
@@ -1,2 +1,3 @@
 apache::logrotate::period: "daily"
 apache::logrotate::rotate: 7
+standard::has_ganglia: false

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: Add RSS plugin to rawdog

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: planet: Add RSS plugin to rawdog
..


planet: Add RSS plugin to rawdog

This will generate the atom xtml like planet venus does.

Change-Id: I7036c6e0f745da5256dea054847426d9ff45956d
---
M modules/planet/manifests/config.pp
M modules/planet/manifests/dirs.pp
M modules/planet/manifests/init.pp
M modules/planet/manifests/packages.pp
A modules/planet/manifests/rawdogplugin.pp
M modules/planet/templates/feeds_rawdog/ar_config.erb
M modules/planet/templates/feeds_rawdog/bg_config.erb
M modules/planet/templates/feeds_rawdog/cs_config.erb
M modules/planet/templates/feeds_rawdog/de_config.erb
M modules/planet/templates/feeds_rawdog/el_config.erb
M modules/planet/templates/feeds_rawdog/en_config.erb
M modules/planet/templates/feeds_rawdog/es_config.erb
M modules/planet/templates/feeds_rawdog/fr_config.erb
M modules/planet/templates/feeds_rawdog/gmq_config.erb
M modules/planet/templates/feeds_rawdog/id_config.erb
M modules/planet/templates/feeds_rawdog/it_config.erb
M modules/planet/templates/feeds_rawdog/pl_config.erb
A modules/planet/templates/feeds_rawdog/plugins/rss.py.erb
M modules/planet/templates/feeds_rawdog/pt_config.erb
M modules/planet/templates/feeds_rawdog/ro_config.erb
M modules/planet/templates/feeds_rawdog/ru_config.erb
M modules/planet/templates/feeds_rawdog/sq_config.erb
M modules/planet/templates/feeds_rawdog/uk_config.erb
M modules/planet/templates/feeds_rawdog/zh_config.erb
M modules/planet/templates/html/rd_page.html.tmpl.erb
25 files changed, 238 insertions(+), 9 deletions(-)

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



diff --git a/modules/planet/manifests/config.pp 
b/modules/planet/manifests/config.pp
index b3bfc14..fe0b269 100644
--- a/modules/planet/manifests/config.pp
+++ b/modules/planet/manifests/config.pp
@@ -1,7 +1,7 @@
 # defined type: a config dir and file for a planet-venus or rawdog language 
version
 define planet::config {
 
-if os_version('debian == stretch') {
+if os_version('debian >= stretch') {
 $config_path = '/etc/rawdog'
 $config_file = 'config'
 $feed_src = 'feeds_rawdog'
diff --git a/modules/planet/manifests/dirs.pp b/modules/planet/manifests/dirs.pp
index ae28d60..e78a859 100644
--- a/modules/planet/manifests/dirs.pp
+++ b/modules/planet/manifests/dirs.pp
@@ -1,7 +1,7 @@
 # sets up needed directories for a planet-venus / rawdog install
 class planet::dirs {
 
-if os_version('debian == stretch') {
+if os_version('debian >= stretch') {
 
 file { [
 '/var/www/planet',
@@ -28,7 +28,7 @@
 mode=> '0444',
 owner   => 'planet',
 group   => 'planet',
-content => template('planet/feeds_rawdog/global.erb')
+content => template('planet/feeds_rawdog/global.erb'),
 }
 
 } else {
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 391e543..dfe7136 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -27,13 +27,13 @@
 include ::standard
 include ::locales::extended
 
-# things done once for all planets
+# things done once for all planet per languages
 include ::planet::packages
 include ::planet::dirs
 include ::planet::user
 include ::planet::index_site
 
-if os_version('debian == stretch') {
+if os_version('debian >= stretch') {
 $logo_file = '/var/www/planet/planet-wm2.png'
 } else {
 $logo_file = 
'/usr/share/planet-venus/theme/common/images/planet-wm2.png'
@@ -50,7 +50,6 @@
 # we iterate over the keys of the hash
 # which includes language names and translations
 $planet_languages_keys = keys($planet_languages)
-
 # creates one document root per language
 planet::docroot { $planet_languages_keys: }
 
@@ -66,5 +65,7 @@
 # creates one planet theme (css/logo) per language
 planet::theme { $planet_languages_keys: }
 
+# creates RSS dir and plugin per language
+planet::rawdogplugin { $planet_languages_keys: }
 }
 
diff --git a/modules/planet/manifests/packages.pp 
b/modules/planet/manifests/packages.pp
index 5c8b3a7..945dd30 100644
--- a/modules/planet/manifests/packages.pp
+++ b/modules/planet/manifests/packages.pp
@@ -17,13 +17,16 @@
 # planet-venus does not exist anymore in stretch
 # rawdog is another RSS aggregator using Python and Feedparser
 # to produce a "planet"-like static site
-if os_version('debian == stretch') {
+if os_version('debian >= stretch') {
 # 'RSS Aggregator Without Delusions Of Grandeur'
 package { 'rawdog':
 ensure => 'present',
 }
+
 # PyTidyLib 0.2.1 or later (optional but strongly recommended)
-package { 'python-tidylib':
+# python-libxml2 is needed for the xml archive

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

2017-12-05 Thread Dbrant (Code Review)

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

Change subject: Bump versionCode and minor version.
..

Bump versionCode and minor version.

For great justice.

Change-Id: Ib4c43fe2df8656ab01d550c8a05259ffce4a4895
---
M app/build.gradle
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index 2fbdbba..e6f4d2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@
 }
 
 def computeVersionName(label) {
-return "2.6.${android.defaultConfig.versionCode}-${label}-${date}"
+return "2.7.${android.defaultConfig.versionCode}-${label}-${date}"
 }
 
 final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_8
@@ -55,7 +55,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 19
 targetSdkVersion 26
-versionCode 206
+versionCode 208
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Enable Babel on mobile

2017-12-05 Thread Jdlrobson (Code Review)

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

Change subject: Enable Babel on mobile
..

Enable Babel on mobile

Changes:
* Turn on styles for mobile target
* Restrict floating rules to tablet. Enforce them with !important
to override table defaults

Bug: T178782
Change-Id: I9902359276894b6e94d9794247f5bde02983abd7
---
M extension.json
R resources/ext.babel.less
2 files changed, 19 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel 
refs/changes/69/395669/1

diff --git a/extension.json b/extension.json
index b82550c..53b36ee 100644
--- a/extension.json
+++ b/extension.json
@@ -38,8 +38,9 @@
},
"ResourceModules": {
"ext.babel": {
+   "targets": [ "desktop", "mobile" ],
"position": "top",
-   "styles": "resources/ext.babel.css"
+   "styles": "resources/ext.babel.less"
}
},
"ResourceFileModulePaths": {
diff --git a/resources/ext.babel.css b/resources/ext.babel.less
similarity index 83%
rename from resources/ext.babel.css
rename to resources/ext.babel.less
index 87f0d2f..26b2f14 100644
--- a/resources/ext.babel.css
+++ b/resources/ext.babel.less
@@ -21,18 +21,6 @@
border-spacing: 0;
 }
 
-/* @noflip */
-.mw-content-ltr .mw-babel-wrapper {
-   float: right;
-   clear: right;
-}
-
-/* @noflip */
-.mw-content-rtl .mw-babel-wrapper {
-   float: left;
-   clear: left;
-}
-
 /* Babel box layout */
 /* @noflip */
 .mw-babel-box {
@@ -168,3 +156,20 @@
font-weight: normal;
font-size: 85%;
 }
+
+@media all and ( min-width: @deviceWidthTablet ) {
+   /* @noflip */
+   .mw-content-ltr .mw-babel-wrapper {
+   // !important is necessary for skins like Minerva which try to 
avoid floating tables
+   float: right !important;
+   clear: right;
+   }
+
+   /* @noflip */
+   .mw-content-rtl .mw-babel-wrapper {
+   // !important is necessary for skins like Minerva which try to 
avoid floating tables
+   float: left !important;
+   clear: left;
+   }
+}
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9902359276894b6e94d9794247f5bde02983abd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Final design tweaks for on-this-day.

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

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

Change subject: Final design tweaks for on-this-day.
..


Final design tweaks for on-this-day.

Bug: T175995
Change-Id: Ia3a02a4e9ed99a7d7897d2401f221bcfcd8254d7
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
M app/src/main/res/layout/fragment_on_this_day.xml
M app/src/main/res/layout/view_card_on_this_day.xml
M app/src/main/res/layout/view_events_layout.xml
M app/src/main/res/layout/view_on_this_day_event.xml
5 files changed, 30 insertions(+), 11 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
index 24c6819..90cd006 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
@@ -234,7 +234,8 @@
 @Override
 public void onBindViewHolder(RecyclerView.ViewHolder holder, int 
position) {
 if (holder instanceof EventsViewHolder) {
-((EventsViewHolder) holder).setFields(events.get(position));
+((EventsViewHolder) holder).setFields(events.get(position),
+position > 0 ? events.get(position - 1) : null);
 if (funnel != null) {
 funnel.scrolledToPosition(position);
 }
@@ -257,6 +258,8 @@
 private TextView yearTextView;
 private TextView yearsInfoTextView;
 private RecyclerView pagesRecycler;
+private View yearContainer;
+private View yearSpace;
 private WikiSite wiki;
 
 EventsViewHolder(View v, WikiSite wiki) {
@@ -266,6 +269,8 @@
 yearTextView = v.findViewById(R.id.year);
 yearsInfoTextView = v.findViewById(R.id.years_text);
 pagesRecycler = v.findViewById(R.id.pages_recycler);
+yearContainer = v.findViewById(R.id.years_text_container);
+yearSpace = v.findViewById(R.id.years_text_space);
 this.wiki = wiki;
 setRecycler();
 }
@@ -277,12 +282,19 @@
 }
 }
 
-public void setFields(final OnThisDay.Event event) {
+public void setFields(@NonNull final OnThisDay.Event event, @Nullable 
OnThisDay.Event prevEvent) {
 setPagesRecycler(event);
 setPads();
 descTextView.setText(event.text());
 yearTextView.setText(DateUtil.yearToStringWithEra(event.year()));
 
yearsInfoTextView.setText(DateUtil.getYearDifferenceString(event.year()));
+if (prevEvent != null && prevEvent.year() == event.year()) {
+yearContainer.setVisibility(View.GONE);
+yearSpace.setVisibility(View.GONE);
+} else {
+yearContainer.setVisibility(View.VISIBLE);
+yearSpace.setVisibility(prevEvent == null ? View.GONE : 
View.VISIBLE);
+}
 }
 
 private void setPads() {
diff --git a/app/src/main/res/layout/fragment_on_this_day.xml 
b/app/src/main/res/layout/fragment_on_this_day.xml
index 2d7d1ef..7037930 100644
--- a/app/src/main/res/layout/fragment_on_this_day.xml
+++ b/app/src/main/res/layout/fragment_on_this_day.xml
@@ -75,9 +75,9 @@
 
 
 
 
 
+
+
 https://gerrit.wikimedia.org/r/395667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3a02a4e9ed99a7d7897d2401f221bcfcd8254d7
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Sharvaniharan 
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]: puppetmasters eqiad: remove ganglia

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: puppetmasters eqiad: remove ganglia
..

puppetmasters eqiad: remove ganglia

Bug: T177225
Change-Id: Icca95380878c0a68cf8075ab637539b72b69a3bd
---
A hieradata/hosts/puppetmaster1001.yaml
A hieradata/hosts/puppetmaster1002.yaml
M hieradata/hosts/rhodium.yaml
3 files changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/hosts/puppetmaster1001.yaml 
b/hieradata/hosts/puppetmaster1001.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/hosts/puppetmaster1001.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/hosts/puppetmaster1002.yaml 
b/hieradata/hosts/puppetmaster1002.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/hosts/puppetmaster1002.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/hosts/rhodium.yaml b/hieradata/hosts/rhodium.yaml
index 13e2020..b89f90a 100644
--- a/hieradata/hosts/rhodium.yaml
+++ b/hieradata/hosts/rhodium.yaml
@@ -1,2 +1,3 @@
 apache::logrotate::period: "daily"
 apache::logrotate::rotate: 7
+standard::has_ganglia: false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icca95380878c0a68cf8075ab637539b72b69a3bd
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] apps...wikipedia[master]: Design tweak to on-this-day page cards.

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

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

Change subject: Design tweak to on-this-day page cards.
..


Design tweak to on-this-day page cards.

Bug: T175995
Change-Id: I5e39f8266219037a500f7b8ec18ba3ab6b18a639
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
M app/src/main/res/layout/item_on_this_day_pages.xml
2 files changed, 9 insertions(+), 2 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
index 9781542..bc5638c 100644
--- 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
+++ 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
@@ -7,6 +7,7 @@
 import android.support.annotation.Nullable;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
@@ -50,6 +51,8 @@
 public void setFields(@NonNull RbPageSummary page) {
 selectedPage = page;
 
pageItemDescTextView.setText(StringUtils.capitalize(page.getDescription()));
+
pageItemDescTextView.setVisibility(TextUtils.isEmpty(page.getDescription()) ? 
View.GONE : View.VISIBLE);
+
pageItemTitleTextView.setMaxLines(TextUtils.isEmpty(page.getDescription()) ? 2 
: 1);
 
pageItemTitleTextView.setText(StringUtil.fromHtml(StringUtils.defaultString(page.getNormalizedTitle(;
 setImage(page.getThumbnailUrl());
 }
diff --git a/app/src/main/res/layout/item_on_this_day_pages.xml 
b/app/src/main/res/layout/item_on_this_day_pages.xml
index b233e5e..931d408 100644
--- a/app/src/main/res/layout/item_on_this_day_pages.xml
+++ b/app/src/main/res/layout/item_on_this_day_pages.xml
@@ -24,7 +24,8 @@
 android:layout_height="match_parent"
 android:layout_weight="1"
 android:gravity="center_vertical"
-android:layout_marginStart="16dp"
+android:paddingLeft="16dp"
+android:paddingRight="16dp"
 android:orientation="vertical">
 
 
 
-
 
 

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Final design tweaks for on-this-day.

2017-12-05 Thread Dbrant (Code Review)

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

Change subject: Final design tweaks for on-this-day.
..

Final design tweaks for on-this-day.

Bug: T175995
Change-Id: Ia3a02a4e9ed99a7d7897d2401f221bcfcd8254d7
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
M app/src/main/res/layout/fragment_on_this_day.xml
M app/src/main/res/layout/view_card_on_this_day.xml
M app/src/main/res/layout/view_events_layout.xml
M app/src/main/res/layout/view_on_this_day_event.xml
5 files changed, 30 insertions(+), 11 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
index 24c6819..90cd006 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
@@ -234,7 +234,8 @@
 @Override
 public void onBindViewHolder(RecyclerView.ViewHolder holder, int 
position) {
 if (holder instanceof EventsViewHolder) {
-((EventsViewHolder) holder).setFields(events.get(position));
+((EventsViewHolder) holder).setFields(events.get(position),
+position > 0 ? events.get(position - 1) : null);
 if (funnel != null) {
 funnel.scrolledToPosition(position);
 }
@@ -257,6 +258,8 @@
 private TextView yearTextView;
 private TextView yearsInfoTextView;
 private RecyclerView pagesRecycler;
+private View yearContainer;
+private View yearSpace;
 private WikiSite wiki;
 
 EventsViewHolder(View v, WikiSite wiki) {
@@ -266,6 +269,8 @@
 yearTextView = v.findViewById(R.id.year);
 yearsInfoTextView = v.findViewById(R.id.years_text);
 pagesRecycler = v.findViewById(R.id.pages_recycler);
+yearContainer = v.findViewById(R.id.years_text_container);
+yearSpace = v.findViewById(R.id.years_text_space);
 this.wiki = wiki;
 setRecycler();
 }
@@ -277,12 +282,19 @@
 }
 }
 
-public void setFields(final OnThisDay.Event event) {
+public void setFields(@NonNull final OnThisDay.Event event, @Nullable 
OnThisDay.Event prevEvent) {
 setPagesRecycler(event);
 setPads();
 descTextView.setText(event.text());
 yearTextView.setText(DateUtil.yearToStringWithEra(event.year()));
 
yearsInfoTextView.setText(DateUtil.getYearDifferenceString(event.year()));
+if (prevEvent != null && prevEvent.year() == event.year()) {
+yearContainer.setVisibility(View.GONE);
+yearSpace.setVisibility(View.GONE);
+} else {
+yearContainer.setVisibility(View.VISIBLE);
+yearSpace.setVisibility(prevEvent == null ? View.GONE : 
View.VISIBLE);
+}
 }
 
 private void setPads() {
diff --git a/app/src/main/res/layout/fragment_on_this_day.xml 
b/app/src/main/res/layout/fragment_on_this_day.xml
index 2d7d1ef..7037930 100644
--- a/app/src/main/res/layout/fragment_on_this_day.xml
+++ b/app/src/main/res/layout/fragment_on_this_day.xml
@@ -75,9 +75,9 @@
 
 
 
 
 
+
+
 https://gerrit.wikimedia.org/r/395667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Discard unused metadata from schema

2017-12-05 Thread Code Review

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

Change subject: Discard unused metadata from schema
..

Discard unused metadata from schema

Drop columns for color, image, icon.

Bug: T180092
Change-Id: Icc712cb8abc025b992ed25afbf4f67d4e67386f9
---
M i18n/en.json
M i18n/qqq.json
A sql/patches/04-drop-metadata-columns.sql
M sql/readinglists.sql
M src/Api/ApiQueryReadingLists.php
M src/Api/ApiReadingListsCreate.php
M src/Api/ApiReadingListsUpdate.php
M src/Doc/ReadingListRow.php
M src/HookHandler.php
M src/ReadingListRepository.php
M tests/src/ReadingListRepositoryTest.php
11 files changed, 13 insertions(+), 117 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index f3acfe8..a427c12 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -66,7 +66,6 @@
"apihelp-readinglists+create-param-image": "List image. (The meaning 
and format of values is left to the clients.)",
"apihelp-readinglists+create-param-icon": "List icon.  (The meaning and 
format of values is left to the clients.)",
"apihelp-readinglists+create-example-1": "Create a new reading list.",
-   "apihelp-readinglists+create-example-2": "Create a new reading list 
with custom appearance.",
"apihelp-readinglists+update-summary": "Update a list belonging to the 
current user.",
"apihelp-readinglists+update-param-list": "List ID.",
"apihelp-readinglists+update-param-name": "New list name.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b79480e..be0dee4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -67,7 +67,6 @@
"apihelp-readinglists+create-param-image": 
"{{doc-apihelp-param|readinglists+create|image}}",
"apihelp-readinglists+create-param-icon": 
"{{doc-apihelp-param|readinglists+create|icon}}",
"apihelp-readinglists+create-example-1": 
"{{doc-apihelp-example|readinglists+create}}",
-   "apihelp-readinglists+create-example-2": 
"{{doc-apihelp-example|readinglists+create}}",
"apihelp-readinglists+update-summary": 
"{{doc-apihelp-summary|readinglists+update}}",
"apihelp-readinglists+update-param-list": 
"{{doc-apihelp-param|readinglists+update|list}}",
"apihelp-readinglists+update-param-name": 
"{{doc-apihelp-param|readinglists+update|name}}",
diff --git a/sql/patches/04-drop-metadata-columns.sql 
b/sql/patches/04-drop-metadata-columns.sql
new file mode 100644
index 000..e3a29eb
--- /dev/null
+++ b/sql/patches/04-drop-metadata-columns.sql
@@ -0,0 +1,4 @@
+ALTER TABLE reading_list
+DROP COLUMN rl_color,
+DROP COLUMN rl_image,
+DROP COLUMN rl_icon;
diff --git a/sql/readinglists.sql b/sql/readinglists.sql
index 11ced2e..bd61d74 100644
--- a/sql/readinglists.sql
+++ b/sql/readinglists.sql
@@ -13,12 +13,6 @@
 rl_name VARCHAR(255) BINARY NOT NULL,
 -- Description of the list.
 rl_description VARBINARY(767) NOT NULL DEFAULT '',
--- List color as 3x2 hex digits.
-rl_color VARBINARY(6) DEFAULT NULL,
--- List image as file name to pass to wfFindFile() or the like.
-rl_image VARBINARY(255) DEFAULT NULL,
--- List icon.
-rl_icon VARBINARY(32) DEFAULT NULL,
 -- Creation timestamp.
 rl_date_created BINARY(14) NOT NULL default '1970010100',
 -- Last modification timestamp.
diff --git a/src/Api/ApiQueryReadingLists.php b/src/Api/ApiQueryReadingLists.php
index cd024c8..2e3fd1d 100644
--- a/src/Api/ApiQueryReadingLists.php
+++ b/src/Api/ApiQueryReadingLists.php
@@ -163,9 +163,6 @@
'name' => $row->rl_name,
'default' => (bool)$row->rl_is_default,
'description' => $row->rl_description,
-   'color' => $row->rl_color,
-   'image' => $row->rl_image,
-   'icon' => $row->rl_icon,
'created' => wfTimestamp( TS_ISO_8601, 
$row->rl_date_created ),
'updated' => wfTimestamp( TS_ISO_8601, 
$row->rl_date_updated ),
];
diff --git a/src/Api/ApiReadingListsCreate.php 
b/src/Api/ApiReadingListsCreate.php
index f4f9925..7d4c9af 100644
--- a/src/Api/ApiReadingListsCreate.php
+++ b/src/Api/ApiReadingListsCreate.php
@@ -26,7 +26,7 @@
$params = $this->extractRequestParams();
 
$listId = $this->getReadingListRepository( $this->getUser() 
)->addList( $params['name'],
-   $params['description'], $params['color'], 
$params['image'], $params['icon'] );
+   $params['description'] );
$this->getResult()->addValue( null, $this->getModuleName(), [ 
'id' => $listId ] );
}
 
@@ -45,21 +45,6 @@
self::PARAM_TYPE => 'string',
self::PARAM_DFLT => '',

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Don't break codemirror if wikEdDiff is enabled, only if wikE...

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

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

Change subject: Don't break codemirror if wikEdDiff is enabled, only if wikEd 
is enabled
..


Don't break codemirror if wikEdDiff is enabled, only if wikEd is enabled

Bug: T178348
Change-Id: If579d4da99f364e73dec5a7e6bed87019431386b
---
M resources/ext.CodeMirror.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index c0770e0..03a84f0 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -302,7 +302,7 @@
 
// If CodeMirror is already loaded or wikEd gadget is 
enabled, abort. See T178348.
// FIXME: Would be good to replace the wikEd check with 
something more generic.
-   if ( codeMirror || window.wikEd !== undefined ) {
+   if ( codeMirror || mw.user.options.get( 'gadget-wikEd' 
) > 0 ) {
return;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If579d4da99f364e73dec5a7e6bed87019431386b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Kaldari 
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]: Alias map

2017-12-05 Thread Arlolra (Code Review)

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

Change subject: Alias map
..

Alias map

Change-Id: Ica3ea544cec7183b3474b5cdf7489e3f04c91eef
---
M lib/html2wt/WikitextSerializer.js
1 file changed, 12 insertions(+), 3 deletions(-)


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

diff --git a/lib/html2wt/WikitextSerializer.js 
b/lib/html2wt/WikitextSerializer.js
index 895de1c..c54987e 100644
--- a/lib/html2wt/WikitextSerializer.js
+++ b/lib/html2wt/WikitextSerializer.js
@@ -423,16 +423,19 @@
}));
// Record order of parameters in templatedata (if present)
var tplDataOrder = new Map();
+   var aliasMap = new Map();
var keys = [];
if (tplData && Array.isArray(tplData.paramOrder)) {
var params = tplData.params;
tplData.paramOrder.forEach(function(k, i) {
-   tplDataOrder.set(k, { order: keys.length });
+   tplDataOrder.set(k, { order: i });
+   aliasMap.set(k, { key: k, order: -1 });
keys.push(k);
// Aliases have the same sort order as the main name.
var aliases = params && params[k] && params[k].aliases;
-   (aliases || []).forEach(function(a) {
-   tplDataOrder.set(a, { order: keys.length });
+   (aliases || []).forEach(function(a, j) {
+   tplDataOrder.set(a, { order: i });
+   aliasMap.set(a, { key: k, order: j });
keys.push(a);
});
});
@@ -467,6 +470,12 @@
var aOrder = defaultGet(nearestOrder, a);
var bOrder = defaultGet(nearestOrder, b);
if (aOrder !== bOrder) { return aOrder - bOrder; }
+   // canon
+   var aCanon = aliasMap.get(a);
+   var bCanon = aliasMap.get(b);
+   if (aCanon && bCanon && aCanon.key === bCanon.key) {
+   return aCanon.order - bCanon.order;
+   }
// secondary key is templatedata order
aOrder = defaultGet(tplDataOrder, a);
bOrder = defaultGet(tplDataOrder, b);

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: On This Day endpoint follow-up.

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

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

Change subject: On This Day endpoint follow-up.
..


On This Day endpoint follow-up.

Change-Id: If90c272c70001d192fdbe91b82676107254663be
---
M app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
M 
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
3 files changed, 6 insertions(+), 23 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java 
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
index 0a17056..21978ef 100644
--- a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
+++ b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
@@ -19,12 +19,10 @@
 @SuppressWarnings("unused") @Nullable private FeaturedImage image;
 @SuppressWarnings("unused") @Nullable private List 
onthisday;
 
-
 @Nullable
 public List onthisday() {
 return onthisday;
 }
-
 
 @Nullable
 RbPageSummary tfa() {
diff --git 
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
 
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
index a15db7a..d80c534 100644
--- 
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
+++ 
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
@@ -13,7 +13,6 @@
 import org.wikipedia.feed.model.UtcDate;
 import org.wikipedia.feed.mostread.MostReadListCard;
 import org.wikipedia.feed.news.NewsListCard;
-import org.wikipedia.feed.onthisday.OnThisDay;
 import org.wikipedia.feed.onthisday.OnThisDayCard;
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.util.DateUtil;
@@ -45,12 +44,8 @@
 @Override
 void getCardFromResponse(@NonNull AggregatedFeedContent content, 
@NonNull WikiSite wiki,
  int age, @NonNull List outCards) {
-if (content.onthisday() != null) {
-List selectedEvents = content.onthisday();
-OnThisDay onThisDay = new OnThisDay();
-onThisDay.setSelected(selectedEvents);
-OnThisDayCard card = new OnThisDayCard(onThisDay, wiki, age);
-outCards.add(card);
+if (content.onthisday() != null && !content.onthisday().isEmpty()) 
{
+outCards.add(new OnThisDayCard(content.onthisday(), wiki, 
age));
 }
 }
 }
diff --git a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
index 5b1c11b..d08ea6b 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
@@ -19,25 +19,19 @@
 public class OnThisDayCard extends Card {
 private int nextYear;
 private Calendar date;
-private OnThisDay onThisDay;
 private FeedAdapter.Callback callback;
 private WikiSite wiki;
 private OnThisDay.Event eventShownOnCard;
 private int age;
 
-public OnThisDayCard(@NonNull OnThisDay onThisDay, @NonNull WikiSite wiki, 
int age) {
+public OnThisDayCard(@NonNull List events, @NonNull 
WikiSite wiki, int age) {
 super();
-this.onThisDay = onThisDay;
-int randomIndex = new 
Random().nextInt(onThisDay.selectedEvents().size() - 1);
-eventShownOnCard = onThisDay.selectedEvents().get(randomIndex);
 this.date = DateUtil.getDefaultDateFor(age);
-this.nextYear = onThisDay.selectedEvents().get(randomIndex + 1).year();
 this.wiki = wiki;
 this.age = age;
-}
-
-@NonNull public OnThisDay onthisday() {
-return onThisDay;
+int randomIndex = new Random().nextInt(events.size() - 1);
+eventShownOnCard = events.get(randomIndex);
+this.nextYear = randomIndex + 1 < events.size() ? 
events.get(randomIndex + 1).year() : eventShownOnCard.year();
 }
 
 public FeedAdapter.Callback getCallback() {
@@ -46,10 +40,6 @@
 
 public void setCallback(FeedAdapter.Callback callback) {
 this.callback = callback;
-}
-
-@NonNull public List events() {
-return onThisDay.selectedEvents();
 }
 
 @Override @NonNull public CardType type() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If90c272c70001d192fdbe91b82676107254663be
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: [EXPERIMENTAL] Using OOUI lazy-load for rudamentary reply

2017-12-05 Thread Mooeypoo (Code Review)

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

Change subject: [EXPERIMENTAL] Using OOUI lazy-load for rudamentary reply
..

[EXPERIMENTAL] Using OOUI lazy-load for rudamentary reply

** DO NOT MERGE **

This is an experiment to get a rudamentary 'reply' action working
with ooui php and js for Flow with lazy-loading.

** DO NOT MERGE **

Change-Id: I49b6c68ea2b5a5533722b49abf3a0da5d35105bf
---
M extension.json
M includes/OOUI/BaseUiWidget.php
M includes/OOUI/FlowButtonWidget.php
M includes/OOUI/PostWidget.php
M includes/OOUI/TopicWidget.php
M modules/flow/experimental/initialization.js
A modules/flow/experimental/ui.PostWidget.js
A modules/flow/experimental/ui.ReplyWidget.js
A modules/flow/experimental/ui.SimpleMenuWidget.js
M modules/styles/flow/widgets/experimental/mw.flow.ui.less
10 files changed, 413 insertions(+), 19 deletions(-)


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

diff --git a/extension.json b/extension.json
index 3a18f89..66bd7e2 100644
--- a/extension.json
+++ b/extension.json
@@ -596,6 +596,17 @@
"flow/experimental/initialization.js"
]
},
+   "ext.flow.ooui.experimental.lazy": {
+   "scripts": [
+   "flow/experimental/ui.SimpleMenuWidget.js",
+   "flow/experimental/ui.PostWidget.js",
+   "flow/experimental/ui.ReplyWidget.js"
+   ],
+   "dependencies": [
+   "oojs-ui",
+   "mediawiki.api"
+   ]
+   },
"ext.flow": {
"position": "top",
"styles": [
diff --git a/includes/OOUI/BaseUiWidget.php b/includes/OOUI/BaseUiWidget.php
index 133b468..70cf851 100644
--- a/includes/OOUI/BaseUiWidget.php
+++ b/includes/OOUI/BaseUiWidget.php
@@ -36,7 +36,7 @@
protected function makeSection( $name, $class = '' ) {
$tag = new \OOUI\Tag( 'div' );
 
-   $class = $class ? $class : 'flow-ui-' . lcfirst( 
self::WIDGET_NAME ) . '-' . $name;
+   $class = $class ? $class : 'mw-flow-ui-' . lcfirst( 
static::WIDGET_NAME ) . '-' . $name;
$tag->addClasses( [ $class ] );
return $tag;
}
diff --git a/includes/OOUI/FlowButtonWidget.php 
b/includes/OOUI/FlowButtonWidget.php
index 97d9128..dabc840 100644
--- a/includes/OOUI/FlowButtonWidget.php
+++ b/includes/OOUI/FlowButtonWidget.php
@@ -8,7 +8,7 @@
 class FlowButtonWidget extends \OOUI\ButtonWidget {
protected $name;
 
-   public function __construct( array $config = [] ) {
+   public function __construct( array $config = [ 'infusable' => true ] ) {
 
parent::__construct( $config );
 
@@ -31,8 +31,9 @@
 
protected function getOnClickDeferredAction( $definition ) {
return 'window.mwSDInitActions = window.mwSDInitActions || [];' 
.
+   'this.className+=" flow-ui-pending";' .
'window.mwSDInitActions.push( [this, ' . $definition . 
']);' .
-   'console.log("clicked",window.mwSDInitActions);' .
+   'console.log("onClick 
intercepted",window.mwSDInitActions);' .
'return false;';
}
-}
\ No newline at end of file
+}
diff --git a/includes/OOUI/PostWidget.php b/includes/OOUI/PostWidget.php
index 80458b5..1145ed7 100644
--- a/includes/OOUI/PostWidget.php
+++ b/includes/OOUI/PostWidget.php
@@ -14,7 +14,7 @@
 * @param array $revisionData Post revision data from the API
 * @param array $config Configuration options
 */
-   public function __construct( $postID, $revisionData, $allTopicPosts, 
$allTopicRevisions, array $config = [] ) {
+   public function __construct( $postID, $topicId, $revisionData, 
$allTopicPosts, $allTopicRevisions, array $config = [] ) {
global $wgLang;
 
// Parent constructor
@@ -25,9 +25,14 @@
// Traits
$this->initializeGroupElement( array_merge( $config, [ 'group' 
=> $this->replies ] ) );
 
+   $this->topicID = $topicId;
// Author info
$userID = $revisionData['author']['id'];
$userName = $revisionData['author']['name'];
+   // var_dump( $userID );
+   // var_dump( \Linker::userLink( $userID, $userName ) );
+   // var_dump( \Linker::userToolLinks( $userID, $userName ) );
+   // die();
$authorName = new \OOUI\LabelWidget( [
'label' => new \OOUI\HtmlSnippet( \Linker::userLink( 
$userID, $userName ) ),
'classes' =>

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove major-gifts specific dedupe code.

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

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

Change subject: Remove major-gifts specific dedupe code.
..


Remove major-gifts specific dedupe code.

I struggled to make myself do this as I seem to believe it will be back in some 
form
However, trying to convince myself to 'trust in git'. Have put as a separate 
patch
for easier retrieval...

Bug: T181088
Change-Id: Id89df916d7e1e865547eb285d6a78c9fe44e95be
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 0 insertions(+), 25 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 6e07755..d1c525d 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2483,9 +2483,6 @@
   }
 
   if (substr($moveField, 0, 13) === 'move_location') {
-if (!isset($refs['is_major_gift'])) {
-  $refs['is_major_gift'] = 
_wmf_civicrm_is_merged_contact_major_donor($mainId, $otherId);
-}
 $fieldParts = explode('_', $moveField);
 
 if ($fieldParts[2] == 'email') {
@@ -2958,28 +2955,6 @@
  */
 function _wmf_civicrm_count_capital_letters($string) {
   return strlen(preg_replace('/[^A-Z]+/', '', $string));
-}
-
-/**
- * Has the combined contact given $500 or more?
- *
- * @param int $mainId
- * @param int $otherId
- *
- * @return bool
- *
- * @throws \CiviCRM_API3_Exception
- */
-function _wmf_civicrm_is_merged_contact_major_donor($mainId, $otherId) {
-  $total = 0;
-  $donations = civicrm_api3('Contribution', 'get', array(
-'return' => 'total_amount',
-'contact_id' => array('IN' => array($mainId, $otherId)),
-  ));
-  foreach ($donations['values'] as $donation) {
-$total += $donation['total_amount'];
-  }
-  return ($total >= 500) ? TRUE : FALSE;
 }
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id89df916d7e1e865547eb285d6a78c9fe44e95be
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: 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]: Allow Major gift contacts with conflicting addresses to merge.

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

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

Change subject: Allow Major gift contacts with conflicting addresses to merge.
..


Allow Major gift contacts with conflicting addresses to merge.

By removing the conflict we allow all the prioritisation rules developed for 
other
contacts to apply

Unit tests updated to reflect the fact that merge now takes place and the most 
recent
donor's details are now used. Comfortingly all the 'resolvable' conflict tests 
are
unchanged, still selecting the preferable addresses. The 'unresolvable' conflict
tests have been updated to reflect use of most recent donor detail. (a couple
of test names had to be updated to be accurate about that distinction

Bug: T181088
Change-Id: Ie78e3a517b796967976936b4fc93d2352a7aa14e
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 9 insertions(+), 22 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 0f1961e..6e07755 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2487,29 +2487,16 @@
   $refs['is_major_gift'] = 
_wmf_civicrm_is_merged_contact_major_donor($mainId, $otherId);
 }
 $fieldParts = explode('_', $moveField);
-if (!$refs['is_major_gift']) {
-  if ($fieldParts[2] == 'email') {
-$mainIsOnHold = 
$refs['migration_info']['main_details']['location_blocks']['email'][$fieldParts[3]]['on_hold'];
-$otherIsOnHold = 
$refs['migration_info']['other_details']['location_blocks']['email'][$fieldParts[3]]['on_hold'];
-if ($mainIsOnHold + $otherIsOnHold === 1) {
-  // One is one hold & the other isn't - conflict.
-  return;
-}
-  }
-  unset($refs['fields_in_conflict'][$moveField]);
-}
-else {
-  if (_wmf_civicrm_merge_is_address_conflict_resolvable(
-$refs['migration_info']['rows'][$moveField]['other'],
-$refs['migration_info']['rows'][$moveField]['main'],
-
$refs['migration_info']['other_details']['location_blocks'][$fieldParts[2]][$fieldParts[3]],
-
$refs['migration_info']['main_details']['location_blocks'][$fieldParts[2]][$fieldParts[3]]
-)) {
-  // Actual resolution is in alterLocationMergeData hook.
-  unset($refs['fields_in_conflict'][$moveField]);
-  }
-}
 
+if ($fieldParts[2] == 'email') {
+  $mainIsOnHold = 
$refs['migration_info']['main_details']['location_blocks']['email'][$fieldParts[3]]['on_hold'];
+  $otherIsOnHold = 
$refs['migration_info']['other_details']['location_blocks']['email'][$fieldParts[3]]['on_hold'];
+  if ($mainIsOnHold + $otherIsOnHold === 1) {
+// One is one hold & the other isn't - conflict.
+return;
+  }
+}
+unset($refs['fields_in_conflict'][$moveField]);
   }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie78e3a517b796967976936b4fc93d2352a7aa14e
Gerrit-PatchSet: 1
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] operations/puppet[production]: wmf-auto-reimage: add --conftool-value option

2017-12-05 Thread Volans (Code Review)

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

Change subject: wmf-auto-reimage: add --conftool-value option
..

wmf-auto-reimage: add --conftool-value option

* The current parse of command line arguments allow the -c/--conftool
  option to accept an optional value to use to depool the host in
  conftool. Due to a limitation in Python argparse module, this can
  generate an error while parsing valid CLI options, see T181798.
* Convert the -c/--conftool option to be boolean and move the optional
  specification of a custom value for conftool to the new
  --conftool-value option, that defaults to 'inactive' as it is now.

Bug: T181798
Change-Id: I379bd619a1bebf7ecf8bdb456ce666293b1fadb7
---
M modules/profile/files/cumin/wmf_auto_reimage_host.py
M modules/profile/files/cumin/wmf_auto_reimage_lib.py
2 files changed, 15 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/395662/1

diff --git a/modules/profile/files/cumin/wmf_auto_reimage_host.py 
b/modules/profile/files/cumin/wmf_auto_reimage_host.py
index b8e2ad7..db43c16 100644
--- a/modules/profile/files/cumin/wmf_auto_reimage_host.py
+++ b/modules/profile/files/cumin/wmf_auto_reimage_host.py
@@ -105,8 +105,8 @@
 lib.icinga_downtime(args.host, user, args.phab_task_id)
 
 # Depool via conftool
-if args.conftool is not None and not args.new:
-previous = lib.conftool_depool(args.host, pooled=args.conftool)
+if args.conftool and not args.new:
+previous = lib.conftool_depool(args.host, pooled=args.conftool_value)
 lib.print_line('Waiting 3 minutes to let the host drain', 
host=args.host)
 time.sleep(180)
 
@@ -160,7 +160,7 @@
 lib.run_apache_fast_test(args.host)
 
 # The repool is *not* done automatically, the command to repool is printed 
and logged
-if args.conftool is not None:
+if args.conftool:
 lib.print_repool_message(previous, rename_from=rename_from, 
rename_to=args.rename)
 
 lib.print_line('Reimage completed', host=args.host)
diff --git a/modules/profile/files/cumin/wmf_auto_reimage_lib.py 
b/modules/profile/files/cumin/wmf_auto_reimage_lib.py
index 7a84f27..20b2a21 100644
--- a/modules/profile/files/cumin/wmf_auto_reimage_lib.py
+++ b/modules/profile/files/cumin/wmf_auto_reimage_lib.py
@@ -128,11 +128,15 @@
 help=('for first imaging of new hosts that are not in puppet yet and 
this is their first'
   'imaging. Skips some steps on old hosts, includes --no-verify'))
 parser.add_argument(
-'-c', '--conftool', nargs='?', const='inactive',
-help=("depool the host(s) via conftool with the 'inactive' value, if 
set. Optionally "
-  "a custom value can be specified to be used for conftool 
'set/pooled' update. "
-  "The host(s) will NOT be repooled automatically, but the repool 
commands will be "
-  "printed at the end. If --new is also set just print the pool 
message."))
+'-c', '--conftool', action='store_true',
+help=('Depool the host(s) via conftool with the value of the 
--conftool-value option. '
+  'The host(s) will NOT be repooled automatically, but the repool 
commands will be '
+  'printed at the end. If --new is also set, it will just print 
the pool message at '
+  'the end.'))
+parser.add_argument(
+'--conftool-value', default='inactive',
+help=("Value to pass to the 'set/pooled' command in conftool to depool 
the host(s), if "
+  "the -c/--conftool option is set. [default: inactive]"))
 parser.add_argument(
 '-a', '--apache', action='store_true',
 help='run apache-fast-test on the hosts after the reimage')
@@ -398,14 +402,15 @@
 command_args = ['wmf-auto-reimage-host']
 args_dict = vars(args)
 # Add boolean command line arguments
-for key in ('debug', 'no_reboot', 'no_verify', 'no_downtime', 'no_pxe', 
'new', 'apache'):
+for key in ('debug', 'no_reboot', 'no_verify', 'no_downtime', 'no_pxe', 
'new', 'apache',
+'conftool'):
 if args_dict[key]:
 command_args.append(get_option_from_name(key))
 
 # Add command line arguments with values
 # The --phab-task-id options is skipped because the main script already 
takes care
 # of upgrading Phabricator
-for key in ('conftool',):
+for key in ('conftool-value',):
 if args_dict[key] is not None:
 command_args.append(get_option_from_name(key))
 command_args.append(args_dict[key])

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I379bd619a1bebf7ecf8bdb456ce666293b1fadb7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmf-auto-reimage: improve screen/tmux detection

2017-12-05 Thread Volans (Code Review)

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

Change subject: wmf-auto-reimage: improve screen/tmux detection
..

wmf-auto-reimage: improve screen/tmux detection

* Improve the screen/tmux session detection to cover additional cases
  that were not properly detected in the current version, checking also
  the TERM environment variable.

Bug: T181796
Change-Id: Idf3908d3bc61e10990183c6b96dfc9ebad4b6d74
---
M modules/profile/files/cumin/wmf_auto_reimage_lib.py
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/modules/profile/files/cumin/wmf_auto_reimage_lib.py 
b/modules/profile/files/cumin/wmf_auto_reimage_lib.py
index 20b2a21..d9f030e 100644
--- a/modules/profile/files/cumin/wmf_auto_reimage_lib.py
+++ b/modules/profile/files/cumin/wmf_auto_reimage_lib.py
@@ -148,8 +148,9 @@
 
 
 def ensure_shell_mode():
-"""Ensure running in non-interactive mode or screen/tmux session or 
raise."""
-if os.isatty(0) and not (os.getenv('STY') or os.getenv('TMUX')):
+"""Ensure it is running in non-interactive mode or screen/tmux session, 
raise otherwise."""
+if (os.isatty(0) and not os.getenv('STY', '') and not os.getenv('TMUX', '')
+and 'screen' not in os.getenv('TERM', '')):
 raise RuntimeError(
 'Must be run in non-interactive mode or inside a screen or tmux.')
 

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: OnThisDay endpoint change

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

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

Change subject: OnThisDay endpoint change
..


OnThisDay endpoint change

- Deriving the response from aggregate feed response instead of a separate call.

Change-Id: Iffdb689fe39bff45e436c90dac09d1a2ec62fef2
---
M app/src/main/java/org/wikipedia/feed/FeedContentType.java
M app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
M 
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDay.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
D app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayClient.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
A app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFullListClient.java
D app/src/test/java/org/wikipedia/feed/onthisday/OnThisDayClientTest.java
9 files changed, 78 insertions(+), 199 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/feed/FeedContentType.java 
b/app/src/main/java/org/wikipedia/feed/FeedContentType.java
index ed4f258..1055752 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedContentType.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedContentType.java
@@ -10,7 +10,6 @@
 import org.wikipedia.feed.continuereading.ContinueReadingClient;
 import org.wikipedia.feed.dataclient.FeedClient;
 import org.wikipedia.feed.mainpage.MainPageClient;
-import org.wikipedia.feed.onthisday.OnThisDayClient;
 import org.wikipedia.feed.random.RandomClient;
 import org.wikipedia.model.EnumCode;
 import org.wikipedia.model.EnumCodeMap;
@@ -31,7 +30,7 @@
 @Nullable
 @Override
 public FeedClient newClient(AggregatedFeedContentClient 
aggregatedClient, int age, boolean isOnline) {
-return isEnabled() && isOnline ? new OnThisDayClient() : null;
+return isEnabled() && isOnline ? new 
AggregatedFeedContentClient.OnThisDayFeed(aggregatedClient) : null;
 }
 },
 CONTINUE_READING(2, R.string.view_continue_reading_card_title, 
R.string.feed_item_type_continue_reading) {
diff --git 
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java 
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
index 0f10615..0a17056 100644
--- a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
+++ b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
@@ -8,6 +8,7 @@
 import org.wikipedia.feed.image.FeaturedImage;
 import org.wikipedia.feed.mostread.MostReadArticles;
 import org.wikipedia.feed.news.NewsItem;
+import org.wikipedia.feed.onthisday.OnThisDay;
 
 import java.util.List;
 
@@ -16,6 +17,14 @@
 @SuppressWarnings("unused") @Nullable private List news;
 @SuppressWarnings("unused") @SerializedName("mostread") @Nullable private 
MostReadArticles mostRead;
 @SuppressWarnings("unused") @Nullable private FeaturedImage image;
+@SuppressWarnings("unused") @Nullable private List 
onthisday;
+
+
+@Nullable
+public List onthisday() {
+return onthisday;
+}
+
 
 @Nullable
 RbPageSummary tfa() {
diff --git 
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
 
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
index dbfec05..a15db7a 100644
--- 
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
+++ 
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
@@ -13,6 +13,8 @@
 import org.wikipedia.feed.model.UtcDate;
 import org.wikipedia.feed.mostread.MostReadListCard;
 import org.wikipedia.feed.news.NewsListCard;
+import org.wikipedia.feed.onthisday.OnThisDay;
+import org.wikipedia.feed.onthisday.OnThisDayCard;
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.util.DateUtil;
 import org.wikipedia.util.log.L;
@@ -35,6 +37,23 @@
 @Nullable private AggregatedFeedContent aggregatedResponse;
 private int aggregatedResponseAge = -1;
 
+public static class OnThisDayFeed extends BaseClient {
+public OnThisDayFeed(@NonNull AggregatedFeedContentClient 
aggregatedClient) {
+super(aggregatedClient);
+}
+
+@Override
+void getCardFromResponse(@NonNull AggregatedFeedContent content, 
@NonNull WikiSite wiki,
+ int age, @NonNull List outCards) {
+if (content.onthisday() != null) {
+List selectedEvents = content.onthisday();
+OnThisDay onThisDay = new OnThisDay();
+onThisDay.setSelected(selectedEvents);
+OnThisDayCard card = new OnThisDayCard(onThisDay, wiki, age);
+

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Allow Major gift contacts with conflicting addresses to merge.

2017-12-05 Thread Eileen (Code Review)

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

Change subject: Allow Major gift contacts with conflicting addresses to merge.
..

Allow Major gift contacts with conflicting addresses to merge.

By removing the conflict we allow all the prioritisation rules developed for 
other
contacts to apply

Unit tests updated to reflect the fact that merge now takes place and the most 
recent
donor's details are now used. Comfortingly all the 'resolvable' conflict tests 
are
unchanged, still selecting the preferable addresses. The 'unresolvable' conflict
tests have been updated to reflect use of most recent donor detail. (a couple
of test names had to be updated to be accurate about that distinction

Bug: T181088
Change-Id: Ie78e3a517b796967976936b4fc93d2352a7aa14e
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 9 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/61/395661/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 0f1961e..6e07755 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2487,29 +2487,16 @@
   $refs['is_major_gift'] = 
_wmf_civicrm_is_merged_contact_major_donor($mainId, $otherId);
 }
 $fieldParts = explode('_', $moveField);
-if (!$refs['is_major_gift']) {
-  if ($fieldParts[2] == 'email') {
-$mainIsOnHold = 
$refs['migration_info']['main_details']['location_blocks']['email'][$fieldParts[3]]['on_hold'];
-$otherIsOnHold = 
$refs['migration_info']['other_details']['location_blocks']['email'][$fieldParts[3]]['on_hold'];
-if ($mainIsOnHold + $otherIsOnHold === 1) {
-  // One is one hold & the other isn't - conflict.
-  return;
-}
-  }
-  unset($refs['fields_in_conflict'][$moveField]);
-}
-else {
-  if (_wmf_civicrm_merge_is_address_conflict_resolvable(
-$refs['migration_info']['rows'][$moveField]['other'],
-$refs['migration_info']['rows'][$moveField]['main'],
-
$refs['migration_info']['other_details']['location_blocks'][$fieldParts[2]][$fieldParts[3]],
-
$refs['migration_info']['main_details']['location_blocks'][$fieldParts[2]][$fieldParts[3]]
-)) {
-  // Actual resolution is in alterLocationMergeData hook.
-  unset($refs['fields_in_conflict'][$moveField]);
-  }
-}
 
+if ($fieldParts[2] == 'email') {
+  $mainIsOnHold = 
$refs['migration_info']['main_details']['location_blocks']['email'][$fieldParts[3]]['on_hold'];
+  $otherIsOnHold = 
$refs['migration_info']['other_details']['location_blocks']['email'][$fieldParts[3]]['on_hold'];
+  if ($mainIsOnHold + $otherIsOnHold === 1) {
+// One is one hold & the other isn't - conflict.
+return;
+  }
+}
+unset($refs['fields_in_conflict'][$moveField]);
   }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie78e3a517b796967976936b4fc93d2352a7aa14e
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] mediawiki...ReadingLists[master]: Fix schema change patch

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

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

Change subject: Fix schema change patch
..


Fix schema change patch

Fixes Ia04a6c42ed7eca2a1c49d6ef109f0359db06ccd4.

Change-Id: Icff06fe7dfb7f4f4dc619b281fc07b29389e425b
---
M sql/patches/03-add-sort-indexes.sql
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/sql/patches/03-add-sort-indexes.sql 
b/sql/patches/03-add-sort-indexes.sql
index e840caa..d8156d0 100644
--- a/sql/patches/03-add-sort-indexes.sql
+++ b/sql/patches/03-add-sort-indexes.sql
@@ -6,6 +6,8 @@
 CREATE INDEX /*i*/rl_user_default ON /*_*/reading_list (rl_user_id, 
rl_is_default);
 CREATE UNIQUE INDEX /*i*/rl_user_deleted_name_id ON /*_*/reading_list 
(rl_user_id, rl_deleted, rl_name, rl_id);
 CREATE UNIQUE INDEX /*i*/rl_user_deleted_updated_id ON /*_*/reading_list 
(rl_user_id, rl_deleted, rl_date_updated, rl_id);
+CREATE UNIQUE INDEX /*i*/rl_user_name_id ON /*_*/reading_list (rl_user_id, 
rl_name, rl_id);
+CREATE UNIQUE INDEX /*i*/rl_user_updated_id ON /*_*/reading_list (rl_user_id, 
rl_deleted, rl_date_updated, rl_id);
 CREATE INDEX /*i*/rl_deleted_updated ON /*_*/reading_list (rl_deleted, 
rl_date_updated);
 
 CREATE UNIQUE INDEX /*i*/rle_list_deleted_title_id ON /*_*/reading_list_entry 
(rle_rl_id, rle_deleted, rle_title, rle_id);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icff06fe7dfb7f4f4dc619b281fc07b29389e425b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Mholloway 
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]: puppetmasters codfw: remove ganglia

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: puppetmasters codfw: remove ganglia
..


puppetmasters codfw: remove ganglia

Bug: T177225
Change-Id: Ia13c513c4ee8671645d2a58573f4ea64e065fb72
---
M hieradata/hosts/puppetmaster2001.yaml
M hieradata/hosts/puppetmaster2002.yaml
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/puppetmaster2001.yaml 
b/hieradata/hosts/puppetmaster2001.yaml
index 8725ce7..a7fea21 100644
--- a/hieradata/hosts/puppetmaster2001.yaml
+++ b/hieradata/hosts/puppetmaster2001.yaml
@@ -1 +1,2 @@
 puppet_major_version: 4
+standard::has_ganglia: false
diff --git a/hieradata/hosts/puppetmaster2002.yaml 
b/hieradata/hosts/puppetmaster2002.yaml
index 8725ce7..a7fea21 100644
--- a/hieradata/hosts/puppetmaster2002.yaml
+++ b/hieradata/hosts/puppetmaster2002.yaml
@@ -1 +1,2 @@
 puppet_major_version: 4
+standard::has_ganglia: false

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Fix schema change patch

2017-12-05 Thread Code Review

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

Change subject: Fix schema change patch
..

Fix schema change patch

Fixes Ia04a6c42ed7eca2a1c49d6ef109f0359db06ccd4.

Change-Id: Icff06fe7dfb7f4f4dc619b281fc07b29389e425b
---
M sql/patches/03-add-sort-indexes.sql
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/sql/patches/03-add-sort-indexes.sql 
b/sql/patches/03-add-sort-indexes.sql
index e840caa..d8156d0 100644
--- a/sql/patches/03-add-sort-indexes.sql
+++ b/sql/patches/03-add-sort-indexes.sql
@@ -6,6 +6,8 @@
 CREATE INDEX /*i*/rl_user_default ON /*_*/reading_list (rl_user_id, 
rl_is_default);
 CREATE UNIQUE INDEX /*i*/rl_user_deleted_name_id ON /*_*/reading_list 
(rl_user_id, rl_deleted, rl_name, rl_id);
 CREATE UNIQUE INDEX /*i*/rl_user_deleted_updated_id ON /*_*/reading_list 
(rl_user_id, rl_deleted, rl_date_updated, rl_id);
+CREATE UNIQUE INDEX /*i*/rl_user_name_id ON /*_*/reading_list (rl_user_id, 
rl_name, rl_id);
+CREATE UNIQUE INDEX /*i*/rl_user_updated_id ON /*_*/reading_list (rl_user_id, 
rl_deleted, rl_date_updated, rl_id);
 CREATE INDEX /*i*/rl_deleted_updated ON /*_*/reading_list (rl_deleted, 
rl_date_updated);
 
 CREATE UNIQUE INDEX /*i*/rle_list_deleted_title_id ON /*_*/reading_list_entry 
(rle_rl_id, rle_deleted, rle_title, rle_id);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icff06fe7dfb7f4f4dc619b281fc07b29389e425b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Design tweak to on-this-day page cards.

2017-12-05 Thread Dbrant (Code Review)

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

Change subject: Design tweak to on-this-day page cards.
..

Design tweak to on-this-day page cards.

Bug: T175995
Change-Id: I5e39f8266219037a500f7b8ec18ba3ab6b18a639
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
M app/src/main/res/layout/item_on_this_day_pages.xml
2 files changed, 9 insertions(+), 2 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
index 9781542..bc5638c 100644
--- 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
+++ 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
@@ -7,6 +7,7 @@
 import android.support.annotation.Nullable;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
@@ -50,6 +51,8 @@
 public void setFields(@NonNull RbPageSummary page) {
 selectedPage = page;
 
pageItemDescTextView.setText(StringUtils.capitalize(page.getDescription()));
+
pageItemDescTextView.setVisibility(TextUtils.isEmpty(page.getDescription()) ? 
View.GONE : View.VISIBLE);
+
pageItemTitleTextView.setMaxLines(TextUtils.isEmpty(page.getDescription()) ? 2 
: 1);
 
pageItemTitleTextView.setText(StringUtil.fromHtml(StringUtils.defaultString(page.getNormalizedTitle(;
 setImage(page.getThumbnailUrl());
 }
diff --git a/app/src/main/res/layout/item_on_this_day_pages.xml 
b/app/src/main/res/layout/item_on_this_day_pages.xml
index b233e5e..931d408 100644
--- a/app/src/main/res/layout/item_on_this_day_pages.xml
+++ b/app/src/main/res/layout/item_on_this_day_pages.xml
@@ -24,7 +24,8 @@
 android:layout_height="match_parent"
 android:layout_weight="1"
 android:gravity="center_vertical"
-android:layout_marginStart="16dp"
+android:paddingLeft="16dp"
+android:paddingRight="16dp"
 android:orientation="vertical">
 
 
 
-
 
 

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

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

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

[MediaWiki-commits] [Gerrit] marvin[master]: Chore: add type checking to error and 404 page props

2017-12-05 Thread Niedzielski (Code Review)

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

Change subject: Chore: add type checking to error and 404 page props
..

Chore: add type checking to error and 404 page props

Validate that the correct types are passed to the error and not found
page modules from the router since these are the only two statically
bundled routes.

Change-Id: Icdc8aa51bfcb208cec6115e77af81559f833e65c
---
M src/common/pages/error.tsx
M src/common/router/router.ts
2 files changed, 15 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/58/395658/1

diff --git a/src/common/pages/error.tsx b/src/common/pages/error.tsx
index 1f85d89..1a13979 100644
--- a/src/common/pages/error.tsx
+++ b/src/common/pages/error.tsx
@@ -2,7 +2,7 @@
 import App from "../components/app/app";
 import Page from "../components/page/page";
 
-interface Props {
+export interface Props {
   error: Error;
 }
 
diff --git a/src/common/router/router.ts b/src/common/router/router.ts
index c4b8f45..eaab9d3 100644
--- a/src/common/router/router.ts
+++ b/src/common/router/router.ts
@@ -6,9 +6,8 @@
   Route
 } from "../../common/router/route";
 import HttpResponse from "../http/http-response";
-
-import notFoundPage from "../pages/not-found";
-import errorPage from "../pages/error";
+import notFoundPage, { Props as notFoundProps } from "../pages/not-found";
+import errorPage, { Props as errorProps } from "../pages/error";
 import { RedirectError } from "../http/fetch";
 
 export interface RouteResponse {
@@ -54,17 +53,23 @@
   );
 }
 
+function respondNotFound(path: string) {
+  const props: notFoundProps = { path };
+  return Promise.resolve({
+status: notFoundPage.status,
+Component: notFoundPage.Component,
+props
+  });
+}
+
 function respondError(error: Error) {
   // Throw up RedirectErrors so that they can be handled by the server/client
   // appropriately
   if (error instanceof RedirectError) throw error;
 
   console.error(`${error.message}\n${error.stack}`); // eslint-disable-line 
no-console
-  return {
-status: errorPage.status,
-Component: errorPage.Component,
-props: { error }
-  };
+  const props: errorProps = { error };
+  return { status: errorPage.status, Component: errorPage.Component, props };
 }
 
 interface PageResolver {
@@ -83,11 +88,7 @@
   return respond(getPage, route, params).catch(respondError);
 }
   }
-  return Promise.resolve({
-status: notFoundPage.status,
-Component: notFoundPage.Component,
-props: { path }
-  });
+  return respondNotFound(path);
 }
   };
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdc8aa51bfcb208cec6115e77af81559f833e65c
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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

[MediaWiki-commits] [Gerrit] marvin[master]: Chore: update router test style to return Promises

2017-12-05 Thread Niedzielski (Code Review)

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

Change subject: Chore: update router test style to return Promises
..

Chore: update router test style to return Promises

• Return Promises to Mocha instead of manually calling `done()`.

• Replace calls to `assert.equal()` with `assert.deepEqual()`. These
  aren't needed but seems like a better default.

Change-Id: Ia59e7dd59ce302346d551c955d382b1907e1dcee
---
M src/common/router/router.test.ts
1 file changed, 22 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/57/395657/1

diff --git a/src/common/router/router.test.ts b/src/common/router/router.test.ts
index 58a1f1e..32bd13e 100644
--- a/src/common/router/router.test.ts
+++ b/src/common/router/router.test.ts
@@ -7,71 +7,58 @@
 import * as HomeModule from "../pages/home";
 import { RedirectError } from "../http/fetch";
 
-import { newRoute, PageModule } from "./route";
+import { newRoute } from "./route";
 import { newRouter } from "./router";
 
-const routes = [
-  newRoute({
-path: "/",
-page: "home"
-  })
-];
+const routes = [newRoute({ path: "/", page: "home" })];
 
 describe("router()", () => {
   describe(".route()", () => {
-it("a known route is resolved", done => {
-  newRouter(routes)
+it("a known route is resolved", () => {
+  return newRouter(routes)
 .route("/")
-.then(() => done());
+.then(rsp => {
+  assert.deepEqual(rsp.status, 200);
+});
 });
 
-// eslint-disable-next-line max-len
-it("an unknown route resolves with the path and appropriate status", done 
=> {
-  newRouter(routes)
+it("an unknown route resolves with the path and appropriate status", () => 
{
+  return newRouter(routes)
 .route("/404")
 .then(res => {
-  assert.equal(res.status, 404);
-  assert.equal(res.props.path, "/404");
-  done();
+  assert.deepEqual(res.status, 404);
+  assert.deepEqual(res.props.path, "/404");
 });
 });
 
 // eslint-disable-next-line max-len
-it("throws redirect errors up for handling on the server/client 
environment", done => {
+it("throws redirect errors up for handling on the server/client 
environment", () => {
   // Page module that throws a redirect
-  const page: PageModule = {
+  const module = {
 default: {
-  getInitialProps() {
-// Trick TS and eslint for tests
-if ((_ => true)()) throw new RedirectError(301, "/redirected-url");
-return Promise.reject("Doesn't matter");
+  getInitialProps(): Promise {
+throw new RedirectError(301, "/redirected-url");
   },
   Component: () => null
 }
   };
 
-  const getPage = (name: string) =>
-name === "redirect"
-  ? Promise.resolve(page)
+  const resolver = (page: string) =>
+page === "redirect"
+  ? Promise.resolve(module)
   : Promise.reject(new Error("No page found"));
 
-  const routes = [
-newRoute({
-  path: "/redirect",
-  page: "redirect"
-})
-  ];
+  const routes = [newRoute({ path: "/redirect", page: "redirect" })];
 
-  newRouter(routes, getPage)
+  return newRouter(routes, resolver)
 .route("/redirect")
 .catch(err => {
   assert.ok(
 err instanceof RedirectError,
 "Error is a redirect error on redirect"
   );
-  assert.equal(err.status, 301);
-  assert.equal(err.url, "/redirected-url");
-  done();
+  assert.deepEqual(err.status, 301);
+  assert.deepEqual(err.url, "/redirected-url");
 });
 });
   });

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia59e7dd59ce302346d551c955d382b1907e1dcee
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Allow Major gift contacts with conflicting addresses to merge.

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

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

Change subject: Allow Major gift contacts with conflicting addresses to merge.
..


Allow Major gift contacts with conflicting addresses to merge.

By removing the conflict we allow all the prioritisation rules developed for 
other
contacts to apply

Unit tests updated to reflect the fact that merge now takes place and the most 
recent
donor's details are now used. Comfortingly all the 'resolvable' conflict tests 
are
unchanged, still selecting the preferable addresses. The 'unresolvable' conflict
tests have been updated to reflect use of most recent donor detail. (a couple
of test names had to be updated to be accurate about that distinction

Bug: T181088
Change-Id: Ie78e3a517b796967976936b4fc93d2352a7aa14e
---
M sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 88 insertions(+), 77 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
index 44fde89..e5eb6cb 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
@@ -221,10 +221,10 @@
 if ($dataSet['is_major_gifts']) {
   $this->contributionCreate(array('contact_id' => $this->contactID2, 
'receive_date' => '2012-01-01', 'total_amount' => 300));
 }
-foreach ($dataSet['contact_1'] as $address) {
+foreach ($dataSet['earliest_donor'] as $address) {
   $this->callAPISuccess($dataSet['entity'], 'create', 
array_merge(array('contact_id' => $this->contactID), $address));
 }
-foreach ($dataSet['contact_2'] as $address) {
+foreach ($dataSet['most_recent_donor'] as $address) {
   $this->callAPISuccess($dataSet['entity'], 'create', 
array_merge(array('contact_id' => $this->contactID2), $address));
 }
 
@@ -265,10 +265,10 @@
 if ($dataSet['is_major_gifts']) {
   $this->contributionCreate(array('contact_id' => $this->contactID, 
'receive_date' => '2012-01-01', 'total_amount' => 300));
 }
-foreach ($dataSet['contact_1'] as $address) {
+foreach ($dataSet['earliest_donor'] as $address) {
   $this->callAPISuccess($dataSet['entity'], 'create', 
array_merge(array('contact_id' => $this->contactID2), $address));
 }
-foreach ($dataSet['contact_2'] as $address) {
+foreach ($dataSet['most_recent_donor'] as $address) {
   $this->callAPISuccess($dataSet['entity'], 'create', 
array_merge(array('contact_id' => $this->contactID), $address));
 }
 
@@ -704,9 +704,12 @@
   /**
* Test that we don't see a city named after a country as the same as a 
country.
*
+   * UPDATE - this is now merged, keeping most recent donor - ie. 1 since
+   * that is the only one with a donation.
+   *
* Bug T176699
*/
-  public function 
testBatchMergeResolvableConflictCityLooksCountryishWithCounty() {
+  public function 
testBatchMergeUnResolvableConflictCityLooksCountryishWithCounty() {
 $this->callAPISuccess('Address', 'create', array(
   'country_id' => 'US',
   'contact_id' => $this->contactID2,
@@ -722,17 +725,26 @@
 $this->contributionCreate(array('contact_id' => $this->contactID, 
'receive_date' => '2010-01-01', 'total_amount' => 500));
 
 $result = $this->callAPISuccess('Job', 'process_batch_merge', array('mode' 
=> 'safe'));
-$this->assertEquals(1, count($result['values']['skipped']));
-$this->assertEquals(0, count($result['values']['merged']));
+$this->assertEquals(0, count($result['values']['skipped']));
+$this->assertEquals(1, count($result['values']['merged']));
+
+$address = $this->callAPISuccessGetSingle('Address', array('contact_id' => 
$this->contactID));
+$this->assertEquals('First on the left after you cross the border', 
$address['street_address']);
+$this->assertEquals('MX', 
CRM_Core_PseudoConstant::countryIsoCode($address['country_id']));
+$this->assertTrue(!isset($address['city']));
+
   }
 
   /**
* Test that we don't see a city named after a country as the same as a 
country
* when it has no country.
*
+   * UPDATE - this is now merged, keeping most recent donor - ie. 1 since
+   * that is the only one with a donation.
+   *
* Bug T176699
*/
-  public function 
testBatchMergeResolvableConflictCityLooksCountryishNoCountry() {
+  public function 
testBatchMergeUnResolvableConflictCityLooksCountryishNoCountry() {
 $this->callAPISuccess('Address', 'create', array(
   'contact_id' => $this->contactID2,
   'city' => 'Mexico',
@@ -747,8 +759,13 @@
 $this->contributionCreate(array('contact_id' => $this->contactID, 
'receive_date' => '2010-01-01', 'total_amount' => 500));
 
 $result = $this->callAPISuccess('Job',

[MediaWiki-commits] [Gerrit] marvin[master]: Fix: return not found wiki pages as 404s

2017-12-05 Thread Niedzielski (Code Review)

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

Change subject: Fix: return not found wiki pages as 404s
..

Fix: return not found wiki pages as 404s

The wiki route may fail when requesting initial properties (page
content) due to the page being nonexistent. Report 404s to the user as
the not found page route instead of the generic error page.

Change-Id: Ifc9a530a53ddf517016b9c732388c617714df983
---
M package.json
M src/common/router/router.ts
2 files changed, 26 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/56/395656/1

diff --git a/package.json b/package.json
index a414068..a33ff03 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
   "bundlesize": [
 {
   "path": "dist/public/index.*.js",
-  "maxSize": "3.7KB"
+  "maxSize": "3.8KB"
 },
 {
   "path": "dist/public/runtime.*.js",
diff --git a/src/common/router/router.ts b/src/common/router/router.ts
index f9c92cc..a5fec2b 100644
--- a/src/common/router/router.ts
+++ b/src/common/router/router.ts
@@ -3,7 +3,7 @@
 import HttpResponse from "../http/http-response";
 import notFoundPage from "../pages/not-found";
 import errorPage from "../pages/error";
-import { RedirectError } from "../http/fetch";
+import { ClientError, RedirectError, FetchError } from "../http/fetch";
 
 export interface RouteResponse {
   chunkName?: string;
@@ -48,40 +48,51 @@
   );
 }
 
-function respondError(error: Error) {
+function respondNotFound(path: string): Promise {
+  return Promise.resolve({
+status: notFoundPage.status,
+Component: notFoundPage.Component,
+props: { path }
+  });
+}
+
+function respondError(path: string, error: Error): Promise 
{
   // Throw up RedirectErrors so that they can be handled by the server/client
   // appropriately
   if (error instanceof RedirectError) throw error;
 
+  if (error instanceof ClientError && error.status === 404) {
+return respondNotFound(path);
+  }
+
+  const status = error instanceof FetchError ? error.status : errorPage.status;
   console.error(`${error.message}\n${error.stack}`); // eslint-disable-line 
no-console
-  return {
-status: errorPage.status,
+  return Promise.resolve({
+status,
 Component: errorPage.Component,
 props: { error }
-  };
+  });
 }
 
 interface PageResolver {
   (name: string): Promise>;
 }
 
-export const newRouter = (
+export function newRouter(
   routes: Route[],
   getPage: PageResolver = getChunk
-) => {
+) {
   return {
 route(path: string): Promise {
   for (const route of routes) {
 const params = route.toParams(path);
 if (params) {
-  return respond(getPage, route, params).catch(respondError);
+  return respond(getPage, route, params).catch(error =>
+respondError(path, error)
+  );
 }
   }
-  return Promise.resolve({
-status: notFoundPage.status,
-Component: notFoundPage.Component,
-props: { path }
-  });
+  return respondNotFound(path);
 }
   };
-};
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc9a530a53ddf517016b9c732388c617714df983
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmasters codfw: remove ganglia

2017-12-05 Thread Dzahn (Code Review)

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

Change subject: puppetmasters codfw: remove ganglia
..

puppetmasters codfw: remove ganglia

Bug: T177225
Change-Id: Ia13c513c4ee8671645d2a58573f4ea64e065fb72
---
M hieradata/hosts/puppetmaster2001.yaml
M hieradata/hosts/puppetmaster2002.yaml
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/395655/1

diff --git a/hieradata/hosts/puppetmaster2001.yaml 
b/hieradata/hosts/puppetmaster2001.yaml
index 8725ce7..a7fea21 100644
--- a/hieradata/hosts/puppetmaster2001.yaml
+++ b/hieradata/hosts/puppetmaster2001.yaml
@@ -1 +1,2 @@
 puppet_major_version: 4
+standard::has_ganglia: false
diff --git a/hieradata/hosts/puppetmaster2002.yaml 
b/hieradata/hosts/puppetmaster2002.yaml
index 8725ce7..a7fea21 100644
--- a/hieradata/hosts/puppetmaster2002.yaml
+++ b/hieradata/hosts/puppetmaster2002.yaml
@@ -1 +1,2 @@
 puppet_major_version: 4
+standard::has_ganglia: false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia13c513c4ee8671645d2a58573f4ea64e065fb72
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] marvin[master]: Chore: remove isomorphic unfetch extras

2017-12-05 Thread Niedzielski (Code Review)

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

Change subject: Chore: remove isomorphic unfetch extras
..

Chore: remove isomorphic unfetch extras

IsomorphicHeaders no longer appear to be necessary. Remove the
definition and update all references to Headers instead.

Change-Id: I38b021e06d25121ec6323b6f7137abfbf3dba8e1
---
M src/common/http/page-http-client.ts
M src/common/marshallers/page-base/page-base-unmarshaller.ts
M src/common/marshallers/page-summary/page-summary-unmarshaller.ts
M src/common/marshallers/page/page-unmarshaller.ts
M src/common/marshallers/utils.test.ts
D src/common/types/isomorphic-unfetch-extras.d.ts
6 files changed, 7 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/54/395654/1

diff --git a/src/common/http/page-http-client.ts 
b/src/common/http/page-http-client.ts
index 46d155e..3ff5bac 100644
--- a/src/common/http/page-http-client.ts
+++ b/src/common/http/page-http-client.ts
@@ -1,4 +1,3 @@
-import { IsomorphicHeaders } from "../types/isomorphic-unfetch-extras";
 import { JSONObject } from "../types/json";
 import { Page, PageLead } from "../models/page/page";
 import { PageTitleID, PageTitlePath } from "../models/page/title";
@@ -41,7 +40,7 @@
 interface UnmarshalParams {
   url: string;
   requestTitleID?: PageTitleID | string;
-  headers: IsomorphicHeaders;
+  headers: Headers;
   json: JSONObject;
 }
 
diff --git a/src/common/marshallers/page-base/page-base-unmarshaller.ts 
b/src/common/marshallers/page-base/page-base-unmarshaller.ts
index 416499c..7e95266 100644
--- a/src/common/marshallers/page-base/page-base-unmarshaller.ts
+++ b/src/common/marshallers/page-base/page-base-unmarshaller.ts
@@ -1,7 +1,6 @@
 import { ETag } from "../../models/etag";
 import { PageGeolocation } from "../../models/page/geolocation";
 import { PageTitleID } from "../../models/page/title";
-import { IsomorphicHeaders } from "../../types/isomorphic-unfetch-extras";
 import { JSONObject } from "../../types/json";
 import { RESTBase } from "../restbase";
 
@@ -26,7 +25,7 @@
   }
 };
 
-export const unmarshalETag = (headers: IsomorphicHeaders): ETag => {
+export const unmarshalETag = (headers: Headers): ETag => {
   const etag = headers.get("ETag") as string;
   const [revision, timeID] = etag.split("/");
   return { revision: parseInt(revision, 10), timeID };
diff --git a/src/common/marshallers/page-summary/page-summary-unmarshaller.ts 
b/src/common/marshallers/page-summary/page-summary-unmarshaller.ts
index f0ece26..42626de 100644
--- a/src/common/marshallers/page-summary/page-summary-unmarshaller.ts
+++ b/src/common/marshallers/page-summary/page-summary-unmarshaller.ts
@@ -1,7 +1,6 @@
 import { PageImage } from "../../models/page/image";
 import { PageSummary } from "../../models/page/summary";
 import { PageTitleID } from "../../models/page/title";
-import { IsomorphicHeaders } from "../../types/isomorphic-unfetch-extras";
 import { JSONObject } from "../../types/json";
 import {
   unmarshalPageTitleID,
@@ -67,7 +66,7 @@
 }: {
   url: string;
   requestTitleID?: PageTitleID | string;
-  headers: IsomorphicHeaders;
+  headers: Headers;
   json: JSONObject;
 }): PageSummary => {
   const type: RESTBase.PageSummary.PageSummary = json as any;
diff --git a/src/common/marshallers/page/page-unmarshaller.ts 
b/src/common/marshallers/page/page-unmarshaller.ts
index 9ed89d8..3cb858a 100644
--- a/src/common/marshallers/page/page-unmarshaller.ts
+++ b/src/common/marshallers/page/page-unmarshaller.ts
@@ -8,7 +8,6 @@
   FilePageImage
 } from "../../models/page/page";
 import { PageUser, PageUserGender } from "../../models/page/user";
-import { IsomorphicHeaders } from "../../types/isomorphic-unfetch-extras";
 import { JSONArray, JSONObject } from "../../types/json";
 import {
   unmarshalPageTitleID,
@@ -91,7 +90,7 @@
 }: {
   url: string;
   requestTitleID?: PageTitleID | string;
-  headers: IsomorphicHeaders;
+  headers: Headers;
   json: JSONObject;
 }): PageLead => {
   const type: RESTBase.PageSections.Lead = json as any;
@@ -151,7 +150,7 @@
 }: {
   url: string;
   requestTitleID?: PageTitleID | string;
-  headers: IsomorphicHeaders;
+  headers: Headers;
   json: JSONObject;
 }): Page => {
   const type: RESTBase.PageSections.Page = json as any;
diff --git a/src/common/marshallers/utils.test.ts 
b/src/common/marshallers/utils.test.ts
index 9b35ebe..656a390 100644
--- a/src/common/marshallers/utils.test.ts
+++ b/src/common/marshallers/utils.test.ts
@@ -1,4 +1,4 @@
-import * as fetch from "node-fetch";
+import { Headers } from "node-fetch";
 import { JSONValue } from "../types/json";
 
 export const reviveFile = (
@@ -8,6 +8,6 @@
 
 const ETAG_REVISION = 802006980;
 const ETAG_TIME_ID = "4f754377-a235-11e7-a776-efb84f18649a";
-export const HEADERS = new fetch.Headers();
+export const HEADERS = new Headers();
 HEADERS.append("etag",

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Media: Exclude .noviewer and .metadata items

2017-12-05 Thread Mholloway (Code Review)

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

Change subject: Media: Exclude .noviewer and .metadata items
..

Media: Exclude .noviewer and .metadata items

Looks like this mostly overlaps with our size- and mime-based filtering.

Bug: T177430
Change-Id: Idfe8664cf187e0811a27dbce94a1f361e42cb910
---
M lib/selectors.js
M test/lib/media/media-test.js
2 files changed, 13 insertions(+), 10 deletions(-)


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

diff --git a/lib/selectors.js b/lib/selectors.js
index 835aac7..213ebed 100644
--- a/lib/selectors.js
+++ b/lib/selectors.js
@@ -1,15 +1,15 @@
 'use strict';
 
 const MediaSelectors = [
-'figure[typeof^=mw:Image]',
-'figure[typeof^=mw:Video]',
-'figure[typeof^=mw:Audio]',
-'span[typeof^=mw:Image]',
-'span[typeof^=mw:Video]',
-'span[typeof^=mw:Audio]',
-'figure-inline[typeof^=mw:Image]',
-'figure-inline[typeof^=mw:Video]',
-'figure-inline[typeof^=mw:Audio]',
+'figure[typeof^=mw:Image]:not(.noviewer,.metadata)',
+'figure[typeof^=mw:Video]:not(.noviewer,.metadata)',
+'figure[typeof^=mw:Audio]:not(.noviewer,.metadata)',
+'span[typeof^=mw:Image]:not(.noviewer,.metadata)',
+'span[typeof^=mw:Video]:not(.noviewer,.metadata)',
+'span[typeof^=mw:Audio]:not(.noviewer,.metadata)',
+'figure-inline[typeof^=mw:Image]:not(.noviewer,.metadata)',
+'figure-inline[typeof^=mw:Video]:not(.noviewer,.metadata)',
+'figure-inline[typeof^=mw:Audio]:not(.noviewer,.metadata)',
 'span.IPA+small a[rel=mw:MediaLink]'
 ];
 
diff --git a/test/lib/media/media-test.js b/test/lib/media/media-test.js
index 7ab95bd..2fd8020 100644
--- a/test/lib/media/media-test.js
+++ b/test/lib/media/media-test.js
@@ -29,12 +29,15 @@
 const noTypeSpan = '';
 const noTypeFigureInline = '';
 
+const imageNoViewer = '';
+const imageMetadata = '';
+
 const images = [imageFigure, imageSpan, imageFigureInline, imageThumbFigure, 
imageThumbSpan, imageThumbFigureInline];
 const videos = [videoFigure, videoSpan, videoFigureInline, videoThumbFigure, 
videoThumbSpan, videoThumbFigureInline];
 const audio = [audioFigure, audioSpan, audioFigureInline];
 
 const validItems = images.concat(videos).concat(audio);
-const invalidItems = [noTypeFigure, noTypeSpan, noTypeFigureInline];
+const invalidItems = [noTypeFigure, noTypeSpan, noTypeFigureInline, 
imageNoViewer, imageMetadata];
 
 const imageWithCaption =
 '' +

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Prevent results from wiggling

2017-12-05 Thread Petar.petkovic (Code Review)

Petar.petkovic has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395652 )

Change subject: Prevent results from wiggling
..

Prevent results from wiggling

The patch Ifecaaff572 introduces clearing to the right for the first
result list item, when grouping is disabled. The difference between
cleared vs non-cleared result becomes visible when legend is toggled,
causing really small (around a pixel), but annoying wiggle.

Change-Id: Ida6fb6f8ad0caf666258e3f1e770c6da9e24af58
---
M resources/src/mediawiki.special/mediawiki.special.changeslist.css
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/395652/1

diff --git a/resources/src/mediawiki.special/mediawiki.special.changeslist.css 
b/resources/src/mediawiki.special/mediawiki.special.changeslist.css
index 734666f..9521a2b 100644
--- a/resources/src/mediawiki.special/mediawiki.special.changeslist.css
+++ b/resources/src/mediawiki.special/mediawiki.special.changeslist.css
@@ -45,8 +45,12 @@
display: none;
 }
 
+.mw-changeslist-legend.mw-collapsed {
+   margin: 0;
+}
+
 /* Prevent pushing down of content if legend is initially collapsed */
-.mw-changeslist-legend.mw-collapsed ~ ul.special > li:first-child {
+.mw-changeslist-legend.mw-collapsed ~ ul:first-of-type > li:first-child {
clear: right;
 }
 
@@ -55,5 +59,4 @@
background-color: #fff;
position: absolute;
right: 0;
-   margin-top: -0.5em;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida6fb6f8ad0caf666258e3f1e770c6da9e24af58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic 

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Fix $.fn.hover is deprecated

2017-12-05 Thread Albert221 (Code Review)

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

Change subject: Fix $.fn.hover is deprecated
..

Fix $.fn.hover is deprecated

Change-Id: I6a2cfbd26535c3e778a811e2f8ed5939123d6571
---
M resources/dist/index.js
M resources/dist/index.js.json
M src/ui/renderer.js
3 files changed, 4 insertions(+), 3 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a2cfbd26535c3e778a811e2f8ed5939123d6571
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Albert221 

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

[MediaWiki-commits] [Gerrit] mediawiki...MassAction[master]: Fixed Issues With Internationalization

2017-12-05 Thread Ryan10145 (Code Review)

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

Change subject: Fixed Issues With Internationalization
..

Fixed Issues With Internationalization

Bug: T96417
Change-Id: I71285492f8eba6166ede13fd8e9ff7bcca9882c7
---
M i18n/en.json
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassAction 
refs/changes/50/395650/1

diff --git a/i18n/en.json b/i18n/en.json
index 2fe10ee..7b0ae63 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -22,10 +22,10 @@
"massaction-specialpage-actions-section":"Actions",
"massaction-target-wikipage-titleregexmatcher-regex-help":"Regex 
characters allowed: . * ?",
"massaction-queued-count": "Queued [[Special:MassAction|mass action]] 
jobs",
-   "massaction-append-desc": "Appends $1 characters to Page $2",
+   "massaction-append-desc": "Appends $1 
{{PLURAL:$1|character|characters}} to page \"$2\"",
"massaction-append-trimmed": "... (trimmed to 25 characters)",
"massaction-regexreplace-desc": "Performs a regex replace on the 
content using the pattern",
-   "massaction-titleregexmatcher-desc": "Matches pages with titles 
matching regex '$1'",
-   "massaction-titleregexmatcher-enabled": "Title Regex Matcher Enabled?",
-   "massaction-titleregexmatcher-label": "Title Regex"
+   "massaction-titleregexmatcher-desc": "Matches pages with titles 
matching regex \"$1\"",
+   "massaction-titleregexmatcher-enabled": "Title regex matcher enabled?",
+   "massaction-titleregexmatcher-label": "Title regex"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71285492f8eba6166ede13fd8e9ff7bcca9882c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassAction
Gerrit-Branch: master
Gerrit-Owner: Ryan10145 

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[specialpages]: Optimise Special:MobileOptions for tablet display

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

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

Change subject: Optimise Special:MobileOptions for tablet display
..


Optimise Special:MobileOptions for tablet display

Bug: T180095
Change-Id: I0ef0ce914a360848f8f66b39c40588f3fa04647c
---
M resources/skins.minerva.base.styles/ui.less
M resources/skins.minerva.tablet.styles/common.less
M skin.json
A skinStyles/mobile.special.mobileoptions.styles/minerva.less
4 files changed, 25 insertions(+), 2 deletions(-)

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



diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index 2fbfd81..d26b9bb 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -446,6 +446,8 @@
 .pre-content,
 // Form only pages e.g Special:MobileOptions
 #mw-content-text > form .oo-ui-fieldLayout-body,
+// Save button on Special:MobileOptions
+#mw-content-text > form > .oo-ui-widget,
 .content,
 .post-content {
margin: 0 @contentMargin;
diff --git a/resources/skins.minerva.tablet.styles/common.less 
b/resources/skins.minerva.tablet.styles/common.less
index 9fe89d3..5c57993 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -138,8 +138,6 @@
.post-content,
// Form only pages e.g. Special:MobileOptions
#mw-content-text > form,
-   // Form only pages e.g Special:MobileOptions
-   #mw-content-text > form .oo-ui-fieldLayout-body,
// FIXME: remove need for id selector
#mw-mf-page-center .pointer-overlay {
margin-left: auto;
diff --git a/skin.json b/skin.json
index c81b5c1..b731766 100644
--- a/skin.json
+++ b/skin.json
@@ -39,6 +39,9 @@
},
"ResourceModuleSkinStyles": {
"minerva": {
+   "mobile.special.mobileoptions.styles": [
+   
"skinStyles/mobile.special.mobileoptions.styles/minerva.less"
+   ],
"mediawiki.special.userlogin.common.styles": [

"skinStyles/mediawiki.special.userlogin.common.styles/minerva.less"
],
diff --git a/skinStyles/mobile.special.mobileoptions.styles/minerva.less 
b/skinStyles/mobile.special.mobileoptions.styles/minerva.less
new file mode 100644
index 000..f326b5e
--- /dev/null
+++ b/skinStyles/mobile.special.mobileoptions.styles/minerva.less
@@ -0,0 +1,20 @@
+@import 'minerva.variables';
+
+@media all and ( min-width: @deviceWidthTablet ) {
+   .ns-special .pre-content {
+   background: #fff;
+
+   .tagline,
+   h1 {
+   margin: 0 @contentMargin;
+   }
+   }
+
+   .ns-special #content {
+   background: @colorGray14;
+
+   form {
+   background: #fff;
+   }
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ef0ce914a360848f8f66b39c40588f3fa04647c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Remove apache dependency from ELK role

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

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

Change subject: Remove apache dependency from ELK role
..


Remove apache dependency from ELK role

Kibana no longer needs an Apche front, it runs
its own web server on port 5601

Change-Id: I77834f8676df4d340cbb2d615cfc1041e2491990
---
M puppet/modules/role/manifests/elk.pp
D puppet/modules/role/templates/elk/apache.conf.erb
2 files changed, 2 insertions(+), 56 deletions(-)

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



diff --git a/puppet/modules/role/manifests/elk.pp 
b/puppet/modules/role/manifests/elk.pp
index 48825b3..40c8371 100644
--- a/puppet/modules/role/manifests/elk.pp
+++ b/puppet/modules/role/manifests/elk.pp
@@ -6,6 +6,8 @@
 # === Parameters
 # [*vhost_name*]
 #   vhost_name of Kibana web interface. Default 'logstash.local.wmftest.net'.
+#   Kibana runs on the default 5601 port.
+#   To access it, the default is thus to browse to 
http://logstash.local.wmftest.net:5601/
 #
 class role::elk (
 $vhost_name,
@@ -17,9 +19,6 @@
 include ::logstash
 include ::logstash::output::elasticsearch
 include ::kibana
-include ::apache::mod::headers
-include ::apache::mod::proxy
-include ::apache::mod::proxy_http
 
 ## Configure Logstash
 logstash::input::syslog { 'syslog':
@@ -68,11 +67,6 @@
 unless  => template('role/elk/check-logstash-template.erb'),
 require => Service['elasticsearch'],
 before  => Class['::logstash::output::elasticsearch'],
-}
-
-## Configure Kibana
-apache::site { $vhost_name:
-content => template('role/elk/apache.conf.erb'),
 }
 
 ## Configure MediaWiki
diff --git a/puppet/modules/role/templates/elk/apache.conf.erb 
b/puppet/modules/role/templates/elk/apache.conf.erb
deleted file mode 100644
index f437372..000
--- a/puppet/modules/role/templates/elk/apache.conf.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-ServerName <%= @vhost_name %>
-
-DocumentRoot <%= scope['::kibana::deploy_dir'] %>/src
-
-
-  Options FollowSymLinks
-  AllowOverride None
-  Require all denied
-
-
-
-  Require all granted
-
-
-/src>
-  Require all granted
-
-
-alias /config.js /etc/kibana/config.js
-
-ProxyRequests Off
-http://127.0.0.1:9200>
-  ProxySet connectiontimeout=5 timeout=90 retry=0
-
-
-Header set Cache-Control "public, must-revalidate, max-age=3600"
-
-# Elasticsearch searches
-
-  ProxyPassMatch http://127.0.0.1:9200/$1
-  ProxyPassReverse http://127.0.0.1:9200/$1
-  Header set Cache-Control "private, must-revalidate, max-age=0"
-  Header set Expires "Thu, 01 Jan 1970 00:00:00 GMT"
-
-
-# Elasticsearch meta-data requests
-
-  ProxyPassMatch http://127.0.0.1:9200/$1
-  ProxyPassReverse http://127.0.0.1:9200/$1
-  Header set Cache-Control "public, must-revalidate, max-age=900"
-
-
-# Storage/retrieval of saved dashboards via elasticsearch
-
-  ProxyPassMatch http://127.0.0.1:9200/$1$2
-  ProxyPassReverse http://127.0.0.1:9200/$1$2
-  Header set Cache-Control "public, must-revalidate, max-age=900"
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77834f8676df4d340cbb2d615cfc1041e2491990
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: EBernhardson 
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]: Add stripe to initial install

2017-12-05 Thread Eileen (Code Review)

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

Change subject: Add stripe to initial install
..

Add stripe to initial install

Bug T172423

Change-Id: If50f42af300518b8c180652f46d4608d824b96e7
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/49/395649/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index f739ff9..543b696 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -68,6 +68,7 @@
   wmf_civicrm_update_7525();
   wmf_civicrm_update_7526();
   wmf_civicrm_update_7530();
+  wmf_civicrm_update_7590();
 }
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If50f42af300518b8c180652f46d4608d824b96e7
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] integration/config[master]: docker: keep build-essential in npm images

2017-12-05 Thread Hashar (Code Review)

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

Change subject: docker: keep build-essential in npm images
..

docker: keep build-essential in npm images

Some node modules require compiling files, typically for binding to a
lib. Keep build-essential around.

Change-Id: I3b5dec688ad639ea1c7f2ce8b03d7f89f03b98da
---
M dockerfiles/npm-stretch/Dockerfile
M dockerfiles/npm/Dockerfile
2 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/48/395648/1

diff --git a/dockerfiles/npm-stretch/Dockerfile 
b/dockerfiles/npm-stretch/Dockerfile
index 872d9f2..6822274 100644
--- a/dockerfiles/npm-stretch/Dockerfile
+++ b/dockerfiles/npm-stretch/Dockerfile
@@ -11,7 +11,6 @@
 nodejs-legacy \
 ruby ruby-dev rubygems-integration build-essential && \
 gem install --no-rdoc --no-ri jsduck && \
-apt-get remove -y build-essential && apt-get autoremove -y && \
 apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # If no volume is mounted, make sure /cache exists
diff --git a/dockerfiles/npm/Dockerfile b/dockerfiles/npm/Dockerfile
index 9b68bd8..cce6907 100644
--- a/dockerfiles/npm/Dockerfile
+++ b/dockerfiles/npm/Dockerfile
@@ -1,13 +1,13 @@
 FROM wmfreleng/ci-jessie:latest
 
 # Install nodejs-legacy to provide /usr/bin/node alias
+# ruby/etc for jsduck
+# build-essential for node-gyp (native modules and compilation)
 RUN apt-get update && \
 apt-get install --yes \
 nodejs-legacy npm \
-# ruby/etc for jsduck
 ruby ruby2.1 ruby2.1-dev rubygems-integration build-essential && \
 gem install --no-rdoc --no-ri jsduck && \
-apt-get remove -y build-essential && apt-get autoremove -y && \
 apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # DO NOT CHANGE VERSION WITHOUT INVOLVING Krinkle OR hashar

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for d81158f36c91

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

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

Change subject: Fix for d81158f36c91
..


Fix for d81158f36c91

Change-Id: I9b942d508c9475dfb78502eca66509c1881bd15d
---
M includes/CargoUtils.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/CargoUtils.php b/includes/CargoUtils.php
index 76bf893..7238401 100644
--- a/includes/CargoUtils.php
+++ b/includes/CargoUtils.php
@@ -387,7 +387,7 @@
// Add a newline at the beginning if it looks like the value
// starts with a bulleted or numbered list, to make sure that
// the first line gets formatted correctly.
-   if ( strpos( $value, '*' ) === 0 || strpos( $value, '*' ) === 0 
) {
+   if ( strpos( $value, '*' ) === 0 || strpos( $value, '#' ) === 0 
) {
$value = "\n" . $value;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Catch uncatched SerializationException in EntityContent::get...

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

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

Change subject: Catch uncatched SerializationException in 
EntityContent::getNativeData
..


Catch uncatched SerializationException in EntityContent::getNativeData

This is quite obviously a bug. Whenever a serializer is called, code must
expect the serialization to fail, and handle the failure appropriately.
However, this was never necessary here because it was impossible to feed an
"invalid" entity to this serializer. The concept of an entity that can not
be serialized never existed, but exists now with StorageLexemeSerializer.

Personally I think StorageLexemeSerializer violates a contract and must be
changed. But this is independend from this patch. This try-catch should be
here no matter what.

I decided to simply return the entity object as a fallback. Could also
return an empty array, "really anything", as the interface says.

Bug: T182082
Change-Id: I7a2fec4f0ed6b1809806f6a56b64fc1c78c17abe
---
M repo/includes/Content/EntityContent.php
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/repo/includes/Content/EntityContent.php 
b/repo/includes/Content/EntityContent.php
index da186ac..bcecb60 100644
--- a/repo/includes/Content/EntityContent.php
+++ b/repo/includes/Content/EntityContent.php
@@ -16,6 +16,7 @@
 use ParserOptions;
 use ParserOutput;
 use RuntimeException;
+use Serializers\Exceptions\SerializationException;
 use Status;
 use Title;
 use User;
@@ -450,7 +451,11 @@
 
// NOTE: this may or may not be consistent with what 
EntityContentCodec does!
$serializer = 
WikibaseRepo::getDefaultInstance()->getAllTypesEntitySerializer();
-   return $serializer->serialize( $this->getEntity() );
+   try {
+   return $serializer->serialize( $this->getEntity() );
+   } catch ( SerializationException $ex ) {
+   return $this->getEntity();
+   }
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a2fec4f0ed6b1809806f6a56b64fc1c78c17abe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
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...MassAction[master]: Revert "Added Internationalization For Some Strings"

2017-12-05 Thread Ryan10145 (Code Review)

Hello Florianschmidtwelzow, D3r1ck01, Addshore, jenkins-bot, Siebrand,

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

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

to review the following change.


Change subject: Revert "Added Internationalization For Some Strings"
..

Revert "Added Internationalization For Some Strings"

This reverts commit d08205d62c503fd331d6446ac2650ad75c7fd52f.

Change-Id: Iaa249b6196966024a329956f22a8fd348ef53ea1
---
M i18n/en.json
M i18n/qqq.json
M src/MassActionSpecialPage.php
M src/Targets/WikiPage/Actions/AppendAction.php
M src/Targets/WikiPage/Actions/RegexReplaceAction.php
M src/Targets/WikiPage/Matchers/TitleRegexMatcher.php
6 files changed, 9 insertions(+), 24 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 2fe10ee..8cc2e6a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,7 +10,6 @@
"massaction-errormessage": "Error: $1",
"massaction-newtask": "New task",
"massaction-viewtask": "View task",
-   "massaction-registeredtask": "Task registered and job queued!",
"massactionsavechange": "Save change",
"specialpages-group-MassAction": "MassAction",
"log-name-massaction": "MassAction",
@@ -21,11 +20,5 @@
"massaction-specialpage-matchers-section":"Matchers",
"massaction-specialpage-actions-section":"Actions",
"massaction-target-wikipage-titleregexmatcher-regex-help":"Regex 
characters allowed: . * ?",
-   "massaction-queued-count": "Queued [[Special:MassAction|mass action]] 
jobs",
-   "massaction-append-desc": "Appends $1 characters to Page $2",
-   "massaction-append-trimmed": "... (trimmed to 25 characters)",
-   "massaction-regexreplace-desc": "Performs a regex replace on the 
content using the pattern",
-   "massaction-titleregexmatcher-desc": "Matches pages with titles 
matching regex '$1'",
-   "massaction-titleregexmatcher-enabled": "Title Regex Matcher Enabled?",
-   "massaction-titleregexmatcher-label": "Title Regex"
+   "massaction-queued-count": "Queued [[Special:MassAction|mass action]] 
jobs"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1d20352..a261986 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -12,7 +12,6 @@
"massaction-errormessage": "Error message for special 
pages\n{{Identical|Error}}",
"massaction-newtask": "New Task special page title",
"massaction-viewtask": "View Task special page title",
-   "massaction-registeredtask": "Message for when a task has been 
registered and the corresponding job has been added to the queue for later 
completion",
"massactionsavechange": "Save Change special page 
title\n{{Identical|Save changes}}",
"specialpages-group-MassAction": "MassAction special page 
group\n{{doc-special-group}}",
"log-name-massaction": "Name for the MassAction log type",
@@ -23,11 +22,5 @@
"massaction-specialpage-matchers-section": "Title for the section 
containing options for Matchers when creating a new task",
"massaction-specialpage-actions-section": "Title for the section 
containing options for Actions when creating a new task\n{{Identical|Action}}",
"massaction-target-wikipage-titleregexmatcher-regex-help": "Help 
message for the WikiPage TitleRegexMatcher Regex form entry box",
-   "massaction-queued-count": "Text for row on [[Special:Statistics]].",
-   "massaction-append-desc": "Description for an action that appends 
characters to a page. Parameters:\n* $1 - the amount of characters appended\n* 
$2 - a snippet of the page that is being appended to",
-   "massaction-append-trimmed": "Message that shows that a snippet of text 
has been truncated past 25 characters",
-   "massaction-regexreplace-desc": "Description for the action that 
replaces the following regex pattern",
-   "massaction-titleregexmatcher-desc": "Description for the matcher that 
matches the following regex pattern in titles. Parameters:\n* $1 - the regex 
pattern that is being matched",
-   "massaction-titleregexmatcher-enabled": "Label for whether or not the 
matcher for title regex is enabled",
-   "massaction-titleregexmatcher-label": "Label for the title regex 
matcher"
+   "massaction-queued-count": "Text for row on [[Special:Statistics]]."
 }
diff --git a/src/MassActionSpecialPage.php b/src/MassActionSpecialPage.php
index ece1dc1..a49ff5e 100644
--- a/src/MassActionSpecialPage.php
+++ b/src/MassActionSpecialPage.php
@@ -498,7 +498,7 @@
$job = new TargetListJob( Title::newMainPage(), array( 'taskid' 
=> $task->getId() ) );
JobQueueGroup::singleton()->push( $job );
 
-   $this->getOutput()->addHTML( '' . wfMessage( 
'massaction-registeredtask' )->escaped() . '' );
+   $this->getOutput()->addHTML( 'Task

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for d81158f36c91

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

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

Change subject: Fix for d81158f36c91
..

Fix for d81158f36c91

Change-Id: I9b942d508c9475dfb78502eca66509c1881bd15d
---
M includes/CargoUtils.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/46/395646/2

diff --git a/includes/CargoUtils.php b/includes/CargoUtils.php
index 76bf893..7238401 100644
--- a/includes/CargoUtils.php
+++ b/includes/CargoUtils.php
@@ -387,7 +387,7 @@
// Add a newline at the beginning if it looks like the value
// starts with a bulleted or numbered list, to make sure that
// the first line gets formatted correctly.
-   if ( strpos( $value, '*' ) === 0 || strpos( $value, '*' ) === 0 
) {
+   if ( strpos( $value, '*' ) === 0 || strpos( $value, '#' ) === 0 
) {
$value = "\n" . $value;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove major-gifts specific dedupe code.

2017-12-05 Thread Eileen (Code Review)

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

Change subject: Remove major-gifts specific dedupe code.
..

Remove major-gifts specific dedupe code.

I struggled to make myself do this as I seem to believe it will be back in some 
form
However, trying to convince myself to 'trust in git'. Have put as a separate 
patch
for easier retrieval...

Bug: T181088
Change-Id: Id89df916d7e1e865547eb285d6a78c9fe44e95be
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 0 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/45/395645/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 6e07755..d1c525d 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2483,9 +2483,6 @@
   }
 
   if (substr($moveField, 0, 13) === 'move_location') {
-if (!isset($refs['is_major_gift'])) {
-  $refs['is_major_gift'] = 
_wmf_civicrm_is_merged_contact_major_donor($mainId, $otherId);
-}
 $fieldParts = explode('_', $moveField);
 
 if ($fieldParts[2] == 'email') {
@@ -2958,28 +2955,6 @@
  */
 function _wmf_civicrm_count_capital_letters($string) {
   return strlen(preg_replace('/[^A-Z]+/', '', $string));
-}
-
-/**
- * Has the combined contact given $500 or more?
- *
- * @param int $mainId
- * @param int $otherId
- *
- * @return bool
- *
- * @throws \CiviCRM_API3_Exception
- */
-function _wmf_civicrm_is_merged_contact_major_donor($mainId, $otherId) {
-  $total = 0;
-  $donations = civicrm_api3('Contribution', 'get', array(
-'return' => 'total_amount',
-'contact_id' => array('IN' => array($mainId, $otherId)),
-  ));
-  foreach ($donations['values'] as $donation) {
-$total += $donation['total_amount'];
-  }
-  return ($total >= 500) ? TRUE : FALSE;
 }
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id89df916d7e1e865547eb285d6a78c9fe44e95be
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...ElectronPdfService[master]: Remove wrong FIXME

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

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

Change subject: Remove wrong FIXME
..


Remove wrong FIXME

We're not going to decommission Extension:Collection anytime soon. The
FIXME meant decommissioning OCG, but there's no logic related to OCG in
that piece of code there.

Bug: T176755
Change-Id: I1922eb7c751f3947f58ce4512a5e0b4d2da6e1e6
---
M src/ElectronPdfServiceHooks.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/src/ElectronPdfServiceHooks.php b/src/ElectronPdfServiceHooks.php
index e470c1d..9b3bfa1 100644
--- a/src/ElectronPdfServiceHooks.php
+++ b/src/ElectronPdfServiceHooks.php
@@ -31,7 +31,6 @@
return true;
}
 
-   // FIXME: remove logic related to Extension:Collection once we 
decommission it: T176755.
if ( $config->has( 'CollectionFormats' ) && array_key_exists( 
'coll-print_export', $bar ) ) {
$index = self::getIndexOfDownloadPdfSidebarItem(
$bar['coll-print_export'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1922eb7c751f3947f58ce4512a5e0b4d2da6e1e6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Rename WikibaseQualityConstraintsHooks function

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

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

Change subject: Rename WikibaseQualityConstraintsHooks function
..


Rename WikibaseQualityConstraintsHooks function

It now checks not only whether the statements were changed, but whether
the *constraint* statements changed, so let’s update the method name to
reflect that.

Bug: T182110
Change-Id: I6fc3d8dbe49ede6833007e76d21403639ec7e1a7
---
M WikibaseQualityConstraintsHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/WikibaseQualityConstraintsHooks.php 
b/WikibaseQualityConstraintsHooks.php
index 05b4316..9970f27 100644
--- a/WikibaseQualityConstraintsHooks.php
+++ b/WikibaseQualityConstraintsHooks.php
@@ -36,7 +36,7 @@
 
public static function onWikibaseChange( Change $change ) {
if ( MediaWikiServices::getInstance()->getMainConfig()->get( 
'WBQualityConstraintsEnableConstraintsImportFromStatements' ) &&
-   self::isPropertyStatementsChange( $change )
+   self::isConstraintStatementsChange( $change )
) {
/** @var EntityChange $change */
$title = Title::newMainPage();
@@ -47,7 +47,7 @@
}
}
 
-   private static function isPropertyStatementsChange( Change $change ) {
+   private static function isConstraintStatementsChange( Change $change ) {
if ( !( $change instanceof EntityChange ) ||
 $change->getAction() !== EntityChange::UPDATE ||
 !( $change->getEntityId() instanceof PropertyId )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6fc3d8dbe49ede6833007e76d21403639ec7e1a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Ladsgroup 
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...Cargo[master]: Added automatic minimizing of large texts in Special:CargoTa...

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

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

Change subject: Added automatic minimizing of large texts in Special:CargoTables
..


Added automatic minimizing of large texts in Special:CargoTables

Change-Id: Ieacab0f45e8804eb286a90728d9aa9f9e9b7b62a
---
M Cargo.php
M extension.json
A libs/Cargo.js
M specials/CargoTables.php
4 files changed, 52 insertions(+), 2 deletions(-)

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



diff --git a/Cargo.php b/Cargo.php
index be5e8cb..5ccba75 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -171,7 +171,12 @@
 // ResourceLoader modules
 $wgResourceModules += array(
'ext.cargo.main' => array(
+   'scripts' => 'libs/Cargo.js',
'styles' => 'Cargo.css',
+   'messages' => array(
+   'show',
+   'hide'
+   ),
'position' => 'top',
'localBasePath' => __DIR__,
'remoteExtPath' => 'Cargo'
diff --git a/extension.json b/extension.json
index af542fa..5a0debe 100644
--- a/extension.json
+++ b/extension.json
@@ -114,7 +114,12 @@
},
"ResourceModules": {
"ext.cargo.main": {
+   "scripts": "libs/Cargo.js",
"styles": "Cargo.css",
+   "messages": [
+   "show",
+   "hide"
+   ],
"position": "top"
},
"ext.cargo.recreatedata": {
diff --git a/libs/Cargo.js b/libs/Cargo.js
new file mode 100644
index 000..fce9838
--- /dev/null
+++ b/libs/Cargo.js
@@ -0,0 +1,28 @@
+/**
+ * Cargo.js
+ *
+ * JavaScript utility functionality for the Cargo extension.
+ *
+ * @author Yaron Koren
+ */
+
+( function ( $, mw ) {
+
+var showText = '[' + mw.msg( 'show' ) + ']';
+var hideText = '[' + mw.msg( 'hide' ) + ']';
+
+$('span.cargoMinimizedText')
+   .hide()
+   .parent().append('' + showText + '');
+
+$('a.cargoToggle').click( function() {
+   if ( $(this).text() == showText ) {
+   $(this).siblings('.cargoMinimizedText').show(400);
+   $(this).text(hideText);
+   } else {
+   $(this).siblings('.cargoMinimizedText').hide(400);
+   $(this).text(showText);
+   }
+});
+
+}( jQuery, mediaWiki ) );
\ No newline at end of file
diff --git a/specials/CargoTables.php b/specials/CargoTables.php
index 117200a..5ad69ac 100644
--- a/specials/CargoTables.php
+++ b/specials/CargoTables.php
@@ -22,6 +22,8 @@
$user = $this->getUser();
$this->setHeaders();
 
+   $out->addModules( 'ext.cargo.main' );
+
if ( $tableName == '' ) {
$out->addHTML( $this->displayListOfTables() );
return;
@@ -177,6 +179,18 @@
$queryDisplayer = CargoQueryDisplayer::newFromSQLQuery( 
$sqlQuery );
$formattedQueryResults = 
$queryDisplayer->getFormattedQueryResults( $queryResults );
 
+   // Modify values to minimize cells that have more than a
+   // certain number of characters, to make the table more
+   // readable.
+   $maxChars = 300;
+   foreach ( $formattedQueryResults as $rowNum => $row ) {
+   foreach ( $row as $colNum => $value ) {
+   if ( strlen( $value ) > $maxChars && strlen( 
strip_tags( $value ) ) > $maxChars ) {
+   
$formattedQueryResults[$rowNum][$colNum] = '' 
. $value . '';
+   }
+   }
+   }
+
$displayParams = array();
 
$tableFormat = new CargoTableFormat( $this->getOutput() );
@@ -260,8 +274,6 @@
 * links and information for each one.
 */
function displayListOfTables() {
-   $this->getOutput()->addModules( 'ext.cargo.main' );
-
$text = '';
 
// Show a note if there are currently Cargo populate-data jobs

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[specialpages]: Correct alignment of save button in Special:MobileOptions

2017-12-05 Thread Jdlrobson (Code Review)

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

Change subject: Correct alignment of save button in Special:MobileOptions
..

Correct alignment of save button in Special:MobileOptions

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/44/395644/1

diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index 2fbfd81..d26b9bb 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -446,6 +446,8 @@
 .pre-content,
 // Form only pages e.g Special:MobileOptions
 #mw-content-text > form .oo-ui-fieldLayout-body,
+// Save button on Special:MobileOptions
+#mw-content-text > form > .oo-ui-widget,
 .content,
 .post-content {
margin: 0 @contentMargin;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3970ace69c0d3fc4ba5ea0dd7eeaf69077a48200
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Media: Add page count for paged items (PDF, TIFF)

2017-12-05 Thread Mholloway (Code Review)

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

Change subject: Media: Add page count for paged items (PDF, TIFF)
..

Media: Add page count for paged items (PDF, TIFF)

Bug: T177430
Change-Id: I94b5c6222a99c7474b019191255e7bb179e23f41
---
M lib/media.js
M spec.yaml
M test/diff/results/page_media-enwiki-Hummingbird.json
M test/diff/results/page_media-enwiki-Ko%C5%A1ice.json
4 files changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/lib/media.js b/lib/media.js
index dce92e6..aeae4e8 100644
--- a/lib/media.js
+++ b/lib/media.js
@@ -148,6 +148,7 @@
 height: info.mediatype === 'AUDIO' ? undefined : info.height,
 mime: info.mime,
 },
+page_count: info.pagecount,
 file_page: `https://commons.wikimedia.org/wiki/${canonical}`,
 duration: meta && (meta.length || meta.playtime_seconds) || 
undefined,
 artist: ext && ext.Artist && ext.Artist.value,
@@ -184,6 +185,7 @@
 'url',
 'dimensions',
 'mime',
+'size',
 'thumbmime',
 'mediatype',
 'metadata',
diff --git a/spec.yaml b/spec.yaml
index aabb1dc..714ce55 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -1285,6 +1285,9 @@
 size:
   type: integer
   description: the original file size in bytes (sizes are not provided 
for video derivatives)
+  page_count:
+type: integer
+description: page count, if the item is a paged item (PDF or TIFF)
   file_page:
 type: string
 description: Full URL to the file page for the item on Wikimedia 
Commons
diff --git a/test/diff/results/page_media-enwiki-Hummingbird.json 
b/test/diff/results/page_media-enwiki-Hummingbird.json
index b62bb3f..1bf7b9c 100644
--- a/test/diff/results/page_media-enwiki-Hummingbird.json
+++ b/test/diff/results/page_media-enwiki-Hummingbird.json
@@ -320,6 +320,7 @@
 "height": 2083,
 "mime": "image/tiff"
   },
+  "page_count": 1,
   "file_page": 
"https://commons.wikimedia.org/wiki/File:Velvet-purple_coronets_sequence.tif;,
   "artist": "Unherdable",
   "credit": "Own work",
diff --git a/test/diff/results/page_media-enwiki-Ko%C5%A1ice.json 
b/test/diff/results/page_media-enwiki-Ko%C5%A1ice.json
index 40c38e8..a2eca8a 100644
--- a/test/diff/results/page_media-enwiki-Ko%C5%A1ice.json
+++ b/test/diff/results/page_media-enwiki-Ko%C5%A1ice.json
@@ -23,6 +23,7 @@
 "height": 2202,
 "mime": "image/tiff"
   },
+  "page_count": 1,
   "file_page": 
"https://commons.wikimedia.org/wiki/File:Fő_utcza,_Kassa_-_1902_(1).tif",
   "artist": "Unknown photographer (scanned by Derzsi Elekes 
Andor)",
   "credit": "Courtesy of Derzsi Elekes Andor",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added automatic minimizing of large texts in Special:CargoTa...

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

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

Change subject: Added automatic minimizing of large texts in Special:CargoTables
..

Added automatic minimizing of large texts in Special:CargoTables

Change-Id: Ieacab0f45e8804eb286a90728d9aa9f9e9b7b62a
---
M Cargo.php
M extension.json
A libs/Cargo.js
M specials/CargoTables.php
4 files changed, 52 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/42/395642/2

diff --git a/Cargo.php b/Cargo.php
index be5e8cb..5ccba75 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -171,7 +171,12 @@
 // ResourceLoader modules
 $wgResourceModules += array(
'ext.cargo.main' => array(
+   'scripts' => 'libs/Cargo.js',
'styles' => 'Cargo.css',
+   'messages' => array(
+   'show',
+   'hide'
+   ),
'position' => 'top',
'localBasePath' => __DIR__,
'remoteExtPath' => 'Cargo'
diff --git a/extension.json b/extension.json
index af542fa..5a0debe 100644
--- a/extension.json
+++ b/extension.json
@@ -114,7 +114,12 @@
},
"ResourceModules": {
"ext.cargo.main": {
+   "scripts": "libs/Cargo.js",
"styles": "Cargo.css",
+   "messages": [
+   "show",
+   "hide"
+   ],
"position": "top"
},
"ext.cargo.recreatedata": {
diff --git a/libs/Cargo.js b/libs/Cargo.js
new file mode 100644
index 000..fce9838
--- /dev/null
+++ b/libs/Cargo.js
@@ -0,0 +1,28 @@
+/**
+ * Cargo.js
+ *
+ * JavaScript utility functionality for the Cargo extension.
+ *
+ * @author Yaron Koren
+ */
+
+( function ( $, mw ) {
+
+var showText = '[' + mw.msg( 'show' ) + ']';
+var hideText = '[' + mw.msg( 'hide' ) + ']';
+
+$('span.cargoMinimizedText')
+   .hide()
+   .parent().append('' + showText + '');
+
+$('a.cargoToggle').click( function() {
+   if ( $(this).text() == showText ) {
+   $(this).siblings('.cargoMinimizedText').show(400);
+   $(this).text(hideText);
+   } else {
+   $(this).siblings('.cargoMinimizedText').hide(400);
+   $(this).text(showText);
+   }
+});
+
+}( jQuery, mediaWiki ) );
\ No newline at end of file
diff --git a/specials/CargoTables.php b/specials/CargoTables.php
index 117200a..5ad69ac 100644
--- a/specials/CargoTables.php
+++ b/specials/CargoTables.php
@@ -22,6 +22,8 @@
$user = $this->getUser();
$this->setHeaders();
 
+   $out->addModules( 'ext.cargo.main' );
+
if ( $tableName == '' ) {
$out->addHTML( $this->displayListOfTables() );
return;
@@ -177,6 +179,18 @@
$queryDisplayer = CargoQueryDisplayer::newFromSQLQuery( 
$sqlQuery );
$formattedQueryResults = 
$queryDisplayer->getFormattedQueryResults( $queryResults );
 
+   // Modify values to minimize cells that have more than a
+   // certain number of characters, to make the table more
+   // readable.
+   $maxChars = 300;
+   foreach ( $formattedQueryResults as $rowNum => $row ) {
+   foreach ( $row as $colNum => $value ) {
+   if ( strlen( $value ) > $maxChars && strlen( 
strip_tags( $value ) ) > $maxChars ) {
+   
$formattedQueryResults[$rowNum][$colNum] = '' 
. $value . '';
+   }
+   }
+   }
+
$displayParams = array();
 
$tableFormat = new CargoTableFormat( $this->getOutput() );
@@ -260,8 +274,6 @@
 * links and information for each one.
 */
function displayListOfTables() {
-   $this->getOutput()->addModules( 'ext.cargo.main' );
-
$text = '';
 
// Show a note if there are currently Cargo populate-data jobs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieacab0f45e8804eb286a90728d9aa9f9e9b7b62a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for HTML-encoding in "template" format

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

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

Change subject: Fix for HTML-encoding in "template" format
..


Fix for HTML-encoding in "template" format

Change-Id: If0f61a1caba26b8b108d57e0f8b44c9f37370a15
---
M formats/CargoTemplateFormat.php
1 file changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/formats/CargoTemplateFormat.php b/formats/CargoTemplateFormat.php
index 3363f4a..a658188 100644
--- a/formats/CargoTemplateFormat.php
+++ b/formats/CargoTemplateFormat.php
@@ -18,7 +18,18 @@
foreach ( $fieldDescriptions as $fieldName => $fieldDescription 
) {
if ( array_key_exists( $fieldName, $row ) ) {
$paramName = $namedArgs ? $fieldName : 
$fieldNum;
-   $wikiText .= '|' . $paramName . '=' . 
$row[$fieldName];
+   // HTML-decode the Wikitext values, which were
+   // encoded in CargoSQLQuery::run().
+   // We do this only for the "template" format
+   // because it's the only one that uses the
+   // unformatted values - the formatted values
+   // do this HTML-encoding on their own.
+   if ( $fieldDescription->mType == 'Wikitext' ) {
+   $value = htmlspecialchars_decode( 
$row[$fieldName] );
+   } else {
+   $value = $row[$fieldName];
+   }
+   $wikiText .= '|' . $paramName . '=' . $value;
$fieldNum++;
}
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Add maintenance script for populating DB with test data

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

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

Change subject: Add maintenance script for populating DB with test data
..


Add maintenance script for populating DB with test data

Change-Id: Ia9e81b2021fd03e1dc78b8d1083773eb4c34bf51
---
A maintenance/populateWithTestData.php
1 file changed, 195 insertions(+), 0 deletions(-)

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



diff --git a/maintenance/populateWithTestData.php 
b/maintenance/populateWithTestData.php
new file mode 100644
index 000..8af4f32
--- /dev/null
+++ b/maintenance/populateWithTestData.php
@@ -0,0 +1,195 @@
+addDescription( 'Fill the database with test data, or 
remove it.' );
+   $this->addOption( 'users', 'Number of users', false, true );
+   $this->addOption( 'lists', 'Lists per user (number or stats 
distribution)', false, true );
+   $this->addOption( 'entries', 'Entries per list (number or stats 
distribution)', false, true );
+   $this->addOption( 'cleanup', 'Delete lists which look like test 
data' );
+   if ( !extension_loaded( 'stats' ) ) {
+   $this->error( 'Requires the stats PHP extension', 1 );
+   }
+   }
+
+   private function setupServices() {
+   // Can't do this in the constructor, initialization not done 
yet.
+   $services = MediaWikiServices::getInstance();
+   $this->loadBalancerFactory = 
$services->getDBLoadBalancerFactory();
+   $this->dbw = Utils::getDB( DB_MASTER, $services );
+   $this->dbr = Utils::getDB( DB_REPLICA, $services );
+   }
+
+   /**
+* @inheritDoc
+*/
+   public function execute() {
+   $this->setupServices();
+   $this->assertOptions();
+   if ( $this->getOption( 'cleanup' ) ) {
+   $this->cleanupTestData();
+   return;
+   }
+
+   $projects = $this->dbw->selectFieldValues( 
'reading_list_project', 'rlp_id' );
+   if ( !$projects ) {
+   $this->error( 'No projects! Please set up some', 1 );
+   }
+   $totalLists = $totalEntries = 0;
+   stats_rand_setall( mt_rand(), mt_rand() );
+   $users = $this->getOption( 'users' );
+   for ( $i = 0; $i < $users; $i++ ) {
+   // The test data is for performance testing so we don't 
care whether the user exists.
+   $centralId = 1000 + $i;
+   $repository = new ReadingListRepository( $centralId, 
$this->dbw, $this->dbr,
+   $this->loadBalancerFactory );
+   try {
+   $repository->setupForUser();
+   $i++;
+   // HACK mark default list so it will be deleted 
together with the rest
+   $this->dbw->update(
+   'reading_list',
+   [ 'rl_description' => __FILE__ ],
+   [
+   'rl_user_id' => $centralId,
+   'rl_is_default' => 1,
+   ]
+   );
+   } catch ( ReadingListRepositoryException $e ) {
+   // Instead of trying to find a user ID that's 
not used yet, we'll be lazy
+   // and just ignore "already set up" errors.
+   }
+   $lists = $this->getRandomValueFromDistribution( 
$this->getOption( 'lists' ) );
+   for ( $j = 0; $j < $lists; $j++, $totalLists++ ) {
+   $listId = $repository->addList( "test_$j", 
__FILE__ );
+   $entries = 
$this->getRandomValueFromDistribution( $this->getOption( 'entries' ) );
+   $rows = [];
+   for ( $k = 0; $k < $entries; $k++, 
$totalEntries++ ) {
+   $project = $projects[array_rand( 
$projects )];
+   // Calling addListEntry for each row 
separately would be a bit slow.
+   $rows[] = [
+   'rle_rl_id' => $listId,
+   'rle_user_id' => $centralId,
+   'rle_rlp_id' => $project,
+   'rle_title' => "Test_$k",
+   ];
+   }
+

1 2 3 4 >

1 - 100 of 375 matches

Mail list logo