date:20180109

[MediaWiki-commits] [Gerrit] integration/config[master]: Add dependencies to BlueSpice* extensions

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Add dependencies to BlueSpice* extensions
..


Add dependencies to BlueSpice* extensions

See T130811

Change-Id: I2778bf0b12156bc05694495f46165d3ac75f4db1
---
M zuul/parameter_functions.py
1 file changed, 39 insertions(+), 1 deletion(-)

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



diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index bca730f..2247bf6 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -150,18 +150,56 @@
 'Arrays': ['Loops', 'ParserFunctions', 'Variables'],
 'ArticlePlaceholder': ['Wikibase', 'Scribunto'],
 'BlogPage': ['Comments', 'SocialProfile', 'VoteNY'],
+'BlueSpiceAbout': ['BlueSpiceFoundation'],
+'BlueSpiceArticleInfo': ['BlueSpiceFoundation'],
+'BlueSpiceAuthors': ['BlueSpiceFoundation'],
+'BlueSpiceAvatars': ['BlueSpiceFoundation'],
+'BlueSpiceBlog': ['BlueSpiceFoundation'],
 'BlueSpiceCategoryManager': ['BlueSpiceFoundation'],
+'BlueSpiceChecklist': ['BlueSpiceFoundation'],
+'BlueSpiceConfigManager': ['BlueSpiceFoundation'],
+'BlueSpiceContextMenu': ['BlueSpiceFoundation'],
+'BlueSpiceCountThings': ['BlueSpiceFoundation'],
+'BlueSpiceDashboards': ['BlueSpiceFoundation'],
 'BlueSpiceEditNotifyConnector': ['BlueSpiceFoundation'],
+'BlueSpiceEmoticons': ['BlueSpiceFoundation'],
 'BlueSpiceExtendedFilelist': ['BlueSpiceFoundation'],
 'BlueSpiceExtendedSearch': ['BlueSpiceFoundation'],
+'BlueSpiceExtendedStatistics': ['BlueSpiceFoundation'],
 'BlueSpiceExtensions': ['BlueSpiceFoundation'],
+'BlueSpiceGroupManager': ['BlueSpiceFoundation'],
+'BlueSpiceHideTitle': ['BlueSpiceFoundation'],
+'BlueSpiceInsertCategory': ['BlueSpiceFoundation'],
+'BlueSpiceInsertFile': ['BlueSpiceFoundation'],
+'BlueSpiceInsertLink': ['BlueSpiceFoundation'],
+'BlueSpiceInsertMagic': ['BlueSpiceFoundation'],
 'BlueSpiceInsertTemplate': ['BlueSpiceFoundation'],
+'BlueSpiceInterWikiLinks': ['BlueSpiceFoundation'],
+'BlueSpiceMenues': ['BlueSpiceFoundation'],
 'BlueSpiceMultiUpload': ['BlueSpiceFoundation'],
+'BlueSpiceNamespaceCSS': ['BlueSpiceFoundation'],
+'BlueSpiceNamespaceManager': ['BlueSpiceFoundation'],
+'BlueSpicePageAccess': ['BlueSpiceFoundation'],
 'BlueSpicePageAssignments': ['BlueSpiceFoundation'],
+'BlueSpicePageTemplates': ['BlueSpiceFoundation'],
 'BlueSpicePageVersion': ['BlueSpiceFoundation'],
-'BlueSpiceSignHere': ['BlueSpiceFoundation'],
+'BlueSpicePagesVisited': ['BlueSpiceFoundation'],
+'BlueSpicePermissionManager': ['BlueSpiceFoundation'],
+'BlueSpiceRSSFeeder': ['BlueSpiceFoundation'],
+'BlueSpiceReaders': ['BlueSpiceFoundation'],
 'BlueSpiceSMWConnector': ['BlueSpiceFoundation'],
+'BlueSpiceSaferEdit': ['BlueSpiceFoundation'],
+'BlueSpiceSignHere': ['BlueSpiceFoundation'],
+'BlueSpiceSmartlist': ['BlueSpiceFoundation'],
 'BlueSpiceSubPageTree': ['BlueSpiceFoundation'],
+'BlueSpiceTagCloud': ['BlueSpiceFoundation'],
+'BlueSpiceUEModulePDF': ['BlueSpiceFoundation'],
+'BlueSpiceUniversalExport': ['BlueSpiceFoundation'],
+'BlueSpiceUsageTracker': ['BlueSpiceFoundation'],
+'BlueSpiceUserManager': ['BlueSpiceFoundation'],
+'BlueSpiceUserPreferences': ['BlueSpiceFoundation'],
+'BlueSpiceWatchList': ['BlueSpiceFoundation'],
+'BlueSpiceWhoIsOnline': ['BlueSpiceFoundation'],
 'Capiunto': ['Scribunto'],
 'Challenge': ['SocialProfile'],
 'Cite': ['VisualEditor'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2778bf0b12156bc05694495f46165d3ac75f4db1
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1067, db1089

2018-01-09 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Depool db1067,db1089
..

db-eqiad.php: Depool db1067,db1089

Checking data drifts

Bug: T162807
Change-Id: If48e07c6ebaba3b37d5b8cd63a1b0bfc742645d9
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 0ce1729..71ec656 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -104,13 +104,13 @@
 'sectionLoads' => [
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
-   'db1067' => 0,   # D1 2.8TB 160GB, old master
+   # 'db1067' => 0,   # D1 2.8TB 160GB, old master # T162807
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
'db1073' => 50,  # B3 2.8TB 160GB, api
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
-   'db1089' => 500, # C3 3.6TB 512GB
+   # 'db1089' => 500, # C3 3.6TB 512GB # T162807
'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If48e07c6ebaba3b37d5b8cd63a1b0bfc742645d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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/vagrant[stretch-migration]: mleb: Use existing roles for l10nupdate and interwiki

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: mleb: Use existing roles for l10nupdate and interwiki
..


mleb: Use existing roles for l10nupdate and interwiki

Change-Id: I658f7d09bdc7c48872755be41dbf83b95ecb1ce2
---
M puppet/modules/role/manifests/mleb.pp
1 file changed, 2 insertions(+), 8 deletions(-)

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



diff --git a/puppet/modules/role/manifests/mleb.pp 
b/puppet/modules/role/manifests/mleb.pp
index 0cbc67e..a59588a 100644
--- a/puppet/modules/role/manifests/mleb.pp
+++ b/puppet/modules/role/manifests/mleb.pp
@@ -8,16 +8,10 @@
 class role::mleb {
 include ::role::babel
 include ::role::cldr
+include ::role::interwiki
+include ::role::l10nupdate
 include ::role::translate
 include ::role::uls
-
-mediawiki::extension { 'LocalisationUpdate':
-settings => { wgLocalisationUpdateDirectory => '$IP/cache' },
-}
-
-mediawiki::extension { 'Interwiki':
-settings => '$wgGroupPermissions["sysop"]["interwiki"] = true',
-}
 
 mediawiki::extension { 'CleanChanges':
 settings => '$wgDefaultUserOptions["usenewrc"] = 1',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mleb: Use existing roles for l10nupdate and interwiki

2018-01-09 Thread BryanDavis (Code Review)

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

Change subject: mleb: Use existing roles for l10nupdate and interwiki
..

mleb: Use existing roles for l10nupdate and interwiki

Change-Id: I658f7d09bdc7c48872755be41dbf83b95ecb1ce2
---
M puppet/modules/role/manifests/mleb.pp
1 file changed, 2 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/56/403356/1

diff --git a/puppet/modules/role/manifests/mleb.pp 
b/puppet/modules/role/manifests/mleb.pp
index 0cbc67e..a59588a 100644
--- a/puppet/modules/role/manifests/mleb.pp
+++ b/puppet/modules/role/manifests/mleb.pp
@@ -8,16 +8,10 @@
 class role::mleb {
 include ::role::babel
 include ::role::cldr
+include ::role::interwiki
+include ::role::l10nupdate
 include ::role::translate
 include ::role::uls
-
-mediawiki::extension { 'LocalisationUpdate':
-settings => { wgLocalisationUpdateDirectory => '$IP/cache' },
-}
-
-mediawiki::extension { 'Interwiki':
-settings => '$wgGroupPermissions["sysop"]["interwiki"] = true',
-}
 
 mediawiki::extension { 'CleanChanges':
 settings => '$wgDefaultUserOptions["usenewrc"] = 1',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I658f7d09bdc7c48872755be41dbf83b95ecb1ce2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: vmbuilder: include linux-image-generic in trusty base image

2018-01-09 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403355 )

Change subject: vmbuilder: include linux-image-generic in trusty base image
..


vmbuilder: include linux-image-generic in trusty base image

This is the package that includes the meltdown fix.

Change-Id: I5d08560b32dadf6ec5183b14fb0261aeabe8da03
---
M modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb 
b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
index 7b8a068..21ad7d7 100644
--- a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
+++ b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
@@ -16,7 +16,7 @@
 mirror = http://mirrors.wikimedia.org/ubuntu/
 components = main,restricted,multiverse,universe
 <% if scope.function_os_version(['ubuntu >= trusty']) %>
-addpkg = coreutils, snmp, wipe, tzdata, zsh, jfsutils, xfsprogs, screen, gdb, 
iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, 
nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, 
jq, moreutils, molly-guard, dstat, tshark, tmux, ncdu, ntp, 
command-not-found-data, os-prober, python3-apport, linux-tools-generic, 
apt-listchanges, apport, command-not-found, wpasupplicant, mlocate, 
ecryptfs-utils, nagios-nrpe-server
+addpkg = coreutils, snmp, wipe, tzdata, zsh, jfsutils, xfsprogs, screen, gdb, 
iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, 
nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, 
jq, moreutils, molly-guard, dstat, tshark, tmux, ncdu, ntp, 
command-not-found-data, os-prober, python3-apport, linux-tools-generic, 
apt-listchanges, apport, command-not-found, wpasupplicant, mlocate, 
ecryptfs-utils, nagios-nrpe-server, linux-image-generic
 <% else %>
 addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, 
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
apt-show-versions, pv, nagios-plugins-standard, nagios-plugins, puppet-lint, 
tree, nagios-plugins-basic
 <% end %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d08560b32dadf6ec5183b14fb0261aeabe8da03
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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]: vmbuilder: include linux-image-generic in trusty base image

2018-01-09 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403355 )

Change subject: vmbuilder: include linux-image-generic in trusty base image
..

vmbuilder: include linux-image-generic in trusty base image

This is the package that includes the meltdown fix.

Change-Id: I5d08560b32dadf6ec5183b14fb0261aeabe8da03
---
M modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb 
b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
index 7b8a068..21ad7d7 100644
--- a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
+++ b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
@@ -16,7 +16,7 @@
 mirror = http://mirrors.wikimedia.org/ubuntu/
 components = main,restricted,multiverse,universe
 <% if scope.function_os_version(['ubuntu >= trusty']) %>
-addpkg = coreutils, snmp, wipe, tzdata, zsh, jfsutils, xfsprogs, screen, gdb, 
iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, 
nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, 
jq, moreutils, molly-guard, dstat, tshark, tmux, ncdu, ntp, 
command-not-found-data, os-prober, python3-apport, linux-tools-generic, 
apt-listchanges, apport, command-not-found, wpasupplicant, mlocate, 
ecryptfs-utils, nagios-nrpe-server
+addpkg = coreutils, snmp, wipe, tzdata, zsh, jfsutils, xfsprogs, screen, gdb, 
iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, 
nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, 
jq, moreutils, molly-guard, dstat, tshark, tmux, ncdu, ntp, 
command-not-found-data, os-prober, python3-apport, linux-tools-generic, 
apt-listchanges, apport, command-not-found, wpasupplicant, mlocate, 
ecryptfs-utils, nagios-nrpe-server, linux-image-generic
 <% else %>
 addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, 
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
apt-show-versions, pv, nagios-plugins-standard, nagios-plugins, puppet-lint, 
tree, nagios-plugins-basic
 <% end %>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d08560b32dadf6ec5183b14fb0261aeabe8da03
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Use jQuery 3 .catch( fn ) instead of .then( null, fn )

2018-01-09 Thread Fomafix (Code Review)

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

Change subject: Use jQuery 3 .catch( fn ) instead of .then( null, fn )
..

Use jQuery 3 .catch( fn ) instead of .then( null, fn )

https://api.jquery.com/deferred.catch/ Since jQuery 3
deferred.catch( fn ) is an alias to deferred.then( null, fn )

This improves the readability.

Change-Id: I6c032936451d370a045ef9db23dad84a7ff985a7
---
M modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
M modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js
M modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js
M modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
M modules/messagePoster/ext.flow.messagePoster.js
5 files changed, 5 insertions(+), 6 deletions(-)


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

diff --git a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
index 27f7754..d29f0df 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
@@ -245,7 +245,7 @@
widget.$content.empty().append( $.parseHTML( 
desc.content.content ) );
widget.emit( 'saveContent' );
} )
-   .then( null, function ( errorCode, errorObj ) {
+   .catch( function ( errorCode, errorObj ) {
widget.captcha.update( errorCode, errorObj );
if ( !widget.captcha.isRequired() ) {
widget.error.setLabel( new 
OO.ui.HtmlSnippet( errorObj.error && errorObj.error.info || errorObj.exception 
) );
diff --git a/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js
index f99cf78..861328d 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js
@@ -148,7 +148,7 @@
 
widget.emit( 'saveContent', workflow, content, 
format );
} )
-   .then( null, function ( errorCode, errorObj ) {
+   .catch( function ( errorCode, errorObj ) {
widget.captcha.update( errorCode, errorObj );
if ( !widget.captcha.isRequired() ) {
widget.error.setLabel( new 
OO.ui.HtmlSnippet( errorObj.error && errorObj.error.info || errorObj.exception 
) );
diff --git a/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js
index 376a1f4..6888a8b 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js
@@ -150,7 +150,7 @@
 
widget.emit( 'saveContent', workflow, content, 
format );
} )
-   .then( null, function ( errorCode, errorObj ) {
+   .catch( function ( errorCode, errorObj ) {
widget.captcha.update( errorCode, errorObj );
if ( !widget.captcha.isRequired() ) {
widget.error.setLabel( new 
OO.ui.HtmlSnippet( errorObj.error && errorObj.error.info || errorObj.exception 
) );
diff --git a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
index eea6ea5..794acc3 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
@@ -216,7 +216,7 @@
widget.toggleExpanded( false );
widget.emit( 'save', topicId );
} )
-   .then( null, function ( errorCode, errorObj ) {
+   .catch( function ( errorCode, errorObj ) {
widget.captcha.update( errorCode, errorObj );
if ( !widget.captcha.isRequired() ) {
widget.error.setLabel( new 
OO.ui.HtmlSnippet( errorObj.error && errorObj.error.info || errorObj.exception 
) );
diff --git a/modules/messagePoster/ext.flow.messagePoster.js 
b/modules/messagePoster/ext.flow.messagePoster.js
index 60d45d7..ce980b5 100644
--- a/modules/messagePoster/ext.flow.messagePoster.js
+++ b/modules/messagePoster/ext.flow.messagePoster.js
@@ -39,8 +39,7 @@
nttopic: subject,
ntcontent: body,
ntformat: 'wikitext'
-   } ).then(
-   null, // Preserve parameters from postWithToken

[MediaWiki-commits] [Gerrit] operations...apertium-urd-hin[master]: apertium-urd-hin: Updated dependency on cg3

2018-01-09 Thread KartikMistry (Code Review)

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

Change subject: apertium-urd-hin: Updated dependency on cg3
..

apertium-urd-hin: Updated dependency on cg3

Bug: T171406
Change-Id: I0aad7d69604ec5b757e013b568eb6fe935b32b03
---
M debian/changelog
M debian/control
2 files changed, 8 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-urd-hin
 refs/changes/53/403353/1

diff --git a/debian/changelog b/debian/changelog
index 8c39eee..06e2e9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-urd-hin (0.1.0~r64379-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated dependency on cg3.
+
+ -- Kartik Mistry   Wed, 10 Jan 2018 11:48:12 +0530
+
 apertium-urd-hin (0.1.0~r64379-1+wmf1) jessie-wikimedia; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index ab0de28..0ce23f3 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@
apertium-lex-tools,
apertium-urd,
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -23,7 +23,7 @@
 Architecture: all
 Depends: apertium (>= 3.4),
  apertium-lex-tools,
- cg3,
+ cg3 (>= 1.0.0~r12254),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides: apertium-hin-urd

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0aad7d69604ec5b757e013b568eb6fe935b32b03
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-urd-hin
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] mediawiki/vagrant[stretch-migration]: Define ::port_fragment for Cloud VPS hosts

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Define ::port_fragment for Cloud VPS hosts
..


Define ::port_fragment for Cloud VPS hosts

Avoid "Warning: Unknown variable: '::port_fragment'." complaints from
Puppet by defining an empty string port_fragment fact for Cloud VPS hosts.

Change-Id: I23949c646ffe5b2b0af6ac680f71691246aaded4
---
M Vagrantfile
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index 76881d4..68afaa4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -265,6 +265,8 @@
 
 if settings[:http_port] != 80 && ENV['MWV_ENVIRONMENT'] != 'labs'
   puppet.facter['port_fragment'] = ":#{settings[:http_port]}"
+else
+  puppet.facter['port_fragment'] = ''
 end
 
 if settings[:nfs_shares]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23949c646ffe5b2b0af6ac680f71691246aaded4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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...apertium-urd[master]: apertium-urd: Updated dependency on cg3

2018-01-09 Thread KartikMistry (Code Review)

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

Change subject: apertium-urd: Updated dependency on cg3
..

apertium-urd: Updated dependency on cg3

Bug: T171406
Change-Id: Ife133abd03c8f0cefa8caac9b22be6d4dbf33245
---
M debian/changelog
M debian/control
2 files changed, 12 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-urd
 refs/changes/52/403352/1

diff --git a/debian/changelog b/debian/changelog
index 628f288..3a98bc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-urd (0.1.0~r61311-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated dependency on cg3.
+
+ -- Kartik Mistry   Wed, 10 Jan 2018 11:46:11 +0530
+
 apertium-urd (0.1.0~r61311-1+wmf1) jessie-wikimedia; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 82a8e28..be244c1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -20,6 +20,10 @@
 
 Package: apertium-urd
 Architecture: all
-Depends: apertium (>= 3.4), cg3, hfst, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ hfst,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Apertium single language data for Urdu
  Data package providing Apertium language resources for Urdu

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife133abd03c8f0cefa8caac9b22be6d4dbf33245
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-urd
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] mediawiki...GlobalCssJs[master]: Namespace this extension and move into includes

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Namespace this extension and move into includes
..


Namespace this extension and move into includes

Also take advantage of Maintenance::requireExtension() instead of
checking for an explicit class name.

Change-Id: If19086e80f3f04bc677fc95de3416d0ad2352fb2
---
M .phpcs.xml
M extension.json
R includes/Hooks.php
R includes/ResourceLoaderGlobalModule.php
R includes/ResourceLoaderGlobalSiteModule.php
R includes/ResourceLoaderGlobalUserModule.php
M maintenance/removeOldManualUserPages.php
M tests/phpunit/RemoveOldManualUserPagesTest.php
M tests/phpunit/ResourceLoaderGlobalModuleTest.php
M tests/phpunit/ResourceLoaderGlobalModuleTestCase.php
M tests/phpunit/ResourceLoaderGlobalSiteModuleTest.php
M tests/phpunit/ResourceLoaderGlobalUserModuleTest.php
12 files changed, 101 insertions(+), 39 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index 5f94480..1f6d143 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -7,9 +7,6 @@



-   
-   */maintenance/*
-   
.


diff --git a/extension.json b/extension.json
index 416a70f..b077f1a 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "GlobalCssJs",
-   "version": "3.3.0",
+   "version": "3.4.0",
"author": [
"Ryan Schmidt",
"Szymon Świerkosz",
@@ -12,21 +12,13 @@
"license-name": "GPL-2.0+",
"type": "other",
"requires": {
-   "MediaWiki": ">= 1.27.0"
+   "MediaWiki": ">= 1.31.0"
},
"Hooks": {
-   "BeforePageDisplay": [
-   "GlobalCssJsHooks::onBeforePageDisplay"
-   ],
-   "ResourceLoaderRegisterModules": [
-   "GlobalCssJsHooks::onResourceLoaderRegisterModules"
-   ],
-   "EditPage::showEditForm:initial": [
-   "GlobalCssJsHooks::onEditPageshowEditForminitial"
-   ],
-   "GetPreferences": [
-   "GlobalCssJsHooks::onGetPreferences"
-   ]
+   "BeforePageDisplay": 
"MediaWiki\\GlobalCssJs\\Hooks::onBeforePageDisplay",
+   "ResourceLoaderRegisterModules": 
"MediaWiki\\GlobalCssJs\\Hooks::onResourceLoaderRegisterModules",
+   "EditPage::showEditForm:initial": 
"MediaWiki\\GlobalCssJs\\Hooks::onEditPageshowEditForminitial",
+   "GetPreferences": 
"MediaWiki\\GlobalCssJs\\Hooks::onGetPreferences"
},
"MessagesDirs": {
"GlobalCssJs": [
@@ -46,15 +38,13 @@
"ext.globalCssJs.user"
],
"ExtensionFunctions": [
-   "GlobalCssJsHooks::onExtensionFunctions"
+   "MediaWiki\\GlobalCssJs\\Hooks::onExtensionFunctions"
],
+   "AutoloadNamespaces": {
+   "MediaWiki\\GlobalCssJs\\": "includes/"
+   },
"AutoloadClasses": {
-   "ResourceLoaderGlobalModule": "ResourceLoaderGlobalModule.php",
-   "ResourceLoaderGlobalSiteModule": 
"ResourceLoaderGlobalSiteModule.php",
-   "ResourceLoaderGlobalUserModule": 
"ResourceLoaderGlobalUserModule.php",
-   "GlobalCssJsHooks": "GlobalCssJsHooks.php",
-   "ResourceLoaderGlobalModuleTestCase": 
"tests/phpunit/ResourceLoaderGlobalModuleTestCase.php",
-   "RemoveOldManualUserPages": 
"maintenance/removeOldManualUserPages.php"
+   
"MediaWiki\\GlobalCssJs\\Test\\ResourceLoaderGlobalModuleTestCase": 
"tests/phpunit/ResourceLoaderGlobalModuleTestCase.php"
},
"ConfigRegistry": {
"globalcssjs": "GlobalVarConfig::newInstance"
diff --git a/GlobalCssJsHooks.php b/includes/Hooks.php
similarity index 96%
rename from GlobalCssJsHooks.php
rename to includes/Hooks.php
index fe6efb7..e863979 100644
--- a/GlobalCssJsHooks.php
+++ b/includes/Hooks.php
@@ -1,6 +1,19 @@
 makeConfig( 
'globalcssjs' );
diff --git a/ResourceLoaderGlobalModule.php 
b/includes/ResourceLoaderGlobalModule.php
similarity index 94%
rename from ResourceLoaderGlobalModule.php
rename to includes/ResourceLoaderGlobalModule.php
index c8f0050..1e87370 100644
--- a/ResourceLoaderGlobalModule.php
+++ b/includes/ResourceLoaderGlobalModule.php
@@ -20,6 +20,12 @@
  * @author Kunal Mehta
  */
 
+namespace MediaWiki\GlobalCssJs;
+
+use IDatabase;
+use InvalidArgumentException;
+use ResourceLoaderWikiModule;
+
 /**
  * Base class for global modules.
  *
diff --git a/ResourceLoaderGlobalSiteModule.php 
b/includes/ResourceLoaderGlobalSiteModule.php
similarity index 95%
rename from ResourceLoaderGlobalSiteModule.php
rename to includes/ResourceLoaderGlobalSiteModule.php
index

[MediaWiki-commits] [Gerrit] mediawiki...GlobalCssJs[master]: Add missing copyright headers

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Add missing copyright headers
..


Add missing copyright headers

Change-Id: Iafdc1a24c3e39647dc9b8086690473048e1f36b5
---
M includes/Hooks.php
M maintenance/removeOldManualUserPages.php
2 files changed, 38 insertions(+), 0 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index e863979..7508974 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -1,4 +1,23 @@
 https://gerrit.wikimedia.org/r/402469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafdc1a24c3e39647dc9b8086690473048e1f36b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalCssJs
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
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/core[master]: EditPage: Remove separator between cancel and help

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: EditPage: Remove separator between cancel and help
..


EditPage: Remove separator between cancel and help

It is no longer needed because those buttons
are already splitted visually by blank space.

Bug: T183672
Change-Id: I1f8a8413a5f4da441e3f4b4ef0b1e03d174987ca
---
M includes/EditPage.php
M resources/src/mediawiki.action/mediawiki.action.edit.styles.less
2 files changed, 0 insertions(+), 14 deletions(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index 3c109f6..a8be3aa 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3670,11 +3670,6 @@
$out->addHTML( implode( $this->getEditButtons( $tabindex ), 
"\n" ) . "\n" );
 
$cancel = $this->getCancelLink();
-   if ( $cancel !== '' ) {
-   $cancel .= Html::element( 'span',
-   [ 'class' => 'mw-editButtons-pipe-separator' ],
-   $this->context->msg( 'pipe-separator' )->text() 
);
-   }
 
$message = $this->context->msg( 'edithelppage' 
)->inContentLanguage()->text();
$edithelpurl = Skin::makeInternalOrExternalUrl( $message );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less 
b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
index e4443f6..3202e59 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
@@ -69,13 +69,4 @@
display: inline-block;
vertical-align: middle;
}
-
-   // FIXME: Remove CSS magic together with DOM element in T183672
-   .mw-editButtons-pipe-separator {
-   display: inline-block;
-   padding-top: 0.625em;
-   padding-bottom: 0.546875em;
-   line-height: 1.172em;
-   vertical-align: middle;
-   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f8a8413a5f4da441e3f4b4ef0b1e03d174987ca
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Albert221 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tpt 
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...apertium-tur[master]: apertium-tur: Updated dependency on cg3

2018-01-09 Thread KartikMistry (Code Review)

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

Change subject: apertium-tur: Updated dependency on cg3
..

apertium-tur: Updated dependency on cg3

Bug: T171406
Change-Id: Id29dbba14350d461e178056034d150ad2b11c517
---
M debian/changelog
M debian/control
2 files changed, 12 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-tur
 refs/changes/51/403351/1

diff --git a/debian/changelog b/debian/changelog
index 4b28e77..f09921c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-tur (0.2.0~r83161-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated dependency on cg3
+
+ -- Kartik Mistry   Wed, 10 Jan 2018 11:44:05 +0530
+
 apertium-tur (0.2.0~r83161-1+wmf1) jessie-wikimedia; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 6c3995c..5b1f6f1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -20,6 +20,10 @@
 
 Package: apertium-tur
 Architecture: all
-Depends: apertium (>= 3.4), cg3, hfst, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ hfst,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Apertium single language data for Turkish
  Data package providing Apertium language resources for Turkish

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id29dbba14350d461e178056034d150ad2b11c517
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-tur
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] operations...apertium-tat[master]: apertium-tat: Updated dependency on cg3

2018-01-09 Thread KartikMistry (Code Review)

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

Change subject: apertium-tat: Updated dependency on cg3
..

apertium-tat: Updated dependency on cg3

Bug: T171406
Change-Id: Ib475bc9771edf17980b49c19525418082d2f31bf
---
M debian/changelog
M debian/control
2 files changed, 12 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-tat
 refs/changes/50/403350/1

diff --git a/debian/changelog b/debian/changelog
index a1866f4..6dda2a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-tat (0.1.0~r60887-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated dependency on cg3.
+
+ -- Kartik Mistry   Wed, 10 Jan 2018 11:41:06 +0530
+
 apertium-tat (0.1.0~r60887-1+wmf1) jessie-wikimedia; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 2345d6e..b86aab1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -22,6 +22,10 @@
 
 Package: apertium-tat
 Architecture: all
-Depends: apertium (>= 3.4), cg3, hfst, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ hfst,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Apertium single language data for Tatar
  Data package providing Apertium language resources for Tatar

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib475bc9771edf17980b49c19525418082d2f31bf
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-tat
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] mediawiki/core[master]: Added tests for ComposerInstalled

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Added tests for ComposerInstalled
..


Added tests for ComposerInstalled

Bug: T183899
Change-Id: Id822caad044a079884795dbea37baf10514bcf5c
---
A tests/phpunit/data/composer/installed.json
A tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
2 files changed, 2,181 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/data/composer/installed.json 
b/tests/phpunit/data/composer/installed.json
new file mode 100644
index 000..ddac980
--- /dev/null
+++ b/tests/phpunit/data/composer/installed.json
@@ -0,0 +1,1682 @@
+[
+{
+"name": "leafo/lessphp",
+"version": "v0.5.0",
+"version_normalized": "0.5.0.0",
+"source": {
+"type": "git",
+"url": "https://github.com/leafo/lessphp.git;,
+"reference": "0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/leafo/lessphp/zipball/0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283;,
+"reference": "0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283",
+"shasum": ""
+},
+"time": "2014-11-24T18:39:20+00:00",
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "0.4.x-dev"
+}
+},
+"installation-source": "dist",
+"autoload": {
+"classmap": [
+"lessc.inc.php"
+]
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT",
+"GPL-3.0"
+],
+"authors": [
+{
+"name": "Leaf Corcoran",
+"email": "lea...@gmail.com",
+"homepage": "http://leafo.net;
+}
+],
+"description": "lessphp is a compiler for LESS written in PHP.",
+"homepage": "http://leafo.net/lessphp/;
+},
+{
+"name": "psr/log",
+"version": "1.0.0",
+"version_normalized": "1.0.0.0",
+"source": {
+"type": "git",
+"url": "https://github.com/php-fig/log.git;,
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b;,
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+"shasum": ""
+},
+"time": "2012-12-21T11:40:51+00:00",
+"type": "library",
+"installation-source": "dist",
+"autoload": {
+"psr-0": {
+"Psr\\Log\\": ""
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "PHP-FIG",
+"homepage": "http://www.php-fig.org/;
+}
+],
+"description": "Common interface for logging libraries",
+"keywords": [
+"log",
+"psr",
+"psr-3"
+]
+},
+{
+"name": "cssjanus/cssjanus",
+"version": "v1.1.1",
+"version_normalized": "1.1.1.0",
+"source": {
+"type": "git",
+"url": "https://github.com/cssjanus/php-cssjanus.git;,
+"reference": "62a9c32e6e140de09082b40a6e99d868ad14d4e0"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/cssjanus/php-cssjanus/zipball/62a9c32e6e140de09082b40a6e99d868ad14d4e0;,
+"reference": "62a9c32e6e140de09082b40a6e99d868ad14d4e0",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.3"
+},
+"require-dev": {
+"jakub-onderka/php-parallel-lint": "0.8.*",
+"phpunit/phpunit": "3.7.*",
+"squizlabs/php_codesniffer": "1.*"
+},
+"time": "2014-11-14T20:00:50+00:00",
+"type": "library",
+"installation-source": "dist",
+"autoload": {
+"psr-0": {
+"": "src/"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"Apache-2.0"
+],
+"description": "Convert CSS stylesheets between left-to-right and 
right-to-left."
+},
+{
+"name": "cdb/cdb",
+"version": "1.0.0",
+"version_normalized": "1.0.0.0",
+"source": {
+"type": "git",
+"url": "https://github.com/wikimedia/cdb.git;,
+"reference": "918601ea3d31b8c37312e9c0e54446aa8bfb3425"
+},

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update officewiki logo, add HD logo for officewiki

2018-01-09 Thread Urbanecm (Code Review)

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

Change subject: Update officewiki logo, add HD logo for officewiki
..

Update officewiki logo, add HD logo for officewiki

Bug: T184575
Change-Id: I40a57b1f93844ad6e82371057b3bb38fd7e875f6
---
A static/images/project-logos/officewiki-1.5x.png
A static/images/project-logos/officewiki-2x.png
M static/images/project-logos/officewiki.png
M wmf-config/InitialiseSettings.php
4 files changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/static/images/project-logos/officewiki-1.5x.png 
b/static/images/project-logos/officewiki-1.5x.png
new file mode 100644
index 000..71de7e4
--- /dev/null
+++ b/static/images/project-logos/officewiki-1.5x.png
Binary files differ
diff --git a/static/images/project-logos/officewiki-2x.png 
b/static/images/project-logos/officewiki-2x.png
new file mode 100644
index 000..c5602a3
--- /dev/null
+++ b/static/images/project-logos/officewiki-2x.png
Binary files differ
diff --git a/static/images/project-logos/officewiki.png 
b/static/images/project-logos/officewiki.png
index 0e1d37a..4d4ba6e 100644
--- a/static/images/project-logos/officewiki.png
+++ b/static/images/project-logos/officewiki.png
Binary files differ
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e439573..7481d7b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1645,6 +1645,7 @@
'donatewiki' => [ '1.5x' => 
'/static/images/project-logos/donatewiki-1.5x.png', '2x' => 
'/static/images/project-logos/donatewiki-2x.png' ],
'foundationwiki' => [ '1.5x' => 
'/static/images/project-logos/foundationwiki-1.5x.png', '2x' => 
'/static/images/project-logos/foundationwiki-2x.png' ],
'metawiki' => [ '1.5x' => 
'/static/images/project-logos/metawiki-1.5x.png', '2x' => 
'/static/images/project-logos/metawiki-2x.png' ],
+   'officewiki' => [ '1.5x' => 
'/static/images/project-logos/officewiki-1.5x.png', '2x' => 
'/static/images/project-logos/officewiki-2x.png' ],
'techconductwiki' => [ '1.5x' => 
'/static/images/project-logos/techconductwiki-1.5x.png', '2x' => 
'/static/images/project-logos/techconductwiki-2x.png' ],
'test2wiki' => [ '1.5x' => 
'/static/images/project-logos/test2wiki-1.5x.png', '2x' => 
'/static/images/project-logos/test2wiki-2x.png' ],
'votewiki' => [ '1.5x' => 
'/static/images/project-logos/votewiki-1.5x.png', '2x' => 
'/static/images/project-logos/votewiki-2x.png' ],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Define ::port_fragment for Cloud VPS hosts

2018-01-09 Thread BryanDavis (Code Review)

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

Change subject: Define ::port_fragment for Cloud VPS hosts
..

Define ::port_fragment for Cloud VPS hosts

Avoid "Warning: Unknown variable: '::port_fragment'." complaints from
Puppet by defining an empty string port_fragment fact for Cloud VPS hosts.

Change-Id: I23949c646ffe5b2b0af6ac680f71691246aaded4
---
M Vagrantfile
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/48/403348/1

diff --git a/Vagrantfile b/Vagrantfile
index 76881d4..3c63f62 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -265,6 +265,8 @@
 
 if settings[:http_port] != 80 && ENV['MWV_ENVIRONMENT'] != 'labs'
   puppet.facter['port_fragment'] = ":#{settings[:http_port]}"
+else
+  puppet.facter['port_fragment'] = ""
 end
 
 if settings[:nfs_shares]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23949c646ffe5b2b0af6ac680f71691246aaded4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] operations...apertium-swe-nor[master]: apertium-swe-nor: Updated dependency on cg3

2018-01-09 Thread KartikMistry (Code Review)

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

Change subject: apertium-swe-nor: Updated dependency on cg3
..

apertium-swe-nor: Updated dependency on cg3

Bug: T171406
Change-Id: I326f967ece2ba9bfc7144142d7a946d14ed608e4
---
M debian/changelog
M debian/control
2 files changed, 8 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-swe-nor
 refs/changes/47/403347/1

diff --git a/debian/changelog b/debian/changelog
index 383bc35..3d911f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-swe-nor (0.2.0~r69544-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated dependency on cg3.
+
+ -- Kartik Mistry   Wed, 10 Jan 2018 11:03:49 +0530
+
 apertium-swe-nor (0.2.0~r69544-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie.
diff --git a/debian/control b/debian/control
index c3ca9ec..c0eefa9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@
apertium-nob (>= 0.9.0~r69513),
apertium-swe (>= 0.7.0~r69513),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -24,7 +24,7 @@
 Architecture: all
 Depends: apertium (>= 3.4.2~r68466),
  apertium-lex-tools,
- cg3,
+ cg3 (>= 1.0.0~r12254),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides: apertium-nor-swe

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I326f967ece2ba9bfc7144142d7a946d14ed608e4
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-swe-nor
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] operations...apertium-swe-dan[master]: apertium-swe-dan: updated dependency on cg3

2018-01-09 Thread KartikMistry (Code Review)

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

Change subject: apertium-swe-dan: updated dependency on cg3
..

apertium-swe-dan: updated dependency on cg3

Bug: T171406
Change-Id: Idb6079d508dd67db498a831efdaadedf1ce571fa
---
M debian/changelog
M debian/control
2 files changed, 11 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-swe-dan
 refs/changes/46/403346/1

diff --git a/debian/changelog b/debian/changelog
index 982b106..0a97847 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-swe-dan (0.7.0~r66063-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated dependency on cg3.
+
+ -- Kartik Mistry   Wed, 10 Jan 2018 11:01:19 +0530
+
 apertium-swe-dan (0.7.0~r66063-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuilt for Jessie.
diff --git a/debian/control b/debian/control
index 1e6a4bb..3a19bc6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@
apertium-lex-tools,
apertium-swe (>= 0.5.0~r66062),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -21,7 +21,10 @@
 
 Package: apertium-swe-dan
 Architecture: all
-Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Provides: apertium-da-sv, apertium-dan-swe, apertium-sv-da
 Conflicts: apertium-da-sv, apertium-dan-swe, apertium-sv-da
 Replaces: apertium-da-sv, apertium-sv-da

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb6079d508dd67db498a831efdaadedf1ce571fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-swe-dan
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] operations...apertium-swe[master]: apertium-swe: Updated dependency on cg3

2018-01-09 Thread KartikMistry (Code Review)

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

Change subject: apertium-swe: Updated dependency on cg3
..

apertium-swe: Updated dependency on cg3

Bug: T171406
Change-Id: I3634f90b0236e0af8c8b2473face3980f82db24c
---
M debian/changelog
M debian/control
2 files changed, 13 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-swe
 refs/changes/45/403345/1

diff --git a/debian/changelog b/debian/changelog
index 23cc08a..86bf640 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-swe (0.7.0~r69513-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated dependency on cg3.
+
+ -- Kartik Mistry   Wed, 10 Jan 2018 10:57:11 +0530
+
 apertium-swe (0.7.0~r69513-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie.
diff --git a/debian/control b/debian/control
index 1da6d10..b18c75c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,11 @@
 Section: science
 Priority: optional
 Maintainer: Debian Science Team 

-Uploaders: Tino Didriksen , Kartik Mistry 

+Uploaders: Tino Didriksen ,
+   Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -17,6 +18,9 @@
 
 Package: apertium-swe
 Architecture: all
-Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Apertium single language data for Swedish
  Data package providing Apertium language resources for Swedish

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3634f90b0236e0af8c8b2473face3980f82db24c
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-swe
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] operations...apertium-srd-ita[master]: apertium-srd-ita: Updated cg3 dependency

2018-01-09 Thread KartikMistry (Code Review)

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

Change subject: apertium-srd-ita: Updated cg3 dependency
..

apertium-srd-ita: Updated cg3 dependency

Bug: T171406
Change-Id: If3df304d73705ae7970beb7472b89f8bc1555a5b
---
M debian/changelog
M debian/control
2 files changed, 8 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-srd-ita
 refs/changes/44/403344/1

diff --git a/debian/changelog b/debian/changelog
index a62af63..b87df40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-srd-ita (0.9.5~r82237-1+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated dependency on cg3.
+
+ -- Kartik Mistry   Wed, 10 Jan 2018 10:47:06 +0530
+
 apertium-srd-ita (0.9.5~r82237-1+wmf1) jessie-wikimedia; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 7f93305..2c2a71b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@
apertium-lex-tools,
apertium-srd (>= 0.10.0~r82237),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -23,7 +23,7 @@
 Architecture: all
 Depends: apertium (>= 3.4),
  apertium-lex-tools,
- cg3,
+ cg3 (>= 1.0.0~r12254),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides: apertium-ita-srd

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3df304d73705ae7970beb7472b89f8bc1555a5b
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-srd-ita
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] mediawiki/core[master]: Add default cache options to patrol status cache set calls

2018-01-09 Thread Code Review

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

Change subject: Add default cache options to patrol status cache set calls
..

Add default cache options to patrol status cache set calls

Change-Id: I10778785477767fe33feb53b30d12d41dadb2e44
---
M includes/page/Article.php
1 file changed, 26 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/403343/1

diff --git a/includes/page/Article.php b/includes/page/Article.php
index d4e8198..00f8ade 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -19,7 +19,9 @@
  *
  * @file
  */
+
 use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\Database;
 
 /**
  * Class for viewing MediaWiki article and history.
@@ -1011,7 +1013,12 @@
) {
// Page is too old to be patrollable.
// This will never change so safe to cache forever.
-   $cache->set( $key, '2' );
+   $cache->set(
+   $key,
+   '2',
+   WANObjectCache::TTL_INDEFINITE,
+   Database::getCacheSetOptions( $dbr )
+   );
return false;
}
 
@@ -1031,7 +1038,12 @@
 
if ( $rc->getAttribute( 'rc_patrolled' ) ) {
// Already patrolled. There is no way for a page to get 
unpatrolled so can be cached.
-   $cache->set( $key, '2' );
+   $cache->set(
+   $key,
+   '2',
+   WANObjectCache::TTL_INDEFINITE,
+   Database::getCacheSetOptions( $dbr )
+   );
return false;
}
 
@@ -1081,7 +1093,12 @@
) {
// Not a local file or too old to be patrollable. This 
only changes when a new
// version is uploaded, and we clear the cache then, so 
safe to cache forever.
-   $cache->set( $key, '1' );
+   $cache->set(
+   $key,
+   '1',
+   WANObjectCache::TTL_INDEFINITE,
+   Database::getCacheSetOptions( $dbr )
+   );
return false;
}
$rc = RecentChange::newFromConds(
@@ -1102,7 +1119,12 @@
if ( $rc->getAttribute( 'rc_patrolled' ) ) {
// Already patrolled. The only way for a file to get 
unpatrolled is new version
// upload and we clear the cache on that, so safe to 
cache.
-   $cache->set( $key, '1' );
+   $cache->set(
+   $key,
+   '1',
+   WANObjectCache::TTL_INDEFINITE,
+   Database::getCacheSetOptions( $dbr )
+   );
return false;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10778785477767fe33feb53b30d12d41dadb2e44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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...ORES[master]: Mostly cover ORES\Hooks

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Mostly cover ORES\Hooks
..


Mostly cover ORES\Hooks

Bug: T184140
Change-Id: I49fc3c3601a91758ca7d44c5f4415bfce7c71903
---
M tests/phpunit/includes/HooksTest.php
1 file changed, 170 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/HooksTest.php 
b/tests/phpunit/includes/HooksTest.php
index b770b9b..e961065 100644
--- a/tests/phpunit/includes/HooksTest.php
+++ b/tests/phpunit/includes/HooksTest.php
@@ -3,12 +3,19 @@
 namespace ORES\Tests;
 
 use IContextSource;
+use JobQueueGroup;
 use ORES\Hooks;
 use ORES\Hooks\PreferencesHookHandler;
 use ORES\Storage\HashModelLookup;
+use ORES\Storage\ScoreStorage;
+use ORES\ThresholdLookup;
+use OutputPage;
+use RecentChange;
 use RequestContext;
+use SkinFactory;
 use SpecialPage;
 use User;
+use Title;
 
 /**
  * @group ORES
@@ -41,6 +48,122 @@
$this->user->saveSettings();
 
$this->context = self::getContext( $this->user );
+   }
+
+   /**
+* @covers ORES\Hooks::onRecentChange_save
+*/
+   public function testOnRecentChange_save() {
+   JobQueueGroup::singleton()->get( 'ORESFetchScoreJob' 
)->delete();
+
+   $rc = RecentChange::newFromRow( (object)[
+   'rc_namespace' => NS_MAIN,
+   'rc_title' => 'Test123',
+   'rc_patrolled' => 0,
+   'rc_timestamp' => '20150921134808',
+   'rc_deleted' => 0,
+   'rc_comment' => '',
+   'rc_comment_text' => '',
+   'rc_comment_data' => null,
+   'rc_type' => RC_EDIT,
+   'rc_this_oldid' => mt_rand( 1000,  ),
+   ] );
+   Hooks::onRecentChange_save( $rc );
+
+   $this->assertFalse( JobQueueGroup::singleton()->get( 
'ORESFetchScoreJob' )->isEmpty() );
+   }
+
+   /**
+* @covers ORES\Hooks::onRecentChangesPurgeRows
+*/
+   public function testOnRecentChangesPurgeRows() {
+   $revIds = [ 1, 5, 8, 13 ];
+   $rows = array_map( function ( $id ) {
+   return (object)[ 'rc_this_oldid' => $id ];
+   }, $revIds );
+
+   $mock = $this->createMock( ScoreStorage::class );
+   $mock->expects( $this->once() )
+   ->method( 'purgeRows' )
+   ->with( $this->equalTo( $revIds ) );
+
+   $this->setService( 'ORESScoreStorage', $mock );
+
+   Hooks::onRecentChangesPurgeRows( $rows );
+   }
+
+   /**
+* @covers ORES\Hooks::getDamagingLevelPreference
+*/
+   public function testGetDamagingLevelPreference_Watchlist() {
+   $level = Hooks::getDamagingLevelPreference( $this->user,
+   Title::newFromText( 'Watchlist', NS_SPECIAL ) );
+
+   $this->assertEquals( 'maybebad', $level );
+   }
+
+   /**
+* @covers ORES\Hooks::getThreshold
+*/
+   public function testGetThreshold_null() {
+   $mock = $this->createMock( ThresholdLookup::class );
+   $mock->method( 'getThresholds' )
+   ->willReturn( [] );
+
+   $this->setService( 'ORESThresholdLookup', $mock );
+   $threshold = Hooks::getThreshold( 'damaging', $this->user );
+
+   $this->assertNull( $threshold );
+   }
+
+   /**
+* @covers ORES\Hooks::getThreshold
+*
+* @expectedException Exception
+* @expectedExceptionMessageRegExp "Unknown ORES test: 'not_a_thing'"
+*/
+   public function testGetThreshold_invalid() {
+   $threshold = Hooks::getThreshold( 'not_a_thing', $this->user );
+   }
+
+   /**
+* @covers ORES\Hooks::onBeforePageDisplay
+*/
+   public function testOnBeforePageDisplay() {
+   $modelData = [ 'damaging' => [ 'id' => 5, 'version' => '0.0.2' 
] ];
+   $this->setService( 'ORESModelLookup', new HashModelLookup( 
$modelData ) );
+
+   $oresData = [
+   123 => [
+   'damaging' => 0.4,
+   ]
+   ];
+   $thresholds = [
+   'damaging' => [
+   'maybebad' => 0.16,
+   'likelybad' => 0.56,
+   ],
+   ];
+
+   $skin = SkinFactory::getDefaultInstance()->makeSkin( 'fallback' 
);
+   $outputPage = new OutputPage( $this->context );
+   $outputPage->setProperty( 'oresData', $oresData );
+
+

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Mostly cover ChangesListHooksHandler

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Mostly cover ChangesListHooksHandler
..


Mostly cover ChangesListHooksHandler

Bug: T184140
Change-Id: I306812039bca488ea037a0e8bcfe7b441d7179e6
---
M tests/phpunit/includes/Hooks/ChangesListHooksHandlerTest.php
1 file changed, 86 insertions(+), 49 deletions(-)

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



diff --git a/tests/phpunit/includes/Hooks/ChangesListHooksHandlerTest.php 
b/tests/phpunit/includes/Hooks/ChangesListHooksHandlerTest.php
index 1031cc5..b55bd01 100644
--- a/tests/phpunit/includes/Hooks/ChangesListHooksHandlerTest.php
+++ b/tests/phpunit/includes/Hooks/ChangesListHooksHandlerTest.php
@@ -15,6 +15,7 @@
 use RequestContext;
 use SpecialPage;
 use User;
+use Wikimedia\TestingAccessWrapper;
 
 /**
  * @group ORES
@@ -56,13 +57,14 @@
$this->context = self::getContext( $this->user );
}
 
-   /**
-* @covers ORES\Hooks\ChangesListHooksHandler::getScoreRecentChangesList
-*/
-   public function testOresRCObj() {
+   protected function makeRcEntry( $isDamaging = false ) {
$row = new \stdClass();
$row->ores_damaging_threshold = 0.2;
-   $row->ores_damaging_score = 0.3;
+   if ( $isDamaging ) {
+   $row->ores_damaging_score = 0.3;
+   } else {
+   $row->ores_damaging_score = 0.1;
+   }
$row->rc_patrolled = 0;
$row->rc_timestamp = '20150921134808';
$row->rc_deleted = 0;
@@ -71,11 +73,18 @@
$row->rc_comment_data = null;
 
$rc = RecentChange::newFromRow( $row );
-   $this->assertTrue( 
ChangesListHooksHandler::getScoreRecentChangesList( $rc, $this->context ) );
+   return $rc;
+   }
 
-   $row->ores_damaging_threshold = 0.4;
-   $rc = RecentChange::newFromRow( $row );
-   $this->assertFalse( 
ChangesListHooksHandler::getScoreRecentChangesList( $rc, $this->context ) );
+   /**
+* @covers ORES\Hooks\ChangesListHooksHandler::getScoreRecentChangesList
+*/
+   public function testGetScoreRecentChangesList() {
+   $this->assertTrue( 
ChangesListHooksHandler::getScoreRecentChangesList(
+   $this->makeRcEntry( true ), $this->context ) );
+
+   $this->assertFalse( 
ChangesListHooksHandler::getScoreRecentChangesList(
+   $this->makeRcEntry( false ), $this->context ) );
}
 
/**
@@ -193,16 +202,7 @@
 * @covers 
ORES\Hooks\ChangesListHooksHandler::onEnhancedChangesListModifyLineData
 */
public function testOnEnhancedChangesListModifyLineDataDamaging() {
-   $row = new \stdClass();
-   $row->ores_damaging_threshold = 0.2;
-   $row->ores_damaging_score = 0.3;
-   $row->rc_patrolled = 0;
-   $row->rc_timestamp = '20150921134808';
-   $row->rc_deleted = 0;
-   $row->rc_comment = '';
-   $row->rc_comment_text = '';
-   $row->rc_comment_data = null;
-   $rc = RecentChange::newFromRow( $row );
+   $rc = $this->makeRcEntry( true );
$rc = RCCacheEntry::newFromParent( $rc );
 
$ecl = $this->getMockBuilder( EnhancedChangesList::class )
@@ -238,16 +238,7 @@
 * @covers 
ORES\Hooks\ChangesListHooksHandler::onEnhancedChangesListModifyLineData
 */
public function testOnEnhancedChangesListModifyLineDataNonDamaging() {
-   $row = new \stdClass();
-   $row->ores_damaging_threshold = 0.4;
-   $row->ores_damaging_score = 0.3;
-   $row->rc_patrolled = 0;
-   $row->rc_timestamp = '20150921134808';
-   $row->rc_deleted = 0;
-   $row->rc_comment = '';
-   $row->rc_comment_text = '';
-   $row->rc_comment_data = null;
-   $rc = RecentChange::newFromRow( $row );
+   $rc = $this->makeRcEntry( false );
$rc = RCCacheEntry::newFromParent( $rc );
 
$ecl = $this->getMockBuilder( EnhancedChangesList::class )
@@ -287,16 +278,7 @@
 * @covers 
ORES\Hooks\ChangesListHooksHandler::onOldChangesListRecentChangesLine
 */
public function testOnOldChangesListModifyLineDataDamaging() {
-   $row = new \stdClass();
-   $row->ores_damaging_threshold = 0.2;
-   $row->ores_damaging_score = 0.3;
-   $row->rc_patrolled = 0;
-   $row->rc_timestamp = '20150921134808';
-   $row->rc_deleted = 0;
-   $row->rc_comment = '';
-   $row->rc_comment_text = '';
-

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Lift the cap on IP address to create accounts on mrwiki

2018-01-09 Thread Jayprakash12345 (Code Review)

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

Change subject: Lift the cap on IP address to create accounts on mrwiki
..

Lift the cap on IP address to create accounts on mrwiki

Change-Id: I1d5ab7a79dcff59ebe4bbd9fc279ad11d713eef6
---
M wmf-config/throttle.php
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/42/403342/2

diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index 9719ddd..102697b 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -36,4 +36,12 @@
'value' => 40 // 30 expected
 ];
 
+$wmgThrottlingExceptions[] = [ // T184579
+   'from' => '2018-01-11T09:00 +5:30',
+   'to' => '2018-01-11T18:00 +5:30',
+   'range' => '103.8.192.54',
+   'dbname' => [ 'mrwiki', 'enwiki' ],
+   'value' => 40 // 35 expected
+];
+
 ## Add throttling definitions above.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d5ab7a79dcff59ebe4bbd9fc279ad11d713eef6
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>
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]: Use Promise.async/yield in roundtrip-test.js

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Use Promise.async/yield in roundtrip-test.js
..


Use Promise.async/yield in roundtrip-test.js

This is a clean up in advance of cloning this for the language converter
test facility.  Audited code to ensure that the legacy 'callback' parameter
to runTests was never used, and removed the weird corner case where passing
'check' in the runTests options would change the structure of the return
value.  Also removed our usage of the deprecated `--prefix` option in
the `roundtrip` test in package.json, and added `--domain` options where
they were previously implicit, just to make our test cases explicit.

Depends-On: I732ae30a5295f6b1f833553c2293bec8b13ff1c9
Change-Id: I8cad43c9ae0e6046957c57b9233c69be2f7c0473
---
M bin/roundtrip-test.js
M package.json
M tests/testreduce/rtTestWrapper.js
M tools/regression-testing.js
4 files changed, 95 insertions(+), 106 deletions(-)

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



diff --git a/bin/roundtrip-test.js b/bin/roundtrip-test.js
index 2743392..5fb2da8 100755
--- a/bin/roundtrip-test.js
+++ b/bin/roundtrip-test.js
@@ -6,6 +6,7 @@
 
 var domino = require('domino');
 var yargs = require('yargs');
+var zlib = require('pn/zlib');
 
 var Promise = require('../lib/utils/promise.js');
 var Util = require('../lib/utils/Util.js').Util;
@@ -13,8 +14,6 @@
 var apiUtils = require('../lib/api/apiUtils');
 var ParsoidConfig = require('../lib/config/ParsoidConfig.js').ParsoidConfig;
 var Diff = require('../lib/utils/Diff.js').Diff;
-
-var gzip = Promise.promisify(require('zlib').gzip, false);
 
 var defaultContentVersion = '1.6.0';
 
@@ -467,7 +466,7 @@
 
 var UA = 'Roundtrip-Test';
 
-function parsoidPost(profile, options) {
+var parsoidPost = Promise.async(function *(profile, options) {
var httpOptions = {
method: 'POST',
body: options.data,
@@ -497,35 +496,33 @@
}
httpOptions.uri = uri;
 
-   return Util.retryingHTTPRequest(10, httpOptions)
-   .spread(function(_, body) {
-   var p = Promise.resolve();
-   // FIXME: Parse time was removed from profiling when we stopped
-   // sending the x-parsoid-performance header.
-   if (options.recordSizes) {
-   var pre = '';
-   if (options.profilePrefix) {
-   pre += options.profilePrefix + ':';
-   }
-   var str;
-   if (options.html2wt) {
-   pre += 'html:';
-   str = body;
-   } else {
-   pre += 'wt:';
-   str = body.html.body;
-   }
-   profile.size[pre + 'raw'] = str.length;
-   // Compress to record the gzipped size
-   p = gzip(str).then(function(gzippedbuf) {
-   profile.size[pre + 'gzip'] = gzippedbuf.length;
-   });
-   }
-   return p.then(function() { return body; });
-   });
-}
+   var result = yield Util.retryingHTTPRequest(10, httpOptions);
+   var body = result[1];
 
-function roundTripDiff(profile, parsoidOptions, data) {
+   // FIXME: Parse time was removed from profiling when we stopped
+   // sending the x-parsoid-performance header.
+   if (options.recordSizes) {
+   var pre = '';
+   if (options.profilePrefix) {
+   pre += options.profilePrefix + ':';
+   }
+   var str;
+   if (options.html2wt) {
+   pre += 'html:';
+   str = body;
+   } else {
+   pre += 'wt:';
+   str = body.html.body;
+   }
+   profile.size[pre + 'raw'] = str.length;
+   // Compress to record the gzipped size
+   var gzippedbuf = yield zlib.gzip(str);
+   profile.size[pre + 'gzip'] = gzippedbuf.length;
+   }
+   return body;
+});
+
+var roundTripDiff = Promise.async(function *(profile, parsoidOptions, data) {
var diff = Diff.diffLines(data.newWt, data.oldWt);
var offsets = Diff.convertDiffToOffsetPairs(diff);
if (!diff.length || !offsets.length) { return []; }
@@ -535,16 +532,16 @@
wt2html: true,
data: { wikitext: data.newWt, contentmodel: contentmodel },
}, parsoidOptions);
-   return parsoidPost(profile, options).then(function(body) {
-   data.newHTML = body.html;
-   data.newDp = body['data-parsoid'];
-   data.newMw = body['data-mw'];
-   return

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: analytics: remove cdh modules and roles

2018-01-09 Thread BryanDavis (Code Review)

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

Change subject: analytics: remove cdh modules and roles
..

analytics: remove cdh modules and roles

Bug: T184151
Change-Id: I1acab43b3e8d9b9fc860074e7cc3d0caa4e60f30
---
M .gitmodules
M .rubocop.yml
M puppet/hieradata/common.yaml
D puppet/modules/cdh
D puppet/modules/role/files/analytics/cdh5.apt-pin
D puppet/modules/role/manifests/analytics.pp
D puppet/modules/role/manifests/hadoop.pp
D puppet/modules/role/manifests/hive.pp
D puppet/modules/role/manifests/hue.pp
D puppet/modules/role/manifests/oozie.pp
D puppet/modules/role/manifests/spark.pp
11 files changed, 0 insertions(+), 251 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/41/403341/1

diff --git a/.gitmodules b/.gitmodules
index 117e3b4..2b59571 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "puppet/modules/nginx"]
path = puppet/modules/nginx
url = https://gerrit.wikimedia.org/r/operations/puppet/nginx
-[submodule "puppet/modules/cdh"]
-   path = puppet/modules/cdh
-   url = https://gerrit.wikimedia.org/r/operations/puppet/cdh
diff --git a/.rubocop.yml b/.rubocop.yml
index 6ff92d4..add6cd7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,7 +8,6 @@
 - 'mediawiki/**/*'
 - 'mediawiki-*/**/*'
 - 'puppet/modules/activemq/**/*'
-- 'puppet/modules/cdh/**/*'
 - 'puppet/modules/nginx/**/*'
 - 'puppet/modules/stdlib/**/*'
 - 'puppet/modules/wmflib/**/*'
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 81ee666..0ab34fe 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -11,12 +11,6 @@
 cassandra::new_size: "10M"
 cassandra::logdir: /vagrant/logs/cassandra
 
-cdh::hue::secret_key: vagrant
-cdh::hue::hive_server_host: "%{::fqdn}"
-
-cdh::oozie::server::db_root_password: "%{hiera('mysql::root_password')}"
-cdh::oozie::server::heapsize: 64
-
 citoid::port: 1970
 citoid::log_level: info
 
diff --git a/puppet/modules/cdh b/puppet/modules/cdh
deleted file mode 16
index 248216f..000
--- a/puppet/modules/cdh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 248216fc71b974e99ffd8d235d8afe289703b976
diff --git a/puppet/modules/role/files/analytics/cdh5.apt-pin 
b/puppet/modules/role/files/analytics/cdh5.apt-pin
deleted file mode 100644
index dead664..000
--- a/puppet/modules/role/files/analytics/cdh5.apt-pin
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: zookeeper
-Pin: version 3.4.5+cdh*
-Pin-Priority: 1001
diff --git a/puppet/modules/role/manifests/analytics.pp 
b/puppet/modules/role/manifests/analytics.pp
deleted file mode 100644
index f449f69..000
--- a/puppet/modules/role/manifests/analytics.pp
+++ /dev/null
@@ -1,54 +0,0 @@
-# == Class: role::analytics
-# Includes all analytics related roles:
-# - hadoop
-# - hive
-# - oozie
-# - pig
-# - sqoop
-# - hue
-#
-# NOTE!  To use this class, you must have the
-# puppet-cdh git submodule available.  Run this command on your
-# local machine make sure modules/cdh is cloned and up to date.
-#
-#git submodule update --init
-#
-# To use Hadoop GUIs, you'll want to set up some extra Vagrant
-# forwarded ports.  You'll also need more RAM allocated to Vagrant.
-# Edit your .settings.yaml file and add:
-#
-#   vagrant_ram: 2048
-#   forward_ports:
-# :  ,# Hue
-# 8088:  8088,# Hadoop Job GUI
-# 50070: 50070,   # Hadoop NameNode GUI
-# 11000: 11000# Oozie
-#
-# ALSO!  If you are not planning on using Mediawiki for this
-# vagrant instance, you should edit hieradata/common.yaml and
-# remove the   - '::role::mediawiki' line from classes to include
-# by default.
-#
-class role::analytics {
-include ::apt
-
-include ::role::hadoop
-include ::role::hive
-include ::role::oozie
-include ::role::hue
-include ::role::spark
-
-# cdh::mahout, cdh::pig and cdh::sqoop are not parameterized so they
-# do not need their own role classes.
-include ::cdh::mahout
-include ::cdh::pig
-include ::cdh::sqoop
-
-file { '/etc/apt/preferences.d/cdh5':
-source => 'puppet:///modules/role/analytics/cdh5.apt-pin',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-before => Package['zookeeper'],
-}
-}
diff --git a/puppet/modules/role/manifests/hadoop.pp 
b/puppet/modules/role/manifests/hadoop.pp
deleted file mode 100644
index c0f5523..000
--- a/puppet/modules/role/manifests/hadoop.pp
+++ /dev/null
@@ -1,106 +0,0 @@
-# == Class: role::hadoop
-# Installs and runs all hadoop services.
-#
-class role::hadoop {
-require_package('openjdk-8-jdk')
-
-$namenode_hosts   = [$::fqdn]
-
-$hadoop_directory = '/var/lib/hadoop'
-$hadoop_name_directory= "${hadoop_directory}/name"
-$hadoop_data_directory= "${hadoop_directory}/data"
-
-file {

[MediaWiki-commits] [Gerrit] operations...apertium-cat-srd[master]: apertium-cat-srd: New upstream and updated dependencies

2018-01-09 Thread KartikMistry (Code Review)

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

Change subject: apertium-cat-srd: New upstream and updated dependencies
..

apertium-cat-srd: New upstream and updated dependencies

Bug: T171406
Change-Id: Ia801c8ce4d2a2a97715b710c3b06fd95bef77981
---
M debian/changelog
M debian/control
2 files changed, 12 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-cat-srd
 refs/changes/40/403340/1

diff --git a/debian/changelog b/debian/changelog
index 1021ed8..6aaa449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apertium-cat-srd (1.0.0~r82995-1+wmf1) jessie-wikimedia; urgency=low
+
+  * New upstream release.
+  * Updated dependency on cg3.
+  * Depends on newer apertium-cat, apertium-srd.
+
+ -- Kartik Mistry   Wed, 10 Jan 2018 09:20:14 +0530
+
 apertium-cat-srd (0.9.0~r82238-1+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie.
diff --git a/debian/control b/debian/control
index ad049a8..323645e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@
 Maintainer: Debian Science Team 

 Uploaders: Tino Didriksen ,
Kartik Mistry 
-Build-Depends: apertium-cat (>= 2.3.0~r82237),
+Build-Depends: apertium-cat (>= 2.3.1~r82994),
apertium-dev (>= 3.4),
apertium-lex-tools,
-   apertium-srd (>= 0.10.0~r82237),
+   apertium-srd (>= 1.2.0~r82994),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -23,7 +23,7 @@
 Architecture: all
 Depends: apertium (>= 3.4),
  apertium-lex-tools,
- cg3,
+ cg3 (>= 1.0.0~r12254),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides: apertium-srd-cat

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia801c8ce4d2a2a97715b710c3b06fd95bef77981
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-cat-srd
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] operations...apertium-cat[master]: apertium-cat: New upstream and updated dependency on cg3

2018-01-09 Thread KartikMistry (Code Review)

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

Change subject: apertium-cat: New upstream and updated dependency on cg3
..

apertium-cat: New upstream and updated dependency on cg3

Bug: T171406
Change-Id: I9b91e57f896d63a3c06cfba235654041cc8b5c8a
---
M debian/changelog
M debian/control
2 files changed, 12 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-cat
 refs/changes/39/403339/1

diff --git a/debian/changelog b/debian/changelog
index a6b4fc2..a0124bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apertium-cat (2.3.1~r82994-1+wmf1) jessie-wikimedia; urgency=low
+
+  * New upstream release.
+  * Updated dependency on cg3.
+
+ -- Kartik Mistry   Wed, 10 Jan 2018 09:05:50 +0530
+
 apertium-cat (2.3.0~r82237-1+wmf1) jessie-wikimedia; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 73dd33f..57a0cea 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -19,6 +19,9 @@
 
 Package: apertium-cat
 Architecture: all
-Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Apertium single language data for Catalan
  Data package providing Apertium language resources for Catalan

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b91e57f896d63a3c06cfba235654041cc8b5c8a
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-cat
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] mediawiki...Cite[master]: Replace "getSelectedItem" with "findSelectedItem"

2018-01-09 Thread Zoranzoki21 (Code Review)

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

Change subject: Replace "getSelectedItem" with "findSelectedItem"
..

Replace "getSelectedItem" with "findSelectedItem"

Replace instances of getSelectedItem with findSelectedItem in 
modules/ve-cite/ve.ui.MWReferenceSearchWidget.js in MediaWiki's Cite extension.

Bug: T184037
Change-Id: Ie4b191ba55cf1cf1300182e056a5a4901c18d583
---
M modules/ve-cite/ve.ui.MWReferenceSearchWidget.js
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/ve-cite/ve.ui.MWReferenceSearchWidget.js 
b/modules/ve-cite/ve.ui.MWReferenceSearchWidget.js
index a2e0570..488b65f 100644
--- a/modules/ve-cite/ve.ui.MWReferenceSearchWidget.js
+++ b/modules/ve-cite/ve.ui.MWReferenceSearchWidget.js
@@ -60,8 +60,8 @@
 ve.ui.MWReferenceSearchWidget.prototype.setInternalList = function ( 
internalList ) {
var i, iLen, groupNames, groupName, groups = 
internalList.getNodeGroups();
 
-   if ( this.results.getSelectedItem() ) {
-   this.results.getSelectedItem().setSelected( false );
+   if ( this.results.findSelectedItem() ) {
+   this.results.findSelectedItem().setSelected( false );
}
 
this.internalList = internalList;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4b191ba55cf1cf1300182e056a5a4901c18d583
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 

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

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Avoid $wgRequest & $wgOut globals in ArticleFromTitle hook s...

2018-01-09 Thread SamanthaNguyen (Code Review)

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

Change subject: Avoid $wgRequest & $wgOut globals in ArticleFromTitle hook 
subscriber
..

Avoid $wgRequest & $wgOut globals in ArticleFromTitle hook subscriber

Change-Id: I3501ebb7a562b87c12f3ad5c4a87883ed6c04701
---
M UserProfile/UserProfileHooks.php
1 file changed, 9 insertions(+), 5 deletions(-)


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

diff --git a/UserProfile/UserProfileHooks.php b/UserProfile/UserProfileHooks.php
index 5c2d458..173983b 100644
--- a/UserProfile/UserProfileHooks.php
+++ b/UserProfile/UserProfileHooks.php
@@ -44,7 +44,11 @@
 * @return bool
 */
public static function onArticleFromTitle( &$title, &$article ) {
-   global $wgRequest, $wgOut, $wgHooks, $wgUserPageChoice;
+   global $wgHooks, $wgUserPageChoice;
+
+   $context = $article->getContext();
+   $out = $context->getOutput();
+   $request = $context->getRequest();
 
if (
!$title->isSubpage() &&
@@ -63,15 +67,15 @@
 
if ( !$show_user_page ) {
// Prevents editing of userpage
-   if ( $wgRequest->getVal( 'action' ) == 'edit' ) 
{
-   $wgOut->redirect( $title->getFullURL() 
);
+   if ( $request->getVal( 'action' ) == 'edit' ) {
+   $out->redirect( $title->getFullURL() );
}
} else {
-   $wgOut->enableClientCache( false );
+   $out->enableClientCache( false );
$wgHooks['ParserLimitReportPrepare'][] = 
'UserProfileHooks::onParserLimitReportPrepare';
}
 
-   $wgOut->addModuleStyles( [
+   $out->addModuleStyles( [
'ext.socialprofile.clearfix',
'ext.socialprofile.userprofile.css'
] );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3501ebb7a562b87c12f3ad5c4a87883ed6c04701
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Add lightgbm support

2018-01-09 Thread EBernhardson (Code Review)

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

Change subject: Add lightgbm support
..

Add lightgbm support

Only support single-executor training at the moment. Distributed
training is left for another day.

Change-Id: Ia9a188ef87afc86985ac9c3e269b6665dcceca10
---
A mjolnir/training/lightgbm.py
M mjolnir/utilities/training_pipeline.py
M setup.py
3 files changed, 248 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR 
refs/changes/35/403335/1

diff --git a/mjolnir/training/lightgbm.py b/mjolnir/training/lightgbm.py
new file mode 100644
index 000..cbc8883
--- /dev/null
+++ b/mjolnir/training/lightgbm.py
@@ -0,0 +1,221 @@
+from __future__ import absolute_import
+import contextlib
+import functools
+import hyperopt
+import json
+import lightgbm as lgb
+import math
+import mjolnir.training.hyperopt
+from mjolnir.utils import as_local_paths
+from multiprocessing.dummy import Pool
+import numpy as np
+import pyspark
+
+
+def _overrideParamsAccordingToTaskCpus(sc, params):
+n_cpus = int(sc.getConf().get("spark.task.cpus", "1"))
+if 'num_threads' not in params:
+params['num_threads'] = n_cpus
+elif params['num_threads'] > n_cpus:
+raise Exception(
+"the num_threads param %d must be no larger than spark.task.cpus 
(%d)" % (
+params['num_threads'], n_cpus))
+
+
+@contextlib.contextmanager
+def load_datasets(fold, train_matrix):
+with as_local_paths(*fold.values) as local_paths:
+datasets = dict(zip(fold.keys(), local_paths))
+try:
+yield datasets
+finally:
+for ds in datasets.values():
+ds._free_handle()
+
+
+def build_distributed_boosters(rdd, params, train_matrix):
+def build_partition(rows):
+fold = rows.next()
+try:
+rows.next()
+raise Exception("Expected single row in partition but received 
more.")
+except StopIteration:
+pass
+
+num_rounds = 100
+if 'num_rounds' in params:
+num_rounds = params['num_rounds']
+del params['num_rounds']
+
+# TODO: Generalize
+with load_datasets(fold) as datasets:
+eval_results = {}
+gbm = lgb.train(
+params, datasets[train_matrix],
+num_boost_round=num_rounds,
+valid_sets=datasets.values(), valid_names=datasets.keys(),
+early_stopping_rounds=None, evals_result=eval_results)
+gbm.free_dataset()
+yield (gbm, eval_results)
+
+return rdd.mapPartitions(build_partition).cache()
+
+
+def _coerce_params(params):
+types = {
+'min_data_in_leaf': int,
+'num_leaves': int,
+}
+for k, val_type in types.items():
+if k in params:
+params[k] = val_type(params[k])
+
+
+def train(fold, paramOverrides, train_matrix=None):
+sc = pyspark.SparkContext.getOrCreate()
+params = {
+'boosting_type': 'gbdt',
+'objective': 'lambdarank',
+'metric': 'ndcg',
+'ndcg_eval_at': '1,3,5,10',
+'is_training_metric': True,
+'num_rounds': 100,
+'max_bin': 255,
+'num_leaves': 63,
+'learning_rate': 0.1,
+'feature_fraction': 1.0,
+'bagging_fraction': 0.9,
+'bagging_freq': 1,
+'verbose': 0,
+}
+params.update(paramOverrides)
+_overrideParamsAccordingToTaskCpus(sc, params)
+_coerce_params(params)
+
+if (len(fold) > 1):
+rdd = sc.parallelize(list(enumerate(fold)), 1).partitionBy(len(fold), 
lambda x: x).map(lambda x: x[1])
+raise Exception("TODO: Distributed Training")
+else:
+rdd = sc.parallelize(fold, 1)
+
+if train_matrix is None:
+train_matrix = "all" if "all" in fold else "train"
+
+booster, metrics = build_distributed_boosters(rdd, params, 
train_matrix).collect()[0]
+return LightGBMModel(booster, metrics)
+
+
+class LightGBMSummary(object):
+def __init__(self, metrics):
+self._metrics = metrics
+
+def train(self):
+return self._metrics['train']['ndcg@10']
+
+def test(self):
+return self._metrics['test']['ndcg@10']
+
+
+class LightGBMModel(object):
+def __init__(self, booster, metrics):
+self._booster = booster
+self.metrics = metrics
+
+def summary(self):
+return LightGBMSummary(self.metrics)
+
+def dump(self, features=None):
+# TODO: lightgbm needs features provided when creating the dataset
+return json.dumps(self._booster.dump_model())
+
+def saveModelAsLocalFile(self, path):
+self._booster.save_model(path)
+
+
+def tune(folds, stats, train_matrix, num_cv_jobs=5, num_workers=5, 
initial_num_trees=100, final_num_trees=500):
+cv_pool = None
+if num_cv_jobs > 1:
+cv_pool

[MediaWiki-commits] [Gerrit] wikimedia...dash[master]: Stop inserting extra 'A/B testing' boards

2018-01-09 Thread Ejegg (Code Review)

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

Change subject: Stop inserting extra 'A/B testing' boards
..


Stop inserting extra 'A/B testing' boards

Change-Id: Ibb3026cec2a6ce25bc82c8f0a1e5245c5f16d580
---
M schema/0002_abtesting.sql
1 file changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/schema/0002_abtesting.sql b/schema/0002_abtesting.sql
index f632a71..37d3d0a 100644
--- a/schema/0002_abtesting.sql
+++ b/schema/0002_abtesting.sql
@@ -6,13 +6,14 @@
 insert ignore into dash_user (id, display_name)
value (1, 'Dev User');
 
--- TODO: Make idempotent
+set @board_count = ( select count(*) FROM dash_board WHERE display_name='A/B 
Testing' AND owner_id = 1 );
+
 insert ignore into dash_board (display_name, description, owner_id, is_shared)
-   values ('A/B Testing', 'Banner A/B test results', 1, true);
+   SELECT 'A/B Testing', 'Banner A/B test results', 1, 1
+   FROM dash_user u
+   WHERE id = 1 AND @board_count = 0;
 
-set @bid = (select id from dash_board where display_name = 'A/B Testing');
-
-update dash_user set default_board = @bid where id = 1;
+set @bid = (select id from dash_board where owner_id = 1 AND display_name = 
'A/B Testing');
 
 insert ignore into dash_widget_instance (widget_id, owner_id, display_name, 
is_shared)
select @wid, 1, display_name, 1 from dash_widget where id = @wid;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb3026cec2a6ce25bc82c8f0a1e5245c5f16d580
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Simplify hyperparameter tuning

2018-01-09 Thread EBernhardson (Code Review)

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

Change subject: Simplify hyperparameter tuning
..

Simplify hyperparameter tuning

I tested letting all the tuning happen at once instead of
the iterative approach we were using, it went quicker and
gave comparable results. This will also make it easier to
add in lightgbm as an alternate training algo.

Also removed use_external_memory parameter from xgboost. This
is specialized and won't be necessary anymore after an
upcoming refactor for file based training.

Change-Id: I8cc4ee504d0e49bc61ffc5d2781e131fabe4372c
---
M example_train.yaml
A mjolnir/pruning.py
A mjolnir/scan_es.py
M mjolnir/test/fixtures/load_config/example_train.expect
M mjolnir/test/training/test_hyperopt.py
M mjolnir/test/training/test_tuning.py
M mjolnir/training/hyperopt.py
M mjolnir/training/tuning.py
M mjolnir/training/xgboost.py
M mjolnir/utilities/training_pipeline.py
10 files changed, 306 insertions(+), 330 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR 
refs/changes/33/40/1

diff --git a/example_train.yaml b/example_train.yaml
index 183ea6e..31ce45c 100644
--- a/example_train.yaml
+++ b/example_train.yaml
@@ -138,7 +138,6 @@
 cv-jobs: 22
 folds: 3
 final-trees: 100
-use-external-memory: yes
 
 medium:
 # 4M to 12M observations per executor.
diff --git a/mjolnir/pruning.py b/mjolnir/pruning.py
new file mode 100644
index 000..c2e78f9
--- /dev/null
+++ b/mjolnir/pruning.py
@@ -0,0 +1,134 @@
+from __future__ import absolute_import
+import json
+import math
+from pyspark.sql import functions as F
+from pyspark.sql.types import FloatType, StructField, StructType
+
+
+class Split(object):
+def __init__(self, left, right, feature, threshold):
+self.left = left
+self.right = right
+self.feature = feature
+self.threshold = threshold
+
+def isLeaf(self):
+return False
+
+def eval(self, features):
+n = self
+while not n.isLeaf():
+if n.threshold > features[n.feature]:
+n = n.left
+else:
+n = n.right
+return n.output
+
+
+class Leaf(object):
+def __init__(self, output):
+self.output = output
+
+def isLeaf(self):
+return True
+
+
+def _parse_node(json_node):
+if 'leaf' in json_node:
+return Leaf(json_node['leaf'])
+else:
+left = _parse_node(json_node['children'][0])
+right = _parse_node(json_node['children'][1])
+return Split(left, right, json_node['split'], 
json_node['split_condition'])
+
+
+def parse_xgboost(json_tree):
+return [_parse_node(tree) for tree in json.loads(json_tree)]
+
+
+def ndcg_at_k(k, predicted, actual):
+idcg = sum([((1 << label) - 1) / math.log(i + 2.0, 2) for i, label in 
enumerate(actual[:k])])
+if idcg == 0:
+return 0.
+else:
+dcg = sum([((1 << label) - 1) / math.log(i + 2.0, 2) for i, label in 
enumerate(predicted[:k])])
+return dcg / idcg
+
+
+# Horrible name ... it returns the ndcg for each removed tree
+def gen_per_tree_ndcg(tree_cols, removed_trees, label_col, k=10):
+def f(rows):
+# Remove trees from the sum
+cur_sum = [reduce(lambda acc, tree: acc - row[tree], removed_trees, 
row.sum) for row in rows]
+data = zip(rows, cur_sum)
+
+# TODO: actual could be pre-calculated? Actually full idcg could be 
pre-calculated
+actual = [x[0][label_col] for x in sorted(data, key=lambda x: 
x[0][label_col], reverse=True)]
+# baseline ndcg
+predicted = [x[0][label_col] for x in sorted(data, key=lambda x: x[1], 
reverse=True)]
+res = [ndcg_at_k(k, predicted, actual)]
+# Per-tree ndcgs
+for tree_pred in tree_cols:
+predicted = [x[0][label_col] for x in sorted(data, key=lambda x: 
x[1] - x[0][tree_pred], reverse=True)]
+res.append(ndcg_at_k(k, predicted, actual))
+return res
+fields = [StructField(name, FloatType()) for name in ['orig'] + tree_cols]
+return F.udf(f, StructType(fields))
+
+
+def gen_eval_tree_udf(bc_trees):
+def f(tree_id, features):
+return bc_trees.value[tree_id].eval(features)
+return F.udf(f, FloatType())
+
+
+def prune(df, trees, feature_col='features', label_col='label', 
group_cols=['wikiid', 'query']):
+# Calculate per-tree scores
+eval_tree_udf = gen_eval_tree_udf(df._sc.broadcast(trees))
+cols = [eval_tree_udf(F.lit(i), feature_col).alias('tree_%d' % (i)) for i 
in range(len(trees))]
+tree_cols = ['tree_%d' % (i) for i in range(len(trees))]
+
+# We should iterate until it gets worse or we hit some desired # of trees
+df_w_scores = (
+df
+.select(feature_col, label_col, 
F.concat(*group_cols).alias('group_id'))
+

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: [WIP] distributed training for lightgbm

2018-01-09 Thread EBernhardson (Code Review)

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

Change subject: [WIP] distributed training for lightgbm
..

[WIP] distributed training for lightgbm

untested. The daemon never closes right

Change-Id: Id50f4f53b221003a89555e870bb771ba26faad21
---
M mjolnir/training/lightgbm.py
1 file changed, 267 insertions(+), 81 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR 
refs/changes/36/403336/1

diff --git a/mjolnir/training/lightgbm.py b/mjolnir/training/lightgbm.py
index cbc8883..460740b 100644
--- a/mjolnir/training/lightgbm.py
+++ b/mjolnir/training/lightgbm.py
@@ -9,7 +9,11 @@
 from mjolnir.utils import as_local_paths
 from multiprocessing.dummy import Pool
 import numpy as np
+import Pyro4
 import pyspark
+import socket
+import threading
+import time
 
 
 def _overrideParamsAccordingToTaskCpus(sc, params):
@@ -33,7 +37,9 @@
 ds._free_handle()
 
 
-def build_distributed_boosters(rdd, params, train_matrix):
+def build_distributed_boosters(rdd, params, train_matrix, client):
+num_partitions = rdd.getNumPartitions()
+
 def build_partition(rows):
 fold = rows.next()
 try:
@@ -47,7 +53,11 @@
 num_rounds = params['num_rounds']
 del params['num_rounds']
 
-# TODO: Generalize
+if client is not None:
+machines, listen_port = client.request_machine_list(num_partitions)
+params['machines'] = machines
+params['local_listen_port'] = listen_port
+
 with load_datasets(fold) as datasets:
 eval_results = {}
 gbm = lgb.train(
@@ -71,7 +81,7 @@
 params[k] = val_type(params[k])
 
 
-def train(fold, paramOverrides, train_matrix=None):
+def train(fold, paramOverrides, train_matrix=None, client=None):
 sc = pyspark.SparkContext.getOrCreate()
 params = {
 'boosting_type': 'gbdt',
@@ -95,13 +105,15 @@
 if (len(fold) > 1):
 rdd = sc.parallelize(list(enumerate(fold)), 1).partitionBy(len(fold), 
lambda x: x).map(lambda x: x[1])
 raise Exception("TODO: Distributed Training")
+if client is None:
+raise Exception("client required for distributed training")
 else:
 rdd = sc.parallelize(fold, 1)
 
 if train_matrix is None:
 train_matrix = "all" if "all" in fold else "train"
 
-booster, metrics = build_distributed_boosters(rdd, params, 
train_matrix).collect()[0]
+booster, metrics = build_distributed_boosters(rdd, params, train_matrix, 
client).collect()[0]
 return LightGBMModel(booster, metrics)
 
 
@@ -132,90 +144,264 @@
 self._booster.save_model(path)
 
 
+DAEMON_PORT = 6827
+
+
 def tune(folds, stats, train_matrix, num_cv_jobs=5, num_workers=5, 
initial_num_trees=100, final_num_trees=500):
 cv_pool = None
 if num_cv_jobs > 1:
 cv_pool = Pool(num_cv_jobs)
 
-# Configure the trials pool large enough to keep cv_pool full
-num_folds = len(folds)
-num_workers = len(folds[0])
-trials_pool_size = int(math.floor(num_cv_jobs / (num_workers * num_folds)))
-if trials_pool_size > 1:
-trials_pool = Pool(trials_pool_size)
-else:
-trials_pool = None
+with Daemon(socket.gethostname(), DAEMON_PORT) as daemon:
+while not daemon.ready:
+time.sleep(1)
 
-train_func = functools.partial(train, train_matrix=train_matrix)
+# Configure the trials pool large enough to keep cv_pool full
+num_folds = len(folds)
+num_workers = len(folds[0])
+trials_pool_size = int(math.floor(num_cv_jobs / (num_workers * 
num_folds)))
+if trials_pool_size > 1:
+trials_pool = Pool(trials_pool_size)
+else:
+trials_pool = None
 
-def eval_space(space, max_evals):
-max_evals = 2  # TODO: remove
-best, trials = mjolnir.training.hyperopt.minimize(
-folds, train_func, space, max_evals=max_evals,
-cv_pool=cv_pool, trials_pool=trials_pool)
-for k, v in space.items():
-if not np.isscalar(v):
-print 'best %s: %f' % (k, best[k])
-return best, trials
+kwargs = {'train_matrix': train_matrix}
+if num_workers > 1:
+kwargs['client'] = Client(daemon.url)
+train_func = functools.partial(train, **kwargs)
 
-space = {
-'boosting_type': 'gbdt',
-'objective': 'lambdarank',
-'metric': 'ndcg',
-'ndcg_eval_at': '1,3,10',
-'is_training_metric': True,
-'num_rounds': initial_num_trees,
-'max_bin': 255,
-'num_leaves': 63,
-'learning_rate': 0.1,
-'feature_fraction': 1.0,
-'bagging_fraction': 0.9,
-'bagging_freq': 1,
-}
-tune_spaces = [
-('initial', {
-'iterations': 5,
-'space': {
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: JavaScriptMinifier: Improve docs for parsing of string literals

2018-01-09 Thread Krinkle (Code Review)

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

Change subject: JavaScriptMinifier: Improve docs for parsing of string literals
..

JavaScriptMinifier: Improve docs for parsing of string literals

Also update docs for parsing of regexp literals to match.

Bug: T75556
Change-Id: I86c79b1b1866339d65d1c69e56d457c62544aaac
---
M includes/libs/JavaScriptMinifier.php
1 file changed, 22 insertions(+), 4 deletions(-)


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

diff --git a/includes/libs/JavaScriptMinifier.php 
b/includes/libs/JavaScriptMinifier.php
index e0bbb59..3be20dd 100644
--- a/includes/libs/JavaScriptMinifier.php
+++ b/includes/libs/JavaScriptMinifier.php
@@ -433,27 +433,43 @@
continue;
}
 
-   // Find out which kind of token we're handling. $end 
will point past the end of it.
+   // Find out which kind of token we're handling.
+   // Note: $end must point past the end of the current 
token
+   // so that `substr($s, $pos, $end - $pos)` would be the 
entire token.
+   // In order words, $end will be the offset of the last 
relevant character
+   // in the stream + 1, or simply put: The offset of the 
first character
+   // of any next token in the stream.
$end = $pos + 1;
// Handle string literals
if( $ch === "'" || $ch === '"' ) {
// Search to the end of the string literal, 
skipping over backslash escapes
$search = $ch . '\\';
do{
+   // Speculatively add 2 to the end so 
that if we see a backslash,
+   // the next iteration will start 2 
characters further (one for the
+   // backslash, one for the escaped 
character).
+   // We'll correct this outside the loop.
$end += strcspn( $s, $search, $end ) + 
2;
+   // If the last character in our search 
for a quote or a backlash
+   // matched a backslash and we haven't 
reached the end, keep searching..
} while( $end - 2 < $length && $s[$end - 2] === 
'\\' );
+   // Correction (1): Undo speculative add, keep 
only one (end of string literal)
$end--;
// We have to distinguish between regexp literals and 
division operators
// A division operator is only possible in certain 
states
} elseif( $ch === '/' && !isset( $divStates[$state] ) ) 
{
// Regexp literal
for( ; ; ) {
+   // Search until we find "/" (end of 
regexp), "\" (backslash escapes),
+   // or "[" (start of character classes).
do{
-   // Skip until we find "/" (end 
of regexp), "\" (backslash escapes),
-   // or "[" (start of character 
classes).
+   // Speculatively add 2 to 
ensure next iteration skips
+   // over backslash and escaped 
character.
+   // We'll correct this outside 
the loop.
$end += strcspn( $s, '/[\\', 
$end ) + 2;
// If backslash escape, keep 
searching...
} while( $end - 2 < $length && $s[$end 
- 2] === '\\' );
+   // Correction (1): Undo speculative 
add, keep only one (end of regexp)
$end--;
// If the end, stop here.
if( $end - 1 >= $length || $s[$end - 1] 
=== '/' ) {
@@ -462,11 +478,13 @@
// (Implicit else), we must've found 
the start of a char class,
// skip until we find "]" (end of char 
class), or "\" (backslash escape)
do{
+   // Speculatively add 2 for 
backslash escape.
+   // We'll substract one outside 
the loop.
$end

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: JavaScriptMinifier: Fix "Uninitialized offset" in string and...

2018-01-09 Thread Krinkle (Code Review)

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

Change subject: JavaScriptMinifier: Fix "Uninitialized offset" in string and 
regexp parsing
..

JavaScriptMinifier: Fix "Uninitialized offset" in string and regexp parsing

When parsing an incomplete string literal or regex literal at the end of a file,
$end would be set to an offset higher than $length, because the code
speculatively increases $end without correcting for this scenario.

This is due to the assumption that the strcspn() search will end because
an end character was seen, instead of simply ending because the string
doesn't have any further characters.

Bug: T75556
Change-Id: I2325c9aff33293c13ff414699c2d47306182aaa6
---
M includes/libs/JavaScriptMinifier.php
M tests/phpunit/includes/libs/JavaScriptMinifierTest.php
2 files changed, 22 insertions(+), 2 deletions(-)


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

diff --git a/includes/libs/JavaScriptMinifier.php 
b/includes/libs/JavaScriptMinifier.php
index 3be20dd..10a9c76 100644
--- a/includes/libs/JavaScriptMinifier.php
+++ b/includes/libs/JavaScriptMinifier.php
@@ -455,6 +455,12 @@
} while( $end - 2 < $length && $s[$end - 2] === 
'\\' );
// Correction (1): Undo speculative add, keep 
only one (end of string literal)
$end--;
+   if ($end > $length) {
+   // Correction (2): Loop wrongly assumed 
an end quote ended the search,
+   // but search ended because we've 
reached the end. Correct $end.
+   // TODO: This is invalid and should 
throw,
+   $end--;
+   }
// We have to distinguish between regexp literals and 
division operators
// A division operator is only possible in certain 
states
} elseif( $ch === '/' && !isset( $divStates[$state] ) ) 
{
@@ -471,8 +477,14 @@
} while( $end - 2 < $length && $s[$end 
- 2] === '\\' );
// Correction (1): Undo speculative 
add, keep only one (end of regexp)
$end--;
-   // If the end, stop here.
-   if( $end - 1 >= $length || $s[$end - 1] 
=== '/' ) {
+   if( $end > $length ) {
+   // Correction (2): Loop wrongly 
assumed end slash was seen
+   // String ended without end of 
regexp. Correct $end.
+   // TODO: This is invalid and 
should throw,
+   $end--;
+   break;
+   }
+   if ( $s[$end - 1] === '/' ) {
break;
}
// (Implicit else), we must've found 
the start of a char class,
diff --git a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php 
b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
index 5061e27..d6a1040 100644
--- a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
+++ b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
@@ -82,6 +82,14 @@
"var a=this\nfor(b=0;c

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

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Split UploadAvatar class into its own file

2018-01-09 Thread SamanthaNguyen (Code Review)

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

Change subject: Split UploadAvatar class into its own file
..

Split UploadAvatar class into its own file

Change-Id: Idf8be2ec65b73140e43e2482bd5b237f9b6fc064
---
M SocialProfile.php
M UserProfile/SpecialUploadAvatar.php
A UserProfile/UploadAvatar.php
3 files changed, 229 insertions(+), 228 deletions(-)


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

diff --git a/SocialProfile.php b/SocialProfile.php
index 5046af6..7bd5de6 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -38,7 +38,7 @@
 $wgAutoloadClasses['SpecialToggleUserPage'] = __DIR__ . 
'/UserProfile/SpecialToggleUserPageType.php';
 $wgAutoloadClasses['SpecialUpdateProfile'] = __DIR__ . 
'/UserProfile/SpecialUpdateProfile.php';
 $wgAutoloadClasses['SpecialUploadAvatar'] = __DIR__ . 
'/UserProfile/SpecialUploadAvatar.php';
-$wgAutoloadClasses['UploadAvatar'] = __DIR__ . 
'/UserProfile/SpecialUploadAvatar.php';
+$wgAutoloadClasses['UploadAvatar'] = __DIR__ . '/UserProfile/UploadAvatar.php';
 $wgAutoloadClasses['RemoveAvatar'] = __DIR__ . 
'/UserProfile/SpecialRemoveAvatar.php';
 $wgAutoloadClasses['UserProfile'] = __DIR__ . 
'/UserProfile/UserProfileClass.php';
 $wgAutoloadClasses['UserProfileHooks'] = __DIR__ . 
'/UserProfile/UserProfileHooks.php';
diff --git a/UserProfile/SpecialUploadAvatar.php 
b/UserProfile/SpecialUploadAvatar.php
index 74a39b8..1041446 100644
--- a/UserProfile/SpecialUploadAvatar.php
+++ b/UserProfile/SpecialUploadAvatar.php
@@ -251,230 +251,4 @@
}
}
 
-}
-
-class UploadAvatar extends UploadFromFile {
-   public $mExtension;
-
-   function createThumbnail( $imageSrc, $imageInfo, $imgDest, $thumbWidth 
) {
-   global $wgUseImageMagick, $wgImageMagickConvertCommand;
-
-   if ( $wgUseImageMagick ) { // ImageMagick is enabled
-   list( $origWidth, $origHeight, $typeCode ) = $imageInfo;
-
-   if ( $origWidth < $thumbWidth ) {
-   $thumbWidth = $origWidth;
-   }
-   $thumbHeight = ( $thumbWidth * $origHeight / $origWidth 
);
-   $border = ' -bordercolor white  -border  0x';
-   if ( $thumbHeight < $thumbWidth ) {
-   $border = ' -bordercolor white  -border  0x' . 
( ( $thumbWidth - $thumbHeight ) / 2 );
-   }
-   if ( $typeCode == 2 ) {
-   exec(
-   $wgImageMagickConvertCommand . ' -size 
' . $thumbWidth . 'x' . $thumbWidth .
-   ' -resize ' . $thumbWidth . ' -crop ' . 
$thumbWidth . 'x' .
-   $thumbWidth . '+0+0   -quality 100 ' . 
$border . ' ' .
-   $imageSrc . ' ' . 
$this->avatarUploadDirectory . '/' . $imgDest . '.jpg'
-   );
-   }
-   if ( $typeCode == 1 ) {
-   exec(
-   $wgImageMagickConvertCommand . ' -size 
' . $thumbWidth . 'x' . $thumbWidth .
-   ' -resize ' . $thumbWidth . ' -crop ' . 
$thumbWidth . 'x' .
-   $thumbWidth . '+0+0 ' . $imageSrc . ' ' 
. $border . ' ' .
-   $this->avatarUploadDirectory . '/' . 
$imgDest . '.gif'
-   );
-   }
-   if ( $typeCode == 3 ) {
-   exec(
-   $wgImageMagickConvertCommand . ' -size 
' . $thumbWidth . 'x' . $thumbWidth .
-   ' -resize ' . $thumbWidth . ' -crop ' . 
$thumbWidth . 'x' .
-   $thumbWidth . '+0+0 ' . $imageSrc . ' ' 
.
-   $this->avatarUploadDirectory . '/' . 
$imgDest . '.png'
-   );
-   }
-   } else { // ImageMagick is not enabled, so fall back to PHP's 
GD library
-   // Get the image size, used in calculations later.
-   list( $origWidth, $origHeight, $typeCode ) = 
getimagesize( $imageSrc );
-
-   switch( $typeCode ) {
-   case '1':
-   $fullImage = imagecreatefromgif( 
$imageSrc );
-   $ext = 'gif';
-   break;
-   case '2':
-   $fullImage = imagecreatefromjpeg( 
$imageSrc );
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOUI to v0.25.0

2018-01-09 Thread VolkerE (Code Review)

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

Change subject: Update OOUI to v0.25.0
..

Update OOUI to v0.25.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.25.0

Depends-on: I5f574a0d2702f421c0c9d2556e3162abd55b9f23
Change-Id: I8a5b279f6dcb9b620e3e4e8998fc2b2d678573db
---
M composer.json
M resources/lib/oojs-ui/i18n/bs.json
M resources/lib/oojs-ui/i18n/hr.json
M resources/lib/oojs-ui/i18n/ug-arab.json
M resources/lib/oojs-ui/i18n/ur.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-core.js.map
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-toolbars.js.map
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-widgets.js.map
M resources/lib/oojs-ui/oojs-ui-wikimediaui.js
M resources/lib/oojs-ui/oojs-ui-wikimediaui.js.map
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/themes/apex/icons-accessibility.json
M resources/lib/oojs-ui/themes/apex/icons-interactions.json
M resources/lib/oojs-ui/themes/apex/icons-movement.json
M resources/lib/oojs-ui/themes/apex/images/icons/add.svg
M resources/lib/oojs-ui/themes/apex/images/icons/advanced.svg
M resources/lib/oojs-ui/themes/apex/images/icons/alert.svg
M resources/lib/oojs-ui/themes/apex/images/icons/align-center.svg
M resources/lib/oojs-ui/themes/apex/images/icons/align-float-left.svg
M resources/lib/oojs-ui/themes/apex/images/icons/align-float-right.svg
M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/arrow-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/arrow-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/article-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/article-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/articleRedirect-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/articleRedirect-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/articles-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/articles-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/attachment-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/attachment-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bell.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bellOn-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bellOn-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bigger-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bigger-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/block.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-a.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-b.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-te.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-f.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-geor-man.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-l.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-n.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-v.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bright-invert.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bright.svg
M resources/lib/oojs-ui/themes/apex/images/icons/browser-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/browser-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/calendar-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/calendar-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/cancel.svg
M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg
M resources/lib/oojs-ui/themes/apex/images/icons/check.svg
M resources/lib/oojs-ui/themes/apex/images/icons/clear.svg
M resources/lib/oojs-ui/themes/apex/images/icons/clip.svg
M resources/lib/oojs-ui/themes/apex/images/icons/clock.svg
M resources/lib/oojs-ui/themes/apex/images/icons/close.svg
M resources/lib/oojs-ui/themes/apex/images/icons/code.svg
M

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOUI to v0.25.0

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Update OOUI to v0.25.0
..


Update OOUI to v0.25.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.25.0

Change-Id: I5e99ef24870356e761fcc8f8d05225d38bf9bd1e
---
M lib/oojs-ui/LICENSE-MIT
M lib/oojs-ui/i18n/bs.json
M lib/oojs-ui/i18n/hr.json
M lib/oojs-ui/i18n/ug-arab.json
M lib/oojs-ui/i18n/ur.json
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.css
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-user.css
M lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-core.js.map
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-toolbars.js.map
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-widgets.js.map
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui.css
M lib/oojs-ui/oojs-ui-wikimediaui.js
M lib/oojs-ui/oojs-ui-wikimediaui.js.map
M lib/oojs-ui/oojs-ui-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-windows-apex.css
M lib/oojs-ui/oojs-ui-windows-apex.rtl.css
M lib/oojs-ui/oojs-ui-windows-wikimediaui.css
M lib/oojs-ui/oojs-ui-windows-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-windows.js
M lib/oojs-ui/themes/apex/images/icons/add.svg
M lib/oojs-ui/themes/apex/images/icons/advanced.svg
M

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOUI to v0.25.0

2018-01-09 Thread VolkerE (Code Review)

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

Change subject: Update OOUI to v0.25.0
..

Update OOUI to v0.25.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.25.0

Change-Id: I5f574a0d2702f421c0c9d2556e3162abd55b9f23
---
M composer.json
M composer.lock
M composer/installed.json
D oojs/oojs-ui/.phpcs.xml
A oojs/oojs-ui/.rubocop_todo.yml
D oojs/oojs-ui/Gemfile
D oojs/oojs-ui/Gemfile.lock
M oojs/oojs-ui/History.md
M oojs/oojs-ui/LICENSE-MIT
M oojs/oojs-ui/demos/classes/IndexedDialog.js
M oojs/oojs-ui/demos/infusion.js
M oojs/oojs-ui/demos/pages/icons.js
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/styles/demo.css
M oojs/oojs-ui/i18n/bs.json
M oojs/oojs-ui/i18n/hr.json
M oojs/oojs-ui/i18n/ug-arab.json
M oojs/oojs-ui/i18n/ur.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/layouts/FieldLayout.php
M oojs/oojs-ui/php/mixins/FlaggedElement.php
M oojs/oojs-ui/php/themes/WikimediaUITheme.php
M oojs/oojs-ui/php/widgets/TextInputWidget.php
23 files changed, 183 insertions(+), 116 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/28/403328/1

diff --git a/composer.json b/composer.json
index 6af7488..d1e4235 100644
--- a/composer.json
+++ b/composer.json
@@ -82,7 +82,7 @@
"mustangostang/spyc": "0.6.2",
"nikic/php-parser": "3.0.6",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.24.4",
+   "oojs/oojs-ui": "0.25.0",
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.4.1",
diff --git a/composer.lock b/composer.lock
index dead67b..d5644ad 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "13c4d84180fa027d02cfc0d5bc988420",
+"content-hash": "5b982394f298c71d14652cd0c7d56c05",
 "packages": [
 {
 "name": "composer/semver",
@@ -1192,16 +1192,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.24.4",
+"version": "v0.25.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "b3598ebd9f7c5218a0be02a4d683cc5c76762a78"
+"reference": "c165b27112aeb281437bb724603851d12f3cb714"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/b3598ebd9f7c5218a0be02a4d683cc5c76762a78;,
-"reference": "b3598ebd9f7c5218a0be02a4d683cc5c76762a78",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/c165b27112aeb281437bb724603851d12f3cb714;,
+"reference": "c165b27112aeb281437bb724603851d12f3cb714",
 "shasum": ""
 },
 "require": {
@@ -1210,7 +1210,7 @@
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "14.1.0",
+"mediawiki/mediawiki-codesniffer": "15.0.0",
 "phpunit/phpunit": "4.8.21"
 },
 "type": "library",
@@ -1267,7 +1267,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-12-20T21:56:38+00:00"
+"time": "2018-01-09T23:46:30+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 3209d30..0ef72e8 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -3698,17 +3698,17 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.24.4",
-"version_normalized": "0.24.4.0",
+"version": "v0.25.0",
+"version_normalized": "0.25.0.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "b3598ebd9f7c5218a0be02a4d683cc5c76762a78"
+"reference": "c165b27112aeb281437bb724603851d12f3cb714"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/b3598ebd9f7c5218a0be02a4d683cc5c76762a78;,
-"reference": "b3598ebd9f7c5218a0be02a4d683cc5c76762a78",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/c165b27112aeb281437bb724603851d12f3cb714;,
+"reference": "c165b27112aeb281437bb724603851d12f3cb714",
 "shasum": ""
 },

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOUI to v0.25.0

2018-01-09 Thread VolkerE (Code Review)

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

Change subject: Update OOUI to v0.25.0
..

Update OOUI to v0.25.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.25.0

Change-Id: I5e99ef24870356e761fcc8f8d05225d38bf9bd1e
---
M lib/oojs-ui/LICENSE-MIT
M lib/oojs-ui/i18n/bs.json
M lib/oojs-ui/i18n/hr.json
M lib/oojs-ui/i18n/ug-arab.json
M lib/oojs-ui/i18n/ur.json
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.css
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-user.css
M lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-core.js.map
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-toolbars.js.map
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-widgets.js.map
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui.css
M lib/oojs-ui/oojs-ui-wikimediaui.js
M lib/oojs-ui/oojs-ui-wikimediaui.js.map
M lib/oojs-ui/oojs-ui-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-windows-apex.css
M lib/oojs-ui/oojs-ui-windows-apex.rtl.css
M lib/oojs-ui/oojs-ui-windows-wikimediaui.css
M lib/oojs-ui/oojs-ui-windows-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-windows.js
M lib/oojs-ui/themes/apex/images/icons/add.svg
M lib/oojs-ui/themes/apex/images/icons/advanced.svg
M

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Add a function to create the references node uniformly

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Add a function to create the references node uniformly
..


Add a function to create the references node uniformly

Change-Id: I58fd7ea7c692b1a38dab160083d3d9a529527fb0
---
M lib/ext/Cite/index.js
M tests/citeParserTests-blacklist.js
2 files changed, 45 insertions(+), 40 deletions(-)

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



diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js
index 8f2f3d1..66bbe8e 100644
--- a/lib/ext/Cite/index.js
+++ b/lib/ext/Cite/index.js
@@ -350,16 +350,45 @@
 
 var dummyDoc = domino.createDocument();
 
+var createReferences = function(body, about, refsOpts, modifyDp) {
+   var doc = body ? body.ownerDocument : dummyDoc;
+   var ol = doc.createElement('ol');
+   if (body) {
+   DU.migrateChildren(body, ol);
+   }
+   DU.addAttributes(ol, {
+   class: 'mw-references references',
+   typeof: 'mw:Extension/references',
+   about: about,
+   });
+   var dp = DU.getDataParsoid(ol);
+   if (refsOpts.group) {  // No group for the empty string either
+   dp.group = refsOpts.group;
+   ol.setAttribute('data-mw-group', refsOpts.group);
+   }
+   if (refsOpts.responsive !== null) {
+   // Pass along the `responsive` parameter
+   dp.tmp.responsive = refsOpts.responsive;
+   }
+   if (typeof modifyDp === 'function') {
+   modifyDp(dp);
+   }
+
+   return ol;
+};
+
 /**
  * Sanitize the references tag and convert it into a meta-token
  */
 References.prototype.tokenHandler = function(manager, pipelineOpts, refsTok, 
cb) {
var env = manager.env;
+   var kvs = refsTok.getAttribute('options');
+   var opts = Util.kvToHash(kvs, true);
 
-   // group is the only recognized option?
var refsOpts = Object.assign({
group: null,
-   }, Util.kvToHash(refsTok.getAttribute("options"), true));
+   responsive: null,
+   }, opts);
 
// Assign an about id and intialize the nested refs html
var referencesId = env.newAboutId();
@@ -368,37 +397,18 @@
// token so that the dom post processor can generate
// and emit references at this point in the DOM.
var emitReferencesFragment = function(toks, body) {
-   var ol;
-   if (body) {
-   ol = body.ownerDocument.createElement('ol');
-   DU.migrateChildren(body, ol);
-   } else {
-   ol = dummyDoc.createElement('ol');
-   body = dummyDoc.createElement('body');
-   }
-   body.appendChild(ol);
-   DU.addAttributes(ol, {
-   'class': 'mw-references references',
-   typeof: 'mw:Extension/references',
-   about: referencesId,
-   });
-   var olProcessor = function(ol) {
-   var dp = DU.getDataParsoid(ol);
+   var ol = createReferences(body, referencesId, refsOpts, 
function(dp) {
dp.src = refsTok.getAttribute('source');
-   if (refsOpts.group) {
-   dp.group = refsOpts.group;
-   ol.setAttribute('data-mw-group', 
refsOpts.group);
-   }
-   // Pass along the `responsive` parameter
-   dp.tmp.responsive = refsOpts.responsive;
-   };
+   });
+   if (!body) { body = dummyDoc.createElement('body'); }
+   body.appendChild(ol);
cb({
async: false,
tokens: DU.buildDOMFragmentTokens(
manager.env,
refsTok,
body,
-   olProcessor,
+   null,
// The  HTML above is wrapper HTML added on 
and doesn't
// have any DSR on it. We want DSR added to it.
{ aboutId: referencesId, setDSR: true, 
isForeignContent: true }
@@ -628,25 +638,20 @@
var self = this;
 
refsData.refGroups.forEach(function(refsValue, refsGroup) {
-   var ol = doc.createElement('ol');
-   var dp = DU.getDataParsoid(ol);
-   DU.addAttributes(ol, {
-   'class': 'mw-references references',
-   typeof: 'mw:Extension/references',
-   about: env.newAboutId(),
+   var ol = createReferences(null, env.newAboutId(), {
+   group:

[MediaWiki-commits] [Gerrit] operations/puppet[production]: letsencrypt: Update LE subscriber agreement URL

2018-01-09 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403326 )

Change subject: letsencrypt: Update LE subscriber agreement URL
..

letsencrypt: Update LE subscriber agreement URL

Changes that I've noticed:
* No longer have to maintain *sole* control etc. of private key
* They will use technical measures to ensure we have control
  over a domain but not *exclusive* control

Could be others that I missed.
This is needed to prevent this error:
Exec[acme-setup-acme-deployment_mx02]/returns:   "detail": "Provided agreement 
URL [https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf] does not 
match current agreement URL 
[https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf];,

Change-Id: I190a4613cb06e32f34b100c39d8b2330185466d3
---
M modules/letsencrypt/files/acme_tiny.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/403326/1

diff --git a/modules/letsencrypt/files/acme_tiny.py 
b/modules/letsencrypt/files/acme_tiny.py
index 4e9a6e1..330637e 100644
--- a/modules/letsencrypt/files/acme_tiny.py
+++ b/modules/letsencrypt/files/acme_tiny.py
@@ -104,7 +104,7 @@
 log.info("Registering account...")
 code, result = _send_signed_request(CA + "/acme/new-reg", {
 "resource": "new-reg",
-"agreement": 
"https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf;,
+"agreement": 
"https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf;,
 })
 if code == 201:
 log.info("Registered!")

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I190a4613cb06e32f34b100c39d8b2330185466d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.25.0

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Tag v0.25.0
..


Tag v0.25.0

Change-Id: Iddfd8ce20368a1e9c6e3601fbfe365b06d765658
---
M History.md
M package.json
2 files changed, 57 insertions(+), 5 deletions(-)

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



diff --git a/History.md b/History.md
index e01885d..a07153e 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,56 @@
-# OOjs UI Release History
+# OOUI Release History
+## v0.25.0 / 2018-01-09
+### Breaking changes
+* [BREAKING CHANGE] Drop the `constructive` flag entirely (James D. Forrester)
+* [BREAKING CHANGE] Remove `BookletLayout#getClosestPage` (James D. Forrester)
+* [BREAKING CHANGE] SelectWidget: Remove `getFirstSelectableItem` (Prateek 
Saxena)
+* [BREAKING CHANGE] SelectWidget: Remove `getHighlightedItem` (Prateek Saxena)
+* [BREAKING CHANGE] SelectWidget: Remove `getRelativeSelectableItem` (Prateek 
Saxena)
+* [BREAKING CHANGE] icons: Drop 'watchlist', deprecated in v0.23.1 (James D. 
Forrester)
+
+### Deprecations
+* [DEPRECATING CHANGE] GroupElement: Rename getItem(s)FromData to 
findItem(s)FromData (Prateek Saxena)
+* [DEPRECATING CHANGE] MultiSelectWidget: Rename getters (Prateek Saxena)
+* [DEPRECATING CHANGE] SelectWidget: Rename `getSelectedItem` to 
`findSelectedItem` (Prateek Saxena)
+* [DEPRECATING CHANGE] icons: Flag indicators 'previous' & 'next' as to be 
removed (Volker E.)
+* [DEPRECATING CHANGE] icons: Rename 'arrowLast' to 'arrowPrevious' (James D. 
Forrester)
+
+### Features
+* MenuTagMultiselectWidget: Erase the input when tag is selected if filtering 
(Moriel Schottlender)
+
+### Styles
+* Add `margin-bottom` for widgets which are part of OOUI HorizontalLayout 
(Phantom42)
+* FieldLayout: Improve alignment of multiline labels with 'help' button 
(Bartosz Dziewoński)
+* WikimediaUI theme: Align 'transparency' icon to WikimedaUI color palette 
(Volker E.)
+* WikimediaUI theme: Remove obsolete global flag for 'layout' icon pack 
(Volker E.)
+* WikimediaUI theme: Remove obsolete icon flags (Volker E.)
+* Apex theme: Align readonly TextInputWidget across themes (Volker E.)
+* Apex theme: Apply `opacity` button transition and ensure Chrome support 
(Volker E.)
+* Apex theme: Remove unused, obsolete 'logo-wikimediaDiscovery' icon (Volker 
E.)
+* icons: Remove obsolete 'bookmark' icon remainders (Volker E.)
+* icons: Remove obsolete 'watchlist' icon remainders (Volker E.)
+* icons: Shorten 'accessibility' pack invert hex color (Volker E.)
+
+### Code
+* Clarify `.oo-ui-force-gpu-composite-layer()` mixin comment (Volker E.)
+* Fix blurry text on PanelLayout promoted to GPU in Safari (Volker E.)
+* Fix popup direction changing when the "anchor" is partially offscreen 
(Bartosz Dziewoński)
+* MenuTagMultiselectWidget: Don't use overlay for `$autoCloseIgnore` (Moriel 
Schottlender)
+* MultilineTextInputWidget: Correct documentation for `config.maxRows` (Roan 
Kattouw)
+* PHP TextInputWidget: Remove remaining type 'search' specific code (Volker E.)
+* Use findItem(s)FromData instead of getItem(s)FromData (Prateek Saxena)
+* demos: Override OO.ui.getViewportSpacing in infused PHP demo too (Bartosz 
Dziewoński)
+* demos: Promote icons page IndicatorWidget to GPU layer (Volker E.)
+* docs: Bump copyright year (James D. Forrester)
+* docs: TagMultiselectWidget: Remove wrong link to MediaWiki documentation 
(Prateek Saxena)
+* build: Update .gitattributes for .phpcs.xml file move (Kunal Mehta)
+* build: Add rake to Gemfile (Antoine Musso)
+* build: Don't include Gemfile* in composer zipballs (Kunal Mehta)
+* build: Update RuboCop Ruby gem (Željko Filipin)
+* build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 (libraryupgrader)
+* build: Use SVGO option of 'grunt-image' for distribution (Volker E.)
+
+
 ## v0.24.4 / 2017-12-20 special release
 ### Deprecations
 * [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be removed 
(Volker E.)
@@ -234,7 +286,7 @@
 * Follow-up 022f532: Don't crash if TitledElement initializes before 
AccessKeyedElement (Roan Kattouw)
 * WikimediaUI theme: Make checkbox/radio code leaner (Volker E.)
 * WikimediaUI theme: Remove unnecessary selector in CheckboxInputWidget 
(Volker E.)
-* doc: Align code comment references to Phabricator tasks (Volker E.)
+* docs: Align code comment references to Phabricator tasks (Volker E.)
 * build: Upgrade devDependencies to latest and make pass (James D. Forrester)
 * build: Update mediawiki-codesniffer to v0.10.1 and fix issues (WMDE-Fisch)
 * build: Update mediawiki-codesniffer to v0.11.0 and fix issues (WMDE-Fisch)
@@ -273,7 +325,7 @@
 * demos: Add examples of TextInputWidget with dynamic label (Bartosz 
Dziewoński)
 * demos: Demo.DraggableItemWidget should not inherit from OO.ui.OptionWidget 
(Bartosz Dziewoński)
 * demos: Show example link on `:focus` (Volker E.)
-* doc: Fix some PHPDoc

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Migrate ar_text to modern storage

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Migrate ar_text to modern storage
..


Migrate ar_text to modern storage

This really should have been done a very long time ago.

This adds a maintenance script to migrate rows with ar_text_id null to
modern storage, either the text table or ExternalStore.

Bug: T36925
Change-Id: I5608c6b6d3ecad516b785e13d668427c1b762e41
---
M autoload.php
M includes/Storage/SqlBlobStore.php
M includes/installer/DatabaseUpdater.php
M includes/installer/MssqlUpdater.php
M includes/installer/MysqlUpdater.php
M includes/installer/OracleUpdater.php
M includes/installer/PostgresUpdater.php
M includes/installer/SqliteUpdater.php
A maintenance/migrateArchiveText.php
9 files changed, 182 insertions(+), 1 deletion(-)

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



diff --git a/autoload.php b/autoload.php
index 4a50894..5d6104c 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1011,6 +1011,7 @@
'MessageContent' => __DIR__ . '/includes/content/MessageContent.php',
'MessageLocalizer' => __DIR__ . '/languages/MessageLocalizer.php',
'MessageSpecifier' => __DIR__ . '/includes/libs/MessageSpecifier.php',
+   'MigrateArchiveText' => __DIR__ . '/maintenance/migrateArchiveText.php',
'MigrateComments' => __DIR__ . '/maintenance/migrateComments.php',
'MigrateFileRepoLayout' => __DIR__ . 
'/maintenance/migrateFileRepoLayout.php',
'MigrateUserGroup' => __DIR__ . '/maintenance/migrateUserGroup.php',
diff --git a/includes/Storage/SqlBlobStore.php 
b/includes/Storage/SqlBlobStore.php
index 69e1539..5ddbd34 100644
--- a/includes/Storage/SqlBlobStore.php
+++ b/includes/Storage/SqlBlobStore.php
@@ -466,6 +466,11 @@
return false;
}
 
+   if ( in_array( 'error', $blobFlags ) ) {
+   // Error row, return false
+   return false;
+   }
+
if ( in_array( 'gzip', $blobFlags ) ) {
# Deal with optional compression of archived pages.
# This can be done periodically via 
maintenance/compressOld.php, and
diff --git a/includes/installer/DatabaseUpdater.php 
b/includes/installer/DatabaseUpdater.php
index 242f148..176d0af 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -1230,4 +1230,15 @@
}
}
 
+   /**
+* Migrate ar_text to modern storage
+* @since 1.31
+*/
+   protected function migrateArchiveText() {
+   $this->output( "Migrating archive ar_text to modern storage.\n" 
);
+   $task = $this->maintenance->runChild( 'MigrateArchiveText', 
'migrateArchiveText.php' );
+   $task->execute();
+   $this->output( "done.\n" );
+   }
+
 }
diff --git a/includes/installer/MssqlUpdater.php 
b/includes/installer/MssqlUpdater.php
index cb7a6ba..b4b34de 100644
--- a/includes/installer/MssqlUpdater.php
+++ b/includes/installer/MssqlUpdater.php
@@ -111,6 +111,7 @@
[ 'addTable', 'content', 'patch-content.sql' ],
[ 'addTable', 'slot_roles', 'patch-slot_roles.sql' ],
[ 'addTable', 'content_models', 
'patch-content_models.sql' ],
+   [ 'migrateArchiveText' ],
];
}
 
diff --git a/includes/installer/MysqlUpdater.php 
b/includes/installer/MysqlUpdater.php
index bc7725e..a3caa07 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -335,6 +335,7 @@
[ 'addTable', 'content', 'patch-content.sql' ],
[ 'addTable', 'slot_roles', 'patch-slot_roles.sql' ],
[ 'addTable', 'content_models', 
'patch-content_models.sql' ],
+   [ 'migrateArchiveText' ],
];
}
 
diff --git a/includes/installer/OracleUpdater.php 
b/includes/installer/OracleUpdater.php
index 67150ee..ea68412 100644
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -132,6 +132,7 @@
[ 'addTable', 'content', 'patch-content.sql' ],
[ 'addTable', 'slot_roles', 'patch-slot_roles.sql' ],
[ 'addTable', 'content_models', 
'patch-content_models.sql' ],
+   [ 'migrateArchiveText' ],
 
// KEEP THIS AT THE BOTTOM!!
[ 'doRebuildDuplicateFunction' ],
diff --git a/includes/installer/PostgresUpdater.php 
b/includes/installer/PostgresUpdater.php
index fe8a1b1..367d431 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -489,6 +489,7 @@
[ 'addTable', 'content',

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: missing Hiera, rename params, rm scope.lookup in erb

2018-01-09 Thread Dzahn (Code Review)

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

Change subject: planet: missing Hiera, rename params, rm scope.lookup in erb
..


planet: missing Hiera, rename params, rm scope.lookup in erb

Change-Id: If05cfb26d9980306b45de9d93aa930bda0efaac0
---
M hieradata/role/common/planet_server.yaml
M modules/planet/manifests/apachesite.pp
M modules/planet/manifests/config.pp
M modules/planet/manifests/cronjob.pp
M modules/planet/manifests/index_site.pp
M modules/planet/manifests/init.pp
M modules/planet/templates/apache/planet-language.erb
M modules/planet/templates/apache/planet.erb
M modules/planet/templates/feeds/ar_config.erb
M modules/planet/templates/feeds/bg_config.erb
M modules/planet/templates/feeds/cs_config.erb
M modules/planet/templates/feeds/de_config.erb
M modules/planet/templates/feeds/el_config.erb
M modules/planet/templates/feeds/en_config.erb
M modules/planet/templates/feeds/es_config.erb
M modules/planet/templates/feeds/fr_config.erb
M modules/planet/templates/feeds/gmq_config.erb
M modules/planet/templates/feeds/id_config.erb
M modules/planet/templates/feeds/it_config.erb
M modules/planet/templates/feeds/pl_config.erb
M modules/planet/templates/feeds/pt_config.erb
M modules/planet/templates/feeds/ro_config.erb
M modules/planet/templates/feeds/ru_config.erb
M modules/planet/templates/feeds/sq_config.erb
M modules/planet/templates/feeds/uk_config.erb
M modules/planet/templates/feeds/zh_config.erb
M modules/planet/templates/feeds_rawdog/plugins/rss.py.erb
M modules/planet/templates/html/index.html.tmpl.erb
M modules/planet/templates/html/rd_page.html.tmpl.erb
M modules/profile/manifests/planet/venus.pp
30 files changed, 91 insertions(+), 75 deletions(-)

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



diff --git a/hieradata/role/common/planet_server.yaml 
b/hieradata/role/common/planet_server.yaml
index 9b44b21..b649495 100644
--- a/hieradata/role/common/planet_server.yaml
+++ b/hieradata/role/common/planet_server.yaml
@@ -1,2 +1,4 @@
 cluster: misc
-planet_domain_name: 'wikimedia.org'
+profile::planet::venus::domain_name: 'wikimedia.org'
+profile::planet::venus::meta_link: 'meta.wikimedia.org/wiki/Planet_Wikimedia'
+profile::planet::venus::http_proxy: 
"http://url-downloader.%{::site}.wikimedia.org:8080;
diff --git a/modules/planet/manifests/apachesite.pp 
b/modules/planet/manifests/apachesite.pp
index 9d56219..608a7d9 100644
--- a/modules/planet/manifests/apachesite.pp
+++ b/modules/planet/manifests/apachesite.pp
@@ -1,5 +1,7 @@
 # defined type: an apache site config for a planet-venus language version
-define planet::apachesite {
+define planet::apachesite (
+$domain_name = $domain_name,
+){
 
 if $title == 'en' {
 $priority = 10
@@ -7,7 +9,7 @@
 $priority = 50
 }
 
-httpd::site { "${title}.planet.${planet::planet_domain_name}":
+httpd::site { "${title}.planet.${domain_name}":
 content  => template('planet/apache/planet-language.erb'),
 priority => $priority,
 }
diff --git a/modules/planet/manifests/config.pp 
b/modules/planet/manifests/config.pp
index fe0b269..abaede5 100644
--- a/modules/planet/manifests/config.pp
+++ b/modules/planet/manifests/config.pp
@@ -1,5 +1,7 @@
 # defined type: a config dir and file for a planet-venus or rawdog language 
version
-define planet::config {
+define planet::config (
+$domain_name = $domain_name,
+){
 
 if os_version('debian >= stretch') {
 $config_path = '/etc/rawdog'
diff --git a/modules/planet/manifests/cronjob.pp 
b/modules/planet/manifests/cronjob.pp
index 41ee77e..fb6dd45 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -16,7 +16,7 @@
 
 cron { "update-${title}-planet":
 ensure  => 'present',
-command => "http_proxy=\"${planet::planet_http_proxy}\" 
https_proxy=\$http_proxy ${planet_bin} ${planet_cmd} > ${planet_logfile} 2>&1",
+command => "http_proxy=\"${planet::http_proxy}\" 
https_proxy=\$http_proxy ${planet_bin} ${planet_cmd} > ${planet_logfile} 2>&1",
 user=> 'planet',
 minute  => $minute,
 require => [
@@ -25,5 +25,4 @@
 User['planet'],
 ],
 }
-
 }
diff --git a/modules/planet/manifests/index_site.pp 
b/modules/planet/manifests/index_site.pp
index 5a14980..410cb96 100644
--- a/modules/planet/manifests/index_site.pp
+++ b/modules/planet/manifests/index_site.pp
@@ -1,7 +1,10 @@
 # sets up the planet-venus index/portal site
-class planet::index_site {
+class planet::index_site (
+$domain_name,
+$meta_link,
+){
 
-httpd::site { "planet.${planet::planet_domain_name}":
+httpd::site { "planet.${domain_name}":
 content => template('planet/apache/planet.erb'),
 }
 
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 7a3b9ac..84e0349 100644
---

[MediaWiki-commits] [Gerrit] integration/config[master]: Add BlueSpiceFoundation for BlueSpice extensions

2018-01-09 Thread Phantom42 (Code Review)

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

Change subject: Add BlueSpiceFoundation for BlueSpice extensions
..

Add BlueSpiceFoundation for BlueSpice extensions

Needed for minus-x tests added in T175794

Bug: T175794
Change-Id: I86a45d74f7ec346d4ab83a3ebbeab33bf909ced4
---
M zuul/parameter_functions.py
1 file changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/25/403325/1

diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index bca730f..409ffb1 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -150,18 +150,39 @@
 'Arrays': ['Loops', 'ParserFunctions', 'Variables'],
 'ArticlePlaceholder': ['Wikibase', 'Scribunto'],
 'BlogPage': ['Comments', 'SocialProfile', 'VoteNY'],
+'BlueSpiceArticleInfo': ['BlueSpiceFoundation'],
+'BlueSpiceAuthors': ['BlueSpiceFoundation'],
+'BlueSpiceAvatars': ['BlueSpiceFoundation'],
+'BlueSpiceBlog': ['BlueSpiceFoundation'],
 'BlueSpiceCategoryManager': ['BlueSpiceFoundation'],
+'BlueSpiceChecklist': ['BlueSpiceFoundation'],
+'BlueSpiceConfigManager': ['BlueSpiceFoundation'],
+'BlueSpiceContextMenu': ['BlueSpiceFoundation'],
+'BlueSpiceCountThings': ['BlueSpiceFoundation'],
+'BlueSpiceDashboards': ['BlueSpiceFoundation'],
 'BlueSpiceEditNotifyConnector': ['BlueSpiceFoundation'],
+'BlueSpiceEmoticons': ['BlueSpiceFoundation'],
 'BlueSpiceExtendedFilelist': ['BlueSpiceFoundation'],
 'BlueSpiceExtendedSearch': ['BlueSpiceFoundation'],
+'BlueSpiceExtendedStatistics': ['BlueSpiceFoundation'],
 'BlueSpiceExtensions': ['BlueSpiceFoundation'],
+'BlueSpiceGroupManager': ['BlueSpiceFoundation'],
 'BlueSpiceInsertTemplate': ['BlueSpiceFoundation'],
+'BlueSpiceInterWikiLinks': ['BlueSpiceFoundation'],
+'BlueSpiceNamespaceManager': ['BlueSpiceFoundation'],
 'BlueSpiceMultiUpload': ['BlueSpiceFoundation'],
 'BlueSpicePageAssignments': ['BlueSpiceFoundation'],
+'BlueSpicePagesVisited': ['BlueSpiceFoundation'],
+'BlueSpicePageTemplates': ['BlueSpiceFoundation'],
+'BlueSpicePermissionManager': ['BlueSpiceFoundation'],
 'BlueSpicePageVersion': ['BlueSpiceFoundation'],
+'BlueSpiceReaders': ['BlueSpiceFoundation'],
 'BlueSpiceSignHere': ['BlueSpiceFoundation'],
+'BlueSpiceSmartlist': ['BlueSpiceFoundation'],
 'BlueSpiceSMWConnector': ['BlueSpiceFoundation'],
 'BlueSpiceSubPageTree': ['BlueSpiceFoundation'],
+'BlueSpiceUserManager': ['BlueSpiceFoundation'],
+'BlueSpiceUserPreferences': ['BlueSpiceFoundation'],
 'Capiunto': ['Scribunto'],
 'Challenge': ['SocialProfile'],
 'Cite': ['VisualEditor'],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Fix misleading testing utilities and update tests

2018-01-09 Thread Mholloway (Code Review)

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

Change subject: Fix misleading testing utilities and update tests
..

Fix misleading testing utilities and update tests

The deepEqual and isDeepEqual wrapper methods in test/util/assert.js
confusingly use RegExp matching for string inputs in a way that is not
at all equivalent to === and makes it very easy to write tests resulting
in false positives (see
https://github.com/wikimedia/service-template-node/issues/94, for
example).

This eliminates the alternate string behavior and updates the tests that
are broken by that change.

This should be upstreamed in some form.

Change-Id: Ia9b01b26ac004294e10901736ed3d8e8653be984
---
M test/features/app/app.js
M test/utils/assert.js
M test/utils/headers.js
3 files changed, 7 insertions(+), 15 deletions(-)


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

diff --git a/test/features/app/app.js b/test/features/app/app.js
index 3bd5758..2035558 100644
--- a/test/features/app/app.js
+++ b/test/features/app/app.js
@@ -52,9 +52,9 @@
 assert.deepEqual(res.headers['x-xss-protection'], '1; mode=block');
 assert.deepEqual(res.headers['x-content-type-options'], 'nosniff');
 assert.deepEqual(res.headers['x-frame-options'], 'SAMEORIGIN');
-assert.deepEqual(res.headers['content-security-policy'], 
'default-src');
-assert.deepEqual(res.headers['x-content-security-policy'], 
'default-src');
-assert.deepEqual(res.headers['x-webkit-csp'], 'default-src');
+assert.contains(res.headers['content-security-policy'], 
'default-src');
+assert.contains(res.headers['x-content-security-policy'], 
'default-src');
+assert.contains(res.headers['x-webkit-csp'], 'default-src');
 });
 });
 
diff --git a/test/utils/assert.js b/test/utils/assert.js
index fcdd736..f20d959 100644
--- a/test/utils/assert.js
+++ b/test/utils/assert.js
@@ -9,11 +9,7 @@
 function deepEqual(result, expected, message) {
 
 try {
-if (typeof expected === 'string') {
-assert.ok(result === expected || (new 
RegExp(expected).test(result)));
-} else {
-assert.deepEqual(result, expected, message);
-}
+assert.deepEqual(result, expected, message);
 } catch (e) {
 console.log(`Expected:\n${JSON.stringify(expected, null, 2)}`);
 console.log(`Result:\n${JSON.stringify(result, null, 2)}`);
@@ -40,7 +36,7 @@
 function contentType(res, expected) {
 
 const actual = res.headers['content-type'];
-deepEqual(actual, expected,
+assert.ok(RegExp(expected).test(actual),
 `Expected content-type to be ${expected}, but was ${actual}`);
 
 }
@@ -49,11 +45,7 @@
 function isDeepEqual(result, expected, message) {
 
 try {
-if (typeof expected === 'string') {
-assert.ok(result === expected || (new 
RegExp(expected).test(result)), message);
-} else {
-assert.deepEqual(result, expected, message);
-}
+assert.deepEqual(result, expected, message);
 return true;
 } catch (e) {
 return false;
diff --git a/test/utils/headers.js b/test/utils/headers.js
index 0447ba3..73c01f5 100644
--- a/test/utils/headers.js
+++ b/test/utils/headers.js
@@ -14,7 +14,7 @@
 assert.deepEqual(res.status, 200);
 expContentType = expContentType || JSON_CONTENT_TYPE_REGEX;
 assert.contentType(res, expContentType);
-assert.deepEqual(res.headers.etag, '^"[^/"]+/[^/"]+"$',
+assert.ok(RegExp('^"[^/"]+/[^/"]+"$').test(res.headers.etag),
 'The ETag header is not present or invalid');
 assert.deepEqual(res.headers.etag.indexOf('undefined'), -1,
 'etag should not contain "undefined"');

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9b01b26ac004294e10901736ed3d8e8653be984
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] wikimedia...crm[master]: Re-save any contacts without a display name.

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Re-save any contacts without a display name.
..


Re-save any contacts without a display name.

Doing a blank re-save will cause the display name to be recalculated by Civi
 * rules.
 *
 * Not useful here but possibly for Major Gifts letter addressing it also
 * will allow us to update addressing fields (e.g Dear Fred) for sending 
letters.
 * We don't do that for all contacts but could for MG.
 *
 * Bug: T179118

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

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 4340077..3b30ed8 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -3289,3 +3289,25 @@
   require_once 'update_payment_instruments.php';
   wmf_install_add_missing_payment_instruments();
 }
+
+/**
+ * Re-save any contacts without a display name.
+ *
+ * Doing a blank re-save will cause the display name to be recalculated by Civi
+ * rules.
+ *
+ * Not useful here but possibly for Major Gifts letter addressing it also
+ * will allow us to update addressing fields (e.g Dear Fred) for sending 
letters.
+ * We don't do that for all contacts but could for MG.
+ *
+ * Bug: T179118
+ */
+function wmf_civicrm_update_7600() {
+  civicrm_initialize();
+  $result = CRM_Core_DAO::executeQuery(
+"SELECT id FROM civicrm_contact WHERE (display_name is null  OR 
display_name = '') AND is_deleted= 0"
+  );
+  while ($result->fetch()) {
+civicrm_api3('Contact', 'create', array('id' => $result->id));
+  }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib74916c507217524d57afb277e97ad8ac297adbe
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] oojs/ui[master]: Tag v0.25.0

2018-01-09 Thread VolkerE (Code Review)

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

Change subject: Tag v0.25.0
..

Tag v0.25.0

Change-Id: Iddfd8ce20368a1e9c6e3601fbfe365b06d765658
---
M History.md
M package.json
2 files changed, 57 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/23/403323/1

diff --git a/History.md b/History.md
index e01885d..a07153e 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,56 @@
-# OOjs UI Release History
+# OOUI Release History
+## v0.25.0 / 2018-01-09
+### Breaking changes
+* [BREAKING CHANGE] Drop the `constructive` flag entirely (James D. Forrester)
+* [BREAKING CHANGE] Remove `BookletLayout#getClosestPage` (James D. Forrester)
+* [BREAKING CHANGE] SelectWidget: Remove `getFirstSelectableItem` (Prateek 
Saxena)
+* [BREAKING CHANGE] SelectWidget: Remove `getHighlightedItem` (Prateek Saxena)
+* [BREAKING CHANGE] SelectWidget: Remove `getRelativeSelectableItem` (Prateek 
Saxena)
+* [BREAKING CHANGE] icons: Drop 'watchlist', deprecated in v0.23.1 (James D. 
Forrester)
+
+### Deprecations
+* [DEPRECATING CHANGE] GroupElement: Rename getItem(s)FromData to 
findItem(s)FromData (Prateek Saxena)
+* [DEPRECATING CHANGE] MultiSelectWidget: Rename getters (Prateek Saxena)
+* [DEPRECATING CHANGE] SelectWidget: Rename `getSelectedItem` to 
`findSelectedItem` (Prateek Saxena)
+* [DEPRECATING CHANGE] icons: Flag indicators 'previous' & 'next' as to be 
removed (Volker E.)
+* [DEPRECATING CHANGE] icons: Rename 'arrowLast' to 'arrowPrevious' (James D. 
Forrester)
+
+### Features
+* MenuTagMultiselectWidget: Erase the input when tag is selected if filtering 
(Moriel Schottlender)
+
+### Styles
+* Add `margin-bottom` for widgets which are part of OOUI HorizontalLayout 
(Phantom42)
+* FieldLayout: Improve alignment of multiline labels with 'help' button 
(Bartosz Dziewoński)
+* WikimediaUI theme: Align 'transparency' icon to WikimedaUI color palette 
(Volker E.)
+* WikimediaUI theme: Remove obsolete global flag for 'layout' icon pack 
(Volker E.)
+* WikimediaUI theme: Remove obsolete icon flags (Volker E.)
+* Apex theme: Align readonly TextInputWidget across themes (Volker E.)
+* Apex theme: Apply `opacity` button transition and ensure Chrome support 
(Volker E.)
+* Apex theme: Remove unused, obsolete 'logo-wikimediaDiscovery' icon (Volker 
E.)
+* icons: Remove obsolete 'bookmark' icon remainders (Volker E.)
+* icons: Remove obsolete 'watchlist' icon remainders (Volker E.)
+* icons: Shorten 'accessibility' pack invert hex color (Volker E.)
+
+### Code
+* Clarify `.oo-ui-force-gpu-composite-layer()` mixin comment (Volker E.)
+* Fix blurry text on PanelLayout promoted to GPU in Safari (Volker E.)
+* Fix popup direction changing when the "anchor" is partially offscreen 
(Bartosz Dziewoński)
+* MenuTagMultiselectWidget: Don't use overlay for `$autoCloseIgnore` (Moriel 
Schottlender)
+* MultilineTextInputWidget: Correct documentation for `config.maxRows` (Roan 
Kattouw)
+* PHP TextInputWidget: Remove remaining type 'search' specific code (Volker E.)
+* Use findItem(s)FromData instead of getItem(s)FromData (Prateek Saxena)
+* demos: Override OO.ui.getViewportSpacing in infused PHP demo too (Bartosz 
Dziewoński)
+* demos: Promote icons page IndicatorWidget to GPU layer (Volker E.)
+* docs: Bump copyright year (James D. Forrester)
+* docs: TagMultiselectWidget: Remove wrong link to MediaWiki documentation 
(Prateek Saxena)
+* build: Update .gitattributes for .phpcs.xml file move (Kunal Mehta)
+* build: Add rake to Gemfile (Antoine Musso)
+* build: Don't include Gemfile* in composer zipballs (Kunal Mehta)
+* build: Update RuboCop Ruby gem (Željko Filipin)
+* build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 (libraryupgrader)
+* build: Use SVGO option of 'grunt-image' for distribution (Volker E.)
+
+
 ## v0.24.4 / 2017-12-20 special release
 ### Deprecations
 * [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be removed 
(Volker E.)
@@ -234,7 +286,7 @@
 * Follow-up 022f532: Don't crash if TitledElement initializes before 
AccessKeyedElement (Roan Kattouw)
 * WikimediaUI theme: Make checkbox/radio code leaner (Volker E.)
 * WikimediaUI theme: Remove unnecessary selector in CheckboxInputWidget 
(Volker E.)
-* doc: Align code comment references to Phabricator tasks (Volker E.)
+* docs: Align code comment references to Phabricator tasks (Volker E.)
 * build: Upgrade devDependencies to latest and make pass (James D. Forrester)
 * build: Update mediawiki-codesniffer to v0.10.1 and fix issues (WMDE-Fisch)
 * build: Update mediawiki-codesniffer to v0.11.0 and fix issues (WMDE-Fisch)
@@ -273,7 +325,7 @@
 * demos: Add examples of TextInputWidget with dynamic label (Bartosz 
Dziewoński)
 * demos: Demo.DraggableItemWidget should not inherit from OO.ui.OptionWidget 
(Bartosz Dziewoński)
 * demos: Show example link on `:focus` (Volker E.)
-* doc: Fix some PHPDoc `@return`

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Fix PageMigration save button bug

2018-01-09 Thread Phantom42 (Code Review)

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

Change subject: Fix PageMigration save button bug
..

Fix PageMigration save button bug

This fixes bug of ajaxdispatcher working incorrectly
with request promise.

Bug: T179182
Change-Id: I7c1ad68a8aca48ceec04de9ce5f97f20922a4378
---
M Resources.php
M resources/js/ext.translate.special.pagemigration.js
M resources/js/jquery.ajaxdispatcher.js
3 files changed, 13 insertions(+), 3 deletions(-)


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

diff --git a/Resources.php b/Resources.php
index 36180a3..675b6b5 100644
--- a/Resources.php
+++ b/Resources.php
@@ -369,6 +369,7 @@
'pm-on-save-message-text',
'pm-savepages-button-label',
'pm-cancel-button-label',
+   'tpt-unknown-page',
],
 ] + $resourcePaths;
 
diff --git a/resources/js/ext.translate.special.pagemigration.js 
b/resources/js/ext.translate.special.pagemigration.js
index c821223..6e5282e 100644
--- a/resources/js/ext.translate.special.pagemigration.js
+++ b/resources/js/ext.translate.special.pagemigration.js
@@ -362,6 +362,9 @@
$( '#action-import' ).removeClass( 'hide' );
$( 'input' ).prop( 'disabled', false );
$( '.mw-tpm-sp-instructions' ).text( mw.msg( 
'pm-on-save-message-text' ) ).show( 'fast' );
+   } ).fail( function ( errmsg ) {
+   $( 'input' ).prop( 'disabled', false );
+   $( '.mw-tpm-sp-error__message' ).text( mw.msg( 
errmsg ) ).show( 'fast' );
} );
}
}
diff --git a/resources/js/jquery.ajaxdispatcher.js 
b/resources/js/jquery.ajaxdispatcher.js
index d237a76..9f45697 100644
--- a/resources/js/jquery.ajaxdispatcher.js
+++ b/resources/js/jquery.ajaxdispatcher.js
@@ -18,6 +18,8 @@
return $.when( helper( list, maxRetries ) )
.then( function ( promises ) {
return deferred.resolve( promises );
+   } ).fail( function ( errmsg ) {
+   return deferred.reject( errmsg );
} );
}
 
@@ -34,8 +36,10 @@
rest = list.slice( 1 );
 
retries = 0;
-   retrier = function () {
-   var promise = this;
+   retrier = function ( result, promise ) {
+   if ( !promise.state ) {
+   return;
+   }
 
if ( promise.state() === 'rejected' ) {
if ( retries < maxRetries ) {
@@ -51,7 +55,9 @@
}
};
 
-   first.call().always( retrier );
+   first.call().always( retrier ).catch( function ( errmsg ) {
+   return deferred.reject( errmsg );
+   } );
 
return deferred;
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceNamespaceManager[master]: Add minus-x to composer.json

2018-01-09 Thread Divadsn (Code Review)

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

Change subject: Add minus-x to composer.json
..

Add minus-x to composer.json

Bug: T175794
Change-Id: I9245ecc850e930a80c5c64d123a52ab3e7b54e8e
---
M composer.json
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceNamespaceManager 
refs/changes/21/403321/1

diff --git a/composer.json b/composer.json
index 938247c..192f429 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,14 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
+   "fix": "minus-x fix .",
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9245ecc850e930a80c5c64d123a52ab3e7b54e8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceManager
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInterWikiLinks[master]: Add minus-x to composer.json

2018-01-09 Thread Divadsn (Code Review)

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

Change subject: Add minus-x to composer.json
..

Add minus-x to composer.json

Bug: T175794
Change-Id: If650a30daeabf09d13a734cd143337625efa1e20
---
M composer.json
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInterWikiLinks 
refs/changes/20/403320/1

diff --git a/composer.json b/composer.json
index f0bb5f6..071c0dd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,11 +12,14 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
+   "fix": "minus-x fix .",
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If650a30daeabf09d13a734cd143337625efa1e20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInterWikiLinks
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs: Add s8.labsdb and move wikidatawiki

2018-01-09 Thread Madhuvishy (Code Review)

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

Change subject: wmcs: Add s8.labsdb and move wikidatawiki
..


wmcs: Add s8.labsdb and move wikidatawiki

Bug: T184179
Change-Id: I1c0d9468e59682b1ceb061a58bc1defa6a9b7151
---
M modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone 
b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
index f19bcdf..35f98d3 100644
--- a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
+++ b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
@@ -910,7 +910,6 @@
 
 s5 1H  IN  CNAME   s5.analytics.db.svc.eqiad.wmflabs.
 dewiki 1H  IN  CNAME   s5.analytics.db.svc.eqiad.wmflabs.
-wikidatawiki   1H  IN  CNAME   s5.analytics.db.svc.eqiad.wmflabs.
 
 s6 1H  IN  CNAME   s6.analytics.db.svc.eqiad.wmflabs.
 frwiki 1H  IN  CNAME   s6.analytics.db.svc.eqiad.wmflabs.
@@ -932,3 +931,6 @@
 viwiki 1H  IN  CNAME   s7.analytics.db.svc.eqiad.wmflabs.
 centralauth1H  IN  CNAME   s7.analytics.db.svc.eqiad.wmflabs.
 meta   1H  IN  CNAME   s7.analytics.db.svc.eqiad.wmflabs.
+
+s8 1H  IN  CNAME   s8.analytics.db.svc.eqiad.wmflabs.
+wikidatawiki   1H  IN  CNAME   s8.analytics.db.svc.eqiad.wmflabs.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c0d9468e59682b1ceb061a58bc1defa6a9b7151
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Arturo Borrero Gonzalez 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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]: WIP: Permit extension tags in xmlish attribute values

2018-01-09 Thread Arlolra (Code Review)

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

Change subject: WIP: Permit extension tags in xmlish attribute values
..

WIP: Permit extension tags in xmlish attribute values

Bug: T183515
Authored-by: Arlo Breault 
Authored-by: Shannon Bailey 
Change-Id: I311d0fbbd2cdcf2a0c0a3dbf698912e6df5f3356
---
M lib/wt2html/pegTokenizer.pegjs
M lib/wt2html/tt/AttributeExpander.js
M tests/mockAPI.js
M tests/parserTests.txt
4 files changed, 41 insertions(+), 9 deletions(-)


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

diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs
index 1a0f97c..65d10f9 100644
--- a/lib/wt2html/pegTokenizer.pegjs
+++ b/lib/wt2html/pegTokenizer.pegjs
@@ -1412,6 +1412,12 @@
 tag_name_chars = [^\t\n\v />\0]
 tag_name = $([A-Za-z] tag_name_chars*)
 
+extension_tag =
+  &{ return !stops.onStack('extTag'); }
+  extToken:xmlish_tag
+  &{ return extToken.name === 'extension'; }
+  { return extToken; }
+
 xmlish_tag
   = & {
   // By the time we get to `doTableStuff` in the php parser, we've already
@@ -2258,7 +2264,7 @@
   = r:( $[^{}&<\-|/ \t\n\r\x0c>]+
   / !inline_breaks
 !'/>'
-s:( directive / [{}&<\-|/] ) { return s; }
+s:( directive / extension_tag / [{}&<\-|/] ) { return s; }
   )+ {
 return tu.flattenString(r);
   }
@@ -2268,7 +2274,7 @@
   = r:( $[^{}&<\-|/'>]+
   / !inline_breaks
 !'/>'
-s:( directive / [{}&<\-|/] ) { return s; }
+s:( directive / extension_tag / [{}&<\-|/] ) { return s; }
   )* {
 return tu.flattenString(r);
   }
@@ -2278,7 +2284,7 @@
   = r:( $[^{}&<\-|/">]+
   / !inline_breaks
 !'/>'
-s:( directive / [{}&<\-|/] ) { return s; }
+s:( directive / extension_tag / [{}&<\-|/] ) { return s; }
   )* {
 return tu.flattenString(r);
   }
@@ -2294,7 +2300,7 @@
 // The stop set is space_or_newline and | which matches table_att_value.
 table_attribute_preprocessor_text
   = r:( $[^{}&<\-!\[ \t\n\r\x0c|]+
-  / !inline_breaks s:( directive / [{}&<\-!\[] ) { return s; }
+  / !inline_breaks s:( directive / extension_tag / [{}&<\-!\[] ) { return s; }
   )+ {
 return tu.flattenString(r);
   }
@@ -2302,7 +2308,7 @@
 // The stop set is '\r\n| which matches table_att_value.
 table_attribute_preprocessor_text_single
   = r:( $[^{}&<\-!\['\r\n|]+
-  / !inline_breaks s:( directive / [{}&<\-!\[] ) { return s; }
+  / !inline_breaks s:( directive / extension_tag / [{}&<\-!\[] ) { return s; }
   )* {
 return tu.flattenString(r);
   }
@@ -2310,7 +2316,7 @@
 // The stop set is "\r\n| which matches table_att_value.
 table_attribute_preprocessor_text_double
   = r:( $[^{}&<\-!\["\r\n|]+
-  / !inline_breaks s:( directive / [{}&<\-!\[] ) { return s; }
+  / !inline_breaks s:( directive / extension_tag / [{}&<\-!\[] ) { return s; }
   )* {
 return tu.flattenString(r);
   }
diff --git a/lib/wt2html/tt/AttributeExpander.js 
b/lib/wt2html/tt/AttributeExpander.js
index 9a76502..59d88e8 100644
--- a/lib/wt2html/tt/AttributeExpander.js
+++ b/lib/wt2html/tt/AttributeExpander.js
@@ -122,7 +122,7 @@
  * This helper method strips all meta tags introduced by
  * transclusions, etc. and returns the content.
  * -- */
-function stripMetaTags(tokens, wrapTemplates) {
+function stripMetaTags(env, tokens, wrapTemplates) {
var buf = [];
var isPushed = false;
var hasGeneratedContent = false;
@@ -130,6 +130,20 @@
for (var i = 0, l = tokens.length; i < l; i++) {
var t = tokens[i];
if ([TagTk, SelfclosingTagTk].indexOf(t.constructor) !== -1) {
+   // Reinsert expanded extension content that's been 
parsed to DOM
+   // as a string.  This should match what the php parser 
does since
+   // extension content is html being placed in an 
attribute context.
+   if (t.getAttribute('typeof') === 'mw:DOMFragment') {
+   var nodes = 
env.fragmentMap.get(t.dataAttribs.html);
+   var str = nodes.reduce(function(prev, next) {
+   // We strip tags since the sanitizer 
would normally drop
+   // tokens but we're already at html
+   return prev + next.textContent;
+   }, '');
+   buf.push(str);
+   // TODO: Maybe cleanup the remaining about 
sibbling wrappers
+   // but the sanitizer will drop them anyways
+   }
isPushed = false;
if (wrapTemplates) {
// Strip all meta tags.
@@ -348,7

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Don't crash RecordLintJob if the lint info doesn't contain `...

2018-01-09 Thread C. Scott Ananian (Code Review)

C. Scott Ananian has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403317 )

Change subject: Don't crash RecordLintJob if the lint info doesn't contain 
`params`
..

Don't crash RecordLintJob if the lint info doesn't contain `params`

We will crash trying to set `templateInfo` if it is present and `params`
is not.

On line 49 of RecordLintJob we're going to use `$errorInfo['params']`,
which will crash if `params` is not present.

Change-Id: I505c676cc0ccd8d54e44e65b04b10c2de03ee37c
---
M includes/ApiRecordLint.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Linter 
refs/changes/17/403317/1

diff --git a/includes/ApiRecordLint.php b/includes/ApiRecordLint.php
index 2e73282..c7e0ed4 100644
--- a/includes/ApiRecordLint.php
+++ b/includes/ApiRecordLint.php
@@ -74,6 +74,9 @@
continue;
}
$info['location'] = array_slice( $info['dsr'], 0, 2 );
+   if ( !isset( $info['params'] ) ) {
+   $info['params'] = [];
+   }
if ( isset( $info['templateInfo'] ) && 
$info['templateInfo'] ) {
$info['params']['templateInfo'] = 
$info['templateInfo'];
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I505c676cc0ccd8d54e44e65b04b10c2de03ee37c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Always return some category name, even if it's just a placeh...

2018-01-09 Thread C. Scott Ananian (Code Review)

C. Scott Ananian has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403318 )

Change subject: Always return some category name, even if it's just a 
placeholder
..

Always return some category name, even if it's just a placeholder

This further decouples Parsoid deploys of new linter categories from
Linter extension deploys which name them.  If Parsoid logs lints from
an as-yet-unknown category, we will just give them the special temporary
name LINT@nnn with the numeric db identifier.  This allows the API and
UX to query/display/etc them with this placeholder name while we are
waiting for the "official" name/l10n/etc to be deployed.

Add some new methods to allow enumerating all category ids from the
database, even those which aren't yet officially named.

Change-Id: Ic917fa3abb61d2f784d839f8f9e5e866640d2d4d
---
M i18n/en.json
M i18n/qqq.json
M includes/ApiQueryLintErrors.php
M includes/CategoryManager.php
M includes/Database.php
M includes/SpecialLintErrors.php
M includes/TotalsLookup.php
7 files changed, 101 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Linter 
refs/changes/18/403318/1

diff --git a/i18n/en.json b/i18n/en.json
index 2ef9756..07a34ba 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -68,6 +68,7 @@
"linter-heading-high-priority": "High priority",
"linter-heading-medium-priority": "Medium priority",
"linter-heading-low-priority": "Low priority",
+   "linter-heading-placeholder-priority": "Not yet categorized",
"multi-part-template-block": "Output not from a single template",
"pageinfo-linter": "Lint errors",
"apihelp-query+linterrors-description": "Get a list of lint errors",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a650798..3ccaa5b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -72,6 +72,7 @@
"linter-heading-high-priority": "Heading on [[Special:LintErrors]]",
"linter-heading-medium-priority": "Heading on [[Special:LintErrors]]",
"linter-heading-low-priority": "Heading on [[Special:LintErrors]]",
+   "linter-heading-placeholder-priority": "Heading on 
[[Special:LintErrors]]",
"multi-part-template-block": "Table cell on [[Special:LintErrors]] 
indicating that content block is not produced by a single template",
"pageinfo-linter": "Heading on ?action=info for a page if it has lint 
errors",
"apihelp-query+linterrors-description": 
"{{doc-apihelp-description|query+linterrors}}",
diff --git a/includes/ApiQueryLintErrors.php b/includes/ApiQueryLintErrors.php
index f057c0c..62f5976 100644
--- a/includes/ApiQueryLintErrors.php
+++ b/includes/ApiQueryLintErrors.php
@@ -98,13 +98,18 @@
}
 
public function getAllowedParams() {
-   $visibleCats = ( new CategoryManager() 
)->getVisibleCategories();
+   $categoryMgr = new CategoryManager();
+   $visibleCats = $categoryMgr->getVisibleCategories();
+   $placeholderCats = $categoryMgr->getPlaceholderCategories(
+   $this->getDB()
+   );
+   $allCats = array_merge($visibleCats, $placeholderCats);
return [
'categories' => [
-   ApiBase::PARAM_TYPE => $visibleCats,
+   ApiBase::PARAM_TYPE => $allCats,
ApiBase::PARAM_ISMULTI => true,
// Default is to show all categories
-   ApiBase::PARAM_DFLT => implode( '|', 
$visibleCats ),
+   ApiBase::PARAM_DFLT => implode( '|', $allCats ),
],
'limit' => [
ApiBase::PARAM_DFLT => 10,
diff --git a/includes/CategoryManager.php b/includes/CategoryManager.php
index 6d1256d..bb1bb6d 100644
--- a/includes/CategoryManager.php
+++ b/includes/CategoryManager.php
@@ -56,6 +56,21 @@
 */
private $hasNameParam = [];
 
+   /**
+* Special form for "numeric category" names, a special form which 
allows
+* naming/querying new Parsoid categories prior to the Linter extension
+* being updated with information about them.
+*
+* @var string
+*/
+   const NUMERIC_CATID_PREFIX = 'LINT@';
+   /**
+* A regexp to rest for "numeric category" names.
+*
+* @var string
+*/
+   const NUMERIC_CATID_REGEX = '/^' . self::NUMERIC_CATID_PREFIX . 
'([0-9]+)$/';
+
public function __construct() {
global $wgLinterCategories;
foreach ( $wgLinterCategories as $name => $info ) {
@@ -124,8 +139,52 @@
}
 
/**
-* Whether this category has a hardcoded id and can be
-* inserted into the database
+* Categories present in the database

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Add IPv6 localhost to default whitelist along with IPv4 loca...

2018-01-09 Thread C. Scott Ananian (Code Review)

C. Scott Ananian has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403316 )

Change subject: Add IPv6 localhost to default whitelist along with IPv4 
localhost
..

Add IPv6 localhost to default whitelist along with IPv4 localhost

Change-Id: I970b91539606305da9afa6d3e40d66885385615e
---
M extension.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Linter 
refs/changes/16/403316/1

diff --git a/extension.json b/extension.json
index bb3a455..6d16535 100644
--- a/extension.json
+++ b/extension.json
@@ -164,7 +164,8 @@
}
},
"LinterSubmitterWhitelist": {
-   "127.0.0.1": true
+   "127.0.0.1": true,
+   "::1": true
},
"LinterStatsdSampleFactor": false
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I970b91539606305da9afa6d3e40d66885385615e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs: Add s8.labsdb and move wikidatawiki

2018-01-09 Thread BryanDavis (Code Review)

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

Change subject: wmcs: Add s8.labsdb and move wikidatawiki
..

wmcs: Add s8.labsdb and move wikidatawiki

Bug: T184179
Change-Id: I1c0d9468e59682b1ceb061a58bc1defa6a9b7151
---
M modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/403315/1

diff --git a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone 
b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
index f19bcdf..35f98d3 100644
--- a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
+++ b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
@@ -910,7 +910,6 @@
 
 s5 1H  IN  CNAME   s5.analytics.db.svc.eqiad.wmflabs.
 dewiki 1H  IN  CNAME   s5.analytics.db.svc.eqiad.wmflabs.
-wikidatawiki   1H  IN  CNAME   s5.analytics.db.svc.eqiad.wmflabs.
 
 s6 1H  IN  CNAME   s6.analytics.db.svc.eqiad.wmflabs.
 frwiki 1H  IN  CNAME   s6.analytics.db.svc.eqiad.wmflabs.
@@ -932,3 +931,6 @@
 viwiki 1H  IN  CNAME   s7.analytics.db.svc.eqiad.wmflabs.
 centralauth1H  IN  CNAME   s7.analytics.db.svc.eqiad.wmflabs.
 meta   1H  IN  CNAME   s7.analytics.db.svc.eqiad.wmflabs.
+
+s8 1H  IN  CNAME   s8.analytics.db.svc.eqiad.wmflabs.
+wikidatawiki   1H  IN  CNAME   s8.analytics.db.svc.eqiad.wmflabs.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Improve handling of section-wrapping and extcontent boundary...

2018-01-09 Thread Subramanya Sastry (Code Review)

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

Change subject: Improve handling of section-wrapping and extcontent boundary 
conflicts
..

Improve handling of section-wrapping and extcontent boundary conflicts

1. We mistakenly assumed presence of dataMW.body.extsrc for all
   extensions.

2. Expanding template source to include toplevel content was not
   the right thing to do for all extensions -- it might be okay for
   the translate extension which was the primary source of these
   conflicts according to 5c4f0f5b.

Deal with both scenarios properly by adding additional prefix/suffix
properties to data-mw.body for section tags that swallow other content
surrounding extension content and get extension markers added to them.

This required updating html2wt to handle the prefix/suffix text
properly - otherwise, those will be lost in html2wt (since the content
could have been marked extension affected).
Ex: https://fr.wikisource.org/wiki/Clair_de_lune_(Leopold_von_Sacher-Masoch)

Change-Id: I9cef92966fb9acd8262237884ae8ec7acfe9cdcc
---
M lib/html2wt/DOMHandlers.js
M lib/wt2html/pp/processors/wrapSections.js
2 files changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/lib/html2wt/DOMHandlers.js b/lib/html2wt/DOMHandlers.js
index d6984a4..927ab0c 100644
--- a/lib/html2wt/DOMHandlers.js
+++ b/lib/html2wt/DOMHandlers.js
@@ -1493,6 +1493,10 @@
}
return p.then(function(s) {
state.singleLineContext.disable();
+   // FIXME: Ugh!
+   if ((dataMw.extPrefix || dataMw.extSuffix)) {
+   s = (dataMw.extPrefix || '') + s + 
(dataMw.extSuffix || '');
+   }
self.emitWikitext(handleListPrefix(node, state) 
+ s, node);
state.singleLineContext.pop();
return DU.skipOverEncapsulatedContent(node);
diff --git a/lib/wt2html/pp/processors/wrapSections.js 
b/lib/wt2html/pp/processors/wrapSections.js
index 2f5d315..7a07bf3 100644
--- a/lib/wt2html/pp/processors/wrapSections.js
+++ b/lib/wt2html/pp/processors/wrapSections.js
@@ -230,7 +230,7 @@
if 
(/mw:Transclusion/.test(tplInfo.first.getAttribute('typeof'))) {

dmw.parts.push(state.getSrc(tplEndOffset, newTplEndOffset));
} else { /* Extension */
-   dmw.body.extsrc += 
state.getSrc(tplEndOffset, newTplEndOffset);
+   dmw.extSuffix = 
state.getSrc(tplEndOffset, newTplEndOffset);
}
// Update DSR
tplDsr[1] = newTplEndOffset;
@@ -281,7 +281,8 @@
// the transclusion and eliminates dirty-diffs.
DU.setDataParsoid(newS1, { pi: tplDP.pi, dsr: [ 
dsr1, dsr2 ] });
} else { /* extension */
-   dmw.body.extsrc = state.getSrc(dsr1, tplDsr[0]) 
+ dmw.body.extsrc + state.getSrc(tplDsr[1], dsr2);
+   dmw.extPrefix = state.getSrc(dsr1, tplDsr[0]);
+   dmw.extSuffix = state.getSrc(tplDsr[1], dsr2);
DU.setDataMw(newS1, dmw);
newS1.setAttribute('typeof', 
tplInfo.first.getAttribute('typeof'));
DU.setDataParsoid(newS1, { dsr: [ dsr1, dsr2 ] 
});

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cef92966fb9acd8262237884ae8ec7acfe9cdcc
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] oojs/ui[master]: icons: Fix 'lightbulb' centering

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: icons: Fix 'lightbulb' centering
..


icons: Fix 'lightbulb' centering

Follows-up on I90fe58e79559b7e47a62af6b216098b49802b274

Bug: T175006
Change-Id: I5b5976973ecc09fecf8a9069dc382d8499afb5dd
---
M src/themes/apex/images/icons/lightbulb.svg
M src/themes/wikimediaui/images/icons/lightbulb.svg
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/src/themes/apex/images/icons/lightbulb.svg 
b/src/themes/apex/images/icons/lightbulb.svg
index f2329e0..933d0b5 100644
--- a/src/themes/apex/images/icons/lightbulb.svg
+++ b/src/themes/apex/images/icons/lightbulb.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-
+   
 
diff --git a/src/themes/wikimediaui/images/icons/lightbulb.svg 
b/src/themes/wikimediaui/images/icons/lightbulb.svg
index f2329e0..933d0b5 100644
--- a/src/themes/wikimediaui/images/icons/lightbulb.svg
+++ b/src/themes/wikimediaui/images/icons/lightbulb.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-
+   
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b5976973ecc09fecf8a9069dc382d8499afb5dd
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: Merge remote-tracking branch 'origin/master' into HEAD

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Merge remote-tracking branch 'origin/master' into HEAD
..


Merge remote-tracking branch 'origin/master' into HEAD

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I20fbe9f4ba2fff1f7a2bf953ee3cfdbacd01f54e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
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...DisqusTag[master]: Using the extension registration

2018-01-09 Thread LukBukkit (Code Review)

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

Change subject: Using the extension registration
..

Using the extension registration

Bug: T184570
Change-Id: I9e11803326292da407629f0c8167f59240cad4da
---
M DisqusTag.php
A extension.json
2 files changed, 49 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DisqusTag 
refs/changes/13/403313/1

diff --git a/DisqusTag.php b/DisqusTag.php
index 7c30880..ecfc41f 100644
--- a/DisqusTag.php
+++ b/DisqusTag.php
@@ -1,26 +1,15 @@
  __FILE__,
-   'name' => 'DisqusTag',
-   'descriptionmsg' => 'disqustag-desc',
-   'version' => '0.3.0',
-   'author' => 'Luis Felipe Schenone',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:DisqusTag',
-);
-
-$wgResourceModules['ext.DisqusTag'] = array(
-   'scripts' => 'DisqusTag.js',
-   'styles' => 'DisqusTag.css',
-   'position' => 'bottom',
-   'dependencies' => array( 'jquery.ui.dialog' ),
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'DisqusTag',
-);
-
-$wgMessagesDirs['DisqusTag'] = __DIR__ . '/i18n';
-$wgAutoloadClasses['DisqusTag'] = __DIR__ . '/DisqusTag.body.php';
-
-$wgHooks['BeforePageDisplay'][] = 'DisqusTag::addModule';
-$wgHooks['ParserFirstCallInit'][] = 'DisqusTag::setParserHook';
-$wgHooks['SkinAfterContent'][] = 'DisqusTag::addDisqusElements';
+if ( function_exists( 'DisqusTag' ) ) {
+   wfLoadExtension( 'DisqusTag' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['DisqusTag'] = __DIR__ . '/i18n';
+   wfWarn(
+   'Deprecated PHP entry point used for the DisqusTag extension. ' 
.
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the DisqusTag extension requires MediaWiki 1.25+' 
);
+}
\ No newline at end of file
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..7677307
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,36 @@
+{
+   "name": "DisqusTag",
+   "version": "0.3.0",
+   "author": "Luis Felipe Schenone",
+   "url": "https://www.mediawiki.org/wiki/Extension:DisqusTag;,
+   "descriptionmsg": "disqustag-desc",
+   "type": "parserhook",
+   "MessagesDirs": {
+   "DisqusTag": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "DisqusTag": "DisqusTag.body.php"
+   },
+   "ResourceModules": {
+   "ext.DisqusTag": {
+   "scripts": "DisqusTag.js",
+   "styles": "DisqusTag.css",
+   "position": "bottom",
+   "dependencies": [
+   "jquery.ui.dialog"
+   ]
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "",
+   "remoteExtPath": "DisqusTag"
+   },
+   "Hooks": {
+   "BeforePageDisplay": "DisqusTag::addModule",
+   "ParserFirstCallInit": "DisqusTag::setParserHook",
+   "SkinAfterContent": "DisqusTag::addDisqusElements"
+   },
+   "manifest_version": 2
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e11803326292da407629f0c8167f59240cad4da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DisqusTag
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: Merge remote-tracking branch 'origin/master' into HEAD

2018-01-09 Thread Jdlrobson (Code Review)

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

Change subject: Merge remote-tracking branch 'origin/master' into HEAD
..

Merge remote-tracking branch 'origin/master' into HEAD

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I20fbe9f4ba2fff1f7a2bf953ee3cfdbacd01f54e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
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...MobileFrontend[specialpages]: Run MobileFrontendFeaturesRegistration only once

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Run MobileFrontendFeaturesRegistration only once
..


Run MobileFrontendFeaturesRegistration only once

Due to T165068 it's possible that onRequestContextCreateSkin
will be called more than once which causes feature management
system to register same feature more than once.
Prevent that by moving the Hook call to the manager and setting
an `initialized` flag;

Bug: T182362
Change-Id: I6cc4a2ebcd75c054294daf329d94d35a02e50f8e
---
M includes/MobileFrontend.hooks.php
M includes/features/FeaturesManager.php
2 files changed, 25 insertions(+), 3 deletions(-)

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



diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index a2767c3..fdc08c4 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -85,9 +85,9 @@
// to retrieve the FeaturesManager
// Important: This must be run before 
RequestContextCreateSkinMobile which may make modifications
// to the skin based on enabled features.
-   $featureManager = \MediaWiki\MediaWikiServices::getInstance()
-   ->getService( 'MobileFrontend.FeaturesManager' );
-   Hooks::run( 'MobileFrontendFeaturesRegistration', [ 
$featureManager ] );
+   \MediaWiki\MediaWikiServices::getInstance()
+   ->getService( 'MobileFrontend.FeaturesManager' )
+   ->setup();
 
// enable wgUseMediaWikiUIEverywhere
self::enableMediaWikiUI();
diff --git a/includes/features/FeaturesManager.php 
b/includes/features/FeaturesManager.php
index 6b6b37c..6e13c27 100644
--- a/includes/features/FeaturesManager.php
+++ b/includes/features/FeaturesManager.php
@@ -3,8 +3,15 @@
 namespace MobileFrontend\Features;
 
 use MobileContext;
+use Hooks;
 
 class FeaturesManager {
+
+   /**
+* @var bool
+*/
+   private $initialized = false;
+
/**
 * A collection of available features
 *
@@ -13,6 +20,21 @@
private $features = [];
 
/**
+* Setup the Features Manager and register all 3rd party features
+* The $initialized lock is required due to bug T165068
+* There is no other way to register feature other than on 
onRequestContextCreateSkin
+* hook, but this hook might be called more than once due to special 
pages transclusion.
+*
+* @see https://phabricator.wikimedia.org/T165068
+*/
+   public function setup() {
+   if ( !$this->initialized ) {
+   Hooks::run( 'MobileFrontendFeaturesRegistration', [ 
$this ] );
+   $this->initialized = true;
+   }
+   }
+
+   /**
 * Register a new MobileFronted feature
 * @param IFeature $feature Feature to register
 */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cc4a2ebcd75c054294daf329d94d35a02e50f8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: specialpages
Gerrit-Owner: Pmiazga 
Gerrit-Reviewer: Jdlrobson 
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]: Minerva should use FeatureManagers class

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Minerva should use FeatureManagers class
..


Minerva should use FeatureManagers class

Bug: T182362
Depends-On: I6cc4a2ebcd75c054294daf329d94d35a02e50f8e
Change-Id: I6ba5bf49b9060c31ad2224a437072b3426a45619
---
M i18n/en.json
M i18n/qqq.json
M includes/Minerva.hooks.php
M skin.json
4 files changed, 58 insertions(+), 5 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index f35556d..7397c82 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -56,5 +56,9 @@
"mobile-frontend-user-page-talk": "Talk",
"mobile-frontend-user-page-uploads": "Uploads",
"skinname-minerva": "MinervaNeue",
-   "minerva-skin-desc": "A responsive mobile first skin"
+   "minerva-skin-desc": "A responsive mobile first skin",
+   "skin-minerva-mobile-option-MinervaShowCategoriesButton": "Categories",
+   "skin-minerva-mobile-option-MinervaShowCategoriesButton-description": 
"View categories of pages",
+   "skin-minerva-mobile-option-MinervaEnableBackToTop": "Jump to top",
+   "skin-minerva-mobile-option-MinervaEnableBackToTop-description": "Jump 
to top of the current page using a floating button"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 20d35ec..60b8fbc 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -65,5 +65,9 @@
"mobile-frontend-user-page-talk": "Text of the link to the user's talk 
page\n{{Identical|Talk}}",
"mobile-frontend-user-page-uploads": "Text of the link to the user's 
uploads page\n{{Identical|Upload}}",
"skinname-minerva": "{{name}}",
-   "minerva-skin-desc": "{{desc|name=Minerva 
Neue|url=https://www.mediawiki.org/wiki/Skin:Minerva_Neue|what=skin}}"
+   "minerva-skin-desc": "{{desc|name=Minerva 
Neue|url=https://www.mediawiki.org/wiki/Skin:Minerva_Neue|what=skin}}",
+   "skin-minerva-mobile-option-MinervaShowCategoriesButton": "Label for 
categories mobile web beta feature.",
+   "skin-minerva-mobile-option-MinervaShowCategoriesButton-description": 
"Description label for categories mobile web beta feature.",
+   "skin-minerva-mobile-option-MinervaEnableBackToTop": "Label for jump to 
top mobile web beta feature",
+   "skin-minerva-mobile-option-MinervaEnableBackToTop-description": 
"Description label for jump to top mobile web beta feature"
 }
diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index c65d939..ec4bf96 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -28,6 +28,40 @@
}
 
/**
+* Register mobile web beta features
+* @see https://www.mediawiki.org/wiki/
+*  Extension:MobileFrontend/MobileFrontendFeaturesRegistration
+*
+* @param MobileFrontend\Features\FeaturesManager $featureManager
+* @return bool
+*/
+   public static function onMobileFrontendFeaturesRegistration( 
$featureManager ) {
+   $config = MediaWikiServices::getInstance()->getConfigFactory()
+   ->makeConfig( 'minerva' );
+
+   try {
+   $featureManager->registerFeature(
+   new MobileFrontend\Features\Feature(
+   'MinervaShowCategoriesButton',
+   'skin-minerva',
+   $config->get( 
'MinervaShowCategoriesButton' )
+   )
+   );
+   $featureManager->registerFeature(
+   new MobileFrontend\Features\Feature(
+   'MinervaEnableBackToTop',
+   'skin-minerva',
+   $config->get( 'MinervaEnableBackToTop' )
+   )
+   );
+   } catch ( RuntimeException $e ) {
+   // features already registered...
+   // due to a bug it's possible for this to run twice
+   // https://phabricator.wikimedia.org/T165068
+   }
+   }
+
+   /**
 * Skin registration callback.
 */
public static function onRegistration() {
@@ -132,13 +166,19 @@
) {
// setSkinOptions is not available
if ( $skin instanceof SkinMinerva ) {
+   $featureManager = 
\MediaWiki\MediaWikiServices::getInstance()
+   ->getService( 'MobileFrontend.FeaturesManager' 
);
+
+   $isBeta = $mobileContext->isBetaGroupMember();
$skin->setSkinOptions( [
SkinMinerva::OPTIONS_MOBILE_BETA
-

[MediaWiki-commits] [Gerrit] integration/config[master]: docker: stretch image to run rake

2018-01-09 Thread Hashar (Code Review)

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

Change subject: docker: stretch image to run rake
..

docker: stretch image to run rake

It fetches changes exactly like I did for tox.

Change-Id: I0af2df2f675a945dc72ed81d82faeaf2c1edb212
---
A dockerfiles/rake/.dockerignore
A dockerfiles/rake/.gitignore
A dockerfiles/rake/Dockerfile.template
A dockerfiles/rake/changelog
A dockerfiles/rake/control
A dockerfiles/rake/example-run.sh
A dockerfiles/rake/run.sh
7 files changed, 45 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/11/403311/1

diff --git a/dockerfiles/rake/.dockerignore b/dockerfiles/rake/.dockerignore
new file mode 100644
index 000..31dbbff
--- /dev/null
+++ b/dockerfiles/rake/.dockerignore
@@ -0,0 +1 @@
+/log
diff --git a/dockerfiles/rake/.gitignore b/dockerfiles/rake/.gitignore
new file mode 100644
index 000..31dbbff
--- /dev/null
+++ b/dockerfiles/rake/.gitignore
@@ -0,0 +1 @@
+/log
diff --git a/dockerfiles/rake/Dockerfile.template 
b/dockerfiles/rake/Dockerfile.template
new file mode 100644
index 000..c871380
--- /dev/null
+++ b/dockerfiles/rake/Dockerfile.template
@@ -0,0 +1,6 @@
+FROM {{ "ci-stretch" | image_tag }}
+RUN {{ "build-essential rubygems-integration rake ruby ruby-dev bundler" | 
apt_install }}
+
+COPY run.sh /run.sh
+USER nobody
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/rake/changelog b/dockerfiles/rake/changelog
new file mode 100644
index 000..a11e5ba
--- /dev/null
+++ b/dockerfiles/rake/changelog
@@ -0,0 +1,5 @@
+rake (0.1.0) wikimedia; urgency=medium
+
+  * Initial release.
+
+ -- Antoine Musso   Tue, 09 Jan 2018 22:34:48 +0100
diff --git a/dockerfiles/rake/control b/dockerfiles/rake/control
new file mode 100644
index 000..643e079
--- /dev/null
+++ b/dockerfiles/rake/control
@@ -0,0 +1,3 @@
+Package: rake
+Description: ruby on a stretch image
+Depends: ci-stretch
diff --git a/dockerfiles/rake/example-run.sh b/dockerfiles/rake/example-run.sh
new file mode 100755
index 000..89ba873
--- /dev/null
+++ b/dockerfiles/rake/example-run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+install --mode 2777 --directory log
+docker run \
+--rm --tty \
+--env JENKINS_URL=1 \
+--env ZUUL_URL=https://gerrit.wikimedia.org/r \
+--env ZUUL_PROJECT=mediawiki/ruby/api \
+--env ZUUL_COMMIT=master \
+--env ZUUL_REF=master \
+--volume /"$(pwd)"/log://log \
+docker-registry.wikimedia.org/releng/rake:latest
diff --git a/dockerfiles/rake/run.sh b/dockerfiles/rake/run.sh
new file mode 100755
index 000..b2f942b
--- /dev/null
+++ b/dockerfiles/rake/run.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+umask 002
+
+cd /src
+
+git init
+git fetch --depth 2 --quiet "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF"
+git checkout --quiet FETCH_HEAD
+git submodule --quiet update --init --recursive
+
+bundle install --path .bundle
+exec bundle exec rake test

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0af2df2f675a945dc72ed81d82faeaf2c1edb212
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] wikimedia...crm[master]: Add Citibank International to payment instruments on new ins...

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Add Citibank International to payment instruments on new 
installs.
..


Add Citibank International to payment instruments on new installs.

There are 2 Citibank payment instruments on live but neither are added via the 
install script
for test sites. I have stuck all the code that adds payment instruments into 
one function
and it is always called on new installs. A new function needs to be added to 
get them onto
live like wmf_civicrm_update_7595. I've removed older instances of the 
payment_instrument
adds - I don't feel like it adds some amazing historical value to keep them all.

I also added a few extension installs update functions to the new-install to 
make sure
they get enabled

Change-Id: Ib1ca183c597f464d4493bbe754fd482c7d496691
---
A sites/all/modules/wmf_civicrm/update_payment_instruments.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
2 files changed, 110 insertions(+), 158 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/update_payment_instruments.php 
b/sites/all/modules/wmf_civicrm/update_payment_instruments.php
new file mode 100644
index 000..920cb56
--- /dev/null
+++ b/sites/all/modules/wmf_civicrm/update_payment_instruments.php
@@ -0,0 +1,101 @@
+ array(array('total_amount', 'receive_date')),
   ));
-}
-
-/**
- * Add Latin American payment methods for AstroPay
- */
-function wmf_civicrm_update_7195() {
-  $payment_instruments = array(
-'Credit Card: Elo',
-'Credit Card: HiperCard',
-'Credit Card: MercadoLivre',
-'Credit Card: Cabal',
-'Credit Card: Naranja',
-'Credit Card: Tarjeta Shopping',
-'Credit Card: Nativa',
-'Credit Card: Cencosud',
-'Credit Card: Argencard',
-'Credit Card: Webpay',
-'Banamex',
-'Bancomer',
-'Davivienda',
-'Efecty',
-'OXXO',
-'Pago Facil',
-'Provencia Pagos',
-'Red Pagos',
-'Rapi Pago',
-'Santander',
-  );
-  wmf_civicrm_bootstrap_civi();
-  wmf_civicrm_create_option_values('payment_instrument', $payment_instruments);
-}
-
-/**
- * Add a few more Chilean credit cards
- */
-function wmf_civicrm_update_7196() {
-  $payment_instruments = array(
-'Credit Card: CMR Falabella',
-'Credit Card: Magna',
-'Credit Card: Presto',
-  );
-  wmf_civicrm_bootstrap_civi();
-  wmf_civicrm_create_option_values('payment_instrument', $payment_instruments);
 }
 
 /**
@@ -3016,17 +2878,6 @@
 }
 
 /**
- * Add Bijcard
- */
-function wmf_civicrm_update_7521() {
-  $payment_instruments = array(
-'Credit Card: Bijenkorf',
-  );
-  wmf_civicrm_bootstrap_civi();
-  wmf_civicrm_create_option_values('payment_instrument', $payment_instruments);
-}
-
-/**
  * Normalize old phone numbers
  **/
 function wmf_civicrm_update_7522() {
@@ -3434,7 +3285,7 @@
 /**
  * Add Stripe payment instrument
  */
-function wmf_civicrm_update_7590() {
-  civicrm_initialize();
-  wmf_civicrm_create_option_values('payment_instrument', array('Stripe'));
+function wmf_civicrm_update_7595() {
+  require_once 'update_payment_instruments.php';
+  wmf_install_add_missing_payment_instruments();
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [BREAKING CHANGE] Rename TitleWidget#getTitle to TitleWidget...

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: [BREAKING CHANGE] Rename TitleWidget#getTitle to 
TitleWidget#getMWTitle
..


[BREAKING CHANGE] Rename TitleWidget#getTitle to TitleWidget#getMWTitle

Rename TitleWidget#getTitle so it won't clash with TitledElement#getTitle

Bug: T184181
Change-Id: I97ff46d8ca60f260af2a0b12e6c053aa91c777d1
---
M resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
index a78ad82..98d07f3 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
@@ -131,7 +131,7 @@
value = 
mw.widgets.TitleInputWidget.parent.prototype.cleanUpValue.call( this, value );
 
return $.trimByteLength( this.value, value, this.maxLength, 
function ( value ) {
-   var title = widget.getTitle( value );
+   var title = widget.getMWTitle( value );
return title ? title.getMain() : value;
} ).newVal;
};
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 5670ce4..0c6385b 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -355,7 +355,7 @@
 * @param {string} [value] Value to get a title for
 * @return {mw.Title|null} Title object, or null if value is invalid
 */
-   mw.widgets.TitleWidget.prototype.getTitle = function ( value ) {
+   mw.widgets.TitleWidget.prototype.getMWTitle = function ( value ) {
var title = value !== undefined ? value : this.getQueryValue(),
// mw.Title doesn't handle null well
titleObj = mw.Title.newFromText( title, this.namespace 
!== null ? this.namespace : undefined );
@@ -369,7 +369,7 @@
 * @return {boolean} The query is valid
 */
mw.widgets.TitleWidget.prototype.isQueryValid = function () {
-   return this.validateTitle ? !!this.getTitle() : true;
+   return this.validateTitle ? !!this.getMWTitle() : true;
};
 
 }( jQuery, mediaWiki ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97ff46d8ca60f260af2a0b12e6c053aa91c777d1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Use built GUI for distribution package

2018-01-09 Thread Smalyshev (Code Review)

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

Change subject: Use built GUI for distribution package
..

Use built GUI for distribution package

Bug: T16624
Change-Id: I77f82b93e13e63e0d4d4a9fa02ceec47c40e5c0e
---
M dist/src/assembly/dist.xml
1 file changed, 1 insertion(+), 13 deletions(-)


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

diff --git a/dist/src/assembly/dist.xml b/dist/src/assembly/dist.xml
index a694704..efc74e9 100644
--- a/dist/src/assembly/dist.xml
+++ b/dist/src/assembly/dist.xml
@@ -32,19 +32,7 @@
 
 
   gui
-  ${project.basedir}/../gui
-  
-Gruntfile.js
-.git*
-.js*
-.settings
-.project
-package.json
-jsduck.json
-README.md
-node_modules/**
-wikibase/tests/**
-  
+  ${project.basedir}/../gui/build
 
 
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77f82b93e13e63e0d4d4a9fa02ceec47c40e5c0e
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Use MP3 with LAME instead of OGG for MIDI conversion

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Use MP3 with LAME instead of OGG for MIDI conversion
..


Use MP3 with LAME instead of OGG for MIDI conversion

This patch utilizes the lame command in order to convert
from fluidsynth/timidty generated WAV files to MP3.

Also increased max filesize for large MIDIs.

Depends on change 402148.

Bug: T181875
Change-Id: I4b87d0bb665e824fe934d714bf2e282b1bbe8318
---
M README
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Score.php
5 files changed, 134 insertions(+), 79 deletions(-)

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



diff --git a/README b/README
index d12f9fb..b407698 100644
--- a/README
+++ b/README
@@ -42,10 +42,11 @@
$wgScoreAbc2Ly = '/path/to/your/abc2ly/executable'; /* if you want ABC to
   LilyPond conversion 
*/
$wgScoreFluidsynth = '/path/to/your/fluidsynth/executable'; /* if you want 
MIDI to
-  Vorbis 
conversion */
+  MP3 
conversion */
$wgScoreSoundfont = '/path/to/your/soundfont/file'; /* required for 
Fluidsynth */
$wgScoreTimidity = '/path/to/your/timidity/executable'; /* fallback when 
Fluidsynth
   is not installed 
*/
+   $wgScoreLame = '/path/to/your/lame/executable' /* required to convert sound 
*/
$wgScoreTrim = true; /* Set to false if you don't want score trimming */
$wgScoreSafeMode = false; /* Set to true if the Lilypond executable is
 running in a Firejail or equivalent */
diff --git a/extension.json b/extension.json
index 7dc5b2c..5c27e5f 100644
--- a/extension.json
+++ b/extension.json
@@ -90,6 +90,7 @@
"ScoreFluidsynth": "/usr/bin/fluidsynth",
"ScoreSoundfont": "/usr/share/sounds/sf2/FluidR3_GM.sf2",
"ScoreTimidity": "/usr/bin/timidity",
+   "ScoreLame": "/usr/bin/lame",
"ScoreSafeMode": true,
"ScorePath": false,
"ScoreDirectory": false,
diff --git a/i18n/en.json b/i18n/en.json
index 3ec220c..87a2363 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,37 +4,39 @@
},
"score-abc2lynotexecutable": "ABC to LilyPond converter could not be 
executed: $1 is not an executable file. Make sure $wgScoreAbc2Ly 
is set correctly.",
"score-abcconversionerr": "Unable to convert ABC file to LilyPond 
format:\n$1",
+   "score-audioconversionerr": "Unable to convert MIDI to MP3:\n$1",
+   "score-audiooverridenotfound": "The file \"$1\" you 
specified with override_audio does not exist.",
+   "score-backend-error": "Unable to copy the generated files to their 
final location:\n$1",
"score-chdirerr": "Unable to change to directory $1",
"score-cleanerr": "Unable to clean out old files before re-rendering",
"score-compilererr": "Unable to compile LilyPond input file:\n$1",
-   "score-backend-error": "Unable to copy the generated files to their 
final location:\n$1",
+   "score-convertoverrideaudio": "You cannot request audio rendering and 
specify override_audio at the same time.",
"score-desc": "Adds a tag for rendering musical scores with LilyPond",
"score-download-midi-file": "Download MIDI file",
"score-download-source-file": "Download lilypond file",
"score-error-category": "Pages with score rendering errors",
"score-error-category-desc": "There was an error while rendering the 
score.",
+   "score-fallbacknotexecutable": "TiMidity++ could not be executed as 
fallback: $1 is not an executable file. Make sure $wgScoreTimidity 
or $wgScoreFluidsynth is set correctly.",
"score-getcwderr": "Unable to obtain current working directory",
+   "score-invalidaudiooverride": "The file \"$1\" you 
specified with override_audio is invalid. Please specify the file name only, 
omit [[…]] and the \"{{ns:file}}:\" prefix.",
"score-invalidlang": "Invalid score language 
lang=\"$1\". Currently recognized languages are 
lang=\"lilypond\" (the default) and lang=\"ABC\".",
"score-invalidnotelanguage": "Invalid 
note-language=\"$1\". Currently recognized note languages are: 
$2",
-   "score-invalidaudiooverride": "The file \"$1\" you 
specified with override_audio is invalid. Please specify the file name only, 
omit [[…]] and the \"{{ns:file}}:\" prefix.",
-   "score-notelanguagewithraw": "Attribute \"note-language\" cannot be 
used for raw mode scores",
+   "score-lamenotexecutable": "LAME could not be executed: $1 is not an 
executable file. Make sure $wgScoreLame is set correctly.",
"score-midioverridenotfound": "The file \"$1\"

[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: TemplateData: Replace "getSelectedItem" with "findSelectedItem"

2018-01-09 Thread Zoranzoki21 (Code Review)

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

Change subject: TemplateData: Replace "getSelectedItem" with "findSelectedItem"
..

TemplateData: Replace "getSelectedItem" with "findSelectedItem"

Replace instances of getSelectedItem with findSelectedItem in 
modules/ext.templateDataGenerator.ui.tdDialog.js in MediaWiki's TemplateData 
extension.

Bug: T184040
Change-Id: I469d0e0b9982ea5f5de35b514c76e817b1d8e9b5
---
M modules/ext.templateDataGenerator.ui.tdDialog.js
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData 
refs/changes/09/403309/1

diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index efa6fe3..48459bf 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -1,4 +1,4 @@
-/**
+/**
  * TemplateData Dialog
  *
  * @class
@@ -488,7 +488,7 @@
  * @param {string} value Input widget value
  */
 mw.TemplateData.Dialog.prototype.onTemplateFormatInputWidgetChange = function 
( value ) {
-   var item = this.templateFormatSelectWidget.getSelectedItem(),
+   var item = this.templateFormatSelectWidget.findSelectedItem(),
format,
newValue;
if ( item.getData() === 'custom' ) {
@@ -521,7 +521,7 @@
allProps = mw.TemplateData.Model.static.getAllProperties( true 
);
 
if ( property === 'type' ) {
-   value = this.propInputs[ property ].getMenu().getSelectedItem() 
? this.propInputs[ property ].getMenu().getSelectedItem().getData() : 'unknown';
+   value = this.propInputs[ property 
].getMenu().findSelectedItem() ? this.propInputs[ property 
].getMenu().findSelectedItem().getData() : 'unknown';
}
 
// TODO: Validate the name

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I469d0e0b9982ea5f5de35b514c76e817b1d8e9b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: ferm pre hook to stop kube-proxy

2018-01-09 Thread Rush (Code Review)

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

Change subject: tools: ferm pre hook to stop kube-proxy
..

tools: ferm pre hook to stop kube-proxy

There is a dangerous race condition here between
kube-proxy and ferm.  The only sane thing to do is
have one updating at a time.  This needs to be
revisited and reworked.

Bug: T182722
Change-Id: Icca8d25948451b31e3c0781c67906e93281939fa
---
M modules/role/manifests/toollabs/k8s/worker.pp
M modules/role/manifests/toollabs/proxy.pp
R modules/toollabs/files/ferm_post_handler.sh
A modules/toollabs/files/ferm_pre_handler.sh
A modules/toollabs/manifests/ferm_handlers.pp
D modules/toollabs/manifests/ferm_restart_handler.pp
6 files changed, 55 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/403308/1

diff --git a/modules/role/manifests/toollabs/k8s/worker.pp 
b/modules/role/manifests/toollabs/k8s/worker.pp
index 928d82a..dd88f04 100644
--- a/modules/role/manifests/toollabs/k8s/worker.pp
+++ b/modules/role/manifests/toollabs/k8s/worker.pp
@@ -2,7 +2,7 @@
 class role::toollabs::k8s::worker {
 include ::toollabs::infrastructure
 include ::base::firewall
-include ::toollabs::ferm_restart_handler
+include ::toollabs::ferm_handlers
 
 $flannel_etcd_url = join(prefix(suffix(hiera('flannel::etcd_hosts'), 
':2379'), 'https://'), ',')
 
diff --git a/modules/role/manifests/toollabs/proxy.pp 
b/modules/role/manifests/toollabs/proxy.pp
index c82cfef..4490ab9 100644
--- a/modules/role/manifests/toollabs/proxy.pp
+++ b/modules/role/manifests/toollabs/proxy.pp
@@ -3,7 +3,7 @@
 include ::toollabs::proxy
 include ::role::toollabs::k8s::webproxy
 include ::base::firewall
-include ::toollabs::ferm_restart_handler
+include ::toollabs::ferm_handlers
 
 ferm::service { 'proxymanager':
 proto  => 'tcp',
diff --git a/modules/toollabs/files/ferm_restart_handler.sh 
b/modules/toollabs/files/ferm_post_handler.sh
similarity index 97%
rename from modules/toollabs/files/ferm_restart_handler.sh
rename to modules/toollabs/files/ferm_post_handler.sh
index 692219d..e324bf4 100644
--- a/modules/toollabs/files/ferm_restart_handler.sh
+++ b/modules/toollabs/files/ferm_post_handler.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 /usr/bin/logger -i -t ${0} "restart firewall components post ferm management"
 
diff --git a/modules/toollabs/files/ferm_pre_handler.sh 
b/modules/toollabs/files/ferm_pre_handler.sh
new file mode 100644
index 000..0a3301a
--- /dev/null
+++ b/modules/toollabs/files/ferm_pre_handler.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# https://kubernetes.io/docs/reference/generated/kube-proxy/
+# kube-proxy does its own competing state dump and restore
+# we stop kube-proxy here for the duration.
+# Ferm seems to handle these pre-hooks intelligently in that
+# a bad config or an unresolvable host in a rule is checked
+# before any prehooks.  In that case Ferm itself will stop
+# but kube-proxy will never be touched.
+/usr/bin/logger -i -t ${0} "stop kube-proxy"
+service kube-proxy stop
diff --git a/modules/toollabs/manifests/ferm_handlers.pp 
b/modules/toollabs/manifests/ferm_handlers.pp
new file mode 100644
index 000..a8c789a
--- /dev/null
+++ b/modules/toollabs/manifests/ferm_handlers.pp
@@ -0,0 +1,41 @@
+# tldr; hook post ferm updates to let other interested
+#   parties resync their iptables state.
+# See: T182722
+# http://ferm.foo-projects.org/download/2.1/ferm.html#hooks
+
+class toollabs::ferm_handlers{
+
+file {'/usr/local/sbin/ferm_restart_handler':
+ensure => 'absent',
+source => 'puppet:///modules/toollabs/ferm_restart_handler.sh',
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+}
+
+file {'/usr/local/sbin/ferm_pre_handler':
+source => 'puppet:///modules/toollabs/ferm_pre_handler.sh',
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+}
+
+file {'/usr/local/sbin/ferm_post_handler':
+source => 'puppet:///modules/toollabs/ferm_post_handler.sh',
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+}
+
+ferm::conf{'ferm_pre_handler':
+prio  => 00,
+content   => '@hook post "/usr/local/sbin/ferm_pre_handler";',
+subscribe => File['/usr/local/sbin/ferm_pre_handler'],
+}
+
+ferm::conf{'ferm_post_handler':
+prio  => 00,
+content   => '@hook post "/usr/local/sbin/ferm_post_handler";',
+subscribe => File['/usr/local/sbin/ferm_post_handler'],
+}
+}
diff --git a/modules/toollabs/manifests/ferm_restart_handler.pp 
b/modules/toollabs/manifests/ferm_restart_handler.pp
deleted file mode 100644
index 58a4437..000
--- a/modules/toollabs/manifests/ferm_restart_handler.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# tldr; hook post ferm updates to let other

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Schema tweaks

2018-01-09 Thread MaxSem (Code Review)

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

Change subject: Schema tweaks
..

Schema tweaks

* Replace unique index with a primary one per our policy
  that every table must have a primary index.
* Comment everything.

Change-Id: I4204ad88af49fe7595ecf5232c8c14d89c91bce7
---
M schema.sql
1 file changed, 9 insertions(+), 3 deletions(-)


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

diff --git a/schema.sql b/schema.sql
index 614ed2f..bae0b45 100644
--- a/schema.sql
+++ b/schema.sql
@@ -1,8 +1,14 @@
-CREATE TABLE global_preferences (
+-- Central table that stores global preferences
+CREATE TABLE /*_*/global_preferences (
+  -- Key to globaluser.gu_id
   gp_user INT(11) NOT NULL,
+  -- Property name, same as user_properties.up_property
   gp_property VARBINARY(255) NOT NULL,
-  gp_value BLOB
+  -- Property value, same as user_properties.up_value
+  gp_value BLOB,
+
+  PRIMARY KEY (gp_user, gp_property)
 ) /*$wgDBTableOptions*/;
 
-CREATE UNIQUE INDEX /*i*/global_preferences_user_property ON 
/*_*/global_preferences (gp_user,gp_property);
+-- For batch lookup
 CREATE INDEX /*i*/global_preferences_property ON /*_*/global_preferences 
(gp_property);

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.16]: Disable cpPosTime injection to LBFactory in Setup.php for now

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Disable cpPosTime injection to LBFactory in Setup.php for now
..


Disable cpPosTime injection to LBFactory in Setup.php for now

This avoids triggering an old timeout bug in ChrolonologyProtector.

Bug: T182322
Change-Id: I24a3380650febd09a410a717425747ac5a60d162
---
M includes/Setup.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/Setup.php b/includes/Setup.php
index 4936b0b..18f6e25 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -742,7 +742,8 @@
'IPAddress' => $wgRequest->getIP(),
'UserAgent' => $wgRequest->getHeader( 'User-Agent' ),
'ChronologyProtection' => $wgRequest->getHeader( 'ChronologyProtection' 
),
-   'ChronologyPositionTime' => $cpPosTime
+   # Disabled; bug T182322. No replication waiting for single DC stripped 
main-stash anyway.
+   #'ChronologyPositionTime' => $cpPosTime
 ] );
 // Make sure that caching does not compromise the consistency improvements
 if ( $cpPosTime ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24a3380650febd09a410a717425747ac5a60d162
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.16
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
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...Score[master]: Score: Replace "getSelectedItem" with "findSelectedItem"

2018-01-09 Thread Zoranzoki21 (Code Review)

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

Change subject: Score: Replace "getSelectedItem" with "findSelectedItem"
..

Score: Replace "getSelectedItem" with "findSelectedItem"

Replace instances of getSelectedItem with findSelectedItem in 
modules/ve-score/ve.ui.MWScoreInspector.js in MediaWiki's Score extension.

Bug: T184041
Change-Id: I85766266b4325296119f358a9fb8d136532a3c4c
---
M modules/ve-score/ve.ui.MWScoreInspector.js
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score 
refs/changes/06/403306/1

diff --git a/modules/ve-score/ve.ui.MWScoreInspector.js 
b/modules/ve-score/ve.ui.MWScoreInspector.js
index ba6ccce..3de0296 100644
--- a/modules/ve-score/ve.ui.MWScoreInspector.js
+++ b/modules/ve-score/ve.ui.MWScoreInspector.js
@@ -245,8 +245,8 @@
ve.ui.MWScoreInspector.super.prototype.updateMwData.call( this, mwData 
);
 
// Get data from inspector
-   lang = this.langSelect.getSelectedItem().getData();
-   noteLanguage = 
this.noteLanguageDropdown.getMenu().getSelectedItem().getData();
+   lang = this.langSelect.findSelectedItem().getData();
+   noteLanguage = 
this.noteLanguageDropdown.getMenu().findSelectedItem().getData();
raw = !this.rawCheckbox.isDisabled() && this.rawCheckbox.isSelected();
// audioCheckbox is selected if an audio file is being included, 
whether that file
// is being auto-generated or whether an existing file is being used; 
but the "vorbis"
@@ -272,7 +272,7 @@
  */
 ve.ui.MWScoreInspector.prototype.toggleDisableRawCheckbox = function () {
// Disable the checkbox if the language is not LilyPond
-   this.rawCheckbox.setDisabled( 
this.langSelect.getSelectedItem().getData() !== 'lilypond' );
+   this.rawCheckbox.setDisabled( 
this.langSelect.findSelectedItem().getData() !== 'lilypond' );
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85766266b4325296119f358a9fb8d136532a3c4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: T183275 WIP. Implementation working but not tests..due to fl...

2018-01-09 Thread Jgleeson (Code Review)

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

Change subject: T183275 WIP. Implementation working but not tests..due to flaky 
DonationStats API.
..

T183275 WIP. Implementation working but not tests..due to flaky
DonationStats API.

Running `drush qc` runs the queue consumer which triggers the stats
logging and export process.

/var/spool/prometheus/donations.prom output looks like:

donations_average_enqueued_age{gateway="acme"} 1928340
donations_average_enqueued_age{gateway="all"} 1928340
donations_average_transaction_age{gateway="acme"} 96919463
donations_average_transaction_age{gateway="all"} 96733716.4
donations_count{gateway="acme"} 1
donations_count{gateway="all"} 5
donations_processing_rate{period="latest_batch"} 1.2906119823456
donations_processing_rate{period="1s"} 3.8741310854041
donations_processing_rate{period="5s"} 19.37065542702
donations_processing_rate{period="10s"} 38.741310854041
donations_processing_rate{period="30s"} 116.22393256212

(I've removed the real gateway data above and replace with the original 'acme')

Change-Id: I39b7ecb7762b297fab313bcb1de3ff990afbbec1
---
M sites/all/modules/queue2civicrm/DonationStats.php
M sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsTest.php
2 files changed, 147 insertions(+), 100 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/05/403305/1

diff --git a/sites/all/modules/queue2civicrm/DonationStats.php 
b/sites/all/modules/queue2civicrm/DonationStats.php
index a0c62e3..f7ac4b5 100644
--- a/sites/all/modules/queue2civicrm/DonationStats.php
+++ b/sites/all/modules/queue2civicrm/DonationStats.php
@@ -35,46 +35,62 @@
 
   public function __construct() {
 $this->statsCollector = Collector::getInstance();
-// set the root namespace for all donation related stats
 $this->statsCollector->ns("donations");
   }
 
   /**
* Record donation stats:
* 1) Number of donations by gateway
-   * 2) Number of overall donations
-   * 3) Time between gateway transaction time and civiCRM import time (now)
-   * 4) Gateway specific moving average of (3)
-   * 5) Overall moving average of (3)
-   * 6) Time between donation message enqueued time and civiCRM import time 
(now)
-   * 7) Gateway specific moving average of (6)
-   * 8) Overall moving average of (6)
+   * 2) Time between gateway transaction time and civiCRM import time (now)
+   * 3) Time between donation message enqueued time and civiCRM import time 
(now)
*
* This method is called within @see DonationQueueConsumer::processMessage()
*
* @param array $message
* @param array $contribution
+   *
+   * @throws \Statistics\Exception\StatisticsCollectorException
*/
   public function recordDonationStats($message, $contribution) {
-$paymentGateway = $message['gateway'];
+$gateway = $message['gateway'];
 $gatewayTransactionTime = $contribution['receive_date'];
 
+// record gateway temporarily so we work out averages later
+$this->statsCollector->add("temp.gateways", $gateway);
+
 // donation counter
-$this->recordGatewayDonation($paymentGateway);
-$this->recordOverallDonations();
+$this->recordGatewayDonation($gateway);
 
 // difference between gateway transaction time to civiCRM save time
-$this->recordGatewayTransactionAge($paymentGateway, 
$gatewayTransactionTime);
-$this->recordAverageGatewayTransactionAge($paymentGateway);
-$this->recordOverallAverageGatewayTransactionAge();
+$this->recordGatewayTransactionAge($gateway, $gatewayTransactionTime);
 
 // difference between message enqueued time to civiCRM save time
 if (isset($message['source_enqueued_time'])) {
   $messageEnqueuedTime = $message['source_enqueued_time'];
-  $this->recordMessageEnqueuedAge($paymentGateway, $messageEnqueuedTime);
-  $this->recordAverageGatewayMessageEnqueuedAge($paymentGateway);
-  $this->recordOverallAverageMessageEnqueuedAge();
+  $this->recordMessageEnqueuedAge($gateway, $messageEnqueuedTime);
 }
+  }
+
+  /**
+   * Record batch processing time
+   *
+   * @param float $batchProcessingTime
+   */
+  public function recordBatchProcessingTime($batchProcessingTime) {
+$this->statsCollector->add("temp.batch_processing_time", 
$batchProcessingTime);
+  }
+
+  /**
+   * Generate export stats data and export to Prometheus out files using the
+   * Statistics\Exporter\Prometheus exporter.
+   *
+   * Currently we only export to Prometheus.
+   *
+   * @throws \Statistics\Exception\StatisticsCollectorException
+   */
+  public function export() {
+$this->generateExportStats();
+$this->exportToPrometheus();
   }
 
   /**
@@ -83,7 +99,13 @@
* @return float|int
*/
   public function getOverallAverageGatewayTransactionAge() {
-return $this->statsCollector->get("overall.average.transaction_age");
+

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: Run MobileFrontendFeaturesRegistration only once

2018-01-09 Thread Pmiazga (Code Review)

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

Change subject: Run MobileFrontendFeaturesRegistration only once
..

Run MobileFrontendFeaturesRegistration only once

Due to T165068 it's possible that onRequestContextCreateSkin
will be called more than once which causes feature management
system to register same feature more than once.
Prevent that by moving the Hook call to the manager and setting
an `initialized` flag;

Bug: T182362
Change-Id: I6cc4a2ebcd75c054294daf329d94d35a02e50f8e
---
M includes/MobileFrontend.hooks.php
M includes/features/FeaturesManager.php
2 files changed, 25 insertions(+), 3 deletions(-)


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

diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index a2767c3..fdc08c4 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -85,9 +85,9 @@
// to retrieve the FeaturesManager
// Important: This must be run before 
RequestContextCreateSkinMobile which may make modifications
// to the skin based on enabled features.
-   $featureManager = \MediaWiki\MediaWikiServices::getInstance()
-   ->getService( 'MobileFrontend.FeaturesManager' );
-   Hooks::run( 'MobileFrontendFeaturesRegistration', [ 
$featureManager ] );
+   \MediaWiki\MediaWikiServices::getInstance()
+   ->getService( 'MobileFrontend.FeaturesManager' )
+   ->setup();
 
// enable wgUseMediaWikiUIEverywhere
self::enableMediaWikiUI();
diff --git a/includes/features/FeaturesManager.php 
b/includes/features/FeaturesManager.php
index 6b6b37c..6e13c27 100644
--- a/includes/features/FeaturesManager.php
+++ b/includes/features/FeaturesManager.php
@@ -3,8 +3,15 @@
 namespace MobileFrontend\Features;
 
 use MobileContext;
+use Hooks;
 
 class FeaturesManager {
+
+   /**
+* @var bool
+*/
+   private $initialized = false;
+
/**
 * A collection of available features
 *
@@ -13,6 +20,21 @@
private $features = [];
 
/**
+* Setup the Features Manager and register all 3rd party features
+* The $initialized lock is required due to bug T165068
+* There is no other way to register feature other than on 
onRequestContextCreateSkin
+* hook, but this hook might be called more than once due to special 
pages transclusion.
+*
+* @see https://phabricator.wikimedia.org/T165068
+*/
+   public function setup() {
+   if ( !$this->initialized ) {
+   Hooks::run( 'MobileFrontendFeaturesRegistration', [ 
$this ] );
+   $this->initialized = true;
+   }
+   }
+
+   /**
 * Register a new MobileFronted feature
 * @param IFeature $feature Feature to register
 */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cc4a2ebcd75c054294daf329d94d35a02e50f8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: specialpages
Gerrit-Owner: Pmiazga 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Fix popup direction changing when the "anchor" is partially ...

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Fix popup direction changing when the "anchor" is partially 
offscreen
..


Fix popup direction changing when the "anchor" is partially offscreen

When the "anchor" (floatable container) is partially offscreen, and
'hideWhenOutOfView' is not disabled, the popup/menu (floatable) gets
hidden. That means we get a 0x0px box when calculating its dimensions,
which in turn means it never has to be clipped.

So, whenever we're checking whether the floatable is clipped, let's
also check if it's completely offscreen.

Bug: T182650
Change-Id: I3568f445d5354c6bedee2c532c538b5e8b64ebe2
---
M src/mixins/FloatableElement.js
M src/toolgroups/PopupToolGroup.js
M src/widgets/MenuSelectWidget.js
M src/widgets/PopupWidget.js
4 files changed, 20 insertions(+), 9 deletions(-)

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



diff --git a/src/mixins/FloatableElement.js b/src/mixins/FloatableElement.js
index c5b6da3..bbf2cf1 100644
--- a/src/mixins/FloatableElement.js
+++ b/src/mixins/FloatableElement.js
@@ -41,6 +41,7 @@
this.$floatableContainer = null;
this.$floatableWindow = null;
this.$floatableClosestScrollable = null;
+   this.floatableOutOfView = false;
this.onFloatableScrollHandler = this.position.bind( this );
this.onFloatableWindowResizeHandler = this.position.bind( this );
 
@@ -245,6 +246,15 @@
 };
 
 /**
+ * Check if the floatable is hidden to the user because it was offscreen.
+ *
+ * @return {boolean} Floatable is out of view
+ */
+OO.ui.mixin.FloatableElement.prototype.isFloatableOutOfView = function () {
+   return this.floatableOutOfView;
+};
+
+/**
  * Position the floatable below its container.
  *
  * This should only be done when both of them are attached to the DOM and 
visible.
@@ -270,7 +280,8 @@
return this;
}
 
-   if ( this.hideWhenOutOfView && !this.isElementInViewport( 
this.$floatableContainer, this.$floatableClosestScrollable ) ) {
+   this.floatableOutOfView = this.hideWhenOutOfView && 
!this.isElementInViewport( this.$floatableContainer, 
this.$floatableClosestScrollable );
+   if ( this.floatableOutOfView ) {
this.$floatable.addClass( 'oo-ui-element-hidden' );
return this;
} else {
diff --git a/src/toolgroups/PopupToolGroup.js b/src/toolgroups/PopupToolGroup.js
index 96345dd..3adf7f3 100644
--- a/src/toolgroups/PopupToolGroup.js
+++ b/src/toolgroups/PopupToolGroup.js
@@ -211,7 +211,7 @@
this.$element.addClass( 'oo-ui-popupToolGroup-active 
oo-ui-popupToolGroup-left' );
this.setFlags( { progressive: true } );
this.toggleClipping( true );
-   if ( this.isClippedHorizontally() ) {
+   if ( this.isClippedHorizontally() || 
this.isFloatableOutOfView() ) {
// Anchoring to the left caused the popup to 
clip, so anchor it to the right instead
this.toggleClipping( false );
this.$element
@@ -219,7 +219,7 @@
.addClass( 'oo-ui-popupToolGroup-right' 
);
this.toggleClipping( true );
}
-   if ( this.isClippedHorizontally() ) {
+   if ( this.isClippedHorizontally() || 
this.isFloatableOutOfView() ) {
// Anchoring to the right also caused the popup 
to clip, so just make it fill the container
containerWidth = 
this.$clippableScrollableContainer.width();
containerLeft = 
this.$clippableScrollableContainer[ 0 ] === document.documentElement ?
diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js
index a11d3a2..5beb7b0 100644
--- a/src/widgets/MenuSelectWidget.js
+++ b/src/widgets/MenuSelectWidget.js
@@ -357,11 +357,11 @@
this.togglePositioning( !!this.$floatableContainer );
this.toggleClipping( true );
 
-   if ( this.isClippedVertically() ) {
+   if ( this.isClippedVertically() || 
this.isFloatableOutOfView() ) {
// If opening the menu downwards causes it to 
be clipped, flip it to open upwards instead
belowHeight = this.$element.height();
this.setVerticalPosition( 'above' );
-   if ( this.isClippedVertically() ) {
+   if ( this.isClippedVertically() || 
this.isFloatableOutOfView() ) {
// If opening upwards also causes it to 
be clipped, flip it to open

[MediaWiki-commits] [Gerrit] operations/dns[master]: Reoving dns entries for mw1180-1200

2018-01-09 Thread Cmjohnson (Code Review)

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

Change subject: Reoving dns entries for mw1180-1200
..


Reoving dns entries for mw1180-1200

Bug: T183895
Change-Id: If461426401e621a78f63724dc01f96465450cfc5
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 82 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 99a3371..fdbcc4a 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -741,27 +741,9 @@
 47  1H IN PTR   mw1326.eqiad.wmnet.
 48  1H IN PTR   mw1327.eqiad.wmnet.
 49  1H IN PTR   mw1328.eqiad.wmnet.
-50  1H IN PTR   mw1180.eqiad.wmnet.
-51  1H IN PTR   mw1181.eqiad.wmnet.
-52  1H IN PTR   mw1182.eqiad.wmnet.
-53  1H IN PTR   mw1183.eqiad.wmnet.
-54  1H IN PTR   mw1184.eqiad.wmnet.
-55  1H IN PTR   mw1185.eqiad.wmnet.
-56  1H IN PTR   mw1186.eqiad.wmnet.
-57  1H IN PTR   mw1187.eqiad.wmnet.
-58  1H IN PTR   mw1188.eqiad.wmnet.
-59  1H IN PTR   mw1189.eqiad.wmnet.
-60  1H IN PTR   mw1190.eqiad.wmnet.
-61  1H IN PTR   mw1191.eqiad.wmnet.
-62  1H IN PTR   mw1192.eqiad.wmnet.
-63  1H IN PTR   mw1193.eqiad.wmnet.
-64  1H IN PTR   mw1194.eqiad.wmnet.
-65  1H IN PTR   mw1195.eqiad.wmnet.
+
 66  1H IN PTR   mw1329.eqiad.wmnet.
-67  1H IN PTR   mw1197.eqiad.wmnet.
-68  1H IN PTR   mw1198.eqiad.wmnet.
-69  1H IN PTR   mw1199.eqiad.wmnet.
-70  1H IN PTR   mw1200.eqiad.wmnet.
+
 71  1H IN PTR   db1108.eqiad.wmnet.
 72  1H IN PTR   pc1005.eqiad.wmnet.
 73  1H IN PTR   db1110.eqiad.wmnet.
@@ -1496,27 +1478,6 @@
 108 1H  IN PTR  mw1337.mgmt.eqiad.wmnet.
 108 1H  IN PTR  wmf7286.mgmt.eqiad.wmnet.
 
-180 1H  IN PTR  mw1180.mgmt.eqiad.wmnet.
-181 1H  IN PTR  mw1181.mgmt.eqiad.wmnet.
-182 1H  IN PTR  mw1182.mgmt.eqiad.wmnet.
-183 1H  IN PTR  mw1183.mgmt.eqiad.wmnet.
-184 1H  IN PTR  mw1184.mgmt.eqiad.wmnet.
-185 1H  IN PTR  mw1185.mgmt.eqiad.wmnet.
-186 1H  IN PTR  mw1186.mgmt.eqiad.wmnet.
-187 1H  IN PTR  mw1187.mgmt.eqiad.wmnet.
-188 1H  IN PTR  mw1188.mgmt.eqiad.wmnet.
-189 1H  IN PTR  mw1189.mgmt.eqiad.wmnet.
-190 1H  IN PTR  mw1190.mgmt.eqiad.wmnet.
-191 1H  IN PTR  mw1191.mgmt.eqiad.wmnet.
-192 1H  IN PTR  mw1192.mgmt.eqiad.wmnet.
-193 1H  IN PTR  mw1193.mgmt.eqiad.wmnet.
-194 1H  IN PTR  mw1194.mgmt.eqiad.wmnet.
-195 1H  IN PTR  mw1195.mgmt.eqiad.wmnet.
-196 1H  IN PTR  mw1196.mgmt.eqiad.wmnet.
-197 1H  IN PTR  mw1197.mgmt.eqiad.wmnet.
-198 1H  IN PTR  mw1198.mgmt.eqiad.wmnet.
-199 1H  IN PTR  mw1199.mgmt.eqiad.wmnet.
-200 1H  IN PTR  mw1200.mgmt.eqiad.wmnet.
 201 1H  IN PTR  mw1201.mgmt.eqiad.wmnet.
 202 1H  IN PTR  mw1202.mgmt.eqiad.wmnet.
 203 1H  IN PTR  mw1203.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 1d64ec5..58230c0 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -568,26 +568,6 @@
 ms-fe1007   1H  IN A10.64.32.220
 ms-fe1008   1H  IN A10.64.32.221
 mwlog1001   1H  IN A10.64.32.175
-mw1180  1H  IN A10.64.32.50
-mw1181  1H  IN A10.64.32.51
-mw1182  1H  IN A10.64.32.52
-mw1183  1H  IN A10.64.32.53
-mw1184  1H  IN A10.64.32.54
-mw1185  1H  IN A10.64.32.55
-mw1186  1H  IN A10.64.32.56
-mw1187  1H  IN A10.64.32.57
-mw1188  1H  IN A10.64.32.58
-mw1189  1H  IN A10.64.32.59
-mw1190  1H  IN A10.64.32.60
-mw1191  1H  IN A10.64.32.61
-mw1192  1H  IN A10.64.32.62
-mw1193  1H  IN A10.64.32.63
-mw1194  1H  IN A10.64.32.64
-mw1195  1H  IN A10.64.32.65
-mw1197  1H  IN A10.64.32.67
-mw1198  1H  IN A10.64.32.68
-mw1199  1H  IN A10.64.32.69
-mw1200  1H  IN A10.64.32.70
 mw1201  1H  IN A10.64.48.33
 mw1202  1H  IN A10.64.48.34
 mw1203  1H  IN A10.64.48.35
@@ -1864,27 +1844,6 @@
 wmf7285 1H  IN A10.65.1.107
 mw1337  1H  IN A10.65.1.108
 wmf7286 1H  IN A10.65.1.108
-mw1180  1H  IN A10.65.1.180
-mw1181  1H  IN A10.65.1.181
-mw1182  1H  IN A10.65.1.182
-mw1183  1H  IN A10.65.1.183
-mw1184  1H  IN A10.65.1.184
-mw1185  1H  IN A10.65.1.185
-mw1186  1H  IN A10.65.1.186
-mw1187  1H  IN A10.65.1.187
-mw1188  1H  IN A10.65.1.188
-mw1189  1H  IN A

[MediaWiki-commits] [Gerrit] oojs/ui[master]: docs: TagMultiselectWidget: Remove link to MediaWiki documen...

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: docs: TagMultiselectWidget: Remove link to MediaWiki 
documentation
..


docs: TagMultiselectWidget: Remove link to MediaWiki documentation

…as it has no details about this kind of widget

Change-Id: I7ebc5bf6c88d670c1b1137ad52dfc1f6aeff3399
---
M src/widgets/MenuTagMultiselectWidget.js
M src/widgets/PopupTagMultiselectWidget.js
M src/widgets/TagMultiselectWidget.js
3 files changed, 0 insertions(+), 12 deletions(-)

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



diff --git a/src/widgets/MenuTagMultiselectWidget.js 
b/src/widgets/MenuTagMultiselectWidget.js
index f5a87f3..97b4e2b 100644
--- a/src/widgets/MenuTagMultiselectWidget.js
+++ b/src/widgets/MenuTagMultiselectWidget.js
@@ -2,8 +2,6 @@
  * MenuTagMultiselectWidget is a {@link OO.ui.TagMultiselectWidget 
OO.ui.TagMultiselectWidget} intended
  * to use a menu of selectable options.
  *
- * For more information about menus and options, please see the [OOjs UI 
documentation on MediaWiki][1].
- *
  * @example
  * // Example: A basic MenuTagMultiselectWidget.
  * var widget = new OO.ui.MenuTagMultiselectWidget( {
@@ -16,8 +14,6 @@
  * selected: [ 'option1', 'option2' ]
  * } );
  * $( 'body' ).append( widget.$element );
- *
- * [1]: 
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options
  *
  * @class
  * @extends OO.ui.TagMultiselectWidget
diff --git a/src/widgets/PopupTagMultiselectWidget.js 
b/src/widgets/PopupTagMultiselectWidget.js
index 530bd25..8bd61a7 100644
--- a/src/widgets/PopupTagMultiselectWidget.js
+++ b/src/widgets/PopupTagMultiselectWidget.js
@@ -2,8 +2,6 @@
  * PopupTagMultiselectWidget is a {@link OO.ui.TagMultiselectWidget 
OO.ui.TagMultiselectWidget} intended
  * to use a popup. The popup can be configured to have a default input to 
insert values into the widget.
  *
- * For more information about menus and options, please see the [OOjs UI 
documentation on MediaWiki][1].
- *
  * @example
  * // Example: A basic PopupTagMultiselectWidget.
  * var widget = new OO.ui.PopupTagMultiselectWidget();
@@ -18,8 +16,6 @@
  *}
  * } );
  * $( 'body' ).append( widget.$element );
- *
- * [1]: 
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options
  *
  * @class
  * @extends OO.ui.TagMultiselectWidget
diff --git a/src/widgets/TagMultiselectWidget.js 
b/src/widgets/TagMultiselectWidget.js
index 9cfeba2..b7d35d0 100644
--- a/src/widgets/TagMultiselectWidget.js
+++ b/src/widgets/TagMultiselectWidget.js
@@ -2,8 +2,6 @@
  * A basic tag multiselect widget, similar in concept to {@link 
OO.ui.ComboBoxInputWidget combo box widget}
  * that allows the user to add multiple values that are displayed in a tag 
area.
  *
- * For more information about menus and options, please see the [OOjs UI 
documentation on MediaWiki][1].
- *
  * This widget is a base widget; see {@link OO.ui.MenuTagMultiselectWidget 
MenuTagMultiselectWidget} and
  * {@link OO.ui.PopupTagMultiselectWidget PopupTagMultiselectWidget} for the 
implementations that use
  * a menu and a popup respectively.
@@ -16,8 +14,6 @@
  * selected: [ 'Option 1' ]
  * } );
  * $( 'body' ).append( widget.$element );
- *
- * [1]: 
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options
  *
  * @class
  * @extends OO.ui.Widget

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ebc5bf6c88d670c1b1137ad52dfc1f6aeff3399
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Improve some parameter docs

2018-01-09 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Ie1a2d264c5829f599fd6707fa303b69a8c1bc2b3
---
M .phpcs.xml
M Hooks.php
M includes/Actions/PurgeAction.php
M includes/Api/ApiFlow.php
M includes/Api/ApiFlowBase.php
M includes/Api/ApiFlowBaseGet.php
M includes/Api/ApiFlowBasePost.php
M includes/Api/ApiFlowEditHeader.php
M includes/Api/ApiFlowEditPost.php
M includes/Api/ApiFlowEditTitle.php
M includes/Api/ApiFlowEditTopicSummary.php
M includes/Api/ApiFlowLockTopic.php
M includes/Api/ApiFlowModeratePost.php
M includes/Api/ApiFlowModerateTopic.php
M includes/Api/ApiFlowNewTopic.php
M includes/Api/ApiFlowReply.php
M includes/Api/ApiFlowUndoEditHeader.php
M includes/Api/ApiFlowUndoEditPost.php
M includes/Api/ApiFlowUndoEditTopicSummary.php
M includes/Api/ApiFlowViewHeader.php
M includes/Api/ApiFlowViewPost.php
M includes/Api/ApiFlowViewPostHistory.php
M includes/Api/ApiFlowViewTopic.php
M includes/Api/ApiFlowViewTopicHistory.php
M includes/Api/ApiFlowViewTopicList.php
M includes/Api/ApiFlowViewTopicSummary.php
M includes/Api/ApiParsoidUtilsFlow.php
M includes/Api/ApiQueryPropFlowInfo.php
M includes/Block/Block.php
M includes/Block/Topic.php
M includes/Block/TopicSummary.php
M includes/Data/Index/FeatureIndex.php
M includes/Data/Listener/AbstractListener.php
M includes/Data/Listener/UserNameListener.php
M includes/Data/Mapper/BasicObjectMapper.php
M includes/Data/Mapper/CachingObjectMapper.php
M includes/Data/ObjectLocator.php
M includes/Data/ObjectManager.php
M includes/Data/Storage/BoardHistoryStorage.php
M includes/Data/Storage/DbStorage.php
M includes/Data/Storage/PostRevisionStorage.php
M includes/Data/Storage/RevisionStorage.php
M includes/Data/Storage/TopicListStorage.php
M includes/Data/Utils/MultiDimArray.php
M includes/Data/Utils/ResultDuplicator.php
M includes/Data/Utils/SortRevisionsByRevisionId.php
M includes/DbFactory.php
M includes/Dump/Exporter.php
M includes/Exception/ExceptionHandling.php
M includes/Formatter/ContributionsFormatter.php
M includes/Formatter/ContributionsQuery.php
M includes/Formatter/RevisionDiffViewFormatter.php
M includes/Formatter/RevisionFormatter.php
M includes/Formatter/RevisionUndoViewFormatter.php
M includes/Formatter/RevisionViewQuery.php
M includes/Formatter/TopicListQuery.php
M includes/Import/EnableFlow/EnableFlowWikitextConversionStrategy.php
M includes/Import/LiquidThreadsApi/ConversionStrategy.php
M includes/Import/LiquidThreadsApi/Objects.php
M includes/Import/LiquidThreadsApi/Source.php
M includes/Import/Wikitext/ConversionStrategy.php
M includes/Import/Wikitext/ImportSource.php
M includes/Model/HtmlRenderingInformation.php
M includes/Model/Reference.php
M includes/Model/URLReference.php
M includes/Model/WikiReference.php
M includes/Model/Workflow.php
M includes/Notifications/Controller.php
M includes/Parsoid/Extractor/CategoryExtractor.php
M includes/Parsoid/Extractor/ExtLinkExtractor.php
M includes/Parsoid/Extractor/ImageExtractor.php
M includes/Parsoid/Extractor/PlaceholderExtractor.php
M includes/Parsoid/Extractor/TransclusionExtractor.php
M includes/Parsoid/Extractor/WikiLinkExtractor.php
M includes/Repository/TreeRepository.php
M includes/Search/Iterators/HeaderIterator.php
M includes/Search/Iterators/TopicIterator.php
M includes/Search/SearchEngine.php
M includes/Search/Updaters/HeaderUpdater.php
M includes/Search/Updaters/TopicUpdater.php
M includes/TalkpageManager.php
M includes/WatchedTopicItems.php
M maintenance/FlowUpdateUserWiki.php
M maintenance/FlowUpdateWorkflowPageId.php
M maintenance/MaintenanceDebugLogger.php
M maintenance/benchUuidTimestampConversion.php
M tests/phpunit/Mock/MockImportHeader.php
M tests/phpunit/Mock/MockImportPost.php
M tests/phpunit/Mock/MockImportRevision.php
M tests/phpunit/Mock/MockImportSource.php
M tests/phpunit/Mock/MockImportTopic.php
M tests/phpunit/api/ApiTestCase.php
92 files changed, 295 insertions(+), 155 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index 1ae6078..e1dd968 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -7,7 +7,6 @@



-   



@@ -16,9 +15,6 @@



-   
-   
-   */maintenance/*



diff --git a/Hooks.php b/Hooks.php
index de887c1..11df22e 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -730,7 +730,11 @@
return true;
}
 
-   // Static variables that do not vary by request; delivered through 
startup module
+   /**
+* Static variables that do not vary by request; delivered through 
startup module
+* @param array &$vars
+* @return true
+*/

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Initializer: Simplify and deduplicate setupUndoPage()

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Initializer: Simplify and deduplicate setupUndoPage()
..


Initializer: Simplify and deduplicate setupUndoPage()

It used to delegate to three different functions (depending on what was
being undone) that were almost identical. Merge them into one and deal
with the (few) differences where relevant.

Bonus: After undoing a post edit, redirect to the post (topic URL +
parameter + fragment) rather than just to the topic.

Change-Id: I49499e25787ba5bb32826394bc4989010789cedf
---
M modules/mw.flow.Initializer.js
1 file changed, 43 insertions(+), 154 deletions(-)

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



diff --git a/modules/mw.flow.Initializer.js b/modules/mw.flow.Initializer.js
index bfbc12d..d22342b 100644
--- a/modules/mw.flow.Initializer.js
+++ b/modules/mw.flow.Initializer.js
@@ -858,65 +858,59 @@
 * @return {boolean} The page is an in-progress undo form
 */
mw.flow.Initializer.prototype.isUndoForm = function () {
-   return !!( $( 'form[data-module="topic"]' ).length ||
-   $( 'form[data-module="header"]' ).length ) ||
-   $( 'form[data-module="topicsummary"]' ).length;
+   return !!$( 'form[data-module="topic"], 
form[data-module="header"], form[data-module="topicsummary"]' ).length;
};
 
-   /**
-* Set up editors in undo pages
-*/
mw.flow.Initializer.prototype.setupUndoPage = function () {
-   if ( $( 'form[data-module="topic"]' ).length ) {
-   this.replaceEditorInUndoEditPost( $( 
'form[data-module="topic"]' ) );
-   } else if ( $( 'form[data-module="header"]' ).length ) {
-   this.replaceEditorInUndoHeader( $( 
'form[data-module="header"]' ) );
-   } else if ( $( 'form[data-module="topicsummary"]' ).length ) {
-   this.replaceEditorInUndoSummary( $( 
'form[data-module="topicsummary"]' ) );
-   }
-   };
-
-   /**
-* Replace the editor in undo edit post pages
-*
-* @param {jQuery} $form The form where the no-js editor exists to be 
replaced
-*/
-   mw.flow.Initializer.prototype.replaceEditorInUndoEditPost = function ( 
$form ) {
-   var apiHandler, content, postId, editor, prevRevId,
+   var $undoForm = $( 'form[data-module="topic"], 
form[data-module="header"], form[data-module="topicsummary"]' ),
+   undoType = $undoForm.attr( 'data-module' ),
pageName = mw.config.get( 'wgPageName' ),
title = mw.Title.newFromText( pageName ),
topicId = title.getNameText(),
+   postId = $undoForm.find( 'input[name="topic_postId"]' 
).val(),
+   prevRevId = $undoForm.find( 'input[name="' + undoType + 
'_prev_revision"]' ).val(),
+   content = $undoForm.find( 'textarea' ).val(),
returnToTitle = function () {
-   // HACK: redirect to topic view
-   window.location.href = title.getUrl();
-   };
+   var url;
+   if ( undoType === 'topic' ) {
+   // If we're undoing a post edit, 
redirect to the topic page with the right parameter
+   // and fragment to highlight the post
+   url = title.getUrl( { topic_showPostId: 
postId } ) + '#flow-post-' + postId;
+   } else {
+   // When undoing a topic summary edit, 
redirect to the topic;
+   // when undoing a board description 
edit, redirect to the board
+   url = title.getUrl();
+   }
+   window.location.href = url;
+   },
+   apiHandler = new mw.flow.dm.APIHandler(
+   title.getPrefixedDb(),
+   { currentRevision: prevRevId }
+   ),
+   save = ( {
+   topic: apiHandler.savePost.bind( apiHandler, 
topicId, postId ),
+   header: apiHandler.saveDescription.bind( 
apiHandler ),
+   topicsummary: apiHandler.saveTopicSummary.bind( 
apiHandler, topicId )
+   } )[ undoType ],
+   saveMsgKey = ( {
+   topic: [
+   
'flow-post-action-edit-post-submit-anonymously',

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Adyen test IPN messages: use right account

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Adyen test IPN messages: use right account
..


Adyen test IPN messages: use right account

WikimediaCOM isn't the thing anymore, and we have that in the db.

What we DON'T have in the pending db is the actual PSP reference.
Right now, the only way to test actual interaction with the sandbox
server is to look at the donation in
https://ca-test.adyen.com/ca/ca/payments/showList.shtml
then edit the generated auth_success.x.xml and put in the correct
originalReference

Change-Id: If2c25c760e8862d1d6c696a6e5593cb736a47d33
---
M Maintenance/CreateIpnMessagesFromPendingDb.php
M Tests/IPNTemplates/adyen/auth_success.xml
M Tests/IPNTemplates/adyen/capture_success.xml
3 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/Maintenance/CreateIpnMessagesFromPendingDb.php 
b/Maintenance/CreateIpnMessagesFromPendingDb.php
index 5fc6aff..dde83d5 100644
--- a/Maintenance/CreateIpnMessagesFromPendingDb.php
+++ b/Maintenance/CreateIpnMessagesFromPendingDb.php
@@ -84,6 +84,9 @@
$replacements['[[ASTROPAY_SIGNATURE_SUCCESS]]'] = 
$this->getAstroPaySignature( $pendingMessage, '9' );
$replacements['[[ASTROPAY_SIGNATURE_FAILURE]]'] = 
$this->getAstroPaySignature( $pendingMessage, '8' );
}
+   if ( isset( $pendingMessage['gateway_account'] ) ) {
+   $replacements['[[ACCOUNT_CODE]]'] = 
$pendingMessage['gateway_account'];
+   }
foreach ( $templates as $template ) {
$fullPath = $this->templateDir . $template;
if ( is_dir( $fullPath ) ) {
diff --git a/Tests/IPNTemplates/adyen/auth_success.xml 
b/Tests/IPNTemplates/adyen/auth_success.xml
index f053f3c..c004508 100644
--- a/Tests/IPNTemplates/adyen/auth_success.xml
+++ b/Tests/IPNTemplates/adyen/auth_success.xml
@@ -22,7 +22,7 @@


AUTHORISATION

2016-01-25T17:07:36.862+01:00
-   
WikimediaCOM
+   
[[ACCOUNT_CODE]]

[[ORDER_ID]]

CANCEL
diff --git a/Tests/IPNTemplates/adyen/capture_success.xml 
b/Tests/IPNTemplates/adyen/capture_success.xml
index 41cf808..fb22ca2 100644
--- a/Tests/IPNTemplates/adyen/capture_success.xml
+++ b/Tests/IPNTemplates/adyen/capture_success.xml
@@ -13,7 +13,7 @@
 
 CAPTURE
 2015-12-11T20:30:03+01:00
-WikimediaCOM
+
[[ACCOUNT_CODE]]
 [[ORDER_ID]]
 
 
[[PROCESSOR_REF_1]]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If2c25c760e8862d1d6c696a6e5593cb736a47d33
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Mepps 
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...GlobalPreferences[master]: Local overrides for global prefs

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Local overrides for global prefs
..


Local overrides for global prefs

This allows individual local overrides for globalized preferences,
by adding a checkbox to the "this is a global pref" notice.

Bug: T178044
Change-Id: I8e15f1570f314cae63a38325589f3d4811919bc6
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/GlobalPreferencesFactory.php
M includes/GlobalPreferencesForm.php
M includes/Hooks.php
M includes/SpecialGlobalPreferences.php
R resources/ext.GlobalPreferences.global-nojs.css
R resources/ext.GlobalPreferences.global.css
R resources/ext.GlobalPreferences.global.js
A resources/ext.GlobalPreferences.local-nojs.css
A resources/ext.GlobalPreferences.local.css
A resources/ext.GlobalPreferences.local.js
13 files changed, 170 insertions(+), 35 deletions(-)

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



diff --git a/extension.json b/extension.json
index 4824a25..c28c5e8 100644
--- a/extension.json
+++ b/extension.json
@@ -44,6 +44,9 @@
],
"MediaWikiServices": [
"GlobalPreferences\\Hooks::onMediaWikiServices"
+   ],
+   "BeforePageDisplay": [
+   "GlobalPreferences\\Hooks::onBeforePageDisplay"
]
},
"ResourceFileModulePaths": {
@@ -51,13 +54,20 @@
"remoteExtPath": "GlobalPreferences/resources"
},
"ResourceModules": {
-   "ext.GlobalPreferences.special": {
-   "styles": "ext.GlobalPreferences.special.css",
-   "scripts": "ext.GlobalPreferences.special.js",
+   "ext.GlobalPreferences.global": {
+   "styles": "ext.GlobalPreferences.global.css",
+   "scripts": "ext.GlobalPreferences.global.js",
"messages": [ "globalprefs-select-all" ]
},
-   "ext.GlobalPreferences.special.nojs": {
-   "styles": "ext.GlobalPreferences.special.nojs.css"
+   "ext.GlobalPreferences.global-nojs": {
+   "styles": "ext.GlobalPreferences.global-nojs.css"
+   },
+   "ext.GlobalPreferences.local": {
+   "styles": "ext.GlobalPreferences.local.css",
+   "scripts": "ext.GlobalPreferences.local.js"
+   },
+   "ext.GlobalPreferences.local-nojs": {
+   "styles": "ext.GlobalPreferences.local-nojs.css"
}
},
"manifest_version": 1
diff --git a/i18n/en.json b/i18n/en.json
index 119902e..03c9156 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,7 +5,8 @@
]
},
"globalprefs-desc": "Allows users to set global preferences",
-   "globalprefs-set-globally": "This preference has been set globally and 
must be modified through [[Special:GlobalPreferences#$1|your global 
preferences]].",
+   "globalprefs-set-local-exception": "Set a local exception for this 
[[Special:GlobalPreferences#$1|global preference]].",
+   "globalprefs-has-local-exception": "This global preference has a 
[[Special:Preferences#$1|local exception on this wiki]].",
"tooltip-globalprefs-check-label": "Make this setting global",
"globalprefs-error-header": "Error",
"globalprefs-notglobal": "Your account is not a global account and 
cannot set global preferences.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d2c1323..38c7f30 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -6,7 +6,8 @@
]
},
"globalprefs-desc": "{{desc|name=Global 
Preferences|url=https://www.mediawiki.org/wiki/Extension:GlobalPreferences}};,
-   "globalprefs-set-globally": "Help message below a disabled preference 
option instructing the user to change it at their global preferences page.",
+   "globalprefs-set-local-exception": "Label for the checkbox below a 
globally-set preference, inviting user to set a local exception for it. $1 is 
the fragment identifier for the current preferences section, with which to link 
to the correct section on Special:GlobalPreferences.",
+   "globalprefs-has-local-exception": "Help text on a global preference 
that has a local exception. $1 is the fragment identifier for the current 
preferences section, with which to link to the correct section on 
Special:Preferences.",
"tooltip-globalprefs-check-label": "The tooltip and the label text for 
the checkbox to enable a preference globally.",
"globalprefs-error-header": "Page title for error 
message.\n{{Identical|Error}}",
"globalprefs-notglobal": "Error message a user sees if they do not have 
a global account.",
diff --git a/includes/GlobalPreferencesFactory.php

[MediaWiki-commits] [Gerrit] research/landing-page[master]: Squash updates from Github

2018-01-09 Thread Bmansurov (Code Review)

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

Change subject: Squash updates from Github
..

Squash updates from Github

- Update acknowledgments.html
- Update why-we-read-wikipedia.html
  Revising language for intended audience and purpose.
- corrent Ali's company name
  minor copyedits on re-write
- Update structured-multimedia-data.html
  Revised language for intended audience and purpose.
- Update structured-citations.html
  Revised language for intended audience and purpose.
- Update scoring-platform.html
  Revised language for intended audience and purpose.
- emdashes
  Update recommender-system-ux.html
  Revising language for intended audience and purpose.
- Update knowledge-gaps.html
  Revising language for intended audience and purpose.
- small grammar fix + emdash
- Update increasing-diversity.html
  Revising language for intended audience and purpose.
- rmv duplicate word
- Update community-health.html
  Revised copy for intended audience and purpose.
- straighten quotes
- rebalance resource links

Change-Id: I43b2d054f151ac1415a6c156aaaba17a165a7246
---
M acknowledgments.html
M community-health.html
M increasing-diversity.html
M knowledge-gaps.html
M recommender-system-ux.html
M scoring-platform.html
M structured-citations.html
M structured-multimedia-data.html
M why-we-read-wikipedia.html
9 files changed, 121 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/research/landing-page 
refs/changes/01/403301/1

diff --git a/acknowledgments.html b/acknowledgments.html
index 4e7586d..878e3ca 100644
--- a/acknowledgments.html
+++ b/acknowledgments.html
@@ -54,9 +54,10 @@
We would like to thank the following 
people for their contributions to the design and development of this 
website:

Volker Eckl, Wikimedia 
Foundation
-   Ali Ferguson, Purple Pink 
Editing
+   Ali Ferguson, Purple Ink 
Editing
Carolyn Li-Madeo, Wikimedia 
Foundation
Nirzar Pangarkar, Wikimedia 
Foundation
+   Sarah R. Rodlund, Wikimedia 
Foundation

The design of this website is based 
on the https://wikimedia.github.io/WikimediaUI-Style-Guide/;>Wikimedia 
UI Style Guide by Wikimedia Foundation design team (https://github.com/wikimedia/WikimediaUI-Style-Guide/;>source 
code).
 
+English Wikipedia contains 
more than 5 million articles. New articles are being added every day and there 
are still many subjects that need better coverage. Wikipedia users and 
contributors often find themselves asking, "What should I read or edit next?"
+
+
+
+The Wikimedia Foundation is building algorithmic models that recommend 
articles for people to read, edit, translate, and create based on their 
personal interests. The goal is to help users filter out the information they 
are not interested in, so they can discover content that is relevant to them. 
There are many ways to generate recommendations and many ways to share them 
with users.
+
+
+
+The Research Team is working to discover better ways to generate and present 
recommendations for Wikimedia content. We are developing new methods to predict 
and evaluate how recommendation-based features will be received and used by 
different types of users. We are also working on ways to detect and correct for 
potential biases in our algorithmic models, which could impact the types of 
recommendations users receive.
+
+


Project team
diff --git a/scoring-platform.html b/scoring-platform.html
index aa9a6f6..57c8279 100644
--- a/scoring-platform.html
+++ b/scoring-platform.html
@@ -63,15 +63,27 @@

Projects
Machine 
Learning as a Service for Free Knowledge
-   We are 
investigating the design of automated quality control in Wikimedia projects. We 
explore ways to enhance the impact of machine classifiers while minimizing 
their detrimental effects.
+   We are 
investigating the design of automated quality control in Wikimedia projects. We 
explore ways to enhance the impact of machine classifiers, while minimizing 
their detrimental effects.
 

Project overview
-

[MediaWiki-commits] [Gerrit] research/landing-page[master]: Squash updates from Github

2018-01-09 Thread Bmansurov (Code Review)

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

Change subject: Squash updates from Github
..


Squash updates from Github

- Update acknowledgments.html
- Update why-we-read-wikipedia.html
  Revising language for intended audience and purpose.
- corrent Ali's company name
  minor copyedits on re-write
- Update structured-multimedia-data.html
  Revised language for intended audience and purpose.
- Update structured-citations.html
  Revised language for intended audience and purpose.
- Update scoring-platform.html
  Revised language for intended audience and purpose.
- emdashes
  Update recommender-system-ux.html
  Revising language for intended audience and purpose.
- Update knowledge-gaps.html
  Revising language for intended audience and purpose.
- small grammar fix + emdash
- Update increasing-diversity.html
  Revising language for intended audience and purpose.
- rmv duplicate word
- Update community-health.html
  Revised copy for intended audience and purpose.
- straighten quotes
- rebalance resource links

Change-Id: I43b2d054f151ac1415a6c156aaaba17a165a7246
---
M acknowledgments.html
M community-health.html
M increasing-diversity.html
M knowledge-gaps.html
M recommender-system-ux.html
M scoring-platform.html
M structured-citations.html
M structured-multimedia-data.html
M why-we-read-wikipedia.html
9 files changed, 121 insertions(+), 33 deletions(-)

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



diff --git a/acknowledgments.html b/acknowledgments.html
index 4e7586d..878e3ca 100644
--- a/acknowledgments.html
+++ b/acknowledgments.html
@@ -54,9 +54,10 @@
We would like to thank the following 
people for their contributions to the design and development of this 
website:

Volker Eckl, Wikimedia 
Foundation
-   Ali Ferguson, Purple Pink 
Editing
+   Ali Ferguson, Purple Ink 
Editing
Carolyn Li-Madeo, Wikimedia 
Foundation
Nirzar Pangarkar, Wikimedia 
Foundation
+   Sarah R. Rodlund, Wikimedia 
Foundation

The design of this website is based 
on the https://wikimedia.github.io/WikimediaUI-Style-Guide/;>Wikimedia 
UI Style Guide by Wikimedia Foundation design team (https://github.com/wikimedia/WikimediaUI-Style-Guide/;>source 
code).
 
+English Wikipedia contains 
more than 5 million articles. New articles are being added every day and there 
are still many subjects that need better coverage. Wikipedia users and 
contributors often find themselves asking, "What should I read or edit next?"
+
+
+
+The Wikimedia Foundation is building algorithmic models that recommend 
articles for people to read, edit, translate, and create based on their 
personal interests. The goal is to help users filter out the information they 
are not interested in, so they can discover content that is relevant to them. 
There are many ways to generate recommendations and many ways to share them 
with users.
+
+
+
+The Research Team is working to discover better ways to generate and present 
recommendations for Wikimedia content. We are developing new methods to predict 
and evaluate how recommendation-based features will be received and used by 
different types of users. We are also working on ways to detect and correct for 
potential biases in our algorithmic models, which could impact the types of 
recommendations users receive.
+
+


Project team
diff --git a/scoring-platform.html b/scoring-platform.html
index aa9a6f6..57c8279 100644
--- a/scoring-platform.html
+++ b/scoring-platform.html
@@ -63,15 +63,27 @@

Projects
Machine 
Learning as a Service for Free Knowledge
-   We are 
investigating the design of automated quality control in Wikimedia projects. We 
explore ways to enhance the impact of machine classifiers while minimizing 
their detrimental effects.
+   We are 
investigating the design of automated quality control in Wikimedia projects. We 
explore ways to enhance the impact of machine classifiers, while minimizing 
their detrimental effects.
 

Project overview
-   As a

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: branch.py: Cleanup/prep for sub-submodule support

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: branch.py: Cleanup/prep for sub-submodule support
..


branch.py: Cleanup/prep for sub-submodule support

Change-Id: Ib75335404a5a2d66aaf7112738ac1a9c38fa5413
---
M make-release/branch.py
M make-release/make-release.yaml
2 files changed, 33 insertions(+), 16 deletions(-)

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



diff --git a/make-release/branch.py b/make-release/branch.py
index 3a6e9b9..8aff26f 100755
--- a/make-release/branch.py
+++ b/make-release/branch.py
@@ -3,8 +3,10 @@
 """Stuff about making branches and so forth."""
 
 import argparse
+from contextlib import contextmanager
 import logging
 import os
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -27,13 +29,26 @@
 auth=HTTPDigestAuth(CONFIG['username'], CONFIG['password']))
 
 
+def get_branchpoint(branch, repository, default):
+try:
+return CONFIG['manual_branch_points'][branch][repository]
+except KeyError:
+return default
+
+
 def create_branch(repository, branch, revision):
 """Create a branch for a given repo."""
+# If we've got a sub-submodule we care about, branch it first so we can
+# do some magic stuff
 try:
-try:
-revision = CONFIG['manual_branch_points'][branch][repository]
-except KeyError:
-pass
+subrepo = CONFIG['sub_submodules'][repository]
+create_branch(subrepo, branch, revision)
+except KeyError:
+# This is the normal case, actually
+pass
+
+try:
+revision = get_branchpoint(branch, repository, revision)
 
 print('Branching {} to {} from {}'.format(repository, branch, 
revision))
 _get_client().put(
@@ -49,13 +64,6 @@
 print('Already branched!')
 else:
 raise
-
-# If we've got a sub-submodule we care about, branch it too
-try:
-subrepo = CONFIG['sub_submodules'][repo]
-create_branch(subrepo, branch, revision)
-except KeyError:
-pass
 
 
 def get_bundle(bundle):
@@ -75,13 +83,22 @@
 return []
 
 
+@contextmanager
+def clone(repository):
+url = CONFIG['clone_base'] + '/' + repository
+temp = tempfile.mkdtemp()
+subprocess.check_call(['/usr/bin/git', 'clone', url, temp])
+cwd = os.getcwd()
+os.chdir(temp)
+yield temp
+os.chdir(cwd)
+shutil.rmtree(temp)
+
+
 def do_core_work(branch, bundle, version):
 """Add submodules, bump $wgVersion, etc"""
 cwd = os.getcwd()
-with tempfile.TemporaryDirectory() as temp:
-subprocess.check_call(['/usr/bin/git', 'clone', '-b', branch,
-   CONFIG['clone_base'] + '/core', temp])
-os.chdir(temp)
+with clone('core'):
 for submodule in bundle:
 url = CONFIG['clone_base'] + '/' + submodule
 subprocess.check_call(['/usr/bin/git', 'submodule', 'add',
diff --git a/make-release/make-release.yaml b/make-release/make-release.yaml
index c5a2551..8af0605 100644
--- a/make-release/make-release.yaml
+++ b/make-release/make-release.yaml
@@ -31,7 +31,7 @@
 REL1_30:
 core: 0cd28e19cb0f9385a2a1cc11a4d8c9c21ff0b830
 sub_submodules:
-- extensions/VisualEditor: lib/ve
+extensions/VisualEditor: lib/ve
 diff:
 ignore:
 - "*~"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib75335404a5a2d66aaf7112738ac1a9c38fa5413
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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...MobileFrontend[specialpages]: Remove Special:MobileOptions/Languages

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Remove Special:MobileOptions/Languages
..


Remove Special:MobileOptions/Languages

This was added back in 2012
In the old version of the language overlay when a language
did not exist we linked to this page. We don't do that anymore
since the new language overlay we launched in August 2016.

It's not linked to anywhere in the UI.

Should probably remove as it caused me a big surprise to not only
see it existed but to see I wrote the code haha

Change-Id: I9c7cca88c4f3df42f2ced93b72011f18d911acce
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialMobileOptions.php
3 files changed, 3 insertions(+), 87 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 9217300..6f28ee9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -196,12 +196,9 @@
"mobile-frontend-save-error": "Error saving settings. Please make sure 
that you have cookies enabled.",
"mobile-frontend-save-settings": "Save",
"mobile-frontend-search-content": "Search within pages",
-   "mobile-frontend-search-content-no-results": 
"'''{{int:mobile-frontend-search-content}}''' to see if this phrase appears 
anywhere.",
"mobile-frontend-search-no-results": "No page with this title.",
"mobile-frontend-settings-tagline": "Reading preferences",
"mobile-frontend-settings-beta": "{{SITENAME}} βeta",
-   "mobile-frontend-settings-site-description": "{{SITENAME}} is available 
in $1 {{PLURAL:$1|language|languages}}. All available versions are listed 
below",
-   "mobile-frontend-settings-site-header": "{{SITENAME}} Languages",
"mobile-frontend-settings-save": "Settings were saved successfully.",
"mobile-frontend-talk-fullpage": "Read as wiki page",
"mobile-frontend-talk-add-overlay-content-placeholder": "What is on 
your mind?",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 91f2348..7042381 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -197,12 +197,9 @@
"mobile-frontend-save-error": "Error message shown when a user tries to 
save settings form without cookies present.",
"mobile-frontend-save-settings": "Text for button for saving settings 
on [[Special:MobileOptions]]. Since this appears on the settings page 
translating the word save is sufficient\n{{Identical|Save}}",
"mobile-frontend-search-content": "Caption for a button performing full 
text search of a given search query.\n\nUsed in 
{{msg-mw|Mobile-frontend-search-content-no-results}}.",
-   "mobile-frontend-search-content-no-results": "Used when no pages with 
matching titles were found.\n\nRefers to 
{{msg-mw|Mobile-frontend-search-content}}.",
"mobile-frontend-search-no-results": "Message informing user that no 
pages were found for a given query.",
"mobile-frontend-settings-tagline": "Tagline for Special:MobileOptions 
- will show under heading",
"mobile-frontend-settings-beta": "Text for beta on settings 
page.\n{{Identical|Beta}}",
-   "mobile-frontend-settings-site-description": "Shown on 
[[Special:MobileOptions]]. Parameters:\n* $1 - the number of other language 
versions for this wiki",
-   "mobile-frontend-settings-site-header": "Heading for the 
Special:MobileOptions/Language page - only visible to non JavaScript users",
"mobile-frontend-settings-save": "Notification which shows to user when 
settings are saved.",
"mobile-frontend-talk-fullpage": "Used as label for link to the talk 
page (Talk:ArticleName) in Talk Overlay.",
"mobile-frontend-talk-add-overlay-content-placeholder": "Placeholder 
text to prompt user to add content to talk page content",
diff --git a/includes/specials/SpecialMobileOptions.php 
b/includes/specials/SpecialMobileOptions.php
index a00e0b4..d3603c0 100644
--- a/includes/specials/SpecialMobileOptions.php
+++ b/includes/specials/SpecialMobileOptions.php
@@ -8,11 +8,6 @@
private $returnToTitle;
/** @var boolean $hasDesktopVersion Whether this special page has a 
desktop version or not */
protected $hasDesktopVersion = true;
-   /** @var array $options Used in the execute() function as a map of 
subpages to
-functions that are executed when the request method is defined. */
-   private $options = [
-   'Language' => [ 'get' => 'chooseLanguage' ],
-   ];
 
/**
 * Construct function
@@ -44,24 +39,11 @@
$this->setHeaders();
$context->setForceMobileView( true );
$context->setContentTransformations( false );
-   // check, if the subpage has a registered function, that needs 
to be executed
-   if ( isset( $this->options[$par] ) ) {
-   $option = $this->options[$par];
 
-

[MediaWiki-commits] [Gerrit] operations/dns[master]: Reoving dns entries for mw1180-1200

2018-01-09 Thread Cmjohnson (Code Review)

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

Change subject: Reoving dns entries for mw1180-1200
..

Reoving dns entries for mw1180-1200

Bug: T183895
Change-Id: If461426401e621a78f63724dc01f96465450cfc5
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 82 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/39/403239/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index ef89f34..187e6e0 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -747,27 +747,9 @@
 47  1H IN PTR   mw1326.eqiad.wmnet.
 48  1H IN PTR   mw1327.eqiad.wmnet.
 49  1H IN PTR   mw1328.eqiad.wmnet.
-50  1H IN PTR   mw1180.eqiad.wmnet.
-51  1H IN PTR   mw1181.eqiad.wmnet.
-52  1H IN PTR   mw1182.eqiad.wmnet.
-53  1H IN PTR   mw1183.eqiad.wmnet.
-54  1H IN PTR   mw1184.eqiad.wmnet.
-55  1H IN PTR   mw1185.eqiad.wmnet.
-56  1H IN PTR   mw1186.eqiad.wmnet.
-57  1H IN PTR   mw1187.eqiad.wmnet.
-58  1H IN PTR   mw1188.eqiad.wmnet.
-59  1H IN PTR   mw1189.eqiad.wmnet.
-60  1H IN PTR   mw1190.eqiad.wmnet.
-61  1H IN PTR   mw1191.eqiad.wmnet.
-62  1H IN PTR   mw1192.eqiad.wmnet.
-63  1H IN PTR   mw1193.eqiad.wmnet.
-64  1H IN PTR   mw1194.eqiad.wmnet.
-65  1H IN PTR   mw1195.eqiad.wmnet.
+
 66  1H IN PTR   mw1329.eqiad.wmnet.
-67  1H IN PTR   mw1197.eqiad.wmnet.
-68  1H IN PTR   mw1198.eqiad.wmnet.
-69  1H IN PTR   mw1199.eqiad.wmnet.
-70  1H IN PTR   mw1200.eqiad.wmnet.
+
 71  1H IN PTR   db1108.eqiad.wmnet.
 72  1H IN PTR   pc1005.eqiad.wmnet.
 73  1H IN PTR   db1110.eqiad.wmnet.
@@ -1502,27 +1484,6 @@
 108 1H  IN PTR  mw1337.mgmt.eqiad.wmnet.
 108 1H  IN PTR  wmf7286.mgmt.eqiad.wmnet.
 
-180 1H  IN PTR  mw1180.mgmt.eqiad.wmnet.
-181 1H  IN PTR  mw1181.mgmt.eqiad.wmnet.
-182 1H  IN PTR  mw1182.mgmt.eqiad.wmnet.
-183 1H  IN PTR  mw1183.mgmt.eqiad.wmnet.
-184 1H  IN PTR  mw1184.mgmt.eqiad.wmnet.
-185 1H  IN PTR  mw1185.mgmt.eqiad.wmnet.
-186 1H  IN PTR  mw1186.mgmt.eqiad.wmnet.
-187 1H  IN PTR  mw1187.mgmt.eqiad.wmnet.
-188 1H  IN PTR  mw1188.mgmt.eqiad.wmnet.
-189 1H  IN PTR  mw1189.mgmt.eqiad.wmnet.
-190 1H  IN PTR  mw1190.mgmt.eqiad.wmnet.
-191 1H  IN PTR  mw1191.mgmt.eqiad.wmnet.
-192 1H  IN PTR  mw1192.mgmt.eqiad.wmnet.
-193 1H  IN PTR  mw1193.mgmt.eqiad.wmnet.
-194 1H  IN PTR  mw1194.mgmt.eqiad.wmnet.
-195 1H  IN PTR  mw1195.mgmt.eqiad.wmnet.
-196 1H  IN PTR  mw1196.mgmt.eqiad.wmnet.
-197 1H  IN PTR  mw1197.mgmt.eqiad.wmnet.
-198 1H  IN PTR  mw1198.mgmt.eqiad.wmnet.
-199 1H  IN PTR  mw1199.mgmt.eqiad.wmnet.
-200 1H  IN PTR  mw1200.mgmt.eqiad.wmnet.
 201 1H  IN PTR  mw1201.mgmt.eqiad.wmnet.
 202 1H  IN PTR  mw1202.mgmt.eqiad.wmnet.
 203 1H  IN PTR  mw1203.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 812f645..2994ee0 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -568,26 +568,6 @@
 ms-fe1007   1H  IN A10.64.32.220
 ms-fe1008   1H  IN A10.64.32.221
 mwlog1001   1H  IN A10.64.32.175
-mw1180  1H  IN A10.64.32.50
-mw1181  1H  IN A10.64.32.51
-mw1182  1H  IN A10.64.32.52
-mw1183  1H  IN A10.64.32.53
-mw1184  1H  IN A10.64.32.54
-mw1185  1H  IN A10.64.32.55
-mw1186  1H  IN A10.64.32.56
-mw1187  1H  IN A10.64.32.57
-mw1188  1H  IN A10.64.32.58
-mw1189  1H  IN A10.64.32.59
-mw1190  1H  IN A10.64.32.60
-mw1191  1H  IN A10.64.32.61
-mw1192  1H  IN A10.64.32.62
-mw1193  1H  IN A10.64.32.63
-mw1194  1H  IN A10.64.32.64
-mw1195  1H  IN A10.64.32.65
-mw1197  1H  IN A10.64.32.67
-mw1198  1H  IN A10.64.32.68
-mw1199  1H  IN A10.64.32.69
-mw1200  1H  IN A10.64.32.70
 mw1201  1H  IN A10.64.48.33
 mw1202  1H  IN A10.64.48.34
 mw1203  1H  IN A10.64.48.35
@@ -1864,27 +1844,6 @@
 wmf7285 1H  IN A10.65.1.107
 mw1337  1H  IN A10.65.1.108
 wmf7286 1H  IN A10.65.1.108
-mw1180  1H  IN A10.65.1.180
-mw1181  1H  IN A10.65.1.181
-mw1182  1H  IN A10.65.1.182
-mw1183  1H  IN A10.65.1.183
-mw1184  1H  IN A10.65.1.184
-mw1185  1H  IN A10.65.1.185
-mw1186  1H  IN A10.65.1.186
-mw1187  1H  IN A10.65.1.187
-mw1188  1H  IN A10.65.1.188
-mw1189  1H  IN A10.65.1.189
-mw1190  1H  IN A10.65.1.190
-mw1191

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.16]: Disable cpPosTime injection to LBFactory in Setup.php for now

2018-01-09 Thread Aaron Schulz (Code Review)

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

Change subject: Disable cpPosTime injection to LBFactory in Setup.php for now
..

Disable cpPosTime injection to LBFactory in Setup.php for now

This avoids triggering an old timeout bug in ChrolonologyProtector.

Bug: T182322
Change-Id: I24a3380650febd09a410a717425747ac5a60d162
---
M includes/Setup.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/38/403238/1

diff --git a/includes/Setup.php b/includes/Setup.php
index 4936b0b..18f6e25 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -742,7 +742,8 @@
'IPAddress' => $wgRequest->getIP(),
'UserAgent' => $wgRequest->getHeader( 'User-Agent' ),
'ChronologyProtection' => $wgRequest->getHeader( 'ChronologyProtection' 
),
-   'ChronologyPositionTime' => $cpPosTime
+   # Disabled; bug T182322. No replication waiting for single DC stripped 
main-stash anyway.
+   #'ChronologyPositionTime' => $cpPosTime
 ] );
 // Make sure that caching does not compromise the consistency improvements
 if ( $cpPosTime ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24a3380650febd09a410a717425747ac5a60d162
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.16
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [Echo] Remove deleted key

2018-01-09 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403235 )

Change subject: [Echo] Remove deleted key
..


[Echo] Remove deleted key

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

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 486a50c..15a13f5 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -769,7 +769,7 @@
 optional = notification-body-edit-user-talk-with-section, 
notification-body-reverted
 optional = echo-foreign-wiki-lang, echo-specialpage-pagination-range
 ignored = echo-email-batch-separator, notification-welcome-link, 
notification-body-mention
-ignored = notification-body-emailuser, notification-body-user-rights
+ignored = notification-body-emailuser
 ignored = notification-body-foreign
 
 Echo - API

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib567f61b93fd724285bcd365e3e905edc74df066
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [Echo] Remove deleted key

2018-01-09 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403235 )

Change subject: [Echo] Remove deleted key
..

[Echo] Remove deleted key

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/35/403235/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 486a50c..15a13f5 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -769,7 +769,7 @@
 optional = notification-body-edit-user-talk-with-section, 
notification-body-reverted
 optional = echo-foreign-wiki-lang, echo-specialpage-pagination-range
 ignored = echo-email-batch-separator, notification-welcome-link, 
notification-body-mention
-ignored = notification-body-emailuser, notification-body-user-rights
+ignored = notification-body-emailuser
 ignored = notification-body-foreign
 
 Echo - API

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib567f61b93fd724285bcd365e3e905edc74df066
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] mediawiki...MassMessage[master]: Split DatabaseLookup and UrlHelper out of MassMessage

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Split DatabaseLookup and UrlHelper out of MassMessage
..


Split DatabaseLookup and UrlHelper out of MassMessage

Bug: T178215
Bug: T178431
Change-Id: I374decb1108530561851930c0c2d288ae612ff65
---
M extension.json
M includes/ApiQueryMMSites.php
A includes/DatabaseLookup.php
M includes/MassMessage.php
M includes/MassMessageTargets.php
M includes/SpecialEditMassMessageList.php
A includes/UrlHelper.php
M includes/content/MassMessageListContent.php
M includes/content/MassMessageListContentHandler.php
M includes/job/MassMessageJob.php
A tests/phpunit/DatabaseLookupTest.php
M tests/phpunit/MassMessageTest.php
A tests/phpunit/UrlHelperTest.php
13 files changed, 198 insertions(+), 168 deletions(-)

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



diff --git a/extension.json b/extension.json
index 91c79ec..6a1b354 100644
--- a/extension.json
+++ b/extension.json
@@ -211,6 +211,8 @@
"MediaWiki\\MassMessage\\ApiQueryMMSites": 
"includes/ApiQueryMMSites.php",
"MediaWiki\\MassMessage\\MassMessage": 
"includes/MassMessage.php",
"MediaWiki\\MassMessage\\MassMessageTargets": 
"includes/MassMessageTargets.php",
+   "MediaWiki\\MassMessage\\DatabaseLookup": 
"includes/DatabaseLookup.php",
+   "MediaWiki\\MassMessage\\UrlHelper": "includes/UrlHelper.php",
"MediaWiki\\MassMessage\\SpecialMassMessage": 
"includes/SpecialMassMessage.php",
"MediaWiki\\MassMessage\\SpecialCreateMassMessageList": 
"includes/SpecialCreateMassMessageList.php",
"MediaWiki\\MassMessage\\SpecialEditMassMessageList": 
"includes/SpecialEditMassMessageList.php",
diff --git a/includes/ApiQueryMMSites.php b/includes/ApiQueryMMSites.php
index 050d74b..55dfe6c 100644
--- a/includes/ApiQueryMMSites.php
+++ b/includes/ApiQueryMMSites.php
@@ -16,7 +16,7 @@
$params = $this->extractRequestParams();
$term = strtolower( $params['term'] );
 
-   $sites = array_keys( MassMessage::getDatabases() );
+   $sites = array_keys( DatabaseLookup::getDatabases() );
sort( $sites );
$matches = [];
foreach ( $sites as $site ) {
diff --git a/includes/DatabaseLookup.php b/includes/DatabaseLookup.php
new file mode 100644
index 000..4fcd5e8
--- /dev/null
+++ b/includes/DatabaseLookup.php
@@ -0,0 +1,53 @@
+get( $key );
+   if ( $data === false ) {
+   $dbs = $wgConf->getLocalDatabases();
+   $mapping = [];
+   foreach ( $dbs as $dbname ) {
+   $url = WikiMap::getWiki( $dbname 
)->getCanonicalServer();
+   $site = UrlHelper::getBaseUrl( $url );
+   $mapping[$site] = $dbname;
+   }
+   $wgMemc->set( $key, $mapping, 60 * 60 );
+   } else {
+   $mapping = $data;
+   }
+   }
+   return $mapping;
+   }
+
+   /**
+* Get database name from URL hostname
+* @param string $host
+* @return string
+*/
+   public static function getDBName( $host ) {
+   global $wgMassMessageWikiAliases;
+   $mapping = self::getDatabases();
+   if ( isset( $mapping[$host] ) ) {
+   return $mapping[$host];
+   }
+   if ( isset( $wgMassMessageWikiAliases[$host] ) ) {
+   return $wgMassMessageWikiAliases[$host];
+   }
+   return null; // Couldn't find anything
+   }
+
+}
diff --git a/includes/MassMessage.php b/includes/MassMessage.php
index 6bedf19..8a79902 100644
--- a/includes/MassMessage.php
+++ b/includes/MassMessage.php
@@ -14,37 +14,15 @@
 use ParserOptions;
 use Exception;
 use Title;
-use WikiPage;
 use User;
 use JobQueueGroup;
 use CentralIdLookup;
 use Revision;
 use ManualLogEntry;
-use WikiMap;
-use Status;
 use RequestContext;
+use Status;
 
 class MassMessage {
-
-   /**
-* Function to follow redirects
-*
-* @param Title $title
-* @return Title|null null if the page is an interwiki redirect
-*/
-   public static function followRedirect( Title $title ) {
-   if ( !$title->isRedirect() ) {
-   return $title;
-   }
-   $wikipage = WikiPage::factory( $title );
-
-   $target = $wikipage->followRedirect();
-   if ( $target instanceof Title ) {
-   return $target;
-   } else {
-

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: [WIP] Add more WatchedItemQueryServiceExtension tests.

2018-01-09 Thread Awight (Code Review)

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

Change subject: [WIP] Add more WatchedItemQueryServiceExtension tests.
..

[WIP] Add more WatchedItemQueryServiceExtension tests.

Bug: T184140
Change-Id: I27225a9a0e67fc6bc8024f5e7d4b6c8c29a730c3
---
M tests/phpunit/includes/Api/ApiIntegrationTest.php
A tests/phpunit/includes/TestHelper.php
M tests/phpunit/includes/WatchedItemQueryServiceExtensionTest.php
3 files changed, 87 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES 
refs/changes/34/403234/1

diff --git a/tests/phpunit/includes/Api/ApiIntegrationTest.php 
b/tests/phpunit/includes/Api/ApiIntegrationTest.php
index 14e605d..31906f2 100644
--- a/tests/phpunit/includes/Api/ApiIntegrationTest.php
+++ b/tests/phpunit/includes/Api/ApiIntegrationTest.php
@@ -13,6 +13,8 @@
 use User;
 use WikiPage;
 
+use ORES\Tests\TestHelper;
+
 /**
  * @group API
  * @group Database
@@ -26,10 +28,7 @@
public function __construct( $name = null, array $data = [], $dataName 
= '' ) {
parent::__construct( $name, $data, $dataName );
 
-   $this->tablesUsed[] = 'recentchanges';
-   $this->tablesUsed[] = 'page';
-   $this->tablesUsed[] = 'ores_model';
-   $this->tablesUsed[] = 'ores_classification';
+   $this->tablesUsed = TestHelper::getTablesUsed();
}
 
protected function setUp() {
@@ -37,9 +36,8 @@
 
self::$users['ORESApiIntegrationTestUser'] = 
$this->getMutableTestUser();
$this->doLogin( 'ORESApiIntegrationTestUser' );
-   wfGetDB( DB_MASTER )->delete( 'recentchanges', '*', __METHOD__ 
);
-   wfGetDB( DB_MASTER )->delete( 'ores_model', '*', __METHOD__ );
-   wfGetDB( DB_MASTER )->delete( 'ores_classification', '*', 
__METHOD__ );
+
+   TestHelper::clearOresTables();
 
$this->setMwGlobals(
[
@@ -113,7 +111,7 @@
public function testListRecentChanges_getOresScores() {
$target = new TitleValue( 0, 'ORESApiIntegrationTestPage' );
$status = $this->doPageEdit( $this->getLoggedInTestUser(), 
$target, 'Create the page' );
-   $this->insertOresData(
+   TestHelper::insertOresData(
$status->getValue()['revision'],
[ 'damaging' => 0.4, 'goodfaith' => 0.7 ]
);
@@ -153,23 +151,6 @@
return self::$users['ORESApiIntegrationTestUser']->getUser();
}
 
-   private function insertOresData( Revision $revision, $scores ) {
-   /** @var ModelLookup $modelLookup */
-   $modelLookup = MediaWikiServices::getInstance()->getService( 
'ORESModelLookup' );
-   // TODO: Use ScoreStorage
-   $dbData = [];
-   foreach ( $scores as $modelName => $score ) {
-   $dbData[] = [
-   'oresc_rev' => $revision->getId(),
-   'oresc_model' => $modelLookup->getModelId( 
$modelName ),
-   'oresc_class' => 1,
-   'oresc_probability' => $score,
-   'oresc_is_predicted' => 0
-   ];
-   }
-   wfGetDB( DB_MASTER )->insert( 'ores_classification', $dbData );
-   }
-
private function doListRecentChangesRequest( array $params = [] ) {
return $this->doApiRequest(
array_merge(
@@ -184,7 +165,7 @@
public function testListRecentChanges_showOresReview() {
$target = new TitleValue( 0, 'ORESApiIntegrationTestPage' );
$status = $this->doPageEdit( $this->getLoggedInTestUser(), 
$target, 'Create the page' );
-   $this->insertOresData(
+   TestHelper::insertOresData(
$status->getValue()['revision'],
[ 'damaging' => 0.6, 'goodfaith' => 0.3 ]
);
@@ -205,7 +186,7 @@
public function testListRecentChanges_showOresReviewNotNeedingReview() {
$target = new TitleValue( 0, 'ORESApiIntegrationTestPage' );
$status = $this->doPageEdit( $this->getLoggedInTestUser(), 
$target, 'Create the page' );
-   $this->insertOresData(
+   TestHelper::insertOresData(
$status->getValue()['revision'],
[ 'damaging' => 0.4, 'goodfaith' => 0.7 ]
);
@@ -220,7 +201,7 @@
public function testListRecentChanges_showNotOresReview() {
$target = new TitleValue( 0, 'ORESApiIntegrationTestPage' );
$status = $this->doPageEdit( $this->getLoggedInTestUser(), 
$target, 'Create the page' );
-

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaIncubator[master]: Improve some parameter docs

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Improve some parameter docs
..


Improve some parameter docs

Change-Id: Ie83c1380e7804146090ca14ccd67bdd7efae4c2f
---
M .phpcs.xml
M InfoPage.php
M ListUsersTestWiki.php
M SpecialIncubatorFirstSteps.php
M SpecialSearchWiki.php
M WikimediaIncubator.class.php
6 files changed, 53 insertions(+), 9 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index 73c6331..9cfdd4b 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,8 +2,6 @@
 


-   
-   



diff --git a/InfoPage.php b/InfoPage.php
index da613ce..24cfff9 100644
--- a/InfoPage.php
+++ b/InfoPage.php
@@ -140,6 +140,9 @@
}
 
/**
+* @param string $beforetitle
+* @param string $aftertitle
+* @param string $content
 * @return String the core HTML for the info page
 */
public function StandardInfoPage( $beforetitle, $aftertitle, $content ) 
{
diff --git a/ListUsersTestWiki.php b/ListUsersTestWiki.php
index 713b6aa..dcd4284 100644
--- a/ListUsersTestWiki.php
+++ b/ListUsersTestWiki.php
@@ -21,6 +21,9 @@
 
/**
 * Input form
+* @param Pager $pager
+* @param string &$out
+* @return true
 */
static function onSpecialListusersHeaderForm( $pager, &$out ) {
$testwiki = WikimediaIncubator::getUrlParam();
@@ -53,6 +56,9 @@
 
/**
 * Query
+* @param Pager $pager
+* @param array &$query
+* @return true
 */
static function onSpecialListusersQueryInfo( $pager, &$query ) {
$testwiki = WikimediaIncubator::getUrlParam();
diff --git a/SpecialIncubatorFirstSteps.php b/SpecialIncubatorFirstSteps.php
index 8090c65..685d6bf 100644
--- a/SpecialIncubatorFirstSteps.php
+++ b/SpecialIncubatorFirstSteps.php
@@ -47,6 +47,7 @@
 * @param Message $msg Message object
 * @param bool $opaque
 * @param bool $done
+* @return string
 */
protected function showHeader( $msg, $opaque = true, $done = false ) {
$attrs = [];
diff --git a/SpecialSearchWiki.php b/SpecialSearchWiki.php
index 524d250..12ecfbb 100644
--- a/SpecialSearchWiki.php
+++ b/SpecialSearchWiki.php
@@ -98,6 +98,7 @@
/**
 * @param string $projectQuery
 * @param string $languageQuery
+* @return string
 */
protected function doSearch( $projectQuery, $languageQuery ) {
## Match project ##
diff --git a/WikimediaIncubator.class.php b/WikimediaIncubator.class.php
index fb3241b..26f7a95 100644
--- a/WikimediaIncubator.class.php
+++ b/WikimediaIncubator.class.php
@@ -125,6 +125,7 @@
/**
 * This validates a given language code.
 * Only "xx[x]" and "xx[x]-x[]" are allowed.
+* @param string $code
 * @return bool
 */
static function validateLanguageCode( $code ) {
@@ -278,7 +279,10 @@
/**
 * display the prefix by the given project and code
 * (or the URL = or user preference if no parameters are given)
-* @return String
+* @param string $project
+* @param string $code
+* @param bool $allowSister
+* @return string
 */
static function displayPrefix( $project = '', $code = '', $allowSister 
= false ) {
global $wmincSisterProjects;
@@ -371,7 +375,11 @@
 * Disables editing pages belonging to existing wikis (+ shows message)
 * Disables creating an unprefixed page (+ shows error message)
 * See also: WikimediaIncubator::onShowMissingArticle()
-* @return Boolean
+* @param Title $title
+* @param User $user
+* @param string $action
+* @param array &$result
+* @return bool
 */
static function onGetUserPermissionsErrors( $title, $user, $action, 
&$result ) {
$titletext = $title->getText();
@@ -425,7 +433,11 @@
/**
 * Return an error if the user wants to move
 * an existing page to an unprefixed title
-* @return Boolean
+* @param string $oldtitle
+* @param string $newtitle
+* @param User $user
+* @param array &$error
+* @return bool
 */
static function checkPrefixMovePermissions( $oldtitle, $newtitle, 
$user, &$error ) {
$status = new Status();
@@ -441,6 +453,10 @@
 * Add a link to Special:ViewUserLang from 
Special:Contributions/USERNAME
 * if the user has 'viewuserlang' permission
 * Based on code from extension LookupUser made by Tim Starling
+* @param int $id
+* @param Title

[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: Improve some parameter docs

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Improve some parameter docs
..


Improve some parameter docs

Change-Id: Idd55d52910550e18b2cea40970c9bdfb9511cb47
---
M .phpcs.xml
M ApexTemplate.php
M SkinApex.php
3 files changed, 11 insertions(+), 12 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index 76de051..55ab46e 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -8,8 +8,7 @@



-   
-   
+   



diff --git a/ApexTemplate.php b/ApexTemplate.php
index 9c14d6c..a9c83e2 100644
--- a/ApexTemplate.php
+++ b/ApexTemplate.php
@@ -164,7 +164,7 @@
/**
 * Render a series of portals
 *
-* @param $portals array
+* @param array $portals
 */
protected function renderPortals( $portals ) {
// Force the rendering of the following portals
@@ -201,10 +201,10 @@
}
 
/**
-* @param $name string
-* @param $content array
-* @param $msg null|string
-* @param $hook null|string|array
+* @param string $name
+* @param array $content
+* @param null|string $msg
+* @param null|string|array $hook
 */
protected function renderPortal( $name, $content, $msg = null, $hook = 
null ) {
if ( $msg === null ) {
@@ -247,7 +247,7 @@
 * Render one or more navigations elements by name, automatically 
reveresed
 * when UI is in RTL mode
 *
-* @param $elements array
+* @param array $elements
 */
protected function renderNavigation( $elements ) {
// If only one element was given, wrap it in an array, allowing 
more
diff --git a/SkinApex.php b/SkinApex.php
index 05b6e0d..0618484 100644
--- a/SkinApex.php
+++ b/SkinApex.php
@@ -13,7 +13,7 @@
 
/**
 * Initializes output page and sets up skin-specific parameters
-* @param $out OutputPage object to initialize
+* @param OutputPage $out OutputPage object to initialize
 */
public function initPage( OutputPage $out ) {
global $wgLocalStylePath;
@@ -40,7 +40,7 @@
/**
 * Load skin and user CSS files in the correct order
 * fixes bug 22916
-* @param $out OutputPage object
+* @param OutputPage $out OutputPage object
 */
function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
@@ -53,8 +53,8 @@
/**
 * Adds classes to the body element.
 *
-* @param $out OutputPage object
-* @param &$bodyAttrs Array of attributes that will be set on the body 
element
+* @param OutputPage $out OutputPage object
+* @param array &$bodyAttrs Array of attributes that will be set on the 
body element
 */
function addToBodyAttributes( $out, &$bodyAttrs ) {
if ( isset( $bodyAttrs['class'] ) && strlen( 
$bodyAttrs['class'] ) > 0 ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd55d52910550e18b2cea40970c9bdfb9511cb47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Merge branch 'master' into deployment

2018-01-09 Thread jenkins-bot (Code Review)

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

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

055278c Fix classmap for Adyen WSDL

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I572c14d2322ad6414c027726f6aad216af4572c8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Mepps 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 4 >

1 - 100 of 345 matches

Mail list logo