[MediaWiki-commits] [Gerrit] Restore mc1007 memcached growth factor to 1.05 as the rest o... - change (operations/puppet)
Elukey has submitted this change and it was merged.
Change subject: Restore mc1007 memcached growth factor to 1.05 as the rest of
the cluster.
..
Restore mc1007 memcached growth factor to 1.05 as the rest of the cluster.
Memcached on mc1007 has been running with growth factor 1.15 for a while
to test differences between 1.4.21 and 1.4.25 (the latter requiring 1.15
to work properly). mc1007 shows a stunning hit rate but we don't have
precise metrics of what it was before the 1.15 value change, since we
enabled diamond/graphite only afterwards. I want to double check if this
great performance is due to a lucky shard or if the growth factor is
playing a role. In any case, mc1007 will be restore to the current
default value of the cluster (1.05).
Bug: T129963
Change-Id: Ia2d4d35f211adce07370cdb2886e0653fa061f64
---
M manifests/role/memcached.pp
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/memcached.pp b/manifests/role/memcached.pp
index 828ebf6..28f8e1d 100644
--- a/manifests/role/memcached.pp
+++ b/manifests/role/memcached.pp
@@ -36,11 +36,6 @@
'lru_crawler',
'lru_maintainer',
]
-} elsif $::hostname == 'mc1007' {
-$growth_factor= 1.15
-$extended_options = [
-'slab_reassign',
-]
} elsif $::hostname == 'mc2010' {
$growth_factor= 1.05
$extended_options = [
--
To view, visit https://gerrit.wikimedia.org/r/295702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2d4d35f211adce07370cdb2886e0653fa061f64
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey
Gerrit-Reviewer: Elukey
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] url_downloader: Use PRODUCTION_NETWORKS in ferm rules - change (operations/puppet)
Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295781
Change subject: url_downloader: Use PRODUCTION_NETWORKS in ferm rules
..
url_downloader: Use PRODUCTION_NETWORKS in ferm rules
Change-Id: I4be5ac7cca504fa4cee6855522d130b9aa13bce7
---
M manifests/role/url_downloader.pp
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/295781/1
diff --git a/manifests/role/url_downloader.pp b/manifests/role/url_downloader.pp
index 0919d08..a634e46 100644
--- a/manifests/role/url_downloader.pp
+++ b/manifests/role/url_downloader.pp
@@ -77,12 +77,10 @@
config_content => $config_content,
}
-# Restrict the service to WMF only networks using the $ALL_NETWORKS ferm
-# macro
ferm::service { 'url_downloader':
proto => 'tcp',
port => $url_downloader_port,
-srange => '$ALL_NETWORKS',
+srange => '$PRODUCTION_NETWORKS',
}
# Monitoring
--
To view, visit https://gerrit.wikimedia.org/r/295781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4be5ac7cca504fa4cee6855522d130b9aa13bce7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Template wrapping: Eliminate pathological tpl-range nesting ... - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295780
Change subject: Template wrapping: Eliminate pathological tpl-range nesting
scenario
..
Template wrapping: Eliminate pathological tpl-range nesting scenario
wikidata.org/wiki/Wikidata:Database_reports/items_without_claims_categories/enwiki
and other such pages on wikidata have been timing out regularly
for several months now.
It turns out that this was exercising a pathological scenario in
template wrapping.
That page has ~4000 transclusions of the form: {{TR noclaims site|...}}
This transclusion generates a ... which then causes the start
and end-template marker meta tags to lie outside the which seems
to be leading template ranges to expand to the entire table (that
behavior will be investigated separately to see if we can make it stick
to the instead).
So, we now effectively have ~4K transclusions whose template wrapping
range is identical (the entire table).
Given a set of ranges, the findToplevelNonOverlappingRanges algorithm
tries to find what nesting of ranges. However, given ranges A & B
that overlap perfectly, we could mark A nested in B or vice versa.
Normally, this shouldn't be an issue since no matter which one we
pick as the "outermost" range, the whole table will get wrapped.
However, the algorithm also has code to prevent nesting cycles.
This cycle detection code now encounters pathological behavior on this
page. We have ranges R_1 .. R_4000 where R_n is being marked as
nested in R_n+1. So, you now have this nesting tree that is a growing
to be a chain from R_1 ... R_n. So, the cycle-detection code is
walking this chain for each n thus leading to n^2 behavior.
A better nesting tree would be to mark R_2 .. R_4000 as being nested
in R_1. So, given ranges A & B that overlap perfectly, this patch
adds a new test to ensure that B is marked nested in A whenever
B's starting offset is larger than A's offset.
With this fix, the tpl-wrapping code finishes rapidly and the page
parses without a timeout.
Change-Id: Iaaa2fc2cf484ce5cca2a2d3a3fa18a0e4e612262
---
M lib/wt2html/pp/processors/wrapTemplates.js
1 file changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/80/295780/1
diff --git a/lib/wt2html/pp/processors/wrapTemplates.js
b/lib/wt2html/pp/processors/wrapTemplates.js
index 88e8d5a..8bae1dc 100644
--- a/lib/wt2html/pp/processors/wrapTemplates.js
+++ b/lib/wt2html/pp/processors/wrapTemplates.js
@@ -418,9 +418,6 @@
// compute their intersection. If this
intersection has
// another tpl range besides r itself,
we have a winner!
//
- // Array A - B functionality that Ruby
has would have simplified
- // this code!
- //
// The code below does the above check
efficiently.
var sTpls = ranges;
var eTpls =
DU.getDataParsoid(r.end).tmp.tplRanges;
@@ -430,14 +427,18 @@
for (var j = 0; j < sKeys.length; j++) {
// - Don't record nesting
cycles.
// - Record the outermost range
in which 'r' is nested in.
- var other = sKeys[j];
- if (other !== r.id
- && eTpls[other]
- &&
!introducesCycle(r.id, other, subsumedRanges)) {
+ var otherId = sKeys[j];
+ var other = sTpls[otherId];
+ if (otherId !== r.id
+ && eTpls[otherId]
+ // When we have
identical ranges, pick the range with
+ // the larger offset to
be subsumed.
+ && (r.start !==
other.start || r.end !== other.end || other.startOffset < r.startOffset)
+ &&
!introducesCycle(r.id, otherId, subsumedRanges)) {
foundNesting = true;
if
(!subsumedRanges.has(r.id)
- ||
sTpls[other].startOffset < sTpls[subsumedRanges.get(r.id)].startOffset) {
-
[MediaWiki-commits] [Gerrit] Template tool: Refactor parameter mapping - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295779
Change subject: Template tool: Refactor parameter mapping
..
Template tool: Refactor parameter mapping
Change-Id: Ie2c8b57a91b86c34ad2643133cda200f448c9e23
---
M modules/tools/ext.cx.tools.template.js
M tests/qunit/tools/ext.cx.tools.template.test.js
2 files changed, 31 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/79/295779/1
diff --git a/modules/tools/ext.cx.tools.template.js
b/modules/tools/ext.cx.tools.template.js
index 7c9f9fc..5388d82 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -109,13 +109,35 @@
* Adapt a template using template mapping
*/
TemplateTool.prototype.adapt = function () {
- var targetParams = {},
- templateTool = this,
- sourceParams = this.templateData.parts[ 0
].template.params;
-
mw.log( '[CX] Adapting template ' + this.templateTitle + '
based on mapping.' );
// Update the name of the template
this.templateData.parts[ 0 ].template.target.wt =
this.templateMapping.targetname;
+ this.templateData.parts[ 0 ].template.params =
this.getTargetParams( this.getSourceParams() );
+ this.$template.attr( 'data-mw', JSON.stringify(
this.templateData ) );
+
+ // Make templates uneditable unless whitelisted
+ if ( !this.templateMapping.editable ) {
+ this.$template.data( 'editable', false );
+ }
+ };
+
+ /**
+* Get the source parameters for the template
+*
+* @return {Object} Source parameters - key vale pairs.
+*/
+ TemplateTool.prototype.getSourceParams = function () {
+ return this.templateData.parts[ 0 ].template.params;
+ };
+
+ /**
+* Get the target parameters for the template after mapping
+*
+* @return {Object} Target parameters - key vale pairs.
+*/
+ TemplateTool.prototype.getTargetParams = function ( sourceParams ) {
+ var targetParams = {},
+ self = this;
// Update the template parameters
$.each( sourceParams, function ( key, value ) {
@@ -127,22 +149,16 @@
}
// Copy over other parameters, but map known keys
- if ( templateTool.templateMapping.parameters &&
- templateTool.templateMapping.parameters[ key ]
!== undefined
+ if ( self.templateMapping.parameters &&
+ self.templateMapping.parameters[ key ] !==
undefined
) {
- key = templateTool.templateMapping.parameters[
key ];
+ key = self.templateMapping.parameters[ key ];
}
targetParams[ key ] = value;
} );
- this.templateData.parts[ 0 ].template.params = targetParams;
- this.$template.attr( 'data-mw', JSON.stringify(
this.templateData ) );
-
- // Make templates uneditable unless whitelisted
- if ( !this.templateMapping.editable ) {
- this.$template.data( 'editable', false );
- }
+ return targetParams;
};
/**
diff --git a/tests/qunit/tools/ext.cx.tools.template.test.js
b/tests/qunit/tools/ext.cx.tools.template.test.js
index 88807a1..a53f4ea 100644
--- a/tests/qunit/tools/ext.cx.tools.template.test.js
+++ b/tests/qunit/tools/ext.cx.tools.template.test.js
@@ -111,7 +111,7 @@
templateTool.process().then( function () {
var i, key, mappedKey,
templateData = $template.data(
'mw' ),
- templateKeys = Object.keys(
templateData.parts[ 0 ].template.params ),
+ templateKeys = Object.keys(
templateTool.getSourceParams() ),
templateMapping =
$template.data( 'template-mapping' ),
templateMappingKeys =
Object.keys( templateMapping.parameters );
--
To view, visit https://gerrit.wikimedia.org/r/295779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2c8b57a91b86c34ad2643133cda200f448c9e23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
[MediaWiki-commits] [Gerrit] etcd: Use PRODUCTION_NETWORKS in ferm rules - change (operations/puppet)
Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295778
Change subject: etcd: Use PRODUCTION_NETWORKS in ferm rules
..
etcd: Use PRODUCTION_NETWORKS in ferm rules
Only needs to be contacted by systems in production.
Change-Id: Id7116e47310f3af1fd714cec292174b4c3ea55cb
---
M manifests/role/etcd.pp
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/295778/1
diff --git a/manifests/role/etcd.pp b/manifests/role/etcd.pp
index 0cc6551..09d99ec 100644
--- a/manifests/role/etcd.pp
+++ b/manifests/role/etcd.pp
@@ -14,14 +14,12 @@
ferm::service{'etcd_clients':
proto => 'tcp',
port => hiera('etcd::client_port', '2379'),
-srange => '$ALL_NETWORKS',
+srange => '$PRODUCTION_NETWORKS',
}
ferm::service{'etcd_peers':
proto => 'tcp',
port => hiera('etcd::peer_port', '2380'),
-srange => '$ALL_NETWORKS',
+srange => '$PRODUCTION_NETWORKS',
}
-
-
}
--
To view, visit https://gerrit.wikimedia.org/r/295778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7116e47310f3af1fd714cec292174b4c3ea55cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] striker: Update configuration - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295777
Change subject: striker: Update configuration
..
striker: Update configuration
Switch to new ini based configuration style.
Change-Id: I9c1f89a72698d165dece0e15e3d9c15df7fac46d
---
M puppet/modules/role/manifests/striker.pp
M puppet/modules/role/templates/striker/apache.conf.erb
A puppet/modules/role/templates/striker/striker.ini.erb
D puppet/modules/role/templates/striker/vagrant_settings.py.erb
4 files changed, 57 insertions(+), 79 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/77/295777/1
diff --git a/puppet/modules/role/manifests/striker.pp
b/puppet/modules/role/manifests/striker.pp
index a5d3bfd..bbda3eb 100644
--- a/puppet/modules/role/manifests/striker.pp
+++ b/puppet/modules/role/manifests/striker.pp
@@ -101,8 +101,14 @@
}
# Configure striker
-file { "${app_dir}/vagrant_settings.py":
-content => template('role/striker/vagrant_settings.py.erb'),
+file { '/etc/striker':
+ensure => 'directory',
+owner => 'root',
+group => 'root',
+mode => '0555',
+}
+file { '/etc/striker/striker.ini':
+content => template('role/striker/striker.ini.erb'),
require => [
Git::Clone['striker'],
Class['::phabricator'],
@@ -124,10 +130,9 @@
exec { 'striker manage.py migrate':
cwd => $app_dir,
command => "${venv}/bin/python manage.py migrate",
-environment => 'DJANGO_SETTINGS_MODULE=vagrant_settings',
require => [
Mysql::User[$db_user],
-File["${app_dir}/vagrant_settings.py"],
+File['/etc/striker/striker.ini'],
],
onlyif => "${venv}/bin/python manage.py showmigrations --plan |
/bin/grep -q '\\[ \\]'",
}
@@ -135,10 +140,9 @@
exec { 'striker manage.py collectstatic':
cwd => $app_dir,
command => "${venv}/bin/python manage.py collectstatic --noinput",
-environment => 'DJANGO_SETTINGS_MODULE=vagrant_settings',
require => [
Mysql::User[$db_user],
-File["${app_dir}/vagrant_settings.py"],
+File['/etc/striker/striker.ini'],
],
unless => "${venv}/bin/python manage.py collectstatic --noinput
--dry-run| grep -q '^0 static'",
}
diff --git a/puppet/modules/role/templates/striker/apache.conf.erb
b/puppet/modules/role/templates/striker/apache.conf.erb
index 58b53ee..54659a5 100644
--- a/puppet/modules/role/templates/striker/apache.conf.erb
+++ b/puppet/modules/role/templates/striker/apache.conf.erb
@@ -1,10 +1,7 @@
ServerName <%= @vhost_name %>
DocumentRoot <%= @app_dir %>
-SetEnv DJANGO_SETTINGS_MODULE vagrant_settings
-SetEnv DJANGO_LOG_LEVEL DEBUG
SetEnv DJANGO_DEBUG True
-
WSGIDaemonProcess striker python-path=<%= @app_dir %>:<%= @venv
%>/lib/python2.7/site-packages home=<%= @app_dir %> display-name=%{GROUP}
threads=8
WSGIProcessGroup striker
WSGIScriptAlias / <%= @deploy_dir %>/striker/striker/wsgi.py
process-group=striker
diff --git a/puppet/modules/role/templates/striker/striker.ini.erb
b/puppet/modules/role/templates/striker/striker.ini.erb
new file mode 100644
index 000..efc194c
--- /dev/null
+++ b/puppet/modules/role/templates/striker/striker.ini.erb
@@ -0,0 +1,47 @@
+# Managed by Puppet.
+# See puppet/modules/role/templates/striker/striker.ini.erb
+
+[secrets]
+# Not so secret secret key
+SECRET_KEY = &tse*xh73ad^#d+v%%rb18wp2ab%sj5xv1t7&zyj%bma=^h@g_
+
+[debug]
+DEBUG = true
+
+[ldap]
+SERVER_URI = ldap://127.0.0.1:389
+BIND_USER = <%= scope['::role::ldapauth::writer_dn'] %>
+BIND_PASSWORD = <%= scope['::role::ldapauth::writer_password'] %>
+TLS = false
+
+BASE_DN = <%= scope['::role::ldapauth::base_dn'] %>
+USER_DN_TEMPLATE = cn=%(user)s,<%= scope['::role::ldapauth::user_base_dn'] %>
+STAFF_GROUP_DN = cn=wmf,ou=groups,<%= scope['::role::ldapauth::base_dn'] %>
+SUPERUSER_GROUP_DN = cn=tools.admin,ou=servicegroups,<%=
scope['::role::ldapauth::base_dn'] %>
+
+TOOLS_MAINTAINER_BASE_DN = ou=people,<%= scope['::role::ldapauth::base_dn'] %>
+TOOLS_TOOL_BASE_DN = ou=servicegroups,<%= scope['::role::ldapauth::base_dn'] %>
+
+[oauth]
+MWURL = <%= scope['::mediawiki::server_url'] %>/w/index.php
+CONSUMER_KEY = <%= @oauth_consumer_key %>
+CONSUMER_SECRET = <%= @oauth_consumer_secret %>
+
+[phabricator]
+SERVER_URL = <%= @phabricator_url %>
+USER = <%= @phabricator_user %>
+TOKEN = <%= @phabricator_token %>
+REPO_ADMIN_GROUP = <%= @phabricator_repo_admin_group %>
+
+[db]
+ENGINE = django.db.backends.mysql
+NAME = <%= @db_name %>
+USER = <%= @db_user %>
+PASSWORD = <%= @db_pass %>
+HOST = 127.0.0.1
+PORT = 3306
+
+[logging]
+HANDLERS = file
+LEVEL = DEBUG
+FILE_FILENAME = <%= @log_dir %>/striker/django.log
diff --git a/puppet/modules/role/templates/striker/vagrant_sett
[MediaWiki-commits] [Gerrit] stream.wm.o: move to cache_misc in DNS - change (operations/dns)
BBlack has submitted this change and it was merged.
Change subject: stream.wm.o: move to cache_misc in DNS
..
stream.wm.o: move to cache_misc in DNS
Do not deploy before June 23
Bug: T134871
Change-Id: Ie1a87e668cae73bb862de4c29b0b235a544e2408
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 0b18c0f..df440dd 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -243,7 +243,6 @@
$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
d.0.0.0 1H IN PTR misc-web-lb.eqiad.wikimedia.org.
-5.1.0.0300 IN PTR stream-lb.eqiad.wikimedia.org.
6.1.0.0 1H IN PTR git-ssh.eqiad.wikimedia.org.
e.f.0.0 1H IN PTR dns-rec-lb.eqiad.wikimedia.org.
diff --git a/templates/154.80.208.in-addr.arpa
b/templates/154.80.208.in-addr.arpa
index ea7d2fc..8f612d0 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -188,6 +188,5 @@
; - - 208.80.154.248/29 (248-255) LVS Misc
-249 300 IN PTR stream-lb.eqiad.wikimedia.org.
250 1H IN PTR git-ssh.eqiad.wikimedia.org.
251 1H IN PTR misc-web-lb.eqiad.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 9a916bb..cce602a 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -233,8 +233,9 @@
geoiplookup-lb.eqiad600 IN DYNA geoip!geoiplookup-addrs/eqiad
-stream-lb.eqiad 300 IN A208.80.154.249
-300 IN 2620:0:861:ed1a::3:15
+; probably can be removed, shouldn't have been publicly used.
+; Check post-transition (can't tell before due to CNAME).
+stream-lb.eqiad 600 IN DYNA geoip!misc-addrs
; These legacy entries should eventually move to RESTBase
cxserver600 IN DYNA geoip!text-addrs
@@ -527,7 +528,7 @@
secure 600 IN DYNA geoip!text-addrs
-stream 300 IN CNAMEstream-lb.eqiad
+stream 600 IN DYNA geoip!misc-addrs
svn 600 IN DYNA geoip!text-addrs
--
To view, visit https://gerrit.wikimedia.org/r/295385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1a87e668cae73bb862de4c29b0b235a544e2408
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix bug T138553 Change-Id: I1fdec4b31f26aa4fd39d371a27880b9d... - change (mediawiki...HeaderTabs)
jenkins-bot has submitted this change and it was merged.
Change subject: fix bug T138553 Change-Id:
I1fdec4b31f26aa4fd39d371a27880b9d9916a913
..
fix bug T138553
Change-Id: I1fdec4b31f26aa4fd39d371a27880b9d9916a913
---
M skins/ext.headertabs.core.js
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/skins/ext.headertabs.core.js b/skins/ext.headertabs.core.js
index 98f5f7e..ace26c4 100644
--- a/skins/ext.headertabs.core.js
+++ b/skins/ext.headertabs.core.js
@@ -38,12 +38,13 @@
for (s = 0; s < sheets.length; s++ ) {
var cursheet = sheets[s];
var rules = cursheet.cssRules ? cursheet.cssRules: cursheet.rules; //
Yay IE
-
- for (r = 0; r < rules.length; r++){
- if( rules[r].selectorText !== undefined ){
- if( rules[r].selectorText.toLowerCase() ===
".unselected" ){ //find ".unselected" rule
- cursheet.deleteRule ? cursheet.deleteRule(r):
cursheet.removeRule(r); // Yay IE
- break outer;
+ if( rules ) {
+ for (r = 0; r < rules.length; r++) {
+ if (rules[r].selectorText !== undefined) {
+ if (rules[r].selectorText.toLowerCase() ===
".unselected") { //find ".unselected" rule
+ cursheet.deleteRule ?
cursheet.deleteRule(r) : cursheet.removeRule(r); // Yay IE
+ break outer;
+ }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/295776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1fdec4b31f26aa4fd39d371a27880b9d9916a913
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/HeaderTabs
Gerrit-Branch: master
Gerrit-Owner: Vedmaka Wakalaka
Gerrit-Reviewer: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix bug T138553 Change-Id: I1fdec4b31f26aa4fd39d371a27880b9d... - change (mediawiki...HeaderTabs)
Vedmaka Wakalaka has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295776
Change subject: fix bug T138553 Change-Id:
I1fdec4b31f26aa4fd39d371a27880b9d9916a913
..
fix bug T138553
Change-Id: I1fdec4b31f26aa4fd39d371a27880b9d9916a913
---
M skins/ext.headertabs.core.js
1 file changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HeaderTabs
refs/changes/76/295776/1
diff --git a/skins/ext.headertabs.core.js b/skins/ext.headertabs.core.js
index 98f5f7e..75b7cc7 100644
--- a/skins/ext.headertabs.core.js
+++ b/skins/ext.headertabs.core.js
@@ -38,12 +38,13 @@
for (s = 0; s < sheets.length; s++ ) {
var cursheet = sheets[s];
var rules = cursheet.cssRules ? cursheet.cssRules: cursheet.rules; //
Yay IE
-
- for (r = 0; r < rules.length; r++){
- if( rules[r].selectorText !== undefined ){
- if( rules[r].selectorText.toLowerCase() ===
".unselected" ){ //find ".unselected" rule
- cursheet.deleteRule ? cursheet.deleteRule(r):
cursheet.removeRule(r); // Yay IE
- break outer;
+ if( rules != undefined ) {
+ for (r = 0; r < rules.length; r++) {
+ if (rules[r].selectorText !== undefined) {
+ if (rules[r].selectorText.toLowerCase() ===
".unselected") { //find ".unselected" rule
+ cursheet.deleteRule ?
cursheet.deleteRule(r) : cursheet.removeRule(r); // Yay IE
+ break outer;
+ }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/295776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fdec4b31f26aa4fd39d371a27880b9d9916a913
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HeaderTabs
Gerrit-Branch: master
Gerrit-Owner: Vedmaka Wakalaka
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't always update tests. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't always update tests.
..
Don't always update tests.
Change-Id: I5db3aab9240b20797f6cd696f3440bc3b598515f
---
M bin/parserTests.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/parserTests.js b/bin/parserTests.js
index 970d074..b0d6624 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -2152,14 +2152,14 @@
}
// Write updated tests from failed ones
- if (options.hasOwnProperty('update-tests') ||
+ if (options['update-tests'] ||
booleanOption(options['update-unexpected'])) {
var updateFormat = (options['update-tests'] === 'raw') ?
'raw' : 'actualNormalized';
var parserTestsFilename = __dirname +
'/../tests/parserTests.txt';
var parserTests = fs.readFileSync(parserTestsFilename,
'utf8');
this.stats.modes.wt2html.failList.forEach(function(fail) {
- if (booleanOption(options['update-tests'] ||
fail.unexpected)) {
+ if (options['update-tests'] || fail.unexpected)
{
var exp = new RegExp("(" +
/!!\s*test\s*/.source +
Util.escapeRegExp(fail.title) +
/(?:(?!!!\s*end)[\s\S])*/.source +
")(" +
Util.escapeRegExp(fail.expected) + ")", "m");
--
To view, visit https://gerrit.wikimedia.org/r/295772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5db3aab9240b20797f6cd696f3440bc3b598515f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explicitly depend on mediawiki.util where needed - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Explicitly depend on mediawiki.util where needed
..
Explicitly depend on mediawiki.util where needed
Various modules use mw.util without explicitly requesting the
dependency this provides it.
This may lead to JS errors when modules are loaded in certain orders.
Bug: T138473
Change-Id: Ibded5536f49e78d6a9d8e240fb0bf7da3cac4e6d
---
M extension.json
M includes/MobileFrontend.hooks.php
2 files changed, 11 insertions(+), 0 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index dc29546..fd07cf6 100644
--- a/extension.json
+++ b/extension.json
@@ -439,6 +439,7 @@
],
"dependencies": [
"mobile.modules",
+ "mediawiki.util",
"mediawiki.language",
"mediawiki.jqueryMsg"
],
@@ -603,6 +604,7 @@
"mobile.browser",
"mobile.oo",
"mobile.user",
+ "mediawiki.util",
"mediawiki.api",
"mediawiki.viewport",
"mobile.settings",
@@ -712,6 +714,7 @@
"mobile.drawers",
"mobile.toast",
"mobile.messageBox",
+ "mediawiki.util",
"mediawiki.confirmCloseWindow",
"mobile.loggingSchemas.edit"
],
@@ -769,6 +772,7 @@
"mobile.editor.common",
"mobile.microAutoSize",
"oojs-ui.styles.icons-editing-core",
+ "mediawiki.util",
"mediawiki.notification"
],
"scripts": [
@@ -877,6 +881,7 @@
"desktop"
],
"dependencies": [
+ "mediawiki.util",
"mediawiki.ui.anchor",
"mobile.editor.common"
],
@@ -1064,6 +1069,7 @@
"desktop"
],
"dependencies": [
+ "mediawiki.util",
"mobile.startup"
],
"templates": {
@@ -1399,6 +1405,7 @@
"dependencies": [
"mobile.startup",
"mobile.toast",
+ "mediawiki.util",
"mediawiki.Title"
],
"scripts": [
@@ -1600,6 +1607,7 @@
"desktop"
],
"dependencies": [
+ "mediawiki.util",
"mediawiki.router",
"mobile.startup",
"mobile.mainMenu",
@@ -1658,6 +1666,7 @@
],
"dependencies": [
"skins.minerva.editor",
+ "mediawiki.util",
"mobile.contentOverlays"
],
"scripts": [
@@ -1672,6 +1681,7 @@
"skins.minerva.editor": {
"class": "MFResourceLoaderParsedMessageModule",
"dependencies": [
+ "mediawiki.util",
"mediawiki.router",
"skins.minerva.icons.images.scripts",
"skins.minerva.scripts",
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 05e9c63..41a63c3 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1119,6 +1119,7 @@
],
'mobile.notifications.overlay' =>
$resourceBoilerplate + [
'dependencies' => [
+ 'mediawiki.util',
'mobile.overlays',
'ext.echo.ui',
],
--
To view, visit https://gerrit.wikimedia.org/r/295756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType:
[MediaWiki-commits] [Gerrit] Un-break page actions on User pages - change (mediawiki...MobileFrontend)
Bmansurov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295775
Change subject: Un-break page actions on User pages
..
Un-break page actions on User pages
Remove the user page specific rule so that page actions styling
can style the heading holder. The change makes sure that there is
enough padding bottom of heading holder for page actions to occupy.
On small screens page actions container is absolutely positioned,
thus it requires space to be reserved.
A downside of this approach is that the space is always reserved even
when the page actions are invisible. This may happen when all page
actions are JS-only and the browser doesn't support JS.
Alternatively, we could introduce a new class for heading holder
which would let us know whether all page actions are JS only or not.
This will allow us to not reserve space for page actions when they
are invisible.
Bug: T137054
Change-Id: Id0dfec608856eca936d4ddbccc56d88bc53888c9
---
M resources/skins.minerva.userpage.styles/userpage.less
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/75/295775/1
diff --git a/resources/skins.minerva.userpage.styles/userpage.less
b/resources/skins.minerva.userpage.styles/userpage.less
index 118ebc4..779e47c 100755
--- a/resources/skins.minerva.userpage.styles/userpage.less
+++ b/resources/skins.minerva.userpage.styles/userpage.less
@@ -1,10 +1,6 @@
@import 'minerva.variables';
@import 'minerva.mixins';
-.heading-holder {
- padding-bottom: 20px;
-}
-
.tagline {
color: @colorGray5;
font-size: 0.8em;
--
To view, visit https://gerrit.wikimedia.org/r/295775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0dfec608856eca936d4ddbccc56d88bc53888c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Default wgMFSpecialCaseMainPage to false - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/295774 Change subject: Default wgMFSpecialCaseMainPage to false .. Default wgMFSpecialCaseMainPage to false We should discourage usage of this starting now. Bug: T32405 Change-Id: I8269b48b2becf1fdb77b1db018a86b5296ea4082 --- M README.md M extension.json 2 files changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/74/295774/1 diff --git a/README.md b/README.md index d1910f9..2b716a3 100644 --- a/README.md +++ b/README.md @@ -180,11 +180,14 @@ Default: array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' ); # $wgMFSpecialCaseMainPage -If set to true, main page HTML will receive special massaging that removes everything -but a few select pieces. +If set to true, main page HTML will receive special massaging. +See https://m.mediawiki.org/wiki/Mobile_Gateway/Mobile_homepage_formatting + +Use is discouraged as it leads to unnecessary technical debt and on the long term the goal +is to deprecate usage of this config variable. Use at your own risk! Type: Boolean -Default: true; +Default: false; # $wgMinervaEnableSiteNotice Controls whether site notices should be shown. diff --git a/extension.json b/extension.json index dc29546..d5f7a1f 100644 --- a/extension.json +++ b/extension.json @@ -1990,7 +1990,7 @@ "h5", "h6" ], - "MFSpecialCaseMainPage": true, + "MFSpecialCaseMainPage": false, "MinervaEnableSiteNotice": false, "MFTidyMobileViewSections": true, "MFMobileHeader": "X-WAP", -- To view, visit https://gerrit.wikimedia.org/r/295774 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8269b48b2becf1fdb77b1db018a86b5296ea4082 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up 6c4bf99da88: Fix incorrect comment - change (mediawiki...Echo)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295773
Change subject: Follow-up 6c4bf99da88: Fix incorrect comment
..
Follow-up 6c4bf99da88: Fix incorrect comment
Change-Id: I14df92823d8e3c19b94cc225f00d45315e8300c5
---
M modules/ui/mw.echo.ui.PageFilterWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/73/295773/1
diff --git a/modules/ui/mw.echo.ui.PageFilterWidget.js
b/modules/ui/mw.echo.ui.PageFilterWidget.js
index c28ad7b..68e833d 100644
--- a/modules/ui/mw.echo.ui.PageFilterWidget.js
+++ b/modules/ui/mw.echo.ui.PageFilterWidget.js
@@ -12,7 +12,7 @@
* @cfg {string} [title] The title of this page group, usually
* the name of the wiki that the pages belong to
* @cfg {number} [unreadCount] Number of unread notifications
-* @cfg {number} [initialSelection] The pageId of an initial selection
+* @cfg {number} [initialSelection] The page title of the option to
select initially
*/
mw.echo.ui.PageFilterWidget = function MwEchoUiPageFilterWidget(
filterModel, source, config ) {
config = config || {};
--
To view, visit https://gerrit.wikimedia.org/r/295773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I14df92823d8e3c19b94cc225f00d45315e8300c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Complete list of legacy main pages, switch default to false - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Complete list of legacy main pages, switch default to false .. Complete list of legacy main pages, switch default to false After auditing which wiki projects use the legacy wgMFSpecialCaseMainPage option, add them all to the mobilemainpagelegacy dblist. This will force all new wikis and existing wikis not currently using the special casing to be forced to not use it and educate existing projects to move away from using it. Bug: T138425 Change-Id: I0d5e658663fef08bd1cae1d059789af6b8145bee --- M dblists/mobilemainpagelegacy.dblist M wmf-config/InitialiseSettings.php 2 files changed, 236 insertions(+), 68 deletions(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/dblists/mobilemainpagelegacy.dblist b/dblists/mobilemainpagelegacy.dblist index 36749e9..6624093 100644 --- a/dblists/mobilemainpagelegacy.dblist +++ b/dblists/mobilemainpagelegacy.dblist @@ -1,66 +1,237 @@ -hrwikiquote -enwikiquote -frwikiquote -nlwikiquote -dewikiquote -dawikiquote -zhwikiquote -ruwikiquote -tewikiquote -tawikiquote -etwikiquote -trwikiquote -ptwikiquote -suwikiquote -rowikiquote -urwikiquote -itwikiquote -eswikiquote -alswikiquote -crwikiquote -cswikiquote -nawikiquote -sawikiquote -viwikiquote -kawikiquote -astwiktionary -cawiktionary -nlwiktionary -zhwiktionary -hrwiktionary -jawiktionary -mswiktionary -simplewiktionary -svwiktionary -enwiktionary -etwiktionary -hiwiktionary -idwiktionary -ugwiktionary -ltwiktionary -mlwiktionary -trwiktionary -dewiktionary -elwiktionary -plwiktionary -fawiktionary -orwiktionary -ruwiktionary -tawiktionary -uzwiktionary -dawiktionary -iowiktionary -viwiktionary -cswiktionary -biwiktionary -fiwiktionary -frwiktionary -gnwiktionary -alswiktionary -vecwiktionary -lbwiktionary -pnbwiktionary akwiktionary -ptwiktionary +alswiki +alswikiquote +alswiktionary +amwiki +arwiki +arwikibooks +arwikinews +arwikisource +astwiki +astwiktionary +avwiki +azbwiki +azwiki +barwiki +bawiki +bewiki +bewikisource +biwiktionary +bmwiki +bnwikisource +bowiki +brwikisource +cawiki +cawikibooks +cawiktionary +cdowiki +ckbwiki +commonswiki +crwikiquote crwiktionary -skwiktionary \ No newline at end of file +cswikiquote +cswiktionary +cywiki +dawiki +dawikiquote +dawikisource +dawiktionary +dewiki +dewikibooks +dewikinews +dewikiquote +dewikisource +dewikiversity +dewikivoyage +dewiktionary +dsbwiki +elwiki +elwikisource +elwikivoyage +elwiktionary +enwikibooks +enwikinews +enwikiquote +enwikisource +enwikiversity +enwikivoyage +enwiktionary +eowiki +eswikiquote +eswikisource +eswikivoyage +etwiki +etwikiquote +etwikisource +etwiktionary +fawiki +fawikibooks +fawiktionary +ffwiki +fiwiki +fiwiktionary +fowiki +frrwiki +frwiki +frwikibooks +frwikinews +frwikiquote +frwikisource +frwikiversity +frwikivoyage +frwiktionary +fywiki +gnwiktionary +guwiki +guwikisource +hewiki +hewikivoyage +hiwiktionary +hrwiki +hrwikibooks +hrwikiquote +hrwikisource +hrwiktionary +hsbwiki +huwiki +idwiki +idwikibooks +idwikisource +idwiktionary +ilowiki +iowiktionary +iswiki +itwiki +itwikinews +itwikiquote +itwikisource +itwikivoyage +jawiki +jawikinews +jawikisource +jawiktionary +kabwiki +kawikiquote +kgwiki +kmwiki +kmwikibooks +knwiki +kowikibooks +kowikisource +krcwiki +kuwiki +kwwiki +kywiki +lbwiktionary +lezwiki +lnwiki +ltwiktionary +lvwiki +mediawikiwiki +metawiki +minwiki +mkwiki +mlwiki +mlwikisource +mlwiktionary +mnwiki +mswiki +mswikibooks +mswiktionary +mtwiki +mywiki +nahwiki +napwiki +nawikiquote +ndswiki +newiki +newikibooks +nlwiki +nlwikiquote +nlwiktionary +nnwiki +nowiki +orwiki +orwiktionary +oswiki +plwiki +plwikisource +plwiktionary +pnbwiki +pnbwiktionary +ptwiki +ptwikibooks +ptwikiquote +ptwikisource +ptwikiversity +ptwikivoyage +ptwiktionary +rmwiki +rowiki +rowikiquote +ruwiki +ruwikibooks +ruwikinews +ruwikiquote +ruwiktionary +rwwiki +sahwiki +scnwiki +scowiki +scwiki +sdwiki +simplewiki +simplewiktionary +siwikibooks +skwiktionary +slwiki +sowiki +specieswiki +sqwiki +sqwikinews +srwiki +srwikinews +suwiki +suwikiquote +svwiki +svwikisource +svwikivoyage +svwiktionary +tawiki +tawikiquote +tawikisource +tawiktionary +tetwiki +tewiki +tewikiquote +tewikisource +tgwiki +thwiki +tlwiki +trwikibooks +trwikiquote +trwiktionary +tyvwiki +ugwiktionary +ukwiki +ukwikibooks +ukwikinews +ukwikisource +urwiki +urwikiquote +uzwiki +uzwiktionary +vecwikisource +vecwiktionary +viwikibooks +viwikiquote +viwiktionary +xhwiki +yiwiki +zawiki +zhwikibooks +zhwikinews +zhwikiquote +zhwikisource +zhwikivoyage +zhwiktionary diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 238d76f..d65cca6 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14246,10 +14246,7 @@ ], 'wgMFSpecialCaseMainPage' => [ - 'default' => true, - 'wikidata' => false, - 'w
[MediaWiki-commits] [Gerrit] Don't always update tests. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295772
Change subject: Don't always update tests.
..
Don't always update tests.
Change-Id: I5db3aab9240b20797f6cd696f3440bc3b598515f
---
M bin/parserTests.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/72/295772/1
diff --git a/bin/parserTests.js b/bin/parserTests.js
index 970d074..b0d6624 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -2152,14 +2152,14 @@
}
// Write updated tests from failed ones
- if (options.hasOwnProperty('update-tests') ||
+ if (options['update-tests'] ||
booleanOption(options['update-unexpected'])) {
var updateFormat = (options['update-tests'] === 'raw') ?
'raw' : 'actualNormalized';
var parserTestsFilename = __dirname +
'/../tests/parserTests.txt';
var parserTests = fs.readFileSync(parserTestsFilename,
'utf8');
this.stats.modes.wt2html.failList.forEach(function(fail) {
- if (booleanOption(options['update-tests'] ||
fail.unexpected)) {
+ if (options['update-tests'] || fail.unexpected)
{
var exp = new RegExp("(" +
/!!\s*test\s*/.source +
Util.escapeRegExp(fail.title) +
/(?:(?!!!\s*end)[\s\S])*/.source +
")(" +
Util.escapeRegExp(fail.expected) + ")", "m");
--
To view, visit https://gerrit.wikimedia.org/r/295772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5db3aab9240b20797f6cd696f3440bc3b598515f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add gender support to Mobile-frontend-user-page-member-since - change (mediawiki...MobileFrontend)
Psychoslave has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295771
Change subject: Add gender support to Mobile-frontend-user-page-member-since
..
Add gender support to Mobile-frontend-user-page-member-since
Bug: T136916
Change-Id: I344f6f600e8ed62089f2c9c99751cb8cc1ae78b8
---
M i18n/en.json
M includes/skins/SkinMinerva.php
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/71/295771/1
diff --git a/i18n/en.json b/i18n/en.json
index cc1d07a..8b26442 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -343,7 +343,7 @@
"mobile-frontend-watchlist-removed": "Removed $1 from your watchlist",
"mobile-frontend-watchlist-signup-action": "A watchlist helps
you bookmark pages and keep track of changes to them.Sign up to
start one now.",
"mobile-frontend-watchlist-view": "View your watchlist",
- "mobile-frontend-user-page-member-since": "Member since $1",
+ "mobile-frontend-user-page-member-since": "{{GENDER:$2|Member}} since
$1",
"mobile-frontend-user-page-talk": "Talk",
"mobile-frontend-user-page-contributions": "Contributions",
"mobile-frontend-user-page-uploads": "Uploads",
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 3c6ed58..bdb8638 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -621,7 +621,8 @@
$fromDateTs = new MWTimestamp( wfTimestamp(
TS_UNIX, $fromDate ) );
$html .= Html::element( 'div', [ 'class' =>
'tagline', ],
$this->msg(
'mobile-frontend-user-page-member-since',
- $fromDateTs->format( 'F, Y' ) )
+ $fromDateTs->format( 'F, Y' ),
+ $this->pageUser )
);
}
} else {
--
To view, visit https://gerrit.wikimedia.org/r/295771
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I344f6f600e8ed62089f2c9c99751cb8cc1ae78b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Psychoslave
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't abuse SkinPreloadExistence to set mobile target - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295770
Change subject: Don't abuse SkinPreloadExistence to set mobile target
..
Don't abuse SkinPreloadExistence to set mobile target
Instead set the mobile target inside onBeforePageDisplay hook.
This is a more natural place for this anyway, given the other changes inside
this hook.
Bug: T136651
Change-Id: I7c0de0691fd72d5a80c0c2aed12284dcca7402f7
---
M extension.json
M includes/MobileFrontend.hooks.php
2 files changed, 5 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/70/295770/1
diff --git a/extension.json b/extension.json
index dc29546..3269dd9 100644
--- a/extension.json
+++ b/extension.json
@@ -1941,9 +1941,6 @@
"ResourceLoaderGetLessVars": [
"MobileFrontendHooks::onResourceLoaderGetLessVars"
],
- "SkinPreloadExistence": [
- "MobileFrontendHooks::onSkinPreloadExistence"
- ],
"ThumbnailBeforeProduceHTML": [
"MobileFrontendHooks::onThumbnailBeforeProduceHTML"
],
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 05e9c63..36eb347 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -399,23 +399,6 @@
}
/**
-* SkinPreloadExistence hook handler
-* Disables TOC in output before it grabs HTML
-* @see https://www.mediawiki.org/wiki/Manual:Hooks/SkinPreloadExistence
-*
-* @param Title[] $titles
-* @param Skin $skin
-* @return bool
-*/
- public static function onSkinPreloadExistence( array &$titles, Skin
$skin ) {
- $context = MobileContext::singleton();
- if ( $context->shouldDisplayMobileView() &&
!$context->isBlacklistedPage() ) {
- $skin->getOutput()->setTarget( 'mobile' );
- }
- return true;
- }
-
- /**
* ResourceLoaderGetConfigVars hook handler
* This should be used for variables which:
* - vary with the html
@@ -858,6 +841,11 @@
// in mobile view: always add vary header
$out->addVaryHeader( 'Cookie' );
+ // set the mobile target
+ if ( !$context->isBlacklistedPage() ) {
+ $out->setTarget( 'mobile' );
+ }
+
// Allow modifications in mobile only mode
Hooks::run( 'BeforePageDisplayMobile', [ &$out, &$sk ]
);
--
To view, visit https://gerrit.wikimedia.org/r/295770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c0de0691fd72d5a80c0c2aed12284dcca7402f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for 65d5517 to work with PHP < 5.4 - change (mediawiki...SemanticForms)
Yaron Koren has submitted this change and it was merged.
Change subject: Fix for 65d5517 to work with PHP < 5.4
..
Fix for 65d5517 to work with PHP < 5.4
Change-Id: Id51d43f0caa4c8bdf95a186bdaa06e55f6c75161
---
M includes/SF_FormPrinter.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index be237bd..4a39367 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -384,7 +384,8 @@
function tableHTML( $tif, $instanceNum ) {
global $sfgFieldNum;
- $gridValues = $tif->getGridValues()[$instanceNum];
+ $allGridValues = $tif->getGridValues();
+ $gridValues = $allGridValues[$instanceNum];
$html = '';
foreach ( $tif->getFields() as $formField ) {
--
To view, visit https://gerrit.wikimedia.org/r/295768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id51d43f0caa4c8bdf95a186bdaa06e55f6c75161
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merging from d0f21126475cffe8e93d4f4473e6820e97737f0e: - change (wikidata...gui-deploy)
Smalyshev has submitted this change and it was merged. Change subject: Merging from d0f21126475cffe8e93d4f4473e6820e97737f0e: .. Merging from d0f21126475cffe8e93d4f4473e6820e97737f0e: Wikidata logo as loading screen in embeds Change-Id: Ia65d37f5be71d653f61187b9a78310955f685264 --- M embed.html 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: Smalyshev: Verified; Looks good to me, approved diff --git a/embed.html b/embed.html index 0a70fa1..f697c68 100644 --- a/embed.html +++ b/embed.html @@ -12,16 +12,21 @@ - - Loading + + + Loading + + https://upload.wikimedia.org/wikipedia/commons/6/66/Wikidata-logo-en.svg); + background-repeat:no-repeat; background-position:center;"> Error - Wikidata.org + Wikidata.org -- To view, visit https://gerrit.wikimedia.org/r/295745 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia65d37f5be71d653f61187b9a78310955f685264 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui-deploy Gerrit-Branch: production Gerrit-Owner: Smalyshev Gerrit-Reviewer: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix unit tests running on non-DB environment - change (mediawiki/core)
Smalyshev has uploaded a new change for review. https://gerrit.wikimedia.org/r/295769 Change subject: Fix unit tests running on non-DB environment .. Fix unit tests running on non-DB environment Bug: T138551 Change-Id: Ie1d3c8b24e5271d4e12f4190400531cbe606bfd4 --- M tests/phpunit/includes/search/SearchEngineTest.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/69/295769/1 diff --git a/tests/phpunit/includes/search/SearchEngineTest.php b/tests/phpunit/includes/search/SearchEngineTest.php index 055e982..ec4c3a5 100644 --- a/tests/phpunit/includes/search/SearchEngineTest.php +++ b/tests/phpunit/includes/search/SearchEngineTest.php @@ -50,6 +50,11 @@ return; } + $searchType = $this->db->getSearchEngine(); + $this->setMwGlobals( [ + 'wgSearchType' => $searchType + ] ); + $this->insertPage( 'Not_Main_Page', 'This is not a main page' ); $this->insertPage( 'Talk:Not_Main_Page', -- To view, visit https://gerrit.wikimedia.org/r/295769 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1d3c8b24e5271d4e12f4190400531cbe606bfd4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for 65d5517 to work with PHP < 5.4 - change (mediawiki...SemanticForms)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295768
Change subject: Fix for 65d5517 to work with PHP < 5.4
..
Fix for 65d5517 to work with PHP < 5.4
Change-Id: Id51d43f0caa4c8bdf95a186bdaa06e55f6c75161
---
M includes/SF_FormPrinter.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/68/295768/1
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index be237bd..4a39367 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -384,7 +384,8 @@
function tableHTML( $tif, $instanceNum ) {
global $sfgFieldNum;
- $gridValues = $tif->getGridValues()[$instanceNum];
+ $allGridValues = $tif->getGridValues();
+ $gridValues = $allGridValues[$instanceNum];
$html = '';
foreach ( $tif->getFields() as $formField ) {
--
To view, visit https://gerrit.wikimedia.org/r/295768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id51d43f0caa4c8bdf95a186bdaa06e55f6c75161
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for querying notifications not associated with a... - change (mediawiki...Echo)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295767
Change subject: Add support for querying notifications not associated with any
page
..
Add support for querying notifications not associated with any page
Uses the magic value '[]' to mean 'no title'. This is a bit ugly,
but I think introducing an additional ¬withouttitle=1 parameter
is uglier and results in more code.
Change-Id: I83278182aeaf3905eb0f3e24c4c6c247720b1e76
---
M i18n/en.json
M includes/api/ApiEchoNotifications.php
M includes/mapper/NotificationMapper.php
M modules/api/mw.echo.api.EchoApi.js
4 files changed, 20 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/67/295767/1
diff --git a/i18n/en.json b/i18n/en.json
index b175404..4e6f392 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -268,7 +268,7 @@
"apihelp-query+notifications-param-alertunreadfirst": "Whether to show
unread message notifications first (only used if groupbysection is set).",
"apihelp-query+notifications-param-messagecontinue": "When more message
results are available, use this to continue.",
"apihelp-query+notifications-param-messageunreadfirst": "Whether to
show unread alert notifications first (only used if groupbysection is set).",
- "apihelp-query+notifications-param-titles": "Only return notifications
for these pages.",
+ "apihelp-query+notifications-param-titles": "Only return notifications
for these pages. To get notifications not associated with any page, use [] as a
title.",
"apihelp-query+notifications-example-1": "List notifications",
"apihelp-query+notifications-example-2": "List notifications, grouped
by section, with counts",
"apihelp-query+unreadnotificationpages-description": "Get pages for
which there are unread notifications for the current user.",
diff --git a/includes/api/ApiEchoNotifications.php
b/includes/api/ApiEchoNotifications.php
index 3fc66d1..fa78900 100644
--- a/includes/api/ApiEchoNotifications.php
+++ b/includes/api/ApiEchoNotifications.php
@@ -78,6 +78,9 @@
$titles = null;
if ( $params['titles'] ) {
$titles = array_values( array_filter( array_map(
'Title::newFromText', $params['titles'] ) ) );
+ if ( in_array( '[]', $params['titles'] ) ) {
+ $titles[] = null;
+ }
}
$result = array();
diff --git a/includes/mapper/NotificationMapper.php
b/includes/mapper/NotificationMapper.php
index c766f2f..350a5a0 100644
--- a/includes/mapper/NotificationMapper.php
+++ b/includes/mapper/NotificationMapper.php
@@ -98,6 +98,7 @@
* @param string $continue Used for offset
* @param string[] $eventTypes
* @param Title[] $titles If set, only return notifications for these
pages.
+* To find notifications not associated with any page, add null as an
element to this array.
* @param int $dbSource Use master or slave database
* @return EchoNotification[]
*/
@@ -123,6 +124,7 @@
* @param string $continue Used for offset
* @param string[] $eventTypes
* @param Title[] $titles If set, only return notifications for these
pages.
+* To find notifications not associated with any page, add null as an
element to this array.
* @param int $dbSource Use master or slave database
* @return EchoNotification[]
*/
@@ -146,6 +148,7 @@
* @param array $eventTypes Event types to load
* @param array $excludeEventIds Event id's to exclude.
* @param Title[] $titles If set, only return notifications for these
pages.
+* To find notifications not associated with any page, add null as an
element to this array.
* @return EchoNotification[]
*/
public function fetchByUser( User $user, $limit, $continue, array
$eventTypes = array(), array $excludeEventIds = array(), array $titles = null )
{
@@ -168,7 +171,9 @@
protected function getIdsForTitles( array $titles ) {
$ids = array();
foreach ( $titles as $title ) {
- if ( $title->exists() ) {
+ if ( !$title ) {
+ $ids[] = null;
+ } elseif ( $title->exists() ) {
$ids[] = $title->getArticleId();
}
}
diff --git a/modules/api/mw.echo.api.EchoApi.js
b/modules/api/mw.echo.api.EchoApi.js
index a37a0b7..f342bac 100644
--- a/modules/api/mw.echo.api.EchoApi.js
+++ b/modules/api/mw.echo.api.EchoApi.js
@@ -96,11 +96,13 @@
* defining the offset to fetch notifications
* @param {string} [filterObject.readState] Notification read
* state, 'all', 'r
[MediaWiki-commits] [Gerrit] Check if a page is a special page without creating a new Title - change (mediawiki...MobileFrontend)
Bmansurov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295766
Change subject: Check if a page is a special page without creating a new Title
..
Check if a page is a special page without creating a new Title
Follow-up on I65051d198b0916b1968d1a8d2f5a6583ad983461.
Bug: T136617
Change-Id: I069dfb92b513e086a5816f6c8c0d02c19600e339
---
M includes/MobileFrontend.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/66/295766/1
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 05e9c63..da6e24d 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -821,7 +821,7 @@
];
} elseif (
!Title::makeTitleSafe( $title->getNamespace(),
strtok( $title->getText(), '/' ) )
- ->equals( SpecialPage::getTitleFor(
'MobileCite' ) )
+ ->isSpecial( 'MobileCite' )
) {
// Add canonical link to mobile pages (except
for Special:MobileCite),
// instead of noindex - bug T91183.
--
To view, visit https://gerrit.wikimedia.org/r/295766
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I069dfb92b513e086a5816f6c8c0d02c19600e339
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] etherpad-restore: Use etherpad1001b - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: etherpad-restore: Use etherpad1001b
..
etherpad-restore: Use etherpad1001b
Bug: T138516
Change-Id: Ia2aa8b4f64a72491d0ea780189d4ed5bc0d5cc22
---
M modules/role/manifests/cache/misc.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index 6659f4e..32d7932 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -103,7 +103,7 @@
'etherpadrestore' => {
'dynamic' => 'no',
'type' => 'random',
-'backends' => ['etherpad1001.eqiad.wmnet'],
+'backends' => ['etherpad1001b.eqiad.wmnet'],
'be_opts' => merge($app_def_be_opts, { 'port' => 9002 }),
'req_host' => 'etherpad-restore.wikimedia.org',
},
--
To view, visit https://gerrit.wikimedia.org/r/295764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2aa8b4f64a72491d0ea780189d4ed5bc0d5cc22
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
Gerrit-Reviewer: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce etherpad100b.eqiad.wmnet - change (operations/dns)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Introduce etherpad100b.eqiad.wmnet .. Introduce etherpad100b.eqiad.wmnet Bug: T138516 Change-Id: Ic48258670a30eec272f6361a1f33479eb020e683 --- M templates/wmnet 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/templates/wmnet b/templates/wmnet index 63ad86c..934d6f7 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -383,6 +383,7 @@ es1018 1H IN A10.64.48.115 es1019 1H IN A10.64.48.116 etherpad10011H IN A10.64.32.177 ; VM on the ganeti01.svc.eqiad.wmnet cluster +etherpad1001b 1H IN CNAMEetherpad1001 ; T138516 eventlog10011H IN A10.64.32.167 fluorine1H IN A10.64.0.21 francium1H IN A10.64.32.168 -- To view, visit https://gerrit.wikimedia.org/r/295763 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic48258670a30eec272f6361a1f33479eb020e683 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Match the expected format of 'response' log key - change (mediawiki...EventBus)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295765
Change subject: Match the expected format of 'response' log key
..
Match the expected format of 'response' log key
All sources that log a 'response' value need to use the same format.
Make EventBus compatible with how Math extension utilizes the response
field.
Bug: T138539
Change-Id: I71bd2ee45c132d698fd8689d86674497bb3fa817
---
M EventBus.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus
refs/changes/65/295765/1
diff --git a/EventBus.php b/EventBus.php
index d8c8354..1b5fd29 100644
--- a/EventBus.php
+++ b/EventBus.php
@@ -70,7 +70,7 @@
private function onError( $ret ) {
$message = empty( $ret['error'] ) ? $ret['code'] . ': ' .
$ret['reason'] : $ret['error'];
- $context = [ 'response' => $ret['body'] ];
+ $context = [ 'response' => [ 'body' => $ret['body'] ] ];
$logger = LoggerFactory::getInstance( 'EventBus' );
$logger->error( "Unable to deliver event: ${message}", $context
);
--
To view, visit https://gerrit.wikimedia.org/r/295765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71bd2ee45c132d698fd8689d86674497bb3fa817
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: wmf/1.28.0-wmf.3
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] etherpad-restore: Use etherpad1001b - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295764
Change subject: etherpad-restore: Use etherpad1001b
..
etherpad-restore: Use etherpad1001b
Bug: T138516
Change-Id: Ia2aa8b4f64a72491d0ea780189d4ed5bc0d5cc22
---
M modules/role/manifests/cache/misc.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/295764/1
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index 6659f4e..32d7932 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -103,7 +103,7 @@
'etherpadrestore' => {
'dynamic' => 'no',
'type' => 'random',
-'backends' => ['etherpad1001.eqiad.wmnet'],
+'backends' => ['etherpad1001b.eqiad.wmnet'],
'be_opts' => merge($app_def_be_opts, { 'port' => 9002 }),
'req_host' => 'etherpad-restore.wikimedia.org',
},
--
To view, visit https://gerrit.wikimedia.org/r/295764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2aa8b4f64a72491d0ea780189d4ed5bc0d5cc22
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce etherpad100b.eqiad.wmnet - change (operations/dns)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/295763 Change subject: Introduce etherpad100b.eqiad.wmnet .. Introduce etherpad100b.eqiad.wmnet Bug: T138516 Change-Id: Ic48258670a30eec272f6361a1f33479eb020e683 --- M templates/wmnet 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/63/295763/1 diff --git a/templates/wmnet b/templates/wmnet index 63ad86c..934d6f7 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -383,6 +383,7 @@ es1018 1H IN A10.64.48.115 es1019 1H IN A10.64.48.116 etherpad10011H IN A10.64.32.177 ; VM on the ganeti01.svc.eqiad.wmnet cluster +etherpad1001b 1H IN CNAMEetherpad1001 ; T138516 eventlog10011H IN A10.64.32.167 fluorine1H IN A10.64.0.21 francium1H IN A10.64.32.168 -- To view, visit https://gerrit.wikimedia.org/r/295763 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic48258670a30eec272f6361a1f33479eb020e683 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove duplicate keys from log message - change (mediawiki...Math)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/295762 Change subject: Remove duplicate keys from log message .. Remove duplicate keys from log message Bug: T138539 Change-Id: I2289864f20f764e1d9c74a282b3e9d1e1155c11b --- M MathRestbaseInterface.php 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/62/295762/1 diff --git a/MathRestbaseInterface.php b/MathRestbaseInterface.php index d2eef4f..c8b1834 100644 --- a/MathRestbaseInterface.php +++ b/MathRestbaseInterface.php @@ -401,10 +401,12 @@ } return $response['body']; } + // Remove "convenience" duplicate keys put in place by MultiHttpClient + unset( $response[0], $response[1], $response[2], $response[3], $response[4] ); $this->log()->error( 'Restbase math server problem:', [ 'request' => $request, 'response' => $response, - 'type' => $type, + 'math_type' => $type, 'tex' => $this->tex ] ); throw new MWException( "Cannot get $type. Server problem." ); -- To view, visit https://gerrit.wikimedia.org/r/295762 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2289864f20f764e1d9c74a282b3e9d1e1155c11b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: wmf/1.28.0-wmf.3 Gerrit-Owner: EBernhardson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move TFA card strings to strings_no_translate - change (apps...wikipedia)
Mholloway has uploaded a new change for review. https://gerrit.wikimedia.org/r/295761 Change subject: Move TFA card strings to strings_no_translate .. Move TFA card strings to strings_no_translate The TFA card is for now an experimental English-only card, so its strings do not need to be translated to other languages. Change-Id: I27d5ef3e9e687e50d5630bfe2f5e18ff10932832 --- M app/src/main/res/values/strings.xml M app/src/main/res/values/strings_no_translate.xml 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/61/295761/1 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4cae1e4..d1d051c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -319,7 +319,5 @@ Continue reading Because you read -Featured article -Save diff --git a/app/src/main/res/values/strings_no_translate.xml b/app/src/main/res/values/strings_no_translate.xml index ff7300e..8dafea8 100644 --- a/app/src/main/res/values/strings_no_translate.xml +++ b/app/src/main/res/values/strings_no_translate.xml @@ -53,6 +53,11 @@ 1 day ago %d days ago + + +Featured article +Save + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -- To view, visit https://gerrit.wikimedia.org/r/295761 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27d5ef3e9e687e50d5630bfe2f5e18ff10932832 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Mholloway ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove mobile-text route - change (mediawiki...mobileapps)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove mobile-text route
..
Hygiene: Remove mobile-text route
This isn't being actively developed and there are no plans to return to it
at present. Let's remove it and revive it later if things change.
Change-Id: Ica899e375f26ec24cd5448c32f8bc8c10ef1c47e
---
D routes/mobile-text.js
M spec.yaml
D test/features/mobile-text/pagecontent.js
3 files changed, 0 insertions(+), 250 deletions(-)
Approvals:
BearND: Looks good to me, approved
Dbrant: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/routes/mobile-text.js b/routes/mobile-text.js
deleted file mode 100644
index c69afa7..000
--- a/routes/mobile-text.js
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * mobileapp/lite provides page content for a potential lite Mobile App.
- * The goal is to avoid having to use a web view and style the content
natively inside the app
- * using plain TextViews.
- * The payload should not have any extra data, and should be easy to consume
by the Lite App.
- *
- * Status: Prototype -- not ready for production
- * Currently using the mobileview action MW API, and removing some data we
don't display.
- * TODO: Split the "text" objects of each section into paragraph and table
objects
- * TODO: add some transformations that currently are being done by the apps
and remove some more unneeded data
- */
-
-'use strict';
-
-//var BBPromise = require('bluebird');
-var preq = require('preq');
-var domino = require('domino');
-var sUtil = require('../lib/util');
-var mUtil = require('../lib/mobile-util');
-var mwapi = require('../lib/mwapi');
-
-// shortcut
-var HTTPError = sUtil.HTTPError;
-
-
-/**
- * The main router object
- */
-var router = sUtil.router();
-
-/**
- * The main application object reported when this module is require()d
- */
-var app;
-
-
-function rmSelectorAll(doc, selector) {
-var ps = doc.querySelectorAll(selector) || [];
-for (var idx = 0; idx < ps.length; idx++) {
-var node = ps[idx];
-node.parentNode.removeChild(node);
-}
-}
-
-function structureThumbnail(thumbDiv) {
-var thumb = {};
-var thumbimg = thumbDiv.querySelector("img");
-if (thumbimg) {
-thumb.src = thumbimg.getAttribute("src");
-}
-var videoDiv = thumbDiv.querySelector("div.PopUpMediaTransform");
-if (videoDiv && thumbimg) {
-thumb.type = "video";
-thumb.name = thumbimg.alt;
-} else {
-thumb.type = "image";
-var alink = thumbDiv.querySelector("a");
-if (alink) {
-thumb.name = alink.href;
-}
-}
-var caption = thumbDiv.querySelector("div.thumbcaption");
-if (caption) {
-thumb.caption = caption.innerHTML;
-}
-return thumb;
-}
-
-/**
- * Nuke stuff from the DOM we don't want.
- */
-function runDomTransforms(section) {
-var doc = domino.createDocument(section.text);
-rmSelectorAll(doc, 'div.noprint');
-rmSelectorAll(doc, 'div.infobox');
-rmSelectorAll(doc, 'div.metadata');
-rmSelectorAll(doc, 'table'); // TODO: later we may want to transform some
of the tables into a JSON structure
-
-
-// and break it down into items...
-section.items = [];
-var itemIndex = 0;
-var thumbnails, tid, thumb;
-
-var hatnotes = doc.querySelectorAll("div.hatnote") || [];
-for (var hid = 0; hid < hatnotes.length; hid++) {
-section.items[itemIndex] = {};
-section.items[itemIndex].type = "hatnote";
-section.items[itemIndex].text = hatnotes[hid].innerHTML;
-itemIndex++;
-}
-
-var ps = doc.querySelectorAll("p") || [];
-for (var pid = 0; pid < ps.length; pid++) {
-var p = ps[pid];
-
-if (p.innerHTML.length < 4) {
-continue;
-}
-
-section.items[itemIndex] = {};
-section.items[itemIndex].type = "p";
-section.items[itemIndex].text = p.innerHTML;
-itemIndex++;
-
-// find all images in this paragraph, and append them as section items
-thumbnails = p.querySelectorAll("div.thumb") || [];
-for (tid = 0; tid < thumbnails.length; tid++) {
-thumb = thumbnails[tid];
-section.items[itemIndex] = structureThumbnail(thumb);
-itemIndex++;
-}
-
-// remove other inline images from this paragraph
-rmSelectorAll(p, 'img');
-// and remove this paragraph from the DOM
-p.parentNode.removeChild(p);
-}
-
-
-// find all images in this section (outside of paragraphs), and append
them as section items
-thumbnails = doc.querySelectorAll("div.thumb") || [];
-for (tid = 0; tid < thumbnails.length; tid++) {
-thumb = thumbnails[tid];
-section.items[itemIndex] = structureThumbnail(thumb);
-itemIndex++;
-}
-
-delete section.text;
-}
-
-/**
- * GET {domain}/v1/page/mobile-text/
[MediaWiki-commits] [Gerrit] Fix position of page filters in firefox - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix position of page filters in firefox
..
Fix position of page filters in firefox
Bug: T138454
Change-Id: Ib19f9ab1cedc4613c9ac3a07d40111dd39a55774
---
M modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Mooeypoo: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
b/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
index 15b7338..1966d9d 100644
--- a/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
+++ b/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
@@ -3,6 +3,7 @@
.mw-echo-ui-pageNotificationsOptionWidget {
width: 100%;
box-sizing: border-box;
+ clear: both;
&-icon {
float: left;
--
To view, visit https://gerrit.wikimedia.org/r/295752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib19f9ab1cedc4613c9ac3a07d40111dd39a55774
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Sbisson
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] Set up etherpad-restore.wikimedia.org - change (operations/dns)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Set up etherpad-restore.wikimedia.org .. Set up etherpad-restore.wikimedia.org Set up a temporary etherpad host. See I860eb2af2fe and T138516 for the reason behind this Bug: T138516 Change-Id: I05fd8cd3c88d31153c4b633932a354f2c4dec660 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 78dcb1d..9a916bb 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -652,6 +652,7 @@ datasets 600 IN DYNA geoip!misc-addrs download 600 IN DYNA geoip!text-addrs etherpad 600 IN DYNA geoip!misc-addrs +etherpad-restore 600 IN DYNA geoip!misc-addrs fundraising 1H IN CNAMEfundraising-eqiad ganglia 1H IN CNAMEuranium hue 600 IN DYNA geoip!misc-addrs -- To view, visit https://gerrit.wikimedia.org/r/295760 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05fd8cd3c88d31153c4b633932a354f2c4dec660 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set up etherpad-restore.wikimedia.org - change (operations/dns)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/295760 Change subject: Set up etherpad-restore.wikimedia.org .. Set up etherpad-restore.wikimedia.org Set up a temporary etherpad host. See I860eb2af2fe and T138516 for the reason behind this Bug: T138516 Change-Id: I05fd8cd3c88d31153c4b633932a354f2c4dec660 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/60/295760/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 78dcb1d..9a916bb 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -652,6 +652,7 @@ datasets 600 IN DYNA geoip!misc-addrs download 600 IN DYNA geoip!text-addrs etherpad 600 IN DYNA geoip!misc-addrs +etherpad-restore 600 IN DYNA geoip!misc-addrs fundraising 1H IN CNAMEfundraising-eqiad ganglia 1H IN CNAMEuranium hue 600 IN DYNA geoip!misc-addrs -- To view, visit https://gerrit.wikimedia.org/r/295760 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05fd8cd3c88d31153c4b633932a354f2c4dec660 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Feed: Remove placeholder String fields from AggregatedFeedCo... - change (apps...wikipedia)
Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295759
Change subject: Feed: Remove placeholder String fields from
AggregatedFeedContent model
..
Feed: Remove placeholder String fields from AggregatedFeedContent model
These add nothing and break aggregated feed content deserialization
every time a new endpoint is added. Let's just take them out and add
fields as we need them.
Change-Id: I92cb538f3a5e3fea6961ff30f52c4a74fc702452
---
M app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/59/295759/1
diff --git
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
index 831a0f9..8ba51a7 100644
--- a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
+++ b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
@@ -9,10 +9,6 @@
@SuppressWarnings("NullableProblems") @NonNull private CardPageItem tfa;
@SuppressWarnings("NullableProblems") @NonNull private MostReadArticles
mostread;
@SuppressWarnings("NullableProblems") @NonNull private CardPageItem random;
-// Note: the below just have placeholder strings for now
-@SuppressWarnings("NullableProblems") @NonNull private String news;
-@SuppressWarnings("NullableProblems") @NonNull private String image;
-@SuppressWarnings("NullableProblems") @NonNull private String video;
public CardPageItem tfa() {
return tfa;
--
To view, visit https://gerrit.wikimedia.org/r/295759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92cb538f3a5e3fea6961ff30f52c4a74fc702452
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "all wikis to 1.28.0-wmf.7" - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert "all wikis to 1.28.0-wmf.7"
..
Revert "all wikis to 1.28.0-wmf.7"
This reverts commit ca05baeac5c4fa4cfc35d6004db3d5c8e16092fc.
Save timing regression
Change-Id: Id2bb349341716e9f009a9afb1b302619baebe296
---
M wikiversions.json
1 file changed, 297 insertions(+), 297 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikiversions.json b/wikiversions.json
index b7cfd06..0bc867f 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,39 +1,39 @@
{
-"aawiki": "php-1.28.0-wmf.7",
+"aawiki": "php-1.28.0-wmf.6",
"aawikibooks": "php-1.28.0-wmf.7",
"aawiktionary": "php-1.28.0-wmf.7",
-"abwiki": "php-1.28.0-wmf.7",
+"abwiki": "php-1.28.0-wmf.6",
"abwiktionary": "php-1.28.0-wmf.7",
-"acewiki": "php-1.28.0-wmf.7",
+"acewiki": "php-1.28.0-wmf.6",
"advisorywiki": "php-1.28.0-wmf.7",
-"adywiki": "php-1.28.0-wmf.7",
-"afwiki": "php-1.28.0-wmf.7",
+"adywiki": "php-1.28.0-wmf.6",
+"afwiki": "php-1.28.0-wmf.6",
"afwikibooks": "php-1.28.0-wmf.7",
"afwikiquote": "php-1.28.0-wmf.7",
"afwiktionary": "php-1.28.0-wmf.7",
-"akwiki": "php-1.28.0-wmf.7",
+"akwiki": "php-1.28.0-wmf.6",
"akwikibooks": "php-1.28.0-wmf.7",
"akwiktionary": "php-1.28.0-wmf.7",
-"alswiki": "php-1.28.0-wmf.7",
+"alswiki": "php-1.28.0-wmf.6",
"alswikibooks": "php-1.28.0-wmf.7",
"alswikiquote": "php-1.28.0-wmf.7",
"alswiktionary": "php-1.28.0-wmf.7",
-"amwiki": "php-1.28.0-wmf.7",
+"amwiki": "php-1.28.0-wmf.6",
"amwikiquote": "php-1.28.0-wmf.7",
"amwiktionary": "php-1.28.0-wmf.7",
-"angwiki": "php-1.28.0-wmf.7",
+"angwiki": "php-1.28.0-wmf.6",
"angwikibooks": "php-1.28.0-wmf.7",
"angwikiquote": "php-1.28.0-wmf.7",
"angwikisource": "php-1.28.0-wmf.7",
"angwiktionary": "php-1.28.0-wmf.7",
-"anwiki": "php-1.28.0-wmf.7",
+"anwiki": "php-1.28.0-wmf.6",
"anwiktionary": "php-1.28.0-wmf.7",
-"arbcom_dewiki": "php-1.28.0-wmf.7",
-"arbcom_enwiki": "php-1.28.0-wmf.7",
-"arbcom_fiwiki": "php-1.28.0-wmf.7",
-"arbcom_nlwiki": "php-1.28.0-wmf.7",
-"arcwiki": "php-1.28.0-wmf.7",
-"arwiki": "php-1.28.0-wmf.7",
+"arbcom_dewiki": "php-1.28.0-wmf.6",
+"arbcom_enwiki": "php-1.28.0-wmf.6",
+"arbcom_fiwiki": "php-1.28.0-wmf.6",
+"arbcom_nlwiki": "php-1.28.0-wmf.6",
+"arcwiki": "php-1.28.0-wmf.6",
+"arwiki": "php-1.28.0-wmf.6",
"arwikibooks": "php-1.28.0-wmf.7",
"arwikimedia": "php-1.28.0-wmf.7",
"arwikinews": "php-1.28.0-wmf.7",
@@ -41,80 +41,80 @@
"arwikisource": "php-1.28.0-wmf.7",
"arwikiversity": "php-1.28.0-wmf.7",
"arwiktionary": "php-1.28.0-wmf.7",
-"arzwiki": "php-1.28.0-wmf.7",
-"astwiki": "php-1.28.0-wmf.7",
+"arzwiki": "php-1.28.0-wmf.6",
+"astwiki": "php-1.28.0-wmf.6",
"astwikibooks": "php-1.28.0-wmf.7",
"astwikiquote": "php-1.28.0-wmf.7",
"astwiktionary": "php-1.28.0-wmf.7",
-"aswiki": "php-1.28.0-wmf.7",
+"aswiki": "php-1.28.0-wmf.6",
"aswikibooks": "php-1.28.0-wmf.7",
"aswikisource": "php-1.28.0-wmf.7",
"aswiktionary": "php-1.28.0-wmf.7",
"auditcomwiki": "php-1.28.0-wmf.7",
-"avwiki": "php-1.28.0-wmf.7",
+"avwiki": "php-1.28.0-wmf.6",
"avwiktionary": "php-1.28.0-wmf.7",
-"aywiki": "php-1.28.0-wmf.7",
+"aywiki": "php-1.28.0-wmf.6",
"aywikibooks": "php-1.28.0-wmf.7",
"aywiktionary": "php-1.28.0-wmf.7",
-"azbwiki": "php-1.28.0-wmf.7",
-"azwiki": "php-1.28.0-wmf.7",
+"azbwiki": "php-1.28.0-wmf.6",
+"azwiki": "php-1.28.0-wmf.6",
"azwikibooks": "php-1.28.0-wmf.7",
"azwikiquote": "php-1.28.0-wmf.7",
"azwikisource": "php-1.28.0-wmf.7",
"azwiktionary": "php-1.28.0-wmf.7",
-"barwiki": "php-1.28.0-wmf.7",
-"bat_smgwiki": "php-1.28.0-wmf.7",
-"bawiki": "php-1.28.0-wmf.7",
+"barwiki": "php-1.28.0-wmf.6",
+"bat_smgwiki": "php-1.28.0-wmf.6",
+"bawiki": "php-1.28.0-wmf.6",
"bawikibooks": "php-1.28.0-wmf.7",
-"bclwiki": "php-1.28.0-wmf.7",
+"bclwiki": "php-1.28.0-wmf.6",
"bdwikimedia": "php-1.28.0-wmf.7",
-"be_x_oldwiki": "php-1.28.0-wmf.7",
+"be_x_oldwiki": "php-1.28.0-wmf.6",
"betawikiversity": "php-1.28.0-wmf.7",
-"bewiki": "php-1.28.0-wmf.7",
+"bewiki": "php-1.28.0-wmf.6",
"bewikibooks": "php-1.28.0-wmf.7",
"bewikimedia": "php-1.28.0-wmf.7",
"bewikiquote": "php-1.28.0-wmf.7",
"bewikisource": "php-1.28.0-wmf.7",
"bewiktionary": "php-1.28.0-wmf.7",
-"bgwiki": "php-1.28.0-wmf.7",
+"bgwiki": "php-1.28.0-wmf.6",
"bgwikibooks": "php-1.28.0-wmf.7",
"bgwikinews": "php-1.28.0-wmf.7",
"bgwikiquote": "php-1.28.0-wmf.7",
"bgwikisource": "php-1.28.0-wmf.7",
"bgwiktionary": "php-1.28.0-wmf.7",
[MediaWiki-commits] [Gerrit] Revert "all wikis to 1.28.0-wmf.7" - change (operations/mediawiki-config)
Thcipriani has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295758
Change subject: Revert "all wikis to 1.28.0-wmf.7"
..
Revert "all wikis to 1.28.0-wmf.7"
This reverts commit ca05baeac5c4fa4cfc35d6004db3d5c8e16092fc.
Save timing regression
Change-Id: Id2bb349341716e9f009a9afb1b302619baebe296
---
M wikiversions.json
1 file changed, 297 insertions(+), 297 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/58/295758/1
diff --git a/wikiversions.json b/wikiversions.json
index b7cfd06..0bc867f 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,39 +1,39 @@
{
-"aawiki": "php-1.28.0-wmf.7",
+"aawiki": "php-1.28.0-wmf.6",
"aawikibooks": "php-1.28.0-wmf.7",
"aawiktionary": "php-1.28.0-wmf.7",
-"abwiki": "php-1.28.0-wmf.7",
+"abwiki": "php-1.28.0-wmf.6",
"abwiktionary": "php-1.28.0-wmf.7",
-"acewiki": "php-1.28.0-wmf.7",
+"acewiki": "php-1.28.0-wmf.6",
"advisorywiki": "php-1.28.0-wmf.7",
-"adywiki": "php-1.28.0-wmf.7",
-"afwiki": "php-1.28.0-wmf.7",
+"adywiki": "php-1.28.0-wmf.6",
+"afwiki": "php-1.28.0-wmf.6",
"afwikibooks": "php-1.28.0-wmf.7",
"afwikiquote": "php-1.28.0-wmf.7",
"afwiktionary": "php-1.28.0-wmf.7",
-"akwiki": "php-1.28.0-wmf.7",
+"akwiki": "php-1.28.0-wmf.6",
"akwikibooks": "php-1.28.0-wmf.7",
"akwiktionary": "php-1.28.0-wmf.7",
-"alswiki": "php-1.28.0-wmf.7",
+"alswiki": "php-1.28.0-wmf.6",
"alswikibooks": "php-1.28.0-wmf.7",
"alswikiquote": "php-1.28.0-wmf.7",
"alswiktionary": "php-1.28.0-wmf.7",
-"amwiki": "php-1.28.0-wmf.7",
+"amwiki": "php-1.28.0-wmf.6",
"amwikiquote": "php-1.28.0-wmf.7",
"amwiktionary": "php-1.28.0-wmf.7",
-"angwiki": "php-1.28.0-wmf.7",
+"angwiki": "php-1.28.0-wmf.6",
"angwikibooks": "php-1.28.0-wmf.7",
"angwikiquote": "php-1.28.0-wmf.7",
"angwikisource": "php-1.28.0-wmf.7",
"angwiktionary": "php-1.28.0-wmf.7",
-"anwiki": "php-1.28.0-wmf.7",
+"anwiki": "php-1.28.0-wmf.6",
"anwiktionary": "php-1.28.0-wmf.7",
-"arbcom_dewiki": "php-1.28.0-wmf.7",
-"arbcom_enwiki": "php-1.28.0-wmf.7",
-"arbcom_fiwiki": "php-1.28.0-wmf.7",
-"arbcom_nlwiki": "php-1.28.0-wmf.7",
-"arcwiki": "php-1.28.0-wmf.7",
-"arwiki": "php-1.28.0-wmf.7",
+"arbcom_dewiki": "php-1.28.0-wmf.6",
+"arbcom_enwiki": "php-1.28.0-wmf.6",
+"arbcom_fiwiki": "php-1.28.0-wmf.6",
+"arbcom_nlwiki": "php-1.28.0-wmf.6",
+"arcwiki": "php-1.28.0-wmf.6",
+"arwiki": "php-1.28.0-wmf.6",
"arwikibooks": "php-1.28.0-wmf.7",
"arwikimedia": "php-1.28.0-wmf.7",
"arwikinews": "php-1.28.0-wmf.7",
@@ -41,80 +41,80 @@
"arwikisource": "php-1.28.0-wmf.7",
"arwikiversity": "php-1.28.0-wmf.7",
"arwiktionary": "php-1.28.0-wmf.7",
-"arzwiki": "php-1.28.0-wmf.7",
-"astwiki": "php-1.28.0-wmf.7",
+"arzwiki": "php-1.28.0-wmf.6",
+"astwiki": "php-1.28.0-wmf.6",
"astwikibooks": "php-1.28.0-wmf.7",
"astwikiquote": "php-1.28.0-wmf.7",
"astwiktionary": "php-1.28.0-wmf.7",
-"aswiki": "php-1.28.0-wmf.7",
+"aswiki": "php-1.28.0-wmf.6",
"aswikibooks": "php-1.28.0-wmf.7",
"aswikisource": "php-1.28.0-wmf.7",
"aswiktionary": "php-1.28.0-wmf.7",
"auditcomwiki": "php-1.28.0-wmf.7",
-"avwiki": "php-1.28.0-wmf.7",
+"avwiki": "php-1.28.0-wmf.6",
"avwiktionary": "php-1.28.0-wmf.7",
-"aywiki": "php-1.28.0-wmf.7",
+"aywiki": "php-1.28.0-wmf.6",
"aywikibooks": "php-1.28.0-wmf.7",
"aywiktionary": "php-1.28.0-wmf.7",
-"azbwiki": "php-1.28.0-wmf.7",
-"azwiki": "php-1.28.0-wmf.7",
+"azbwiki": "php-1.28.0-wmf.6",
+"azwiki": "php-1.28.0-wmf.6",
"azwikibooks": "php-1.28.0-wmf.7",
"azwikiquote": "php-1.28.0-wmf.7",
"azwikisource": "php-1.28.0-wmf.7",
"azwiktionary": "php-1.28.0-wmf.7",
-"barwiki": "php-1.28.0-wmf.7",
-"bat_smgwiki": "php-1.28.0-wmf.7",
-"bawiki": "php-1.28.0-wmf.7",
+"barwiki": "php-1.28.0-wmf.6",
+"bat_smgwiki": "php-1.28.0-wmf.6",
+"bawiki": "php-1.28.0-wmf.6",
"bawikibooks": "php-1.28.0-wmf.7",
-"bclwiki": "php-1.28.0-wmf.7",
+"bclwiki": "php-1.28.0-wmf.6",
"bdwikimedia": "php-1.28.0-wmf.7",
-"be_x_oldwiki": "php-1.28.0-wmf.7",
+"be_x_oldwiki": "php-1.28.0-wmf.6",
"betawikiversity": "php-1.28.0-wmf.7",
-"bewiki": "php-1.28.0-wmf.7",
+"bewiki": "php-1.28.0-wmf.6",
"bewikibooks": "php-1.28.0-wmf.7",
"bewikimedia": "php-1.28.0-wmf.7",
"bewikiquote": "php-1.28.0-wmf.7",
"bewikisource": "php-1.28.0-wmf.7",
"bewiktionary": "php-1.28.0-wmf.7",
-"bgwiki": "php-1.28.0-wmf.7",
+"bgwiki": "php-1.28.0-wmf.6",
"bgwikibooks": "php-1.28.0-wmf.7",
"bgwikinews": "php-1.28.0-wmf.7",
"bgwikiquote": "php-1.28.0-wmf.7",
"bgwikisource": "php-1.
[MediaWiki-commits] [Gerrit] cache::misc: Set up a temporary etherpad host - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: cache::misc: Set up a temporary etherpad host
..
cache::misc: Set up a temporary etherpad host
Set up a temporary etherpad host to allow interested users to self-serve
restoring pads that were not restored previously while bringing the
service into a working state again after the recent database corruption.
We go for this approach only because it's Wikimania 2016 time and a lot
of interesting pads might have be lost irrevocably before their
users/owners had any chance to follow the best practice of archiving
them elsewhere.
Bug: T138516
Change-Id: I860eb2af2fe1310f19c1c3a1e48a69fa723b2cef
---
M modules/role/manifests/cache/misc.pp
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index 38b3372..6659f4e 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -99,6 +99,14 @@
'be_opts' => merge($app_def_be_opts, { 'port' => 9001 }),
'req_host' => 'etherpad.wikimedia.org',
},
+# TODO: Temporary etherpad Host to allow self-serving of pad
restoration. See T138516
+'etherpadrestore' => {
+'dynamic' => 'no',
+'type' => 'random',
+'backends' => ['etherpad1001.eqiad.wmnet'],
+'be_opts' => merge($app_def_be_opts, { 'port' => 9002 }),
+'req_host' => 'etherpad-restore.wikimedia.org',
+},
'gallium' => { # CI server
'dynamic' => 'no',
'type' => 'random',
--
To view, visit https://gerrit.wikimedia.org/r/295757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I860eb2af2fe1310f19c1c3a1e48a69fa723b2cef
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Ema
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cache::misc: Set up a temporary etherpad host - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295757
Change subject: cache::misc: Set up a temporary etherpad host
..
cache::misc: Set up a temporary etherpad host
Set up a temporary etherpad host to allow interested users to self-serve
restoring pads that were not restored previously while bringing the
service into a working state again after the recent database corruption.
We go for this approach only because it's Wikimania 2016 time and a lot
of interesting pads might have be lost irrevocably before their
users/owners had any chance to follow the best practice of archiving
them elsewhere.
Bug: T138516
Change-Id: I860eb2af2fe1310f19c1c3a1e48a69fa723b2cef
---
M modules/role/manifests/cache/misc.pp
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/295757/1
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index 38b3372..6659f4e 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -99,6 +99,14 @@
'be_opts' => merge($app_def_be_opts, { 'port' => 9001 }),
'req_host' => 'etherpad.wikimedia.org',
},
+# TODO: Temporary etherpad Host to allow self-serving of pad
restoration. See T138516
+'etherpadrestore' => {
+'dynamic' => 'no',
+'type' => 'random',
+'backends' => ['etherpad1001.eqiad.wmnet'],
+'be_opts' => merge($app_def_be_opts, { 'port' => 9002 }),
+'req_host' => 'etherpad-restore.wikimedia.org',
+},
'gallium' => { # CI server
'dynamic' => 'no',
'type' => 'random',
--
To view, visit https://gerrit.wikimedia.org/r/295757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I860eb2af2fe1310f19c1c3a1e48a69fa723b2cef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explicitly depend on mediawiki.util where needed - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295756
Change subject: Explicitly depend on mediawiki.util where needed
..
Explicitly depend on mediawiki.util where needed
Various modules use mw.util without explicitly requesting the
dependency this provides it.
This may lead to JS errors when modules are loaded in certain orders.
Bug: T138473
Change-Id: Ibded5536f49e78d6a9d8e240fb0bf7da3cac4e6d
---
M extension.json
M includes/MobileFrontend.hooks.php
2 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/56/295756/1
diff --git a/extension.json b/extension.json
index dc29546..fd07cf6 100644
--- a/extension.json
+++ b/extension.json
@@ -439,6 +439,7 @@
],
"dependencies": [
"mobile.modules",
+ "mediawiki.util",
"mediawiki.language",
"mediawiki.jqueryMsg"
],
@@ -603,6 +604,7 @@
"mobile.browser",
"mobile.oo",
"mobile.user",
+ "mediawiki.util",
"mediawiki.api",
"mediawiki.viewport",
"mobile.settings",
@@ -712,6 +714,7 @@
"mobile.drawers",
"mobile.toast",
"mobile.messageBox",
+ "mediawiki.util",
"mediawiki.confirmCloseWindow",
"mobile.loggingSchemas.edit"
],
@@ -769,6 +772,7 @@
"mobile.editor.common",
"mobile.microAutoSize",
"oojs-ui.styles.icons-editing-core",
+ "mediawiki.util",
"mediawiki.notification"
],
"scripts": [
@@ -877,6 +881,7 @@
"desktop"
],
"dependencies": [
+ "mediawiki.util",
"mediawiki.ui.anchor",
"mobile.editor.common"
],
@@ -1064,6 +1069,7 @@
"desktop"
],
"dependencies": [
+ "mediawiki.util",
"mobile.startup"
],
"templates": {
@@ -1399,6 +1405,7 @@
"dependencies": [
"mobile.startup",
"mobile.toast",
+ "mediawiki.util",
"mediawiki.Title"
],
"scripts": [
@@ -1600,6 +1607,7 @@
"desktop"
],
"dependencies": [
+ "mediawiki.util",
"mediawiki.router",
"mobile.startup",
"mobile.mainMenu",
@@ -1658,6 +1666,7 @@
],
"dependencies": [
"skins.minerva.editor",
+ "mediawiki.util",
"mobile.contentOverlays"
],
"scripts": [
@@ -1672,6 +1681,7 @@
"skins.minerva.editor": {
"class": "MFResourceLoaderParsedMessageModule",
"dependencies": [
+ "mediawiki.util",
"mediawiki.router",
"skins.minerva.icons.images.scripts",
"skins.minerva.scripts",
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 05e9c63..41a63c3 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1119,6 +1119,7 @@
],
'mobile.notifications.overlay' =>
$resourceBoilerplate + [
'dependencies' => [
+ 'mediawiki.util',
'mobile.overlays',
'ext.echo.ui',
],
--
To view, visit https://gerrit.wikimedia.org/r/295756
To unsubscribe, visit
[MediaWiki-commits] [Gerrit] Hygiene: Make most-read section(s) of spec.yaml more descrip... - change (mediawiki...mobileapps)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Make most-read section(s) of spec.yaml more descriptive
..
Hygiene: Make most-read section(s) of spec.yaml more descriptive
Change-Id: I2e5e41731f77a4d6b9d22a971a78b98cee04
---
M spec.yaml
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/spec.yaml b/spec.yaml
index 6e719d1..a9e4742 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -107,7 +107,12 @@
height: /.+/
mostread:
date: /.+/
-articles: [ /.+/ ]
+articles:
+ - views: /.+/
+rank: /.+/
+title: /.+/
+pageid: /.+/
+normalizedtitle: /.+/
random:
title: /.+/
news: /.+/
@@ -205,7 +210,12 @@
content-type: application/json
body:
date: /.+/
- articles: [ /.+/ ]
+ articles:
+- views: /.+/
+ rank: /.+/
+ title: /.+/
+ pageid: /.+/
+ normalizedtitle: /.+/
# from routes/random.js
/{domain}/v1/page/random/summary:
get:
--
To view, visit https://gerrit.wikimedia.org/r/295749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e5e41731f77a4d6b9d22a971a78b98cee04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway
Gerrit-Reviewer: BearND
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Fjalapeno
Gerrit-Reviewer: GWicke
Gerrit-Reviewer: Jhernandez
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: Mhurd
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: Niedzielski
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] In the News endpoint - change (mediawiki...mobileapps)
jenkins-bot has submitted this change and it was merged.
Change subject: In the News endpoint
..
In the News endpoint
Bug: T132767
Change-Id: I78eb6ba1aab9a5bc8edcaf20454db76f4a6b0f68
---
M lib/feed/most-read.js
A lib/feed/news.js
M lib/mobile-util.js
M lib/mwapi.js
M lib/parseDefinition.js
M lib/parsoid-access.js
M routes/aggregated.js
A routes/news.js
M spec.yaml
M test/features/aggregated/aggregated.js
A test/features/news/news.js
M test/lib/mobile-util/mobile-util-test.js
12 files changed, 240 insertions(+), 19 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/feed/most-read.js b/lib/feed/most-read.js
index bb644ce..199256c 100644
--- a/lib/feed/most-read.js
+++ b/lib/feed/most-read.js
@@ -52,7 +52,7 @@
goodTitles = blacklist.filter(rankedTitles)
.slice(0, mwapi.API_QUERY_MAX_TITLES);
queryTitlesList = constructQueryListFrom(goodTitles);
-return mwapi.requestMostReadMetadata(app, req,
queryTitlesList.join('|'));
+return mwapi.getFeedPageListMetadata(app, req,
queryTitlesList.join('|'));
}).then(function (response) {
api.checkResponseStatus(response);
@@ -65,7 +65,7 @@
['title', 'to']]);
mUtil.mergeByProp(goodTitles, normalizations, 'article');
mUtil.fillInMemberKeys(goodTitles, [['title', 'article']]);
-mUtil.mergeByProp(goodTitles, pages, 'title');
+mUtil.mergeByProp(goodTitles, pages, 'title', true);
goodTitles = blacklist.filterSpecialPages(goodTitles, mainPageTitle);
var results = goodTitles.map(function(entry) {
diff --git a/lib/feed/news.js b/lib/feed/news.js
new file mode 100644
index 000..27117e9
--- /dev/null
+++ b/lib/feed/news.js
@@ -0,0 +1,88 @@
+'use strict';
+
+var domino = require('domino');
+var api = require('../api-util');
+var mUtil = require('../mobile-util');
+var mwapi = require('../mwapi');
+var parsoid = require('../parsoid-access');
+var HTTPError = require('../util').HTTPError;
+
+function promise(app, req, dontThrow) {
+if (req.params.domain.indexOf('en.') !== 0) {
+if (dontThrow) {
+return { payload: undefined, meta: undefined };
+}
+throw new HTTPError({
+status: 501,
+type: 'unsupported_language',
+title: 'Language not supported',
+detail: 'The language you have requested is not yet supported.'
+});
+}
+
+var result = {
+payload: [],
+meta: {}
+};
+req.params.title = 'Template:In_the_news';
+return parsoid.getParsoidHtml(app, req)
+.then(function (response) {
+result.meta.etag = parsoid.getRevisionFromEtag(response.headers);
+
+var linkTitles = [];
+var doc = domino.createDocument(response.body);
+var newsList = doc.getElementsByTagName('ul')[0];
+var stories = newsList.getElementsByTagName('li');
+
+for (var j = 0, m = stories.length; j < m; j++) {
+var anchors = stories[j].getElementsByTagName('a');
+var story = {
+story: mUtil.stripMarkup(stories[j].innerHTML).trim(),
+links: []
+};
+
+for (var i = 0, n = anchors.length; i < n; i++) {
+var anchor = anchors[i];
+var title = anchor.href.slice(1);
+story.links.push({ title: title });
+linkTitles.push(title);
+}
+
+result.payload.push(story);
+}
+return mwapi.getFeedPageListMetadata(app, req, linkTitles.join('|'));
+}).then(function(response) {
+api.checkResponseStatus(response);
+
+var query = response.body && response.body.query;
+var normalizations = query && query.normalized;
+var pages = query && query.pages;
+
+mUtil.adjustMemberKeys(normalizations, [['title', 'from'],
+['normalizedtitle', 'to']]);
+mUtil.adjustMemberKeys(pages, [['normalizedtitle', 'title']]);
+mUtil.mergeByProp(pages, normalizations, 'normalizedtitle');
+mUtil.fillInMemberKeys(pages, [['title', 'normalizedtitle']]);
+
+var pageResults = {};
+
+pages.forEach(function(page) {
+pageResults[page.title] = Object.assign(page, {
+description: page.terms
+ && page.terms.description
+ && page.terms.description[0],
+terms: undefined
+});
+});
+
+result.payload.forEach(function(story) {
+mUtil.mergeByProp(story.links, pageResults, 'title', false);
+});
+
+return result;
+});
+}
+
+module.exports = {
+promise: promise
+};
\ No newline at end of file
diff --git a/lib/mobile-util.js b/lib/mobile-util
[MediaWiki-commits] [Gerrit] Revert "Remove SmashPig from gate-and-submit" - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Revert "Remove SmashPig from gate-and-submit" .. Revert "Remove SmashPig from gate-and-submit" No more needed. Was an emergency workaround. This reverts commit 055adf0d1d262bd90014430482c9417001643943. Change-Id: I7b88e353d92ec071d2a0699e16f89396e09a7667 --- M zuul/layout.yaml 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 360eeaf..46bd5c5 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2235,10 +2235,9 @@ test: - composer-php53 - composer-hhvm-trusty -# Fail at least on deployment branch -#gate-and-submit: -# - composer-php53 -# - composer-hhvm-trusty +gate-and-submit: + - composer-php53 + - composer-hhvm-trusty - name: wikimedia/iegreview template: -- To view, visit https://gerrit.wikimedia.org/r/295754 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b88e353d92ec071d2a0699e16f89396e09a7667 Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar 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] Revert "Remove SmashPig from gate-and-submit" - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/295754 Change subject: Revert "Remove SmashPig from gate-and-submit" .. Revert "Remove SmashPig from gate-and-submit" No more needed. Was an emergency workaround. This reverts commit 055adf0d1d262bd90014430482c9417001643943. Change-Id: I7b88e353d92ec071d2a0699e16f89396e09a7667 --- M zuul/layout.yaml 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/54/295754/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index da5d816..a279269 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2235,10 +2235,9 @@ test: - composer-php53 - composer-hhvm-trusty -# Fail at least on deployment branch -#gate-and-submit: -# - composer-php53 -# - composer-hhvm-trusty +gate-and-submit: + - composer-php53 + - composer-hhvm-trusty - name: wikimedia/iegreview template: -- To view, visit https://gerrit.wikimedia.org/r/295754 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b88e353d92ec071d2a0699e16f89396e09a7667 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] Clean up and fix updateEchoSchemaForSuppression.php - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Clean up and fix updateEchoSchemaForSuppression.php
..
Clean up and fix updateEchoSchemaForSuppression.php
This script was supposed to be run in production in 2013, but that
never happened. It was also never added to update.php.
* Use makeTitleSafe instead of newFromText, for correctness
* Fetch the columns that the update generator needs
* Replace wrapper for private method with closure
* Make the maintenance script logged
Bug: T136427
Bug: T50059
Change-Id: I6c2972120189f035483b5ca49610c008c4ba2c88
---
M autoload.php
M includes/schemaUpdate.php
M maintenance/updateEchoSchemaForSuppression.php
M tests/phpunit/maintenance/SupressionMaintenanceTest.php
4 files changed, 27 insertions(+), 26 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index 69d13e2..ead2307 100644
--- a/autoload.php
+++ b/autoload.php
@@ -122,4 +122,5 @@
'SpecialNotificationsFormatter' => __DIR__ .
'/includes/formatters/SpecialNotificationsFormatter.php',
'SpecialNotificationsMarkRead' => __DIR__ .
'/includes/special/SpecialNotificationsMarkRead.php',
'SuppressionMaintenanceTest' => __DIR__ .
'/tests/phpunit/maintenance/SupressionMaintenanceTest.php',
+ 'UpdateEchoSchemaForSuppression' => __DIR__ .
'/maintenance/updateEchoSchemaForSuppression.php',
];
diff --git a/includes/schemaUpdate.php b/includes/schemaUpdate.php
index 5c20e43..82b2356 100644
--- a/includes/schemaUpdate.php
+++ b/includes/schemaUpdate.php
@@ -7,9 +7,9 @@
*/
class EchoSuppressionRowUpdateGenerator implements RowUpdateGenerator {
/**
-* @var callable Hack to allow replacing Title::newFromText in tests
+* @var callable Hack to allow replacing Title::makeTitleSafe in tests
*/
- protected $newTitleFromText = array( 'Title', 'newFromText' );
+ protected $newTitleFromNsAndText = array( 'Title', 'makeTitleSafe' );
/**
* {@inheritDoc}
@@ -28,19 +28,19 @@
*
* @param $callable callable
*/
- public function setNewTitleFromText( $callable ) {
- $this->newTitleFromText = $callable;
+ public function setNewTitleFromNsAndText( $callable ) {
+ $this->newTitleFromNsAndText = $callable;
}
/**
-* Hackish method of mocking Title::newFromText for tests
+* Hackish method of mocking Title::makeTitleSafe for tests
*
+* @param $namespace integer The namespace of the page to look up
* @param $text string The page name to look up
-* @param $defaultNamespace integer The default namespace of the page
to look up
-* @return Title|null The title located for the text + namespace, or
null if invalid
+* @return Title|null The title located for the namespace + text, or
null if invalid
*/
- protected function newTitleFromText( $text, $defaultNamespace = NS_MAIN
) {
- return call_user_func( $this->newTitleFromText, $text,
$defaultNamespace );
+ protected function newTitleFromNsAndText( $namespace, $text ) {
+ return call_user_func( $this->newTitleFromNsAndText,
$namespace, $text );
}
/**
@@ -53,7 +53,7 @@
*/
protected function updatePageIdFromTitle( $row ) {
$update = array();
- $title = $this->newTitleFromText( $row->event_page_title,
$row->event_page_namespace );
+ $title = $this->newTitleFromNsAndText(
$row->event_page_namespace, $row->event_page_title );
if ( $title !== null ) {
$pageId = $title->getArticleId();
if ( $pageId ) {
@@ -86,7 +86,7 @@
$extra = $this->extra( $row, $update );
if ( isset( $extra['link-from-title'],
$extra['link-from-namespace'] ) ) {
- $title = $this->newTitleFromText(
$extra['link-from-title'], $extra['link-from-namespace'] );
+ $title = $this->newTitleFromNsAndText(
$extra['link-from-namespace'], $extra['link-from-title'] );
unset( $extra['link-from-title'],
$extra['link-from-namespace'] );
// Link from page is always from a content page, if
null or no article id it was
// somehow invalid
diff --git a/maintenance/updateEchoSchemaForSuppression.php
b/maintenance/updateEchoSchemaForSuppression.php
index 0dd9123..6224af5 100644
--- a/maintenance/updateEchoSchemaForSuppression.php
+++ b/maintenance/updateEchoSchemaForSuppression.php
@@ -14,7 +14,7 @@
*
* @ingroup Maintenance
*/
-class UpdateEchoSchemaForSuppression extends Maintenance {
+class UpdateEchoSchemaForSuppression extends LoggedUpdateMaintenance {
/**
* @var string The ta
[MediaWiki-commits] [Gerrit] Add de_dot filter and rename to logstash-filters-wikimedia - change (operations...plugins)
BryanDavis has submitted this change and it was merged.
Change subject: Add de_dot filter and rename to logstash-filters-wikimedia
..
Add de_dot filter and rename to logstash-filters-wikimedia
To facilitate the upgrade to elasticsearch 2.x we need to add the de_dot
filter, as 2.x does not allow properties to contain a dot. Additionally
renames the plugin to logstash-filters-wikimedia to capture the fact
that this now contains multiple plugins and not just the prune plugin.
The de_dot filter is unchanged from upstream. Although it is marked as
requiring logstash >= 2.0.0 it works just fine against 1.5.3.
Bug: T138335
Change-Id: Ibb835587d90a5483e8d38b2481bae5c9eae4fd83
---
R logstash-filters-wikimedia.gemspec
A logstash/filters/de_dot.rb
2 files changed, 99 insertions(+), 2 deletions(-)
Approvals:
BryanDavis: Verified; Looks good to me, approved
diff --git a/logstash-filter-prune.gemspec b/logstash-filters-wikimedia.gemspec
similarity index 78%
rename from logstash-filter-prune.gemspec
rename to logstash-filters-wikimedia.gemspec
index 08b0340..eaa183f 100644
--- a/logstash-filter-prune.gemspec
+++ b/logstash-filters-wikimedia.gemspec
@@ -1,9 +1,9 @@
Gem::Specification.new do |s|
- s.name= 'logstash-filter-prune'
+ s.name= 'logstash-filters-wikimedia'
s.version = '0.1.5'
s.licenses= ['Apache License (2.0)']
- s.summary = "The prune filter is for pruning event data from fields
based on whitelist/blacklist of field names or their values (names and values
can also be regular expressions)"
+ s.summary = "Backports of logstash plugins for wikimedia
installation. Includes the prune and de_dot filters"
s.description = "This gem is a logstash plugin required to be installed
on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname.
This gem is not a stand-alone program"
s.authors = ["Elastic"]
s.email = 'i...@elastic.co'
diff --git a/logstash/filters/de_dot.rb b/logstash/filters/de_dot.rb
new file mode 100644
index 000..5918eae
--- /dev/null
+++ b/logstash/filters/de_dot.rb
@@ -0,0 +1,97 @@
+# encoding: utf-8
+require "logstash/filters/base"
+require "logstash/namespace"
+
+# This filter _appears_ to rename fields by replacing `.` characters with a
different
+# separator. In reality, it's a somewhat expensive filter that has to copy the
+# source field contents to a new destination field (whose name no longer
contains
+# dots), and then remove the corresponding source field.
+#
+# It should only be used if no other options are available.
+class LogStash::Filters::De_dot < LogStash::Filters::Base
+
+ config_name "de_dot"
+
+ # Replace dots with this value.
+ config :separator, :validate => :string, :default => "_"
+
+ # If `nested` is _true_, then create sub-fields instead of replacing dots
with
+ # a different separator.
+ config :nested, :validate => :boolean, :default => false
+
+ # The `fields` array should contain a list of known fields to act on.
+ # If undefined, all top-level fields will be checked. Sub-fields must be
+ # manually specified in the array. For example:
`["field.suffix","[foo][bar.suffix]"]`
+ # will result in "field_suffix" and nested or sub field ["foo"]["bar_suffix"]
+ #
+ # WARNING: This is an expensive operation.
+ #
+ config :fields, :validate => :array
+
+ public
+ def has_dot?(fieldref)
+fieldref =~ /\./
+ end
+
+ public
+ def register
+raise ArgumentError, "de_dot: separator cannot be or contain '.'" unless
(@separator =~ /\./).nil?
+# Add instance variables here, if any
+ end # def register
+
+ private
+ def find_fieldref_for_delete(source)
+# In cases where fieldref may look like [a.b][c.d][e.f], we only want to
delete
+# the first level at which the dotted field appears.
+fieldref = ''
+@logger.debug? && @logger.debug("de_dot: source fieldref for delete",
:source => source)
+# Iterate over each level of source
+source.delete('[').split(']').each do |ref|
+ fieldref = fieldref + '['
+ if has_dot?(ref)
+# return when we find the first ref with a '.'
+@logger.debug? && @logger.debug("de_dot: fieldref for delete",
:fieldref => fieldref + ref + ']')
+return fieldref + ref + ']'
+ else
+fieldref = fieldref + ref + ']'
+@logger.debug? && @logger.debug("de_dot: fieldref still building",
:fieldref => fieldref)
+ end
+end
+ end
+
+ private
+ def rename_field(event, fieldref)
+@logger.debug? && @logger.debug("de_dot: preprocess", :event =>
event.to_hash.to_s)
+if @separator == ']['
+ @logger.debug? && @logger.debug("de_dot: fieldref pre-process",
:fieldref => fieldref)
+ fieldref = '[' + fieldref if fieldref[0] != '['
+ fieldref = fieldref + ']' if fieldref[-1] != ']'
+ @logger.debug? && @logger.debug("de_dot: fieldref bou
[MediaWiki-commits] [Gerrit] Deploy - change (wikimedia...dashboard)
Bearloga has uploaded a new change for review. https://gerrit.wikimedia.org/r/295753 Change subject: Deploy .. Deploy Bug: T134199, T138411 Change-Id: Ib5c44979d6c303855be50a60961ca16add5cbcbe --- M CHANGELOG.md M shiny-server/portal 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/dashboard refs/changes/53/295753/1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 78b961f..a6e9154 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Change Log (Patch Notes) All notable changes to the *Discovery Dashboards* project will be documented in this file. +## 2016/06/23 +- Deployed a new version of Portal dashboard that includes clickthrough rates + of first visits only. + ## 2016/04/05 - Deployed Portal and External Traffic dashboard versions that are compatible with the new data format. [T130083](https://phabricator.wikimedia.org/T130083) diff --git a/shiny-server/portal b/shiny-server/portal index 0f72c00..778b963 16 --- a/shiny-server/portal +++ b/shiny-server/portal -Subproject commit 0f72c00f2f871e695f22c2c014044cb4f9056502 +Subproject commit 778b963bfbe1080e6654a8035c7d7046903304bd -- To view, visit https://gerrit.wikimedia.org/r/295753 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5c44979d6c303855be50a60961ca16add5cbcbe Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/discovery/dashboard Gerrit-Branch: master Gerrit-Owner: Bearloga ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Deploy - change (wikimedia...dashboard)
Bearloga has submitted this change and it was merged. Change subject: Deploy .. Deploy Bug: T134199, T138411 Change-Id: Ib5c44979d6c303855be50a60961ca16add5cbcbe --- M CHANGELOG.md M shiny-server/portal 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Bearloga: Verified; Looks good to me, approved diff --git a/CHANGELOG.md b/CHANGELOG.md index 78b961f..a6e9154 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Change Log (Patch Notes) All notable changes to the *Discovery Dashboards* project will be documented in this file. +## 2016/06/23 +- Deployed a new version of Portal dashboard that includes clickthrough rates + of first visits only. + ## 2016/04/05 - Deployed Portal and External Traffic dashboard versions that are compatible with the new data format. [T130083](https://phabricator.wikimedia.org/T130083) diff --git a/shiny-server/portal b/shiny-server/portal index 0f72c00..778b963 16 --- a/shiny-server/portal +++ b/shiny-server/portal -Subproject commit 0f72c00f2f871e695f22c2c014044cb4f9056502 +Subproject commit 778b963bfbe1080e6654a8035c7d7046903304bd -- To view, visit https://gerrit.wikimedia.org/r/295753 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5c44979d6c303855be50a60961ca16add5cbcbe Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/discovery/dashboard Gerrit-Branch: master Gerrit-Owner: Bearloga Gerrit-Reviewer: Bearloga ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix position of page filters in firefox - change (mediawiki...Echo)
Sbisson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295752
Change subject: Fix position of page filters in firefox
..
Fix position of page filters in firefox
Bug: T138454
Change-Id: Ib19f9ab1cedc4613c9ac3a07d40111dd39a55774
---
M modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/52/295752/1
diff --git a/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
b/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
index 15b7338..1966d9d 100644
--- a/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
+++ b/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
@@ -3,6 +3,7 @@
.mw-echo-ui-pageNotificationsOptionWidget {
width: 100%;
box-sizing: border-box;
+ clear: both;
&-icon {
float: left;
--
To view, visit https://gerrit.wikimedia.org/r/295752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib19f9ab1cedc4613c9ac3a07d40111dd39a55774
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Sbisson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace impossible watchlist_counts custom view with full vi... - change (operations/software)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295751
Change subject: Replace impossible watchlist_counts custom view with full view
of already-filtered watchlist_count
..
Replace impossible watchlist_counts custom view with full view of
already-filtered watchlist_count
Based on Jaime's comment at T138450#2401133
If this gets merged I'll integrate it into Icc51fc9a
Change-Id: I123aabd0c801e4ba6cc8ba4dee7862997db822d7
---
M maintain-replicas/maintain-replicas.pl
1 file changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/51/295751/1
diff --git a/maintain-replicas/maintain-replicas.pl
b/maintain-replicas/maintain-replicas.pl
index c38d77a..07b3701 100755
--- a/maintain-replicas/maintain-replicas.pl
+++ b/maintain-replicas/maintain-replicas.pl
@@ -85,7 +85,7 @@
"wikilove_log", 'global_group_permissions', 'global_group_restrictions',
'global_user_groups',
'globalblocks', 'localuser', 'wikiset', 'wb_changes',
'wb_changes_dispatch', 'wb_changes_subscription',
'wb_entity_per_page', 'wb_id_counters', 'wb_items_per_site',
'wb_property_info', 'wb_terms',
-'wbc_entity_usage', 'wbs_propertypairs',
+'wbc_entity_usage', 'wbs_propertypairs', 'watchlist_count'
);
my @logging_whitelist = (
@@ -328,11 +328,6 @@
'view' => 'select cast(extract(year_month from user_touched)*100+1 as
date) upa_touched,
up_property, up_value',
'where' => 'user_id=up_user and up_property like pw_property', },
-
-'watchlist_counts' => {
-'source' => 'watchlist',
-'view' => 'select count(*) as wl_count, wl_namespace, wl_title',
-'group' => 'wl_namespace, wl_title having wl_count >= 30', },
);
my $dbuser;
--
To view, visit https://gerrit.wikimedia.org/r/295751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I123aabd0c801e4ba6cc8ba4dee7862997db822d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Today's Featured Article card - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Add Today's Featured Article card
..
Add Today's Featured Article card
This card adds a feed card for Today's Featured Article, and in doing so
adds some additional components:
* A BigPictureCard and associated View and layout files; and
* An aggregated feed endpoint client.
Bug: T129079
Change-Id: I7e4ac7b2f2e81f8cdf40f9649daecb08db0cdfc1
Depends-On: I4ae8e6bbaeb221872b1bc1d07be92f33002ff606
---
M app/src/main/java/org/wikipedia/Constants.java
M app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
A app/src/main/java/org/wikipedia/feed/UtcDate.java
A app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
A
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
A app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCard.java
A app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
A app/src/main/java/org/wikipedia/feed/model/BigPictureCard.java
M app/src/main/java/org/wikipedia/feed/model/Card.java
A app/src/main/java/org/wikipedia/feed/model/CardPageItem.java
A app/src/main/java/org/wikipedia/feed/model/Thumbnail.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadArticle.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadItemCard.java
A app/src/main/java/org/wikipedia/feed/view/BigPictureCardView.java
A app/src/main/java/org/wikipedia/feed/view/FeaturedCardFooterView.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
M app/src/main/java/org/wikipedia/util/DateUtil.java
A app/src/main/res/drawable/ic_bookmark_gray_24dp.xml
A app/src/main/res/drawable/ic_share_gray_24dp.xml
A app/src/main/res/layout/view_big_picture_card.xml
A app/src/main/res/layout/view_card_featured_footer.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/strings_no_translate.xml
M app/src/test/java/org/wikipedia/feed/mostread/MostReadArticleTest.java
M app/src/test/res/raw/most_read.json
25 files changed, 662 insertions(+), 115 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/Constants.java
b/app/src/main/java/org/wikipedia/Constants.java
index 0b87dee..b60ad20 100644
--- a/app/src/main/java/org/wikipedia/Constants.java
+++ b/app/src/main/java/org/wikipedia/Constants.java
@@ -13,6 +13,8 @@
public static final int SUGGESTION_REQUEST_ITEMS = 5;
public static final int PREFERRED_THUMB_SIZE = 320;
+public static final String PREFERRED_THUMBNAIL_KEY
+= Integer.toString(Constants.PREFERRED_THUMB_SIZE);
private Constants() { }
}
diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
index 33ad66e..2f0f7aa 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
@@ -3,6 +3,7 @@
import android.content.Context;
import android.support.annotation.NonNull;
+import org.wikipedia.feed.aggregated.AggregatedFeedContentClient;
import org.wikipedia.feed.becauseyouread.BecauseYouReadClient;
import org.wikipedia.feed.continuereading.ContinueReadingClient;
import org.wikipedia.feed.demo.IntegerListClient;
@@ -25,6 +26,7 @@
addPendingClient(new BecauseYouReadClient());
addPendingClient(new ContinueReadingClient());
+addPendingClient(new AggregatedFeedContentClient());
addPendingClient(new IntegerListClient());
addPendingClient(new MostReadClient());
diff --git a/app/src/main/java/org/wikipedia/feed/UtcDate.java
b/app/src/main/java/org/wikipedia/feed/UtcDate.java
new file mode 100644
index 000..3a6bfea
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/UtcDate.java
@@ -0,0 +1,49 @@
+package org.wikipedia.feed;
+
+import android.support.annotation.NonNull;
+
+import java.util.Calendar;
+
+import static java.util.TimeZone.getTimeZone;
+
+public class UtcDate {
+@NonNull private Calendar cal;
+@NonNull private String year;
+@NonNull private String month;
+@NonNull private String date;
+
+public UtcDate(int age) {
+this.cal = Calendar.getInstance(getTimeZone("UTC"));
+cal.add(Calendar.DATE, -age);
+this.year = Integer.toString(cal.get(Calendar.YEAR));
+this.month = pad(Integer.toString(cal.get(Calendar.MONTH) + 1));
+this.date = pad(Integer.toString(cal.get(Calendar.DATE)));
+}
+
+@NonNull
+public Calendar baseCalendar() {
+return cal;
+}
+
+@NonNull
+public String year() {
+return year;
+}
+
+@NonNull
+public String month() {
+return month;
+}
+
+@NonNull
+public String date() {
+return date;
+}
+
+private String pad(String value) {
+if (value.length() == 1) {
+return "0" + valu
[MediaWiki-commits] [Gerrit] Packager: Start README file with info about the ISO - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged. Change subject: Packager: Start README file with info about the ISO .. Packager: Start README file with info about the ISO Change-Id: If28e530c9159706821fbccea62360be7f24b1f13 --- A support/packager/PACKAGER_README.txt 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/support/packager/PACKAGER_README.txt b/support/packager/PACKAGER_README.txt new file mode 100644 index 000..8b08dbb --- /dev/null +++ b/support/packager/PACKAGER_README.txt @@ -0,0 +1,4 @@ +To create a Vagrant USB drive: + +* Run build.sh (unless there is already a suitable ISO at https://mediawiki-vagrant-image.wmflabs.org/mediawiki-vagrant/). +* Burn it to a USB drive using the FAT32 filesystem. -- To view, visit https://gerrit.wikimedia.org/r/295639 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If28e530c9159706821fbccea62360be7f24b1f13 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mattflaschen Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: Dduvall Gerrit-Reviewer: Mattflaschen Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Note search-redirect.php filtering - change (wikimedia...prince)
Bearloga has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295750
Change subject: Note search-redirect.php filtering
..
Note search-redirect.php filtering
Bug: T138411
Change-Id: I426855a7dd7a7be44e131cc895c03a0079211c7e
---
M server.R
M tab_documentation/pageviews.md
M tab_documentation/referers_summary.md
3 files changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/prince
refs/changes/50/295750/1
diff --git a/server.R b/server.R
index 0b47c21..149f6b4 100644
--- a/server.R
+++ b/server.R
@@ -180,7 +180,10 @@
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global, input$smoothing_pageviews)) %>%
polloi::make_dygraph(xlab = "Date", ylab = "Pageviews", title =
"Pageviews to the Wikipedia Portal") %>%
dyCSS(css = "www/inverse.css") %>%
- dyAxis("x", axisLabelFormatter = polloi::custom_axis_formatter,
axisLabelWidth = 70)
+ dyAxis("x", axisLabelFormatter = polloi::custom_axis_formatter,
axisLabelWidth = 70) %>%
+ dyAnnotation(as.Date("2016-05-01"), text = "A",
+ tooltip = "Filtering out search-redirect.php requests",
+ width = 12, height = 20, attachAtBottom = FALSE)
})
output$referer_summary_dygraph <- renderDygraph({
@@ -193,7 +196,10 @@
dyAxis("y", valueFormatter = 'function(x) { return x + "%"; }') %>%
dyLegend(labelsDiv = "referer_summary_legend", show = "always", width =
400) %>%
dyAnnotation(x = as.Date("2016-03-07"), text = "A",
- tooltip = "Switched to a new UDF")
+ tooltip = "Switched to a new UDF") %>%
+ dyAnnotation(as.Date("2016-05-01"), text = "B",
+ tooltip = "Filtering out search-redirect.php requests",
+ width = 12, height = 20, attachAtBottom = FALSE)
})
output$search_engines_dygraph <- renderDygraph({
diff --git a/tab_documentation/pageviews.md b/tab_documentation/pageviews.md
index 5158a5e..d3efb40 100644
--- a/tab_documentation/pageviews.md
+++ b/tab_documentation/pageviews.md
@@ -4,13 +4,9 @@
This looks at, without sampling, the number of pageviews the Wikipedia Portal
gets per day. This is expressed
as raw values.
-General trends
+Notes
--
-
-Outages and inaccuracies
---
-
-* None so far!
+- **A**: Started filtering out search-redirect.php requests. See
[T138411](https://phabricator.wikimedia.org/T138411) for more information.
Questions, bug reports, and feature suggestions
--
diff --git a/tab_documentation/referers_summary.md
b/tab_documentation/referers_summary.md
index ab5f505..30134b5 100644
--- a/tab_documentation/referers_summary.md
+++ b/tab_documentation/referers_summary.md
@@ -11,6 +11,7 @@
Outages and notes
--
- **A**: We switched to a finalized version of the UDF that extracts internal
traffic (see [T130083](https://phabricator.wikimedia.org/T130083))
+- **B**: Started filtering out search-redirect.php requests. See
[T138411](https://phabricator.wikimedia.org/T138411) for more information.
Questions, bug reports, and feature suggestions
--
--
To view, visit https://gerrit.wikimedia.org/r/295750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I426855a7dd7a7be44e131cc895c03a0079211c7e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/prince
Gerrit-Branch: master
Gerrit-Owner: Bearloga
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Note search-redirect.php filtering - change (wikimedia...prince)
Bearloga has submitted this change and it was merged.
Change subject: Note search-redirect.php filtering
..
Note search-redirect.php filtering
Bug: T138411
Change-Id: I426855a7dd7a7be44e131cc895c03a0079211c7e
---
M server.R
M tab_documentation/pageviews.md
M tab_documentation/referers_summary.md
3 files changed, 11 insertions(+), 8 deletions(-)
Approvals:
Bearloga: Verified; Looks good to me, approved
diff --git a/server.R b/server.R
index 0b47c21..149f6b4 100644
--- a/server.R
+++ b/server.R
@@ -180,7 +180,10 @@
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global, input$smoothing_pageviews)) %>%
polloi::make_dygraph(xlab = "Date", ylab = "Pageviews", title =
"Pageviews to the Wikipedia Portal") %>%
dyCSS(css = "www/inverse.css") %>%
- dyAxis("x", axisLabelFormatter = polloi::custom_axis_formatter,
axisLabelWidth = 70)
+ dyAxis("x", axisLabelFormatter = polloi::custom_axis_formatter,
axisLabelWidth = 70) %>%
+ dyAnnotation(as.Date("2016-05-01"), text = "A",
+ tooltip = "Filtering out search-redirect.php requests",
+ width = 12, height = 20, attachAtBottom = FALSE)
})
output$referer_summary_dygraph <- renderDygraph({
@@ -193,7 +196,10 @@
dyAxis("y", valueFormatter = 'function(x) { return x + "%"; }') %>%
dyLegend(labelsDiv = "referer_summary_legend", show = "always", width =
400) %>%
dyAnnotation(x = as.Date("2016-03-07"), text = "A",
- tooltip = "Switched to a new UDF")
+ tooltip = "Switched to a new UDF") %>%
+ dyAnnotation(as.Date("2016-05-01"), text = "B",
+ tooltip = "Filtering out search-redirect.php requests",
+ width = 12, height = 20, attachAtBottom = FALSE)
})
output$search_engines_dygraph <- renderDygraph({
diff --git a/tab_documentation/pageviews.md b/tab_documentation/pageviews.md
index 5158a5e..d3efb40 100644
--- a/tab_documentation/pageviews.md
+++ b/tab_documentation/pageviews.md
@@ -4,13 +4,9 @@
This looks at, without sampling, the number of pageviews the Wikipedia Portal
gets per day. This is expressed
as raw values.
-General trends
+Notes
--
-
-Outages and inaccuracies
---
-
-* None so far!
+- **A**: Started filtering out search-redirect.php requests. See
[T138411](https://phabricator.wikimedia.org/T138411) for more information.
Questions, bug reports, and feature suggestions
--
diff --git a/tab_documentation/referers_summary.md
b/tab_documentation/referers_summary.md
index ab5f505..30134b5 100644
--- a/tab_documentation/referers_summary.md
+++ b/tab_documentation/referers_summary.md
@@ -11,6 +11,7 @@
Outages and notes
--
- **A**: We switched to a finalized version of the UDF that extracts internal
traffic (see [T130083](https://phabricator.wikimedia.org/T130083))
+- **B**: Started filtering out search-redirect.php requests. See
[T138411](https://phabricator.wikimedia.org/T138411) for more information.
Questions, bug reports, and feature suggestions
--
--
To view, visit https://gerrit.wikimedia.org/r/295750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I426855a7dd7a7be44e131cc895c03a0079211c7e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/prince
Gerrit-Branch: master
Gerrit-Owner: Bearloga
Gerrit-Reviewer: Bearloga
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Make most-read section(s) of spec.yaml more descrip... - change (mediawiki...mobileapps)
Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295749
Change subject: Hygiene: Make most-read section(s) of spec.yaml more descriptive
..
Hygiene: Make most-read section(s) of spec.yaml more descriptive
Change-Id: I2e5e41731f77a4d6b9d22a971a78b98cee04
---
M spec.yaml
1 file changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/49/295749/1
diff --git a/spec.yaml b/spec.yaml
index 6e719d1..a9e4742 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -107,7 +107,12 @@
height: /.+/
mostread:
date: /.+/
-articles: [ /.+/ ]
+articles:
+ - views: /.+/
+rank: /.+/
+title: /.+/
+pageid: /.+/
+normalizedtitle: /.+/
random:
title: /.+/
news: /.+/
@@ -205,7 +210,12 @@
content-type: application/json
body:
date: /.+/
- articles: [ /.+/ ]
+ articles:
+- views: /.+/
+ rank: /.+/
+ title: /.+/
+ pageid: /.+/
+ normalizedtitle: /.+/
# from routes/random.js
/{domain}/v1/page/random/summary:
get:
--
To view, visit https://gerrit.wikimedia.org/r/295749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e5e41731f77a4d6b9d22a971a78b98cee04
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] Log PHP/HHVM errors in CLI mode to stderr, not stdout - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Log PHP/HHVM errors in CLI mode to stderr, not stdout
..
Log PHP/HHVM errors in CLI mode to stderr, not stdout
Per the PHP documentation:
https://secure.php.net/manual/en/errorfunc.configuration.php#ini.display-errors
Checked to be also implemented in HHVM (at least in recent
versions).
Bug: T138291
Change-Id: Iff9fe91fd0969444a7f280726b1757082bca5428
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 868ec34..7210c32 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -31,9 +31,9 @@
$_SERVER['SERVER_SOFTWARE'] = 'Apache';
}
-if ( PHP_SAPI == 'cli' ) {
- # Override for sanity's sake.
- ini_set( 'display_errors', 1 );
+if ( PHP_SAPI === 'cli' ) {
+ # Override for sanity's sake. Log errors to stderr.
+ ini_set( 'display_errors', 'stderr' );
}
if ( isset( $_SERVER['SERVER_ADDR'] ) ) {
ini_set( 'error_append_string', ' (' . $_SERVER['SERVER_ADDR'] . ')' );
--
To view, visit https://gerrit.wikimedia.org/r/295554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff9fe91fd0969444a7f280726b1757082bca5428
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man
Gerrit-Reviewer: Daniel Kinzler
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: JanZerebecki
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Tim Starling
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix fatal if members list page does not exist - change (mediawiki...CollaborationKit)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix fatal if members list page does not exist
..
Fix fatal if members list page does not exist
Change-Id: I707881578b4b8ac20fcc5a5c9c6afafef1c8e20d
---
M includes/content/CollaborationHubContent.php
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index 26eb396..981ce7e 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -265,8 +265,9 @@
);
// Members
- $membersTitle = Title::newFromText(
$title->getFullText() . '/' . wfmessage( 'collaborationkit-members-header' ) );
- if ( isset( $membersTitle ) ) {
+ $membersTitle = Title::newFromText(
$title->getFullText() . '/' . wfMessage( 'collaborationkit-members-header'
)->inContentLanguage()->text() );
+ $membersTitleRev = $title ? Revision::newFromTitle(
$membersTitle ) : null;
+ if ( $membersTitleRev ) {
$prependiture .= Html::openElement(
'div',
array( 'id' => 'wp-header-members',
'class' => 'toc wp-junk' )
--
To view, visit https://gerrit.wikimedia.org/r/295748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I707881578b4b8ac20fcc5a5c9c6afafef1c8e20d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: Harej
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ApiUnreadNotificationPages: Output pages as an array rather ... - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: ApiUnreadNotificationPages: Output pages as an array rather
than an object
..
ApiUnreadNotificationPages: Output pages as an array rather than an object
Make the frontend code based on page titles rather than page IDs.
Change-Id: I79c6a0e3a7178acdb14039a0c5208e90a7341044
---
M includes/api/ApiEchoUnreadNotificationPages.php
M modules/controller/mw.echo.Controller.js
M modules/model/mw.echo.dm.SourcePagesModel.js
M modules/ui/mw.echo.ui.CrossWikiUnreadFilterWidget.js
M modules/ui/mw.echo.ui.NotificationsInboxWidget.js
M modules/ui/mw.echo.ui.PageFilterWidget.js
6 files changed, 21 insertions(+), 81 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiEchoUnreadNotificationPages.php
b/includes/api/ApiEchoUnreadNotificationPages.php
index a0fa918..7bf6a91 100644
--- a/includes/api/ApiEchoUnreadNotificationPages.php
+++ b/includes/api/ApiEchoUnreadNotificationPages.php
@@ -39,8 +39,7 @@
$apis = $this->foreignNotifications->getApiEndpoints(
$this->getRequestedWikis() );
foreach ( $result as $wiki => $data ) {
$result[$wiki]['source'] = $apis[$wiki];
- // StdClass to ensure empty data is json_encoded to
`{}` instead of `[]`
- $result[$wiki]['pages'] = $data['pages'] ?: new
StdClass;
+ $result[$wiki]['pages'] = $data['pages'] ?: array();
}
$this->getResult()->addValue( 'query', $this->getModuleName(),
$result );
@@ -82,7 +81,7 @@
$result = array();
$titles = Title::newFromIDs( array_keys( $pages ) );
foreach ( $titles as $title ) {
- $result[$title->getArticleID()] = array(
+ $result[] = array(
'title' => $title->getPrefixedText(),
'count' => $pages[$title->getArticleID()],
);
diff --git a/modules/controller/mw.echo.Controller.js
b/modules/controller/mw.echo.Controller.js
index 6122d52..9c77b3c 100644
--- a/modules/controller/mw.echo.Controller.js
+++ b/modules/controller/mw.echo.Controller.js
@@ -131,7 +131,7 @@
{
continue: continueValue,
readState: filters.getReadState(),
- titles:
filters.getSourcePagesModel().getCurrentPageTitle()
+ titles:
filters.getSourcePagesModel().getCurrentPage()
}
)
.then( function ( data ) {
diff --git a/modules/model/mw.echo.dm.SourcePagesModel.js
b/modules/model/mw.echo.dm.SourcePagesModel.js
index d71927e..385a94a 100644
--- a/modules/model/mw.echo.dm.SourcePagesModel.js
+++ b/modules/model/mw.echo.dm.SourcePagesModel.js
@@ -64,33 +64,12 @@
};
/**
-* Get the current page or pages' id.
-* Returns null if no page is selected.
-*
-* @return {number|number[]} Current page id
-*/
- mw.echo.dm.SourcePagesModel.prototype.getCurrentPage = function () {
- return this.currentPage;
- };
- /**
-* Get the current source
-*
-* @return {string} Current source
-*/
- mw.echo.dm.SourcePagesModel.prototype.getCurrentSource = function () {
- return this.currentSource;
- };
-
- /**
* Get the title of the currently selected page
*
* @return {string} Page title
*/
- mw.echo.dm.SourcePagesModel.prototype.getCurrentPageTitle = function ()
{
- return this.getPageTitle(
- this.getCurrentSource(),
- this.getCurrentPage()
- );
+ mw.echo.dm.SourcePagesModel.prototype.getCurrentPage = function () {
+ return this.currentPage;
};
/**
@@ -144,34 +123,10 @@
* Get all pages in a source
*
* @param {string} source Symbolic name of the source
-* @return {Object} Page definitions in this source
+* @return {Object[]} Page definitions in this source
*/
mw.echo.dm.SourcePagesModel.prototype.getSourcePages = function (
source ) {
return this.sources[ source ] && this.sources[ source ].pages;
- };
-
- /**
-* Get a specific page's title
-*
-* @param {string} source Symbolic name for source
-* @param {number} pageId Page ID
-* @return {string} Page title
-*/
- mw.echo.dm.SourcePagesModel.prototype.getPageTitle = function ( source,
pageId ) {
- return this.getPageTitleById( source, pageId );
- };
-
- /**
[MediaWiki-commits] [Gerrit] Fix fatal if members list page does not exist - change (mediawiki...CollaborationKit)
Brian Wolff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295748
Change subject: Fix fatal if members list page does not exist
..
Fix fatal if members list page does not exist
Change-Id: I707881578b4b8ac20fcc5a5c9c6afafef1c8e20d
---
M includes/content/CollaborationHubContent.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/48/295748/1
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index 26eb396..4636fc3 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -266,7 +266,8 @@
// Members
$membersTitle = Title::newFromText(
$title->getFullText() . '/' . wfmessage( 'collaborationkit-members-header' ) );
- if ( isset( $membersTitle ) ) {
+ $membersTitleRev = $title ? Revision::newFromTitle(
$membersTitle ) : null;
+ if ( $membersTitleRev) {
$prependiture .= Html::openElement(
'div',
array( 'id' => 'wp-header-members',
'class' => 'toc wp-junk' )
--
To view, visit https://gerrit.wikimedia.org/r/295748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I707881578b4b8ac20fcc5a5c9c6afafef1c8e20d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] all wikis to 1.28.0-wmf.7 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: all wikis to 1.28.0-wmf.7
..
all wikis to 1.28.0-wmf.7
Change-Id: I518a5f3e9b6eb21aa0fd2a9d9f8be6529dcb7c88
---
M wikiversions.json
1 file changed, 297 insertions(+), 297 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikiversions.json b/wikiversions.json
index 0bc867f..b7cfd06 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,39 +1,39 @@
{
-"aawiki": "php-1.28.0-wmf.6",
+"aawiki": "php-1.28.0-wmf.7",
"aawikibooks": "php-1.28.0-wmf.7",
"aawiktionary": "php-1.28.0-wmf.7",
-"abwiki": "php-1.28.0-wmf.6",
+"abwiki": "php-1.28.0-wmf.7",
"abwiktionary": "php-1.28.0-wmf.7",
-"acewiki": "php-1.28.0-wmf.6",
+"acewiki": "php-1.28.0-wmf.7",
"advisorywiki": "php-1.28.0-wmf.7",
-"adywiki": "php-1.28.0-wmf.6",
-"afwiki": "php-1.28.0-wmf.6",
+"adywiki": "php-1.28.0-wmf.7",
+"afwiki": "php-1.28.0-wmf.7",
"afwikibooks": "php-1.28.0-wmf.7",
"afwikiquote": "php-1.28.0-wmf.7",
"afwiktionary": "php-1.28.0-wmf.7",
-"akwiki": "php-1.28.0-wmf.6",
+"akwiki": "php-1.28.0-wmf.7",
"akwikibooks": "php-1.28.0-wmf.7",
"akwiktionary": "php-1.28.0-wmf.7",
-"alswiki": "php-1.28.0-wmf.6",
+"alswiki": "php-1.28.0-wmf.7",
"alswikibooks": "php-1.28.0-wmf.7",
"alswikiquote": "php-1.28.0-wmf.7",
"alswiktionary": "php-1.28.0-wmf.7",
-"amwiki": "php-1.28.0-wmf.6",
+"amwiki": "php-1.28.0-wmf.7",
"amwikiquote": "php-1.28.0-wmf.7",
"amwiktionary": "php-1.28.0-wmf.7",
-"angwiki": "php-1.28.0-wmf.6",
+"angwiki": "php-1.28.0-wmf.7",
"angwikibooks": "php-1.28.0-wmf.7",
"angwikiquote": "php-1.28.0-wmf.7",
"angwikisource": "php-1.28.0-wmf.7",
"angwiktionary": "php-1.28.0-wmf.7",
-"anwiki": "php-1.28.0-wmf.6",
+"anwiki": "php-1.28.0-wmf.7",
"anwiktionary": "php-1.28.0-wmf.7",
-"arbcom_dewiki": "php-1.28.0-wmf.6",
-"arbcom_enwiki": "php-1.28.0-wmf.6",
-"arbcom_fiwiki": "php-1.28.0-wmf.6",
-"arbcom_nlwiki": "php-1.28.0-wmf.6",
-"arcwiki": "php-1.28.0-wmf.6",
-"arwiki": "php-1.28.0-wmf.6",
+"arbcom_dewiki": "php-1.28.0-wmf.7",
+"arbcom_enwiki": "php-1.28.0-wmf.7",
+"arbcom_fiwiki": "php-1.28.0-wmf.7",
+"arbcom_nlwiki": "php-1.28.0-wmf.7",
+"arcwiki": "php-1.28.0-wmf.7",
+"arwiki": "php-1.28.0-wmf.7",
"arwikibooks": "php-1.28.0-wmf.7",
"arwikimedia": "php-1.28.0-wmf.7",
"arwikinews": "php-1.28.0-wmf.7",
@@ -41,80 +41,80 @@
"arwikisource": "php-1.28.0-wmf.7",
"arwikiversity": "php-1.28.0-wmf.7",
"arwiktionary": "php-1.28.0-wmf.7",
-"arzwiki": "php-1.28.0-wmf.6",
-"astwiki": "php-1.28.0-wmf.6",
+"arzwiki": "php-1.28.0-wmf.7",
+"astwiki": "php-1.28.0-wmf.7",
"astwikibooks": "php-1.28.0-wmf.7",
"astwikiquote": "php-1.28.0-wmf.7",
"astwiktionary": "php-1.28.0-wmf.7",
-"aswiki": "php-1.28.0-wmf.6",
+"aswiki": "php-1.28.0-wmf.7",
"aswikibooks": "php-1.28.0-wmf.7",
"aswikisource": "php-1.28.0-wmf.7",
"aswiktionary": "php-1.28.0-wmf.7",
"auditcomwiki": "php-1.28.0-wmf.7",
-"avwiki": "php-1.28.0-wmf.6",
+"avwiki": "php-1.28.0-wmf.7",
"avwiktionary": "php-1.28.0-wmf.7",
-"aywiki": "php-1.28.0-wmf.6",
+"aywiki": "php-1.28.0-wmf.7",
"aywikibooks": "php-1.28.0-wmf.7",
"aywiktionary": "php-1.28.0-wmf.7",
-"azbwiki": "php-1.28.0-wmf.6",
-"azwiki": "php-1.28.0-wmf.6",
+"azbwiki": "php-1.28.0-wmf.7",
+"azwiki": "php-1.28.0-wmf.7",
"azwikibooks": "php-1.28.0-wmf.7",
"azwikiquote": "php-1.28.0-wmf.7",
"azwikisource": "php-1.28.0-wmf.7",
"azwiktionary": "php-1.28.0-wmf.7",
-"barwiki": "php-1.28.0-wmf.6",
-"bat_smgwiki": "php-1.28.0-wmf.6",
-"bawiki": "php-1.28.0-wmf.6",
+"barwiki": "php-1.28.0-wmf.7",
+"bat_smgwiki": "php-1.28.0-wmf.7",
+"bawiki": "php-1.28.0-wmf.7",
"bawikibooks": "php-1.28.0-wmf.7",
-"bclwiki": "php-1.28.0-wmf.6",
+"bclwiki": "php-1.28.0-wmf.7",
"bdwikimedia": "php-1.28.0-wmf.7",
-"be_x_oldwiki": "php-1.28.0-wmf.6",
+"be_x_oldwiki": "php-1.28.0-wmf.7",
"betawikiversity": "php-1.28.0-wmf.7",
-"bewiki": "php-1.28.0-wmf.6",
+"bewiki": "php-1.28.0-wmf.7",
"bewikibooks": "php-1.28.0-wmf.7",
"bewikimedia": "php-1.28.0-wmf.7",
"bewikiquote": "php-1.28.0-wmf.7",
"bewikisource": "php-1.28.0-wmf.7",
"bewiktionary": "php-1.28.0-wmf.7",
-"bgwiki": "php-1.28.0-wmf.6",
+"bgwiki": "php-1.28.0-wmf.7",
"bgwikibooks": "php-1.28.0-wmf.7",
"bgwikinews": "php-1.28.0-wmf.7",
"bgwikiquote": "php-1.28.0-wmf.7",
"bgwikisource": "php-1.28.0-wmf.7",
"bgwiktionary": "php-1.28.0-wmf.7",
-"bhwiki": "php-1.28.0-wmf.6",
+"bhwiki": "php-1.28.0-wmf.7",
"bhwiktionary": "php-1.28.0-w
[MediaWiki-commits] [Gerrit] all wikis to 1.28.0-wmf.7 - change (operations/mediawiki-config)
Thcipriani has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295747
Change subject: all wikis to 1.28.0-wmf.7
..
all wikis to 1.28.0-wmf.7
Change-Id: I518a5f3e9b6eb21aa0fd2a9d9f8be6529dcb7c88
---
M wikiversions.json
1 file changed, 297 insertions(+), 297 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/47/295747/1
diff --git a/wikiversions.json b/wikiversions.json
index 0bc867f..b7cfd06 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,39 +1,39 @@
{
-"aawiki": "php-1.28.0-wmf.6",
+"aawiki": "php-1.28.0-wmf.7",
"aawikibooks": "php-1.28.0-wmf.7",
"aawiktionary": "php-1.28.0-wmf.7",
-"abwiki": "php-1.28.0-wmf.6",
+"abwiki": "php-1.28.0-wmf.7",
"abwiktionary": "php-1.28.0-wmf.7",
-"acewiki": "php-1.28.0-wmf.6",
+"acewiki": "php-1.28.0-wmf.7",
"advisorywiki": "php-1.28.0-wmf.7",
-"adywiki": "php-1.28.0-wmf.6",
-"afwiki": "php-1.28.0-wmf.6",
+"adywiki": "php-1.28.0-wmf.7",
+"afwiki": "php-1.28.0-wmf.7",
"afwikibooks": "php-1.28.0-wmf.7",
"afwikiquote": "php-1.28.0-wmf.7",
"afwiktionary": "php-1.28.0-wmf.7",
-"akwiki": "php-1.28.0-wmf.6",
+"akwiki": "php-1.28.0-wmf.7",
"akwikibooks": "php-1.28.0-wmf.7",
"akwiktionary": "php-1.28.0-wmf.7",
-"alswiki": "php-1.28.0-wmf.6",
+"alswiki": "php-1.28.0-wmf.7",
"alswikibooks": "php-1.28.0-wmf.7",
"alswikiquote": "php-1.28.0-wmf.7",
"alswiktionary": "php-1.28.0-wmf.7",
-"amwiki": "php-1.28.0-wmf.6",
+"amwiki": "php-1.28.0-wmf.7",
"amwikiquote": "php-1.28.0-wmf.7",
"amwiktionary": "php-1.28.0-wmf.7",
-"angwiki": "php-1.28.0-wmf.6",
+"angwiki": "php-1.28.0-wmf.7",
"angwikibooks": "php-1.28.0-wmf.7",
"angwikiquote": "php-1.28.0-wmf.7",
"angwikisource": "php-1.28.0-wmf.7",
"angwiktionary": "php-1.28.0-wmf.7",
-"anwiki": "php-1.28.0-wmf.6",
+"anwiki": "php-1.28.0-wmf.7",
"anwiktionary": "php-1.28.0-wmf.7",
-"arbcom_dewiki": "php-1.28.0-wmf.6",
-"arbcom_enwiki": "php-1.28.0-wmf.6",
-"arbcom_fiwiki": "php-1.28.0-wmf.6",
-"arbcom_nlwiki": "php-1.28.0-wmf.6",
-"arcwiki": "php-1.28.0-wmf.6",
-"arwiki": "php-1.28.0-wmf.6",
+"arbcom_dewiki": "php-1.28.0-wmf.7",
+"arbcom_enwiki": "php-1.28.0-wmf.7",
+"arbcom_fiwiki": "php-1.28.0-wmf.7",
+"arbcom_nlwiki": "php-1.28.0-wmf.7",
+"arcwiki": "php-1.28.0-wmf.7",
+"arwiki": "php-1.28.0-wmf.7",
"arwikibooks": "php-1.28.0-wmf.7",
"arwikimedia": "php-1.28.0-wmf.7",
"arwikinews": "php-1.28.0-wmf.7",
@@ -41,80 +41,80 @@
"arwikisource": "php-1.28.0-wmf.7",
"arwikiversity": "php-1.28.0-wmf.7",
"arwiktionary": "php-1.28.0-wmf.7",
-"arzwiki": "php-1.28.0-wmf.6",
-"astwiki": "php-1.28.0-wmf.6",
+"arzwiki": "php-1.28.0-wmf.7",
+"astwiki": "php-1.28.0-wmf.7",
"astwikibooks": "php-1.28.0-wmf.7",
"astwikiquote": "php-1.28.0-wmf.7",
"astwiktionary": "php-1.28.0-wmf.7",
-"aswiki": "php-1.28.0-wmf.6",
+"aswiki": "php-1.28.0-wmf.7",
"aswikibooks": "php-1.28.0-wmf.7",
"aswikisource": "php-1.28.0-wmf.7",
"aswiktionary": "php-1.28.0-wmf.7",
"auditcomwiki": "php-1.28.0-wmf.7",
-"avwiki": "php-1.28.0-wmf.6",
+"avwiki": "php-1.28.0-wmf.7",
"avwiktionary": "php-1.28.0-wmf.7",
-"aywiki": "php-1.28.0-wmf.6",
+"aywiki": "php-1.28.0-wmf.7",
"aywikibooks": "php-1.28.0-wmf.7",
"aywiktionary": "php-1.28.0-wmf.7",
-"azbwiki": "php-1.28.0-wmf.6",
-"azwiki": "php-1.28.0-wmf.6",
+"azbwiki": "php-1.28.0-wmf.7",
+"azwiki": "php-1.28.0-wmf.7",
"azwikibooks": "php-1.28.0-wmf.7",
"azwikiquote": "php-1.28.0-wmf.7",
"azwikisource": "php-1.28.0-wmf.7",
"azwiktionary": "php-1.28.0-wmf.7",
-"barwiki": "php-1.28.0-wmf.6",
-"bat_smgwiki": "php-1.28.0-wmf.6",
-"bawiki": "php-1.28.0-wmf.6",
+"barwiki": "php-1.28.0-wmf.7",
+"bat_smgwiki": "php-1.28.0-wmf.7",
+"bawiki": "php-1.28.0-wmf.7",
"bawikibooks": "php-1.28.0-wmf.7",
-"bclwiki": "php-1.28.0-wmf.6",
+"bclwiki": "php-1.28.0-wmf.7",
"bdwikimedia": "php-1.28.0-wmf.7",
-"be_x_oldwiki": "php-1.28.0-wmf.6",
+"be_x_oldwiki": "php-1.28.0-wmf.7",
"betawikiversity": "php-1.28.0-wmf.7",
-"bewiki": "php-1.28.0-wmf.6",
+"bewiki": "php-1.28.0-wmf.7",
"bewikibooks": "php-1.28.0-wmf.7",
"bewikimedia": "php-1.28.0-wmf.7",
"bewikiquote": "php-1.28.0-wmf.7",
"bewikisource": "php-1.28.0-wmf.7",
"bewiktionary": "php-1.28.0-wmf.7",
-"bgwiki": "php-1.28.0-wmf.6",
+"bgwiki": "php-1.28.0-wmf.7",
"bgwikibooks": "php-1.28.0-wmf.7",
"bgwikinews": "php-1.28.0-wmf.7",
"bgwikiquote": "php-1.28.0-wmf.7",
"bgwikisource": "php-1.28.0-wmf.7",
"bgwiktionary": "php-1.28.0-wmf.7",
-"bhwiki": "php-1.28.0-wmf.6",
+"bhwiki": "
[MediaWiki-commits] [Gerrit] [bugfix] rstrip() strings before comparing for changes - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] rstrip() strings before comparing for changes .. [bugfix] rstrip() strings before comparing for changes - mw does no edit when trying to add spaces or newlines at the end of a page. userPut() should reflect this point and should not try to show diff and should not try to edit the page. Finally the result of the method must not be True. Bug: T137637 Change-Id: I4958cba789f8a0e997a0dee1204b0d1119bd1931 --- M pywikibot/bot.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 378f2b2..3558e99 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1278,7 +1278,7 @@ @return: whether the page was saved successfully @rtype: bool """ -if oldtext == newtext: +if oldtext.rstrip() == newtext.rstrip(): pywikibot.output(u'No changes were needed on %s' % page.title(asLink=True)) return -- To view, visit https://gerrit.wikimedia.org/r/293905 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4958cba789f8a0e997a0dee1204b0d1119bd1931 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Mpaa Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set proper cactions on Special:EditCollaborationHub. - change (mediawiki...CollaborationKit)
jenkins-bot has submitted this change and it was merged.
Change subject: Set proper cactions on Special:EditCollaborationHub.
..
Set proper cactions on Special:EditCollaborationHub.
Bug: T131717
Change-Id: Ia43426a59e3b99b287fb8c7f37008bde73a5d300
---
M includes/SpecialEditCollaborationHub.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SpecialEditCollaborationHub.php
b/includes/SpecialEditCollaborationHub.php
index 3d44fae..9d0e2d6 100644
--- a/includes/SpecialEditCollaborationHub.php
+++ b/includes/SpecialEditCollaborationHub.php
@@ -98,6 +98,7 @@
$out->setPageTitle(
$this->msg( 'collaborationkit-edit-pagetitle',
$this->title->getPrefixedText() )
);
+ $this->getSkin()->setRelevantTitle( $this->title );
// Backlink
if ( $this->rev ) {
--
To view, visit https://gerrit.wikimedia.org/r/295746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia43426a59e3b99b287fb8c7f37008bde73a5d300
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set proper cactions on Special:EditCollaborationHub. - change (mediawiki...CollaborationKit)
Brian Wolff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295746
Change subject: Set proper cactions on Special:EditCollaborationHub.
..
Set proper cactions on Special:EditCollaborationHub.
Bug: T131717
Change-Id: Ia43426a59e3b99b287fb8c7f37008bde73a5d300
---
M includes/SpecialEditCollaborationHub.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/46/295746/1
diff --git a/includes/SpecialEditCollaborationHub.php
b/includes/SpecialEditCollaborationHub.php
index 3d44fae..9d0e2d6 100644
--- a/includes/SpecialEditCollaborationHub.php
+++ b/includes/SpecialEditCollaborationHub.php
@@ -98,6 +98,7 @@
$out->setPageTitle(
$this->msg( 'collaborationkit-edit-pagetitle',
$this->title->getPrefixedText() )
);
+ $this->getSkin()->setRelevantTitle( $this->title );
// Backlink
if ( $this->rev ) {
--
To view, visit https://gerrit.wikimedia.org/r/295746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia43426a59e3b99b287fb8c7f37008bde73a5d300
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merging from d0f21126475cffe8e93d4f4473e6820e97737f0e: - change (wikidata...gui-deploy)
Smalyshev has uploaded a new change for review. https://gerrit.wikimedia.org/r/295745 Change subject: Merging from d0f21126475cffe8e93d4f4473e6820e97737f0e: .. Merging from d0f21126475cffe8e93d4f4473e6820e97737f0e: Wikidata logo as loading screen in embeds Change-Id: Ia65d37f5be71d653f61187b9a78310955f685264 --- M embed.html 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui-deploy refs/changes/45/295745/1 diff --git a/embed.html b/embed.html index 0a70fa1..f697c68 100644 --- a/embed.html +++ b/embed.html @@ -12,16 +12,21 @@ - - Loading + + + Loading + + https://upload.wikimedia.org/wikipedia/commons/6/66/Wikidata-logo-en.svg); + background-repeat:no-repeat; background-position:center;"> Error - Wikidata.org + Wikidata.org -- To view, visit https://gerrit.wikimedia.org/r/295745 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia65d37f5be71d653f61187b9a78310955f685264 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui-deploy Gerrit-Branch: production Gerrit-Owner: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mw.jqueryMsg: Add support for {{PAGENAME}} and {{PAGENAMEE}} - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mw.jqueryMsg: Add support for {{PAGENAME}} and {{PAGENAMEE}}
..
mw.jqueryMsg: Add support for {{PAGENAME}} and {{PAGENAMEE}}
Bug: T115259
Change-Id: I40146e9db5e0b1c171a0fb43b68e28f83c8a590a
---
M resources/src/mediawiki/mediawiki.jqueryMsg.js
M tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
2 files changed, 14 insertions(+), 2 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.jqueryMsg.js
b/resources/src/mediawiki/mediawiki.jqueryMsg.js
index 50fef14..44b9117 100644
--- a/resources/src/mediawiki/mediawiki.jqueryMsg.js
+++ b/resources/src/mediawiki/mediawiki.jqueryMsg.js
@@ -15,6 +15,8 @@
slice = Array.prototype.slice,
parserDefaults = {
magic: {
+ PAGENAME: mw.config.get( 'wgPageName' ),
+ PAGENAMEE: mw.util.wikiUrlencode(
mw.config.get( 'wgPageName' ) ),
SITENAME: mw.config.get( 'wgSiteName' )
},
// Whitelist for allowed HTML elements in wikitext.
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
index aa68bb2..7133039 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@ -1,6 +1,6 @@
( function ( mw, $ ) {
var formatText, formatParse, formatnumTests, specialCharactersPageName,
expectedListUsers,
- expectedListUsersSitename, expectedEntrypoints,
+ expectedListUsersSitename, expectedLinkPagenamee,
expectedEntrypoints,
mwLanguageCache = {},
hasOwn = Object.hasOwnProperty;
@@ -16,6 +16,8 @@
this.parserDefaults = mw.jqueryMsg.getParserDefaults();
mw.jqueryMsg.setParserDefaults( {
magic: {
+ PAGENAME: '2 + 2',
+ PAGENAMEE: mw.util.wikiUrlencode( '2 +
2' ),
SITENAME: 'Wiki'
}
} );
@@ -25,6 +27,7 @@
expectedListUsers = '注册用户';
expectedListUsersSitename = '注册用户' +
'Wiki';
+ expectedLinkPagenamee = 'https://example.org/wiki/Foo?bar=baz#val/2_%2B_2";>Test';
expectedEntrypoints = 'https://www.mediawiki.org/wiki/Manual:index.php";>index.php';
@@ -77,6 +80,7 @@
'jquerymsg-test-statistics-users':
'注册[[Special:ListUsers|用户]]',
'jquerymsg-test-statistics-users-sitename':
'注册[[Special:ListUsers|用户{{SITENAME}}]]',
+ 'jquerymsg-test-link-pagenamee':
'[https://example.org/wiki/Foo?bar=baz#val/{{PAGENAMEE}} Test]',
'jquerymsg-test-version-entrypoints-index-php':
'[https://www.mediawiki.org/wiki/Manual:index.php index.php]',
@@ -385,7 +389,7 @@
process( tasks );
} );
- QUnit.test( 'Links', 14, function ( assert ) {
+ QUnit.test( 'Links', 15, function ( assert ) {
var testCases,
expectedDisambiguationsText,
expectedMultipleBars,
@@ -468,6 +472,12 @@
'Piped wikilink with parser function in the text'
);
+ assert.htmlEqual(
+ formatParse( 'jquerymsg-test-link-pagenamee' ),
+ expectedLinkPagenamee,
+ 'External link with parser function in the URL'
+ );
+
testCases = [
[
'extlink-html-full',
--
To view, visit https://gerrit.wikimedia.org/r/295630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40146e9db5e0b1c171a0fb43b68e28f83c8a590a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Edokter
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: MarkTraceur
Gerrit-Reviewer: Mattflaschen
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 logo as loading screen in embeds - change (wikidata...gui)
jenkins-bot has submitted this change and it was merged. Change subject: Wikidata logo as loading screen in embeds .. Wikidata logo as loading screen in embeds Change-Id: Ia65d37f5be71d653f61187b9a78310955f685264 --- M embed.html 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified diff --git a/embed.html b/embed.html index 17c1c0a..ecde69f 100644 --- a/embed.html +++ b/embed.html @@ -24,16 +24,21 @@ - - Loading + + + Loading + + https://upload.wikimedia.org/wikipedia/commons/6/66/Wikidata-logo-en.svg); + background-repeat:no-repeat; background-position:center;"> Error - Wikidata.org + Wikidata.org -- To view, visit https://gerrit.wikimedia.org/r/295684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia65d37f5be71d653f61187b9a78310955f685264 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) Gerrit-Reviewer: Smalyshev Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add junk to header and make ch mainpages stylable - change (mediawiki...CollaborationKit)
jenkins-bot has submitted this change and it was merged.
Change subject: Add junk to header and make ch mainpages stylable
..
Add junk to header and make ch mainpages stylable
* Add on-wiki file source support for icons and generally redo icon
architecture so it sucks in new ways instead of the old
* Splatter everything with classes and ids
* Make mainpage /members inclusion automatic and show up in the header
* Make mainpage icon show up in the header
Precursor to T132091
Bug: T136779
Change-Id: Iae8ba5a45e90eaa0b7d170f17233994e7a9643d2
---
M i18n/en.json
M i18n/qqq.json
M includes/content/CollaborationHubContent.php
3 files changed, 127 insertions(+), 49 deletions(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index feed57d..cebc55b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -43,5 +43,6 @@
"collaborationkit-listcontent-notlist": "[[$1]] is not a
CollaborationKit list page",
"collabkit-list-delete-summary": "/* $1 */ Deleting from list.",
"collabkit-list-add-summary": "/* $1 */ Adding to list.",
- "collaborationkit-list-add-button": "Add new item to list"
+ "collaborationkit-list-add-button": "Add new item to list",
+ "collaborationkit-members-header": "Members"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index f979d17..f376ab7 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -43,5 +43,6 @@
"collaborationkit-listcontent-notlist": "Error when
{{#transcludelist:page}} is given a page that is not a
CollaborationKit list page. $1 Name of page given.",
"collabkit-list-delete-summary": "Edit summary for removing an item
from a CollaborationKit list. $1 = Item that is being removed.",
"collabkit-list-add-summary": "Edit summary when adding a new item to
CollaborationKit list page",
- "collaborationkit-list-add-button": "Text of button to add a new item
to a CollaborationKit list page."
+ "collaborationkit-list-add-button": "Text of button to add a new item
to a CollaborationKit list page.",
+ "collaborationkit-members-header": "Members header for CH mainpages;
also used for subpage name"
}
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index 0c0e4c1..26eb396 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -138,7 +138,7 @@
if ( $data ) {
$this->pageName = isset( $data->page_name ) ?
$data->page_name : null;
$this->description = isset( $data->description ) ?
$data->description : '';
- $this->icon = isset( $data->icon ) ? $data->icon : null;
+ $this->icon = isset( $data->icon ) ? $data->icon : '';
$this->pageType = isset( $data->page_type ) ?
$data->page_type : 'default';
if ( isset( $data->content ) && is_object(
$data->content ) ) {
@@ -249,10 +249,47 @@
protected function fillParserOutput( Title $title, $revId,
ParserOptions $options,
$generateHtml, ParserOutput &$output
) {
- $output->setText( $this->getParsedDescription( $title, $options
) );
+ $output->setText( Html::rawElement(
+ 'div',
+ array( 'class' => 'wp-intro' ),
+ $this->getParsedDescription( $title, $options )
+ ) );
if ( $this->getPageType() == 'main' ) {
- // TODO generate special hub mainpage intro layout
+
+ // Image
+ $prependiture = Html::rawElement(
+ 'div',
+ array( 'id' => 'wp-header-icon', 'class' =>
'wp-junk' ),
+ $this->getImage( 'none', 120 )
+ );
+
+ // Members
+ $membersTitle = Title::newFromText(
$title->getFullText() . '/' . wfmessage( 'collaborationkit-members-header' ) );
+ if ( isset( $membersTitle ) ) {
+ $prependiture .= Html::openElement(
+ 'div',
+ array( 'id' => 'wp-header-members',
'class' => 'toc wp-junk' )
+ );
+ $prependiture .= Html::element(
+ 'h2',
+ [],
+ wfmessage(
'collaborationkit-members-header' )
+ );
+ $prependiture .= Html::rawElement(
+ 'div',
+ [],
+
[MediaWiki-commits] [Gerrit] Add documentation about how to avoid NFS prompt - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged. Change subject: Add documentation about how to avoid NFS prompt .. Add documentation about how to avoid NFS prompt Bug: T137757 Change-Id: Ifa5cd97ff1bda9924b9434af60a1d77b3e4cd6da --- M README.md 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Mattflaschen: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index 53d8ba7..62689a1 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,10 @@ sudo apt-get install nfs-kernel-server portmap + You can optionally configure sudo not to prompt you for the password when + doing operations related to this NFS service. See + https://www.vagrantup.com/docs/synced-folders/nfs.html#root-privilege-requirement + Next, you'll need a copy of the mediawiki-vagrant project files. * zip: https://git.wikimedia.org/zip/?r=mediawiki/vagrant.git&h=HEAD&format=zip -- To view, visit https://gerrit.wikimedia.org/r/295629 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa5cd97ff1bda9924b9434af60a1d77b3e4cd6da Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mattflaschen Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: Dduvall Gerrit-Reviewer: Mattflaschen 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] Hide "Loading..." text in Special:Nearby after loading is done - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hide "Loading..." text in Special:Nearby after loading is done
..
Hide "Loading..." text in Special:Nearby after loading is done
Bug: T138478
Change-Id: I59b3f2d2db587334d310b84c00add17091015eb6
---
M resources/mobile.special.nearby.styles/specialNearbyDesktop.less
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.special.nearby.styles/specialNearbyDesktop.less
b/resources/mobile.special.nearby.styles/specialNearbyDesktop.less
index a513542..c56a952 100644
--- a/resources/mobile.special.nearby.styles/specialNearbyDesktop.less
+++ b/resources/mobile.special.nearby.styles/specialNearbyDesktop.less
@@ -3,3 +3,8 @@
list-style: none;
margin-left: 0;
}
+
+// hide "Loading..." text after Special:Nearby is done loading
+.hidden {
+ display: none;
+}
--
To view, visit https://gerrit.wikimedia.org/r/295669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I59b3f2d2db587334d310b84c00add17091015eb6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Aude
Gerrit-Reviewer: Florianschmidtwelzow
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] Document mw.mobileFrontend events - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Document mw.mobileFrontend events .. Document mw.mobileFrontend events Because JSDuck requires that all class and member names are proper JavaScript identifiers [0], the "resize:throttled" and "scroll:throttled" events are ignored. Thus we document the "resize:throttled" event in the same DocBlock as the "resize" event, as some visibility is better than none. [0]: https://github.com/senchalabs/jsduck/issues/497 Change-Id: I870320bc458fc02b1c6c4cd6276941ab38b553b3 --- M resources/skins.minerva.scripts/preInit.js 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/skins.minerva.scripts/preInit.js b/resources/skins.minerva.scripts/preInit.js index 8b63a0f..5009e8a 100644 --- a/resources/skins.minerva.scripts/preInit.js +++ b/resources/skins.minerva.scripts/preInit.js @@ -40,6 +40,18 @@ }; } + /** +* @event resize +* The `window`'s resize event debounced at 100 ms. The `resize:throttled` event is the `window`'s +* resize event throttled to 200 ms. +*/ + + /** +* @event scroll +* The `window`'s scroll event debounced at 100 ms. The `scroll:throttled` event is the `window`'s +* scroll event throttled to 200 ms. +*/ + $( window ) .on( 'resize', apply2( $.debounce( 100, $.proxy( M, 'emit', 'resize' ) ), -- To view, visit https://gerrit.wikimedia.org/r/295496 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I870320bc458fc02b1c6c4cd6276941ab38b553b3 Gerrit-PatchSet: 7 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Phuedx Gerrit-Reviewer: Bmansurov Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Phuedx Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [cleanup] Delete old throttle rules - change (operations/mediawiki-config)
Urbanecm has uploaded a new change for review. https://gerrit.wikimedia.org/r/295744 Change subject: [cleanup] Delete old throttle rules .. [cleanup] Delete old throttle rules Change-Id: I82151d7f10be0f6cf80bee05d19acd9c1d57d07d --- M wmf-config/throttle.php 1 file changed, 0 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/44/295744/1 diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index e7f3ee6..958addd 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -34,20 +34,6 @@ /** * Helper to easily add a throttling request. */ - $wmgThrottlingExceptions[] = [ // T137917 - 'from' => '2016-06-17T13:00 -5:00', - 'to' => '2016-06-17T16:00 -5:00', - 'IP' => '181.39.145.67', - 'dbname' => ['eswiki', 'commonswiki'], - 'value' => 30 // 20 expected -]; -$wmgThrottlingExceptions[] = [ // T137917 - 'from' => '2016-06-22T13:00 -5:00', - 'to' => '2016-06-22T16:00 -5:00', - 'IP' => '181.39.156.9', - 'dbname' => ['eswiki', 'commonswiki'], - 'value' => 40 // 30 expected -]; $wmgThrottlingExceptions[] = [ // T137917 'from' => '2016-06-24T13:00 -5:00', 'to' => '2016-06-24T16:00 -5:00', @@ -68,13 +54,6 @@ 'IP' => '181.39.138.146 ', 'dbname' => ['eswiki', 'commonswiki'], 'value' => 40 // 30 expected -]; -$wmgThrottlingExceptions[] = [ // T138322 - 'from' => '2016-06-21T13:00 -5:00', - 'to' => '2016-06-21T16:00 -5:00', - 'IP' => '186.3.110.63', - 'dbname' => ['eswiki', 'commonswiki'], - 'value' => 50 // 40 expected ]; $wmgThrottlingExceptions[] = [ // T138322 'from' => '2016-06-30T13:00 -5:00', -- To view, visit https://gerrit.wikimedia.org/r/295744 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82151d7f10be0f6cf80bee05d19acd9c1d57d07d 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] Replace symbolic link with partial - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace symbolic link with partial
..
Replace symbolic link with partial
Windows and ExtensionDistributor currently have problems with
the:
flow_post.handlebars -> flow_post.partial.handlebars
symbolic link, so replace it with a partial.
Backports I447075b07b6000b765d56807d0cc8e23e4472f2b
Bug: T103702
Change-Id: I4eed303a4b9c384ef6782e8e0bb281fff00ad5a9
---
M Resources.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_block_topic_moderate_post.handlebars
M handlebars/flow_block_topic_moderate_topic.handlebars
D handlebars/flow_post.handlebars
A handlebars/flow_post.handlebars
R handlebars/flow_post_partial.partial.handlebars
9 files changed, 22 insertions(+), 19 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index ba2f2ff..9594c0d 100644
--- a/Resources.php
+++ b/Resources.php
@@ -74,6 +74,7 @@
'handlebars/flow_post_meta_actions.partial.handlebars',
'handlebars/flow_post_moderation_state.partial.handlebars',
'handlebars/flow_post_replies.partial.handlebars',
+ 'handlebars/flow_post_partial.partial.handlebars',
'handlebars/flow_post.handlebars',
'handlebars/flow_reply_form.partial.handlebars',
'handlebars/flow_subscribed.partial.handlebars',
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 71dd19b..bbd5f57 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -271,7 +271,7 @@
'.$sp.''.LCRun3::sec($cx, ((isset($in['replies']) && is_array($in)) ?
$in['replies'] : null), $in, true, function($cx, $in)use($sp){return
''.LCRun3::hbch($cx, 'eachPost',
array(array(((isset($cx['sp_vars']['root']['rootBlock']) &&
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['rootBlock'] :
null),$in),array()), $in, false, function($cx, $in)use($sp){return '
'.$sp.''.LCRun3::ch($cx, 'post',
array(array(((isset($cx['sp_vars']['root']['rootBlock']) &&
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['rootBlock'] :
null),$in),array()), 'encq').'
'.$sp.'';}).'';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['postId'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['postId'] :
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),array()), $in, false, function($cx, $in)use($sp){return
''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['action'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['action'] :
null),'===','reply'),array()), $in, false, function($cx, $in)use($sp){return
''.LCRun3::p($cx, 'flow_reply_form', array(array($in),array()), '
').'';}).'';}).'
-';},'flow_post' => function ($cx, $in, $sp) {return ''.$sp.''.LCRun3::wi($cx,
((isset($in['revision']) && is_array($in)) ? $in['revision'] : null), $in,
function($cx, $in)use($sp){return 'function ($cx, $in, $sp) {return
''.$sp.''.LCRun3::wi($cx, ((isset($in['revision']) && is_array($in)) ?
$in['revision'] : null), $in, function($cx, $in)use($sp){return '
@@ -289,7 +289,7 @@
);
return '
-'.LCRun3::sec($cx, ((isset($in['roots']) && is_array($in)) ? $in['roots'] :
null), $in, true, function($cx, $in) {return ''.LCRun3::hbch($cx, 'eachPost',
array(array(((isset($cx['sp_vars']['root']) && is_array($cx['sp_vars'])) ?
$cx['sp_vars']['root'] : null),$in),array()), $in, false, function($cx, $in)
{return ''.LCRun3::p($cx, 'flow_moderate_post', array(array($in),array()), '
').''.LCRun3::p($cx, 'flow_post', array(array($in),array()), '
').'';}).'';}).'
+'.LCRun3::sec($cx, ((isset($in['roots']) && is_array($in)) ? $in['roots'] :
null), $in, true, function($cx, $in) {return ''.LCRun3::hbch($cx, 'eachPost',
array(array(((isset($cx['sp_vars']['root']) && is_array($cx['sp_vars'])) ?
$cx['sp_vars']['root'] : null),$in),array()), $in, false, function($cx, $in)
{return ''.LCRun3::p($cx, 'flow_moderate_post', array(array($in),array()), '
').''.LCRun3::p($cx, 'flow_post_partial',
array(array($in),array()), ' ').'';}).'';}).'
';
}
?>
\ No newline at end of file
diff --git a/handl
[MediaWiki-commits] [Gerrit] Update debdeploy config for maps caches - change (operations/puppet)
Muehlenhoff has submitted this change and it was merged. Change subject: Update debdeploy config for maps caches .. Update debdeploy config for maps caches Change-Id: I59055949fe724a0cd5b33a314358b5dc22fb758f --- M modules/debdeploy/templates/debdeploy.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index a08c10c..ec398df 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -144,7 +144,7 @@ cp-misc = debdeploy-cp-eqiad-misc:standard, debdeploy-cp-codfw-misc:standard, debdeploy-cp-esams-misc:standard, debdeploy-cp-ulsfo-misc:standard cp-text = debdeploy-cp-eqiad-text:standard, debdeploy-cp-codfw-text:standard, debdeploy-cp-esams-text:standard cp-upload = debdeploy-cp-eqiad-upload:standard, debdeploy-cp-codfw-upload:standard, debdeploy-cp-esams-upload:standard -cp = debdeploy-cp-eqiad-maps:standard, debdeploy-cp-eqiad-misc:standard, debdeploy-cp-eqiad-text:standard, debdeploy-cp-eqiad-upload:standard, debdeploy-cp-codfw-text:standard, debdeploy-cp-codfw-upload:standard, debdeploy-cp-esams-text:standard, debdeploy-cp-esams-upload:standard, debdeploy-cp-ulsfo-text:standard, debdeploy-cp-ulsfo-upload:standard, debdeploy-cp-codfw-misc:standard, debdeploy-cp-esams-misc:standard, debdeploy-cp-ulsfo-misc:standard +cp = debdeploy-cp-eqiad-maps:standard, debdeploy-cp-eqiad-misc:standard, debdeploy-cp-eqiad-text:standard, debdeploy-cp-eqiad-upload:standard, debdeploy-cp-codfw-text:standard, debdeploy-cp-codfw-upload:standard, debdeploy-cp-codfw-maps:standard, debdeploy-cp-esams-text:standard, debdeploy-cp-esams-upload:standard, debdeploy-cp-esams-maps:standard, debdeploy-cp-ulsfo-text:standard, debdeploy-cp-ulsfo-upload:standard, debdeploy-cp-ulsfo-maps:standard, debdeploy-cp-codfw-misc:standard, debdeploy-cp-esams-misc:standard, debdeploy-cp-ulsfo-misc:standard cp-canary = debdeploy-cp:canary redis-eqiad = debdeploy-redis-eqiad:standard, debdeploy-redis-eqiad:canary redis-codfw = debdeploy-redis-codfw:standard -- To view, visit https://gerrit.wikimedia.org/r/295211 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59055949fe724a0cd5b33a314358b5dc22fb758f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] 'Random' feed card layout and view classes - change (apps...wikipedia)
Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295743
Change subject: 'Random' feed card layout and view classes
..
'Random' feed card layout and view classes
Adds a random card to the feed. Based on 'static card' layouts and
view classes that can be also be used for the main page card.
Still need to get the dice icon (from Rita)?
Bug: T132339
Change-Id: I0d838cf28f14a3f1619cfc6e9db6e187d7019b00
---
A app/src/main/java/org/wikipedia/feed/DummyClient.java
M app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
M app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
A app/src/main/java/org/wikipedia/feed/random/RandomCard.java
A app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
A app/src/main/java/org/wikipedia/feed/random/RandomClient.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
A app/src/main/java/org/wikipedia/feed/view/StaticCardView.java
A app/src/main/res/layout/view_static_card.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/strings_no_translate.xml
11 files changed, 205 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/43/295743/1
diff --git a/app/src/main/java/org/wikipedia/feed/DummyClient.java
b/app/src/main/java/org/wikipedia/feed/DummyClient.java
new file mode 100644
index 000..02dffec
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/DummyClient.java
@@ -0,0 +1,29 @@
+package org.wikipedia.feed;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import org.wikipedia.Site;
+import org.wikipedia.feed.model.Card;
+
+import java.util.Collections;
+
+/* A dummy client for providing static cards (main page, random) to the
FeedCoordinator. */
+public class DummyClient implements FeedClient {
+@NonNull private T card;
+
+public DummyClient(@NonNull T card) {
+this.card = card;
+}
+
+@Override
+public void request(@NonNull Context context, @NonNull Site site, int age,
+@NonNull final FeedClient.Callback cb) {
+cb.success(Collections.singletonList(card));
+}
+
+@Override
+public void cancel() {
+
+}
+}
diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
index 33ad66e..07541f8 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
@@ -7,6 +7,8 @@
import org.wikipedia.feed.continuereading.ContinueReadingClient;
import org.wikipedia.feed.demo.IntegerListClient;
import org.wikipedia.feed.mostread.MostReadClient;
+import org.wikipedia.feed.random.RandomCard;
+import org.wikipedia.feed.random.RandomClient;
import org.wikipedia.feed.searchbar.SearchClient;
public class FeedCoordinator extends FeedCoordinatorBase {
@@ -27,6 +29,7 @@
addPendingClient(new ContinueReadingClient());
addPendingClient(new IntegerListClient());
addPendingClient(new MostReadClient());
+addPendingClient(new RandomClient(new RandomCard(getContext(),
getSite(;
}
diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
index b6ecf36..6a25f9a 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
@@ -5,6 +5,7 @@
import android.support.annotation.Nullable;
import org.wikipedia.Site;
+import org.wikipedia.WikipediaApp;
import org.wikipedia.feed.model.Card;
import java.util.ArrayList;
@@ -33,6 +34,19 @@
return cards;
}
+@NonNull
+protected Context getContext() {
+return context;
+}
+
+@NonNull
+protected Site getSite() {
+if (site == null) {
+return WikipediaApp.getInstance().getSite();
+}
+return site;
+}
+
public void setFeedUpdateListener(@Nullable FeedUpdateListener listener) {
updateListener = listener;
}
diff --git a/app/src/main/java/org/wikipedia/feed/random/RandomCard.java
b/app/src/main/java/org/wikipedia/feed/random/RandomCard.java
new file mode 100644
index 000..5866a5a
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/random/RandomCard.java
@@ -0,0 +1,32 @@
+package org.wikipedia.feed.random;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import org.wikipedia.R;
+import org.wikipedia.Site;
+import org.wikipedia.WikipediaApp;
+import org.wikipedia.feed.model.Card;
+
+public class RandomCard extends Card {
+@NonNull private Site site;
+@NonNull private Context context;
+
+public RandomCard(@NonNull Context context, @NonNull Site site) {
+this.context = context;
+this.site = site;
+}
+
+@NonNull @Overrid
[MediaWiki-commits] [Gerrit] Avoid API requests on scroll events in watchlist test - change (mediawiki...MobileFrontend)
Mattflaschen has uploaded a new change for review. https://gerrit.wikimedia.org/r/295742 Change subject: Avoid API requests on scroll events in watchlist test .. Avoid API requests on scroll events in watchlist test When a scroll event is triggered an API event is fired unless the infinite scroll module is disabled. (Backported so Flow changes, e.g. https://gerrit.wikimedia.org/r/#/c/295469/ don't risk hitting this). Bug: T116258 Change-Id: Ia31bb419e21f4d93a459d7772b15aead056c8359 (cherry picked from commit 655b8311098fbcfd8e44b8d770fb4870cff99ffb) --- M tests/qunit/mobile.watchlist/test_WatchList.js 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/42/295742/1 diff --git a/tests/qunit/mobile.watchlist/test_WatchList.js b/tests/qunit/mobile.watchlist/test_WatchList.js index 4734399..7c2d7ae 100644 --- a/tests/qunit/mobile.watchlist/test_WatchList.js +++ b/tests/qunit/mobile.watchlist/test_WatchList.js @@ -37,6 +37,8 @@ id: 60 } ] } ); + // Avoid API requests due to scroll events (https://phabricator.wikimedia.org/T116258) + pl.infiniteScroll.disable(); assert.ok( this.spy.notCalled, 'Callback avoided' ); assert.strictEqual( pl.$el.find( '.watch-this-article' ).length, 3, '3 articles have watch stars...' ); assert.strictEqual( pl.$el.find( '.' + watchIcon.getGlyphClassName() ).length, 3, '...and all are marked as watched.' ); -- To view, visit https://gerrit.wikimedia.org/r/295742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia31bb419e21f4d93a459d7772b15aead056c8359 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: REL1_26 Gerrit-Owner: Mattflaschen Gerrit-Reviewer: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove canonical URL from Special:MobileCite - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove canonical URL from Special:MobileCite
..
Remove canonical URL from Special:MobileCite
* Special:MobileCite is only available on the mobile site
* The page is not being indexed by robots since
Ifaef5114ff0ae8d6955fb7c09bc561535c622822
Bug: T136617
Change-Id: I65051d198b0916b1968d1a8d2f5a6583ad983461
---
M includes/MobileFrontend.hooks.php
M tests/phpunit/MobileFrontend.hooksTest.php
2 files changed, 39 insertions(+), 6 deletions(-)
Approvals:
Jdlrobson: Looks good to me, but someone else must approve
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 8883d52..05e9c63 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -809,6 +809,8 @@
// an canonical/alternate link is only useful, if the mobile
and desktop URL are different
// and $wgMFNoindexPages needs to be true
if ( $mfMobileUrlTemplate && $mfNoIndexPages ) {
+ $link = false;
+
if ( !$context->shouldDisplayMobileView() ) {
// add alternate link to desktop sites - bug
T91183
$desktopUrl = $title->getFullUrl();
@@ -817,14 +819,21 @@
'media' => 'only screen and (max-width:
' . $lessVars['deviceWidthTablet'] . ')',
'href' => $context->getMobileUrl(
$desktopUrl ),
];
- } else {
- // add canonical link to mobile pages, instead
of noindex - bug T91183
+ } elseif (
+ !Title::makeTitleSafe( $title->getNamespace(),
strtok( $title->getText(), '/' ) )
+ ->equals( SpecialPage::getTitleFor(
'MobileCite' ) )
+ ) {
+ // Add canonical link to mobile pages (except
for Special:MobileCite),
+ // instead of noindex - bug T91183.
$link = [
'rel' => 'canonical',
'href' => $title->getFullUrl(),
];
}
- $out->addLink( $link );
+
+ if ( $link !== false ) {
+ $out->addLink( $link );
+ }
}
// set the vary header to User-Agent, if mobile frontend auto
detects, if the mobile
diff --git a/tests/phpunit/MobileFrontend.hooksTest.php
b/tests/phpunit/MobileFrontend.hooksTest.php
index 04f3e3c..b5b5d8a 100644
--- a/tests/phpunit/MobileFrontend.hooksTest.php
+++ b/tests/phpunit/MobileFrontend.hooksTest.php
@@ -5,6 +5,26 @@
*/
class MobileFrontendHooksTest extends MediaWikiTestCase {
/**
+* Test no alternate/canonical link is set on Special:MobileCite
+*
+* @covers MobileFrontendHooks::OnBeforePageDisplay
+*/
+ public function testSpecialMobileCiteOnBeforePageDisplay() {
+ $this->setMwGlobals( [
+ 'wgMobileUrlTemplate' => true,
+ 'wgMFNoindexPages' => true
+ ] );
+ $param = $this->getContextSetup( 'mobile', [],
SpecialPage::getTitleFor( 'MobileCite' ) );
+ $out = $param['out'];
+ $sk = $param['sk'];
+
+ MobileFrontendHooks::onBeforePageDisplay( $out, $sk );
+
+ $links = $out->getLinkTags();
+ $this->assertEquals( 0, count( $links ),
+ 'test, no alternate or canonical link is added' );
+ }
+ /**
* Test headers and alternate/canonical links to be set or not
*
* @dataProvider onBeforePageDisplayDataProvider
@@ -82,10 +102,12 @@
* outputpage and skintemplate.
*
* @param string $mode The mode for the test cases (desktop, mobile)
+* @param array $mfXAnalyticsItems
+* @param Title $title
* @return array Array of objects, including MobileContext (context),
* SkinTemplate (sk) and OutputPage (out)
*/
- protected function getContextSetup( $mode, $mfXAnalyticsItems ) {
+ protected function getContextSetup( $mode, $mfXAnalyticsItems, $title =
null ) {
// Create a new MobileContext object for this test
MobileContext::setInstance( null );
// create a new instance of MobileContext
@@ -96,8 +118,10 @@
$out = new OutputPage( $context );
// create a new, empty SkinTemplate
$sk = new SkinTempl
[MediaWiki-commits] [Gerrit] Use improved format specifier for TemplateData. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295741
Change subject: Use improved format specifier for TemplateData.
..
Use improved format specifier for TemplateData.
Thanks to Thiemo Mättig for the suggestion and specification at
Wikimania 2016 in Esino Lario.
Bug: T138492
Change-Id: I3f32aa308259c935d01e277b9ff4886d1f1c97ae
---
M lib/html2wt/WikitextSerializer.js
M tests/parserTests-blacklist.js
2 files changed, 53 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/41/295741/1
diff --git a/lib/html2wt/WikitextSerializer.js
b/lib/html2wt/WikitextSerializer.js
index ea47a61..3c8b1b8 100644
--- a/lib/html2wt/WikitextSerializer.js
+++ b/lib/html2wt/WikitextSerializer.js
@@ -373,6 +373,7 @@
// See
https://github.com/wikimedia/mediawiki-extensions-TemplateData/blob/master/Specification.md
// for the templatedata specification.
+// Formatting spec is at T138492.
WSP._serializeTemplate = function(node, tpl, isTpl, tplData) {
// open the transclusion
var buf = '{{' + tpl.target.wt;
@@ -523,29 +524,37 @@
// this strategy prevents unnecessary normalization
// of edited transclusions which don't have valid
// templatedata formatting information.
+ // See https://phabricator.wikimedia.org/T138492 for details on
format specification string.
- var defaultBlockSpc = [' ', ' ', ' ', '\n']; // "| foo = bar\n"
- var defaultInlineSpc = ['', '', '', '']; // "|foo=bar"
+ var defaultBlockSpc = '| _ = _\n'; // "block"
+ var defaultInlineSpc = '|_=_'; // "inline"
// FIXME: Do a full regexp test maybe?
if (/.*data-parsoid\/0.0.1"$/.test(env.page.dpContentType)) {
// For previous versions of data-parsoid,
// wt2html pipeline used "|foo = bar" style args
// as the default.
- defaultInlineSpc = ['', ' ', ' ', ''];
+ defaultInlineSpc = "|_ = _";
}
var format = tplData && tplData.format ?
tplData.format.toLowerCase() : null;
- var useBlockFormat = format === 'block';
- var useInlineFormat = format === 'inline' || (!useBlockFormat
&& DU.isNewElt(node));
- if (useBlockFormat &&
!TRAILING_COMMENT_OR_WS_AFTER_NL_REGEXP.test(buf)) {
- buf += '\n';
- } else if (useInlineFormat) {
- buf = buf.replace(/\n/g, ' ').trim();
+ if (format === 'block') { format = defaultBlockSpc; }
+ if (format === 'inline') { format = defaultInlineSpc; }
+ // Check format string for validity.
+ if (format && !/^ *[|] *_+ *= *_+ *\n?$/.test(format)) { format
= null; }
+ var isBlockFormat = format && /\n/.test(format);
+ if (format) {
+ // "magic case": If the format string ends with a
newline, an extra newline is added
+ // between the template name and the first parameter.
+ if (isBlockFormat) {
+ if
(!TRAILING_COMMENT_OR_WS_AFTER_NL_REGEXP.test(buf)) {
+ buf += '\n';
+ }
+ } else {
+ buf = buf.replace(/\n/g, ' ').trim();
+ }
}
for (var i = 0; i < argBuf.length; i++) {
- buf += '|';
-
var arg = argBuf[i];
var name = arg.name;
var val = arg.value;
@@ -553,45 +562,53 @@
// We are serializing a positional parameter.
// Whitespace is significant for these and
// formatting would change semantics.
- buf += val;
+ buf += '|' + val;
} else {
// We are serializing a named parameter.
// arg.value has had its whitespace trimmed
already.
- var spc;
+ var sfmt = format;
+ var forceInline = format && !isBlockFormat;
if (name === '') {
// No spacing for blank parameters
({{foo|=bar}})
// This should be an edge case and
probably only for
// inline-formatted templates, but we
are consciously
// forcing this default he
[MediaWiki-commits] [Gerrit] Add mw1304 to the MW scap DSH list - change (operations/puppet)
Elukey has submitted this change and it was merged. Change subject: Add mw1304 to the MW scap DSH list .. Add mw1304 to the MW scap DSH list Change-Id: I1610356285536c1b6c444c360e3561b9ec630284 --- M modules/scap/files/dsh/group/mediawiki-installation 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Elukey: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/scap/files/dsh/group/mediawiki-installation b/modules/scap/files/dsh/group/mediawiki-installation index dfddc80..6a0c7b4 100644 --- a/modules/scap/files/dsh/group/mediawiki-installation +++ b/modules/scap/files/dsh/group/mediawiki-installation @@ -242,6 +242,7 @@ mw1300.eqiad.wmnet mw1301.eqiad.wmnet mw1303.eqiad.wmnet +mw1304.eqiad.wmnet # codfw mw2017.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/295740 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1610356285536c1b6c444c360e3561b9ec630284 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey Gerrit-Reviewer: Elukey Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mw1304 to the MW scap DSH list - change (operations/puppet)
Elukey has uploaded a new change for review. https://gerrit.wikimedia.org/r/295740 Change subject: Add mw1304 to the MW scap DSH list .. Add mw1304 to the MW scap DSH list Change-Id: I1610356285536c1b6c444c360e3561b9ec630284 --- M modules/scap/files/dsh/group/mediawiki-installation 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/40/295740/1 diff --git a/modules/scap/files/dsh/group/mediawiki-installation b/modules/scap/files/dsh/group/mediawiki-installation index dfddc80..6a0c7b4 100644 --- a/modules/scap/files/dsh/group/mediawiki-installation +++ b/modules/scap/files/dsh/group/mediawiki-installation @@ -242,6 +242,7 @@ mw1300.eqiad.wmnet mw1301.eqiad.wmnet mw1303.eqiad.wmnet +mw1304.eqiad.wmnet # codfw mw2017.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/295740 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1610356285536c1b6c444c360e3561b9ec630284 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Filter out search-redirect.php requests - change (wikimedia...golden)
Bearloga has submitted this change and it was merged.
Change subject: Filter out search-redirect.php requests
..
Filter out search-redirect.php requests
Bug: T138411
Change-Id: I5db02d91c2403f7aef4b446572ce91358857e99e
---
M portal/pageviews.R
M portal/referers.R
2 files changed, 20 insertions(+), 11 deletions(-)
Approvals:
Bearloga: Verified; Looks good to me, approved
diff --git a/portal/pageviews.R b/portal/pageviews.R
index 2ed4a0f..05268dc 100644
--- a/portal/pageviews.R
+++ b/portal/pageviews.R
@@ -6,13 +6,15 @@
clause_data <- wmf::date_clause(date)
# Query
- data <- wmf::query_hive(paste0("USE wmf;
- SELECT COUNT(*) AS pageviews
- FROM webrequest
- ", clause_data$date_clause,
- "AND uri_host IN('www.wikipedia.org',
'wikipedia.org')
- AND content_type RLIKE('^text/html')
- AND webrequest_source = 'text'"))
+ data <- wmf::query_hive(paste("USE wmf;
+ SELECT COUNT(*) AS pageviews
+ FROM webrequest",
+ clause_data$date_clause,
+"AND uri_host
RLIKE('^(www\\.)?wikipedia.org/*$')
+ AND INSTR(uri_path, 'search-redirect.php') = 0
+ AND content_type RLIKE('^text/html')
+ AND webrequest_source = 'text'
+ AND NOT (referer
RLIKE('^http://localhost'));"))
output <- data.frame(date = clause_data$date, pageviews = data$pageviews)
diff --git a/portal/referers.R b/portal/referers.R
index 4f76059..81f583f 100644
--- a/portal/referers.R
+++ b/portal/referers.R
@@ -8,7 +8,7 @@
clause_data <- wmf::date_clause(date)
# Write query and run it
- query <- paste0("ADD JAR
/home/bearloga/Code/analytics-refinery-jars/refinery-hive.jar;
+ query <- paste("ADD JAR
/home/bearloga/Code/analytics-refinery-jars/refinery-hive.jar;
CREATE TEMPORARY FUNCTION is_external_search AS
'org.wikimedia.analytics.refinery.hive.IsExternalSearchUDF';
CREATE TEMPORARY FUNCTION classify_referer AS
@@ -21,10 +21,17 @@
classify_referer(referer) AS referer_class,
get_engine(referer) as search_engine,
COUNT(*) AS pageviews
- FROM webrequest ", clause_data$date_clause, "
-AND webrequest_source = 'text'
+ FROM webrequest",
+ clause_data$date_clause,
+ " AND webrequest_source = 'text'
AND content_type RLIKE('^text/html')
-AND uri_host IN('www.wikipedia.org','wikipedia.org')
+AND uri_host RLIKE('^(www\\.)?wikipedia.org/*$')
+AND (
+ INSTR(uri_path, 'search-redirect.php') = 0
+ OR
+ NOT referer
RLIKE('^(https?://www\\.)?wikipedia.org/+search-redirect.php')
+)
+AND NOT referer RLIKE('^http://localhost')
GROUP BY
is_external_search(referer),
classify_referer(referer),
--
To view, visit https://gerrit.wikimedia.org/r/295739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5db02d91c2403f7aef4b446572ce91358857e99e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Bearloga
Gerrit-Reviewer: Bearloga
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Filter out search-redirect.php requests - change (wikimedia...golden)
Bearloga has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295739
Change subject: Filter out search-redirect.php requests
..
Filter out search-redirect.php requests
Bug: T138411
Change-Id: I5db02d91c2403f7aef4b446572ce91358857e99e
---
M portal/pageviews.R
M portal/referers.R
2 files changed, 20 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden
refs/changes/39/295739/1
diff --git a/portal/pageviews.R b/portal/pageviews.R
index 2ed4a0f..05268dc 100644
--- a/portal/pageviews.R
+++ b/portal/pageviews.R
@@ -6,13 +6,15 @@
clause_data <- wmf::date_clause(date)
# Query
- data <- wmf::query_hive(paste0("USE wmf;
- SELECT COUNT(*) AS pageviews
- FROM webrequest
- ", clause_data$date_clause,
- "AND uri_host IN('www.wikipedia.org',
'wikipedia.org')
- AND content_type RLIKE('^text/html')
- AND webrequest_source = 'text'"))
+ data <- wmf::query_hive(paste("USE wmf;
+ SELECT COUNT(*) AS pageviews
+ FROM webrequest",
+ clause_data$date_clause,
+"AND uri_host
RLIKE('^(www\\.)?wikipedia.org/*$')
+ AND INSTR(uri_path, 'search-redirect.php') = 0
+ AND content_type RLIKE('^text/html')
+ AND webrequest_source = 'text'
+ AND NOT (referer
RLIKE('^http://localhost'));"))
output <- data.frame(date = clause_data$date, pageviews = data$pageviews)
diff --git a/portal/referers.R b/portal/referers.R
index 4f76059..81f583f 100644
--- a/portal/referers.R
+++ b/portal/referers.R
@@ -8,7 +8,7 @@
clause_data <- wmf::date_clause(date)
# Write query and run it
- query <- paste0("ADD JAR
/home/bearloga/Code/analytics-refinery-jars/refinery-hive.jar;
+ query <- paste("ADD JAR
/home/bearloga/Code/analytics-refinery-jars/refinery-hive.jar;
CREATE TEMPORARY FUNCTION is_external_search AS
'org.wikimedia.analytics.refinery.hive.IsExternalSearchUDF';
CREATE TEMPORARY FUNCTION classify_referer AS
@@ -21,10 +21,17 @@
classify_referer(referer) AS referer_class,
get_engine(referer) as search_engine,
COUNT(*) AS pageviews
- FROM webrequest ", clause_data$date_clause, "
-AND webrequest_source = 'text'
+ FROM webrequest",
+ clause_data$date_clause,
+ " AND webrequest_source = 'text'
AND content_type RLIKE('^text/html')
-AND uri_host IN('www.wikipedia.org','wikipedia.org')
+AND uri_host RLIKE('^(www\\.)?wikipedia.org/*$')
+AND (
+ INSTR(uri_path, 'search-redirect.php') = 0
+ OR
+ NOT referer
RLIKE('^(https?://www\\.)?wikipedia.org/+search-redirect.php')
+)
+AND NOT referer RLIKE('^http://localhost')
GROUP BY
is_external_search(referer),
classify_referer(referer),
--
To view, visit https://gerrit.wikimedia.org/r/295739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5db02d91c2403f7aef4b446572ce91358857e99e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Bearloga
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove backwards-compatibility code using APIEditBeforeSave ... - change (mediawiki...SpamBlacklist)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295738
Change subject: Remove backwards-compatibility code using APIEditBeforeSave hook
..
Remove backwards-compatibility code using APIEditBeforeSave hook
It was only needed for MediaWiki prior to 1.25
(09a5febb7b024c0b6585141bb05cba13a642f3eb).
We no longer support those versions after
5d882775f6323e9c23bed3abba9a4b8293c7b840.
Bug: T137832
Change-Id: I97f6a3c20476f1a42e3fadc701df5870a30c790c
---
M SpamBlacklistHooks.php
M extension.json
2 files changed, 4 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamBlacklist
refs/changes/38/295738/1
diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
index e7df36c..184808e 100644
--- a/SpamBlacklistHooks.php
+++ b/SpamBlacklistHooks.php
@@ -53,11 +53,6 @@
static function filterMergedContent( IContextSource $context, Content
$content, Status $status, $summary, User $user, $minoredit ) {
$title = $context->getTitle();
- if ( isset( $title->spamBlackListFiltered ) &&
$title->spamBlackListFiltered ) {
- // already filtered
- return true;
- }
-
// get the link from the not-yet-saved page content.
$editInfo = $context->getWikiPage()->prepareContentForEdit(
$content );
$pout = $editInfo->output;
@@ -81,6 +76,10 @@
foreach ( $matches as $match ) {
$status->fatal( 'spamprotectionmatch', $match );
}
+
+ $status->apiHookResult = [
+ 'spamblacklist' => implode( '|', $matches ),
+ ];
}
// Always return true, EditPage will look at $status->isOk().
@@ -90,50 +89,6 @@
public static function onParserOutputStashForEdit( WikiPage $page ) {
$spamObj = BaseBlacklist::getInstance( 'spam' );
$spamObj->warmCachesForFilter( $page->getTitle() );
- }
-
- /**
-* Hook function for APIEditBeforeSave.
-* This allows blacklist matches to be reported directly in the result
structure
-* of the API call.
-*
-* @param $editPage EditPage
-* @param $text string
-* @param $resultArr array
-* @return bool
-*/
- static function filterAPIEditBeforeSave( $editPage, $text, &$resultArr
) {
- $title = $editPage->mArticle->getTitle();
-
- // get the links from the not-yet-saved page content.
- $content = ContentHandler::makeContent(
- $text,
- $editPage->getTitle(),
- $editPage->contentModel,
- $editPage->contentFormat
- );
- $editInfo = $editPage->mArticle->prepareContentForEdit(
$content, null, null, $editPage->contentFormat );
- $pout = $editInfo->output;
- $links = array_keys( $pout->getExternalLinks() );
-
- // HACK: treat the edit summary as a link
- $summary = $editPage->summary;
- if ( $summary !== '' ) {
- $links[] = $summary;
- }
-
- $spamObj = BaseBlacklist::getInstance( 'spam' );
- $matches = $spamObj->filter( $links, $title );
-
- if ( $matches !== false ) {
- $resultArr['spamblacklist'] = implode( '|', $matches );
- }
-
- // mark the title, so filterMergedContent can skip it.
- $title->spamBlackListFiltered = true;
-
- // return convention for hooks is the inverse of
$wgFilterCallback
- return ( $matches === false );
}
/**
diff --git a/extension.json b/extension.json
index 1007511..257fb5a 100644
--- a/extension.json
+++ b/extension.json
@@ -51,9 +51,6 @@
"EditFilterMergedContent": [
"SpamBlacklistHooks::filterMergedContent"
],
- "APIEditBeforeSave": [
- "SpamBlacklistHooks::filterAPIEditBeforeSave"
- ],
"EditFilter": [
"SpamBlacklistHooks::validate"
],
--
To view, visit https://gerrit.wikimedia.org/r/295738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97f6a3c20476f1a42e3fadc701df5870a30c790c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Anomie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] LABS: Enable graphoid geoshapes - change (operations/puppet)
Gehel has submitted this change and it was merged. Change subject: LABS: Enable graphoid geoshapes .. LABS: Enable graphoid geoshapes Bug: T138192 Change-Id: Iee133037399cb2fd3166136ccfa30c0195d67f65 --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Gehel: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 4120f7c..a5fdab6 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -40,6 +40,8 @@ wikidatasparql: - query.wikidata.org - wdqs-test.wmflabs.org + geoshape: +- maps.wikimedia.org graphoid::headers: 'Cache-Control': 'public, s-maxage=360, max-age=360' graphoid::error_headers: -- To view, visit https://gerrit.wikimedia.org/r/295581 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee133037399cb2fd3166136ccfa30c0195d67f65 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yurik Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Gehel Gerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add an indexing policy and a link back to the article from S... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Add an indexing policy and a link back to the article from
Special:MobileCite
..
Add an indexing policy and a link back to the article from Special:MobileCite
* The indexing policy value is "noindex,nofollow" so that we avoid unnecessary
concentrations of references-only pages in search engine listings.
* The link is especially useful when the user is coming to the page
from a shared link or from the search engine.
Bug: T136617
Change-Id: Ifaef5114ff0ae8d6955fb7c09bc561535c622822
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A includes/specials/SpecialMobileCite.mustache
M includes/specials/SpecialMobileCite.php
A resources/mobile.special.mobilecite.styles/mobilecite.less
6 files changed, 23 insertions(+), 1 deletion(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index d5eac0b..a8b034c 100644
--- a/extension.json
+++ b/extension.json
@@ -1423,6 +1423,12 @@
"class": "MobileUserModule",
"position": "bottom"
},
+ "mobile.special.mobilecite.styles": {
+ "targets": "mobile",
+ "styles": [
+
"resources/mobile.special.mobilecite.styles/mobilecite.less"
+ ]
+ },
"mobile.special.mobilemenu.styles": {
"targets": "mobile",
"styles": [
diff --git a/i18n/en.json b/i18n/en.json
index 1179384..1fec373 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -275,6 +275,7 @@
"mobile-frontend-requires-mobile": "This page is not available on
desktop. Please click the mobile view link at the bottom of the page.",
"mobile-frontend-requires-optin": "This page is not available unless
you opt into our beta mode. Visit the [[Special:MobileOptions|settings page]]
to opt in.",
"mobile-frontend-requires-title": "Page unavailable",
+ "mobile-frontend-return-to-page": "Return to page",
"mobile-frontend-save-error": "Error saving settings. Please make sure
that you have cookies enabled.",
"mobile-frontend-save-settings": "Save",
"mobile-frontend-saving-exit-page": "Your contribution is still saving.
If you leave your contributions will be lost. Are you sure you want to exit?",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b4a2d6a..4a9196f 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -273,6 +273,7 @@
"mobile-frontend-requires-mobile": "Message that shows when a special
page does not have a desktop equivalent.\n\nPoints user to mobile view link at
bottom of page to switch to mobile.\n\nThis should be consistent with
{{msg-mw|Mobile-frontend-view}}.",
"mobile-frontend-requires-optin": "Message that shows when a page
requires beta mode to work. Wikitext that links to [[Special:MobileOptions]]
page.",
"mobile-frontend-requires-title": "Title shown on page when the page is
not available to the user. Currently used for special pages that have no
mobile/desktop equivalent or that are only available as experimental features.",
+ "mobile-frontend-return-to-page": "The text of the link that takes the
user back to the article",
"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-saving-exit-page": "When a user makes an edit in the
page which is happening in the background\nand then tries to leave the page
this message is shown to check that they are happy that they will lose their
changes.\nThey can either exit the page and lose them or stay on the page until
they are complete",
diff --git a/includes/specials/SpecialMobileCite.mustache
b/includes/specials/SpecialMobileCite.mustache
new file mode 100644
index 000..63a7476
--- /dev/null
+++ b/includes/specials/SpecialMobileCite.mustache
@@ -0,0 +1,4 @@
+
+ {{article_link_title}}
+
+{{{html}}}
diff --git a/includes/specials/SpecialMobileCite.php
b/includes/specials/SpecialMobileCite.php
index 5fd7bef..a0dfdc8 100644
--- a/includes/specials/SpecialMobileCite.php
+++ b/includes/specials/SpecialMobileCite.php
@@ -49,6 +49,7 @@
* @param string $pagename The revision number
*/
public function executeWhenAvailable( $param ) {
+ $this->setHeaders();
$out = $this->getOutput();
$revision = null;
if ( $param ) {
@@ -64,7 +65,13 @@
$html = $this->getReferenceBodyHtml( $title, $revId );
[MediaWiki-commits] [Gerrit] Bump src to 18022c96 for deploy - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged. Change subject: Bump src to 18022c96 for deploy .. Bump src to 18022c96 for deploy Change-Id: Ia92f727be8f8ec8e8abca68762505a41085aaec4 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Arlolra: Looks good to me, approved jenkins-bot: Verified diff --git a/src b/src index 8fd4c9b..18022c9 16 --- a/src +++ b/src -Subproject commit 8fd4c9bbee79ab0fe30f86d6ba44dc73b11b62a1 +Subproject commit 18022c96082d77d26b6225b490484167d9e45597 -- To view, visit https://gerrit.wikimedia.org/r/295719 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia92f727be8f8ec8e8abca68762505a41085aaec4 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry Gerrit-Reviewer: Arlolra Gerrit-Reviewer: Cscott Gerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Edit preview: Right click on map should tell you the coordin... - change (mediawiki...Kartographer)
JGirault has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295737
Change subject: Edit preview: Right click on map should tell you the coordinates
..
Edit preview: Right click on map should tell you the coordinates
Bug: T138520
Change-Id: I40c9aff9d49e048d1dc0e4825f6f50b08a3b6b58
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/kartographer.js
A modules/preview/preview.js
5 files changed, 55 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/37/295737/1
diff --git a/extension.json b/extension.json
index 9431ee6..32d0d90 100644
--- a/extension.json
+++ b/extension.json
@@ -150,6 +150,18 @@
"desktop"
]
},
+ "ext.kartographer.preview": {
+ "scripts": [
+ "modules/preview/preview.js"
+ ],
+ "messages": [
+ "kartographer-contextmenu-coords"
+ ],
+ "targets": [
+ "mobile",
+ "desktop"
+ ]
+ },
"ext.kartographer.fullscreen": {
"dependencies": [
"ext.kartographer.site",
diff --git a/i18n/en.json b/i18n/en.json
index be99bc3..a92185e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,6 +17,7 @@
"kartographer-attribution": "Wikimedia maps | Map data ©
[https://www.openstreetmap.org/copyright OpenStreetMap contributors]",
"kartographer-broken-category": "Pages with broken maps",
"kartographer-broken-category-desc": "The page includes an invalid map
usage",
+ "kartographer-contextmenu-coords": "You clicked the map at lat=$1 |
lon=$2",
"kartographer-desc": "Allows maps to be added to the wiki pages",
"kartographer-error-context": "<$1>: $2",
"kartographer-error-context-multi": "<$1> problems:\n$2",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 34714cc..fd22b0a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -20,6 +20,7 @@
"kartographer-attribution": "Attribution text shown at the bottom of
the map",
"kartographer-broken-category": "Name of the tracking category",
"kartographer-broken-category-desc": "Description on
[[Special:TrackingCategories]] for the {{msg-mw|kartographer-broken-category}}
tracking category.",
+ "kartographer-contextmenu-coords": "Popup for displaying coordinates of
where you clicked. \n\nParameters:\n* $1 - latitude\n* $2 - longitude",
"kartographer-desc":
"{{desc|name=Kartographer|url=https://www.mediawiki.org/wiki/Extension:Kartographer}}";,
"kartographer-error-context": "{{Optional}}\nGeneral message shown
before a single specific error\n\nParameters:\n* $1 - tag name, 'mapframe' or
'maplink'\n* $2 - error message",
"kartographer-error-context-multi": "General message shown before
multiple errors\n\nParameters:\n* $1 - tag name, 'mapframe', 'maplink' or
'mapdata'\n* $2 - list of errors combined into a bullet list",
diff --git a/modules/kartographer.js b/modules/kartographer.js
index fca4daf..9f6153c 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -6,7 +6,8 @@
forceHttps = mapServer[ 4 ] === 's',
config = L.mapbox.config,
router = mw.loader.require( 'mediawiki.router' ),
- worldLatLng = new L.LatLngBounds( [ -90, -180 ], [ 90, 180 ] );
+ worldLatLng = new L.LatLngBounds( [ -90, -180 ], [ 90, 180 ] ),
+ getScaleCoords;
config.REQUIRE_ACCESS_TOKEN = false;
config.FORCE_HTTPS = forceHttps;
@@ -445,6 +446,9 @@
/**
* Convenient method that formats the coordinates based on the zoom
level.
*
+* FIXME: This method is public but do not use it. It will become
private
+* again once this file is split into several modules (T134079).
+*
* @param {number} zoom
* @param {number} lat
* @param {number} lng
@@ -452,7 +456,7 @@
* the longitude (string).
* @private
*/
- function getScaleCoords( zoom, lat, lng ) {
+ getScaleCoords = mw.kartographer.getScaleCoords = function( zoom, lat,
lng ) {
var precisionPerZoom = [ 0, 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4,
4, 4, 4, 4, 5, 5 ];
return [
@@ -745,5 +749,9 @@
mapDialog.close();
}
} );
+
+ if ( mw.config.get( 'wgAction' ) === 'submit' ) {
+ mw.loader.using( 'ext.kartographer.preview' );
+ }
} );
}( jQuery, mediaWiki ) );
diff --git a/modules/previe
[MediaWiki-commits] [Gerrit] phpcs: Enable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefo... - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: phpcs: Enable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
and make pass
..
phpcs: Enable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore and make pass
Change-Id: I9b645a1ded14cbc799a9e293aef241d1024edbe8
---
M ProofreadPage.body.php
M includes/Parser/PagesTagParser.php
M includes/page/PageContentBuilder.php
M phpcs.xml
4 files changed, 19 insertions(+), 10 deletions(-)
Approvals:
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 7e2916e..f33a0fd 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -760,7 +760,9 @@
'text' => wfMessage(
'proofreadpage_image' )->plain()
];
}
- } catch ( FileNotFoundException $e ) {}
+ }
+ catch ( FileNotFoundException $e ) {
+}
//Prev, Next and Index links
$indexPage = $page->getIndex();
@@ -777,7 +779,9 @@
'href' =>
self::getLinkUrlForTitle( $prevTitle ),
'text' => wfMessage(
'proofreadpage_prevpage' )->plain()
];
- } catch ( OutOfBoundsException $e ) {} //if the
previous page does not exits
+ }
+ catch ( OutOfBoundsException $e ) {
+ } //if the previous page does not exits
try {
$nextPage = $pagination->getPage(
$pageNumber + 1 );
@@ -787,8 +791,12 @@
'href' =>
self::getLinkUrlForTitle( $nextTitle ),
'text' => wfMessage(
'proofreadpage_nextpage' )->plain()
];
- } catch ( OutOfBoundsException $e ) {} //if the
next page does not exits
- } catch ( PageNotInPaginationException $e ) {}
+ }
+ catch ( OutOfBoundsException $e ) {
+ } //if the next page does not exits
+ }
+ catch ( PageNotInPaginationException $e ) {
+ }
$links['namespaces']['proofreadPageIndexLink'] = [
'class' => ( $skin->skinname === 'vector' ) ?
'icon' : '',
diff --git a/includes/Parser/PagesTagParser.php
b/includes/Parser/PagesTagParser.php
index 72e4201..e6396eb 100644
--- a/includes/Parser/PagesTagParser.php
+++ b/includes/Parser/PagesTagParser.php
@@ -242,7 +242,9 @@
$firstpage->getArticleID(),
$firstpage->getLatestRevID()
);
- } catch ( OutOfBoundsException $e ) {} //if the first
page does not exists
+ }
+ catch ( OutOfBoundsException $e ) {
+ } //if the first page does not exists
}
if ( $header ) {
diff --git a/includes/page/PageContentBuilder.php
b/includes/page/PageContentBuilder.php
index e31fa68..3367ebf 100644
--- a/includes/page/PageContentBuilder.php
+++ b/includes/page/PageContentBuilder.php
@@ -53,7 +53,8 @@
$displayedPageNumber =
$pagination->getDisplayedPageNumber( $pageNumber );
$params['pagenum'] =
$displayedPageNumber->getFormattedPageNumber(
$page->getTitle()->getPageLanguage() );
} catch ( PageNotInPaginationException $e ) {
- } catch ( OutOfBoundsException $e ) {} //should not
happen
+ } catch ( OutOfBoundsException $e ) {
+ } //should not happen
$header = $index->replaceVariablesWithIndexEntries(
'header', $params );
$footer = $index->replaceVariablesWithIndexEntries(
'footer', $params );
@@ -77,7 +78,8 @@
$body = preg_replace( "/(\d*)/",
'', $text );
}
}
- } catch ( FileNotFoundException $e ) {}
+ } catch ( FileNotFoundException $e ) {
+}
return new PageContent(
new WikitextContent( $header ),
diff --git a/phpcs.xml b/phpcs.xml
index b7d9bf1..67e7303 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -21,9 +21,6 @@
0
-
- 0
-
.
node_modules/
--
To view, visit https://gerrit.wikimedia.org/r/295728
To unsubscribe, visit https://gerrit.
[MediaWiki-commits] [Gerrit] Add two missing fields to i18n - change (labs...heritage)
Lokal Profil has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295736
Change subject: Add two missing fields to i18n
..
Add two missing fields to i18n
Change-Id: Ib5156319d8a6a5eec2ffab8870706b247331a1cb
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage
refs/changes/36/295736/1
diff --git a/i18n/en.json b/i18n/en.json
index 84fa066..35be86e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -21,6 +21,9 @@
"db-field-source": "Source",
"db-field-monument_article": "Monument page",
"db-field-registrant_url": "Registrant URL",
+ "db-field-commonscat": "Commons category",
+ "db-field-wd_item": "Wikidata item",
+ "db-field-wd_project": "Wikimedia project",
"db-field-st_address": "Addresses",
"db-field-st_address_pct": "Addresses %",
"db-field-st_coordinates": "Coordinates",
@@ -32,7 +35,6 @@
"db-field-st_name": "Names",
"db-field-st_name_pct": "Names %",
"db-field-st_total": "Total number",
- "db-field-commonscat": "Commons category",
"toolbox-label-searchtipps": "use %term or term% or %term% for fuzzy
search",
"toolbox-meta-title": "Wiki Loves Monuments Toolbox",
"toolbox-main-title": "WLM Toolbox",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 22a8136..a275e65 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -31,6 +31,9 @@
"db-field-source": "Translation of the field \"source\" in the
monuments database. The source field contains a link to the list on a Wikimedia
project from which the data was imported.\n{{Identical|Source}}",
"db-field-monument_article": "Translation of the field
\"monument_article\" in the monuments database. This is the title of a wiki
page about the monument.",
"db-field-registrant_url": "Translation of the field \"registrant_url\"
in the monuments database.\n\nExamples of registrant URLs:\n*
http://www.culture.gouv.fr/public/mistral/merimee_fr?ACTION=CHERCHER&FIELD_1=REF&VALUE_1=PA00088517\n*
http://register.muinas.ee/?menuID=monument&action=view&id=20875";,
+ "db-field-commonscat": "Translation of the field \"commonscat\" in the
monuments database. This is the title of a category on Wikimedia Commons with
images of the monument.",
+ "db-field-wd_item": "Translation of the field \"wd_item\" in the
monuments database. This is the id of a Wikidata item.",
+ "db-field-wd_project": "Translation of the field \"project\" in the
monuments database. This is the title of a Wikimedia Project.",
"db-field-st_address": "{{Identical|Address}}",
"db-field-st_address_pct": "{{Identical|Address}}",
"db-field-st_coordinates": "{{Identical|Coordinates}}",
@@ -42,7 +45,6 @@
"db-field-st_name": "{{Identical|Name}}",
"db-field-st_name_pct": "{{Identical|Name}}",
"db-field-st_total": "{{Identical|Total number}}",
- "db-field-commonscat": "Translation of the field \"commonscat\" in the
monuments database. This is the title of a category on Wikimedia Commons with
images of the monument.",
"toolbox-label-searchtipps": "Instruction for how to perform a fuzzy
search.",
"toolbox-meta-title": "Title used in the metadata header of the page.",
"toolbox-main-title": "Page header used in the top of every page of the
toolbox.",
--
To view, visit https://gerrit.wikimedia.org/r/295736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5156319d8a6a5eec2ffab8870706b247331a1cb
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cache roles: add tcpmhash_entries=64K to kernel cmdline - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: cache roles: add tcpmhash_entries=64K to kernel cmdline
..
cache roles: add tcpmhash_entries=64K to kernel cmdline
Change-Id: I04a86d046fd00e23a98d7ed33f0a379c42ff7ed8
---
M hieradata/role/common/cache/maps.yaml
M hieradata/role/common/cache/misc.yaml
M hieradata/role/common/cache/text.yaml
M hieradata/role/common/cache/upload.yaml
M modules/base/manifests/grub.pp
5 files changed, 11 insertions(+), 1 deletion(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/cache/maps.yaml
b/hieradata/role/common/cache/maps.yaml
index dd92fbb..631ac3a 100644
--- a/hieradata/role/common/cache/maps.yaml
+++ b/hieradata/role/common/cache/maps.yaml
@@ -1,6 +1,7 @@
cluster: cache_maps
cache::cluster: maps
cache::tune_for_media: true
+base::grub::tcpmhash_entries: 65536
# The contents of this hash control our DC->DC routing for varnish backend
# daemons. There should be a key for every cache datacenter, and the
# values can be another datacenter or 'direct', which means contact the
diff --git a/hieradata/role/common/cache/misc.yaml
b/hieradata/role/common/cache/misc.yaml
index f40ae08..f7ca487 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -1,5 +1,6 @@
cluster: cache_misc
cache::cluster: misc
+base::grub::tcpmhash_entries: 65536
# The contents of this hash control our DC->DC routing for varnish backend
# daemons. There should be a key for every cache datacenter, and the
# values can be another datacenter or 'direct', which means contact the
diff --git a/hieradata/role/common/cache/text.yaml
b/hieradata/role/common/cache/text.yaml
index ae2fe39..109fe4e 100644
--- a/hieradata/role/common/cache/text.yaml
+++ b/hieradata/role/common/cache/text.yaml
@@ -2,6 +2,7 @@
cache::cluster: text
admin::groups:
- perf-roots
+base::grub::tcpmhash_entries: 65536
# The contents of this hash control our DC->DC routing for varnish backend
# daemons. There should be a key for every cache datacenter, and the
# values can be another datacenter or 'direct', which means contact the
diff --git a/hieradata/role/common/cache/upload.yaml
b/hieradata/role/common/cache/upload.yaml
index 6c83be9..551ad4b 100644
--- a/hieradata/role/common/cache/upload.yaml
+++ b/hieradata/role/common/cache/upload.yaml
@@ -3,6 +3,7 @@
admin::groups:
- perf-roots
cache::tune_for_media: true
+base::grub::tcpmhash_entries: 65536
# The contents of this hash control our DC->DC routing for varnish backend
# daemons. There should be a key for every cache datacenter, and the
# values can be another datacenter or 'direct', which means contact the
diff --git a/modules/base/manifests/grub.pp b/modules/base/manifests/grub.pp
index 695f93c..f6c2821 100644
--- a/modules/base/manifests/grub.pp
+++ b/modules/base/manifests/grub.pp
@@ -1,4 +1,4 @@
-class base::grub($ioscheduler = 'deadline', $enable_memory_cgroup = false) {
+class base::grub($ioscheduler = 'deadline', $enable_memory_cgroup = false,
$tcpmhash_entries = 0) {
# The augeas Shellvars_list lens can't handle backticks for
# versions < 1.2.0 (practically every distro older than jessie).
# We fallback to the legacy grep/sed method in that case.
@@ -10,6 +10,11 @@
$swapaccount_line = $enable_memory_cgroup ? {
true => 'set GRUB_CMDLINE_LINUX/value[. = "swapaccount=1"]
swapaccount=1',
false => 'rm GRUB_CMDLINE_LINUX/value[. = "swapaccount=1"]'
+}
+
+$tcpmhash_line = $tcpmhash_entries ? {
+0 => 'rm GRUB_CMDLINE_LINUX/value[. =~
glob("tcpmhash_entries=*")]',
+default => "set GRUB_CMDLINE_LINUX/value[. =~
glob(\"tcpmhash_entries=*\")] tcpmhash_entries=${tcpmhash_entries}"
}
augeas { 'grub2':
@@ -27,6 +32,7 @@
"set GRUB_CMDLINE_LINUX/value[. =~ glob(\"elevator=*\")]
elevator=${ioscheduler}",
$cgroup_line,
$swapaccount_line,
+$tcpmhash_line,
],
notify => Exec['update-grub'],
}
--
To view, visit https://gerrit.wikimedia.org/r/295724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I04a86d046fd00e23a98d7ed33f0a379c42ff7ed8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Gehel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] r::c::perf: enable tcp metrics saving - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: r::c::perf: enable tcp metrics saving .. r::c::perf: enable tcp metrics saving Change-Id: Id8539d4b6b66d1d9ab883044327303bce310ce4b --- M modules/role/manifests/cache/perf.pp 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/role/manifests/cache/perf.pp b/modules/role/manifests/cache/perf.pp index d9e2527..24a5101 100644 --- a/modules/role/manifests/cache/perf.pp +++ b/modules/role/manifests/cache/perf.pp @@ -153,6 +153,27 @@ # nginx and/or openssl know what they're doing and we'd benefit from # the writes going out immediately and not autocorking... 'net.ipv4.tcp_autocorking' => 0, + +# EXPERIMENTAL! +# no_metrics_save: default 0. Most tuning advice on the internet +# says set it to 1, our own base-level sysctls for all systems also +# set it to 1. I think it's possible this advice is outdated and +# harmful. The rationale for no_metrics_save is that if there's +# congestion/loss, congestion algorithms will cut down the cwnd of +# the active connection very aggressively, and are very slow at +# recovering from even small bursts of loss, and metrics cache will +# carry this over to new connections after a temporary loss burst +# that's already ended. However, Linux 3.2+ implements PRR (RFC +# 6937), which mitigates these issues and allows faster/fuller +# recovery from loss bursts. That should reduce the downsides of +# saving metrics significantly, and the upsides have always been a +# win because we remember (for an hour) past RTT, ssthresh, cwnd, +# etc, which often allow better initial connection conditions. +# Kernel boot param 'tcpmhash_entries' defaults to 16K on our +# caches, and sets hash table slots for this. We'd probably be +# better off with a much larger hashtable (maybe 64K or 128K?), as +# the chains will be long on high-traffic cache hosts at 16K. +'net.ipv4.tcp_no_metrics_save' => 0, }, } } -- To view, visit https://gerrit.wikimedia.org/r/295723 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8539d4b6b66d1d9ab883044327303bce310ce4b Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack Gerrit-Reviewer: BBlack Gerrit-Reviewer: Ema Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Add custom query to characterEditStats.php when $wgRCM... - change (mediawiki...Translate)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295735
Change subject: [WIP] Add custom query to characterEditStats.php when
$wgRCMaxAge is too low
..
[WIP] Add custom query to characterEditStats.php when $wgRCMaxAge is too low
As suggested about I93ec9443ac6859856c016d2780855bbf8e06ef3a
Bug: T64833
Change-Id: Ib830b6b888eb4fc048c4a3a74c30e82096a372c2
---
M scripts/characterEditStats.php
1 file changed, 38 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/35/295735/1
diff --git a/scripts/characterEditStats.php b/scripts/characterEditStats.php
index 418fe4d..e41e213 100644
--- a/scripts/characterEditStats.php
+++ b/scripts/characterEditStats.php
@@ -52,7 +52,7 @@
}
public function execute() {
- global $wgTranslateFuzzyBotName, $wgSitename;
+ global $wgTranslateFuzzyBotName, $wgSitename, $wgRCMaxAge;
$days = (int)$this->getOption( 'days', 30 );
$hours = $days * 24;
@@ -74,9 +74,43 @@
// Select set of edits to report on
- // Fetch some extrac fields that normally
TranslateUtils::translationChanges wont
- $extraFields = array( 'rc_old_len', 'rc_new_len' );
- $rows = TranslateUtils::translationChanges( $hours, $bots,
$namespaces, $extraFields );
+ if ( $hours * 3600 <= $wgRCMaxAge ) {
+ // Fetch some extract fields that normally
TranslateUtils::translationChanges won't
+ $extraFields = array( 'rc_old_len', 'rc_new_len' );
+ $rows = TranslateUtils::translationChanges( $hours,
$bots, $namespaces, $extraFields );
+ } else {
+ // Fetch some extract fields that normally
TranslateUtils::translationChanges won't
+ $extraFields = array( 'rev_len AS rc_new_len',
'rc_new_len' );
+ $dbr = wfGetDB( DB_SLAVE );
+ $recentchanges = $dbr->tableName( 'revision' );
+ $hours = (int)$hours;
+ $cutoff_unixtime = time() - ( $hours * 3600 );
+ $cutoff = $dbr->timestamp( $cutoff_unixtime );
+
+ $namespaces = $dbr->makeList(
$wgTranslateMessageNamespaces );
+ if ( $ns ) {
+ $namespaces = $dbr->makeList( $ns );
+ }
+
+ $fields = array_merge(
+ array( 'page_title AS rc_title', 'rev_timestamp
AS rc_timestamp', 'rev_user_text AS rc_user_text', 'rev_namespace AS
rc_namespace' ),
+ $extraFields
+ );
+ $fields = implode( ',', $fields );
+ // @todo Raw SQL
+ $sql = "SELECT $fields, substring_index(page_title,
'/', -1) as lang FROM $recentchanges " .
+ "JOIN page ON rev_page = page_id" .
+ "AND rev_namespace in ($namespaces) " .
+ "AND rev_parent_id = 0" .
+ "HAVING rc_timestamp >= '{$cutoff}' " .
+ ( $bots ? '' : 'AND rc_bot = 0 ' ) .
+ "AND rc_namespace in ($namespaces) " .
+ 'ORDER BY lang ASC, rc_timestamp DESC';
+
+ $res = $dbr->query( $sql, __METHOD__ );
+ $rows = iterator_to_array( $res );
+ }
+
// Get counts for edits per language code after filtering out
edits by FuzzyBot
$codes = array();
--
To view, visit https://gerrit.wikimedia.org/r/295735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib830b6b888eb4fc048c4a3a74c30e82096a372c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nemo bis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Swipe to refresh the feed. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295734
Change subject: Swipe to refresh the feed.
..
Swipe to refresh the feed.
Change-Id: If587bdc0ae50e8d1817e04cee2eebf0d1fece141
---
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/res/layout/fragment_feed.xml
M app/src/main/res/values/dimens.xml
3 files changed, 32 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/34/295734/1
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index a1f3c9b..a0c2d4f 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -5,6 +5,7 @@
import android.support.annotation.Nullable;
import android.support.design.widget.AppBarLayout;
import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -35,6 +36,7 @@
MainActivityToolbarProvider,
CallbackFragment {
@BindView(R.id.feed_app_bar_layout) AppBarLayout appBarLayout;
+@BindView(R.id.feed_swipe_refresh_layout) SwipeRefreshLayout
swipeRefreshLayout;
@BindView(R.id.fragment_feed_feed) FeedView feedView;
@BindView(R.id.feed_toolbar) Toolbar toolbar;
private Unbinder unbinder;
@@ -75,10 +77,22 @@
appBarLayout.addOnOffsetChangedListener(headerOffsetChangedListener);
searchIconShowThresholdPx = (int)
getResources().getDimension(R.dimen.view_feed_header_height) -
DimenUtil.getContentTopOffsetPx(getContext());
+swipeRefreshLayout.setProgressViewOffset(true,
+(int)
getResources().getDimension(R.dimen.view_feed_refresh_offset_start),
+(int)
getResources().getDimension(R.dimen.view_feed_refresh_offset_end));
+swipeRefreshLayout.setOnRefreshListener(new
SwipeRefreshLayout.OnRefreshListener() {
+@Override
+public void onRefresh() {
+coordinator.reset();
+coordinator.more(app.getSite());
+}
+});
+
coordinator.setFeedUpdateListener(new
FeedCoordinator.FeedUpdateListener() {
@Override
public void update(List cards) {
if (isAdded()) {
+swipeRefreshLayout.setRefreshing(false);
feedView.update();
}
}
@@ -180,6 +194,7 @@
searchIconVisible = shouldShowSearchIcon;
getActivity().supportInvalidateOptionsMenu();
}
+swipeRefreshLayout.setEnabled(verticalOffset == 0);
}
}
}
diff --git a/app/src/main/res/layout/fragment_feed.xml
b/app/src/main/res/layout/fragment_feed.xml
index c8dcdc5..772f582 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -28,6 +28,7 @@
android:scaleType="centerCrop"
android:fitsSystemWindows="true"
android:src="@drawable/feed_app_bar"
+android:contentDescription="@null"
app:layout_collapseMode="parallax"
/>
@@ -42,15 +43,22 @@
-
+app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+
+
+
diff --git a/app/src/main/res/values/dimens.xml
b/app/src/main/res/values/dimens.xml
index a124a0d..27c9ece 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -90,6 +90,8 @@
260dp
+40dp
+60dp
229.3dp
8dp
5.3dp
--
To view, visit https://gerrit.wikimedia.org/r/295734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If587bdc0ae50e8d1817e04cee2eebf0d1fece141
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] phpcs: Enable MediaWiki.WhiteSpace.MultipleEmptyLines.Multip... - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: phpcs: Enable
MediaWiki.WhiteSpace.MultipleEmptyLines.MultipleEmptyLines and make pass
..
phpcs: Enable MediaWiki.WhiteSpace.MultipleEmptyLines.MultipleEmptyLines and
make pass
Change-Id: I8049b8c1cb5b4a304834c106655a46c24d2adc29
---
M ProofreadPage.body.php
M ProofreadPage.namespaces.php
M includes/index/EditProofreadIndexPage.php
M includes/index/ProofreadIndexValue.php
M includes/index/oai/ProofreadIndexOaiError.php
M includes/index/oai/ProofreadIndexOaiRecord.php
M includes/index/oai/ProofreadIndexOaiSets.php
M includes/index/oai/SpecialProofreadIndexOai.php
M includes/index/oai/SpecialProofreadIndexOaiSchema.php
M includes/page/PageContent.php
M phpcs.xml
M tests/includes/page/PageContentTest.php
12 files changed, 0 insertions(+), 25 deletions(-)
Approvals:
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 7073a8f..ed727a3 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -689,7 +689,6 @@
return true;
}
-
/**
* @param $updater DatabaseUpdater
* @return bool
diff --git a/ProofreadPage.namespaces.php b/ProofreadPage.namespaces.php
index b9c6cfc..51e7f8e 100644
--- a/ProofreadPage.namespaces.php
+++ b/ProofreadPage.namespaces.php
@@ -233,7 +233,6 @@
'index_talk' => 'Discussioni_indice'
];
-
/** Kannada (ಕನ್ನಡ) */
$proofreadPageNamespacesNames['kn'] = [
'page' => 'ಪುಟ',
diff --git a/includes/index/EditProofreadIndexPage.php
b/includes/index/EditProofreadIndexPage.php
index ac69e63..aa07545 100644
--- a/includes/index/EditProofreadIndexPage.php
+++ b/includes/index/EditProofreadIndexPage.php
@@ -71,7 +71,6 @@
Xml::label( $entry->getLabel(), $key )
);
-
$help = $entry->getHelp();
if ( $help !== '' ) {
$out->addHTML( Html::element( 'span', [ 'title' =>
$help, 'class' => 'prp-help-field' ] ) );
@@ -180,7 +179,6 @@
return $value;
}
-
/**
* Check the validity of the page
diff --git a/includes/index/ProofreadIndexValue.php
b/includes/index/ProofreadIndexValue.php
index d0b7933..b2b8954 100644
--- a/includes/index/ProofreadIndexValue.php
+++ b/includes/index/ProofreadIndexValue.php
@@ -111,7 +111,6 @@
}
}
-
/**
* A string value of an index entry
*/
@@ -176,7 +175,6 @@
return 'string';
}
}
-
/**
* A number value of an index entry
@@ -246,7 +244,6 @@
return is_numeric( $value );
}
}
-
/**
* A page value of an index entry
@@ -325,7 +322,6 @@
}
}
-
/**
* A Langcode value of an index entry
*/
@@ -336,7 +332,6 @@
* @var string
*/
protected $value;
-
/**
* Set the value
@@ -371,7 +366,6 @@
return Language::isValidBuiltInCode( $value );
}
}
-
/**
* An identifier value of an index entry
@@ -446,7 +440,6 @@
}
}
-
/**
* An ISSN value of an index entry
*/
@@ -485,7 +478,6 @@
return preg_match( self::VALIDATION_REGEX, $value );
}
}
-
/**
* An LCCN value of an index entry
@@ -527,7 +519,6 @@
}
}
-
/**
* An LCCN value of an index entry
*/
@@ -567,7 +558,6 @@
}
}
-
/**
* An ARC value of an index entry
*/
@@ -606,7 +596,6 @@
return is_numeric( $value );
}
}
-
/**
* An ARK value of an index entry
diff --git a/includes/index/oai/ProofreadIndexOaiError.php
b/includes/index/oai/ProofreadIndexOaiError.php
index c7b985d..752e315 100644
--- a/includes/index/oai/ProofreadIndexOaiError.php
+++ b/includes/index/oai/ProofreadIndexOaiError.php
@@ -18,7 +18,6 @@
* The content of this file use some code from OAIRepo Mediawiki extension.
*/
-
/**
* OAI error
*/
diff --git a/includes/index/oai/ProofreadIndexOaiRecord.php
b/includes/index/oai/ProofreadIndexOaiRecord.php
index 0db4b1d..8ddade8 100644
--- a/includes/index/oai/ProofreadIndexOaiRecord.php
+++ b/includes/index/oai/ProofreadIndexOaiRecord.php
@@ -21,7 +21,6 @@
* @ingroup SpecialPage
*/
-
/**
* Provide OAI record of an index page
*/
diff --git a/includes/index/oai/ProofreadIndexOaiSets.php
b/includes/index/oai/ProofreadIndexOaiSets.php
index af4b552..77e7d2a 100644
--- a/includes/index/oai/ProofreadIndexOaiSets.php
+++ b/includes/index/oai/ProofreadIndexOaiSets.php
@@ -20,7 +20,6 @@
* @file
*/
-
/**
* Manage sets-related features
*/
diff --git a/includes/index/oai/SpecialProofreadIndexOai.php
b/includes/index/oai/SpecialProofreadIndexOai.php
index 4ccfe07..42f49e0 100644
--- a/includes/index/oai/SpecialProofreadIndexOai.php
+++ b/includes/index/oai/SpecialProofreadIndexOai.php
@@ -21,7 +21,6 @@
* @ingroup Spe
[MediaWiki-commits] [Gerrit] phpcs: Enable Generic.Functions.OpeningFunctionBraceKernigha... - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: phpcs: Enable
Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace and
make pass
..
phpcs: Enable
Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace and
make pass
Change-Id: Ifa4f67c3e5b67592645c9a89bd9d1453cc93eb65
---
M includes/index/ProofreadIndexValue.php
M phpcs.xml
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/index/ProofreadIndexValue.php
b/includes/index/ProofreadIndexValue.php
index c59f230..d0b7933 100644
--- a/includes/index/ProofreadIndexValue.php
+++ b/includes/index/ProofreadIndexValue.php
@@ -141,7 +141,8 @@
* Return the value of the entry as string
* @return string
*/
- public function __toString() { // TODO improve by removing all tags.
+ public function __toString() {
+ // TODO improve by removing all tags.
if ( $this->value !== null ) {
return $this->value;
}
@@ -641,7 +642,8 @@
* Return the value of the entry as URI
* @return string
*/
- public function getUri() { // TODO add the canonical NMA
+ public function getUri() {
+ // TODO add the canonical NMA
if ( $this->naan ) {
return 'ark:/' . $this->naan . '/' . $this->value;
} else {
@@ -662,7 +664,8 @@
* @param string $value
* @return bool
*/
- public function isValid( $value ) { // TODO to improve
+ public function isValid( $value ) {
+ // TODO to improve
if ( $this->naan ) {
return true;
} else {
diff --git a/phpcs.xml b/phpcs.xml
index 66c6ac8..5f3b8cd 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -4,9 +4,6 @@
0
-
- 0
-
0
--
To view, visit https://gerrit.wikimedia.org/r/295730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa4f67c3e5b67592645c9a89bd9d1453cc93eb65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Tpt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] phpcs: Enable MediaWiki.WhiteSpace.SpaceBeforeSingleLineComm... - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: phpcs: Enable
MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment
and make pass
..
phpcs: Enable
MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment
and make pass
Change-Id: Ia93304b7e025263adde585d8936d3ac3982f5f48
---
M ProofreadPage.body.php
M ProofreadPage.namespaces.php
M SpecialProofreadPages.php
M includes/FileProvider.php
M includes/Pagination/FilePagination.php
M includes/Pagination/PageList.php
M includes/Pagination/Pagination.php
M includes/Pagination/PaginationFactory.php
M includes/Parser/PagelistTagParser.php
M includes/Parser/PagesTagParser.php
M includes/ProofreadPageInit.php
M includes/index/EditProofreadIndexPage.php
M includes/index/ProofreadIndexDbConnector.php
M includes/index/ProofreadIndexPage.php
M includes/index/ProofreadIndexValue.php
M includes/index/oai/SpecialProofreadIndexOai.php
M includes/page/EditPagePage.php
M includes/page/PageContent.php
M includes/page/PageContentBuilder.php
M includes/page/PageViewAction.php
M phpcs.xml
M tests/includes/page/PageContentTest.php
22 files changed, 54 insertions(+), 57 deletions(-)
Approvals:
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index f33a0fd..7073a8f 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -103,7 +103,7 @@
* @return boolean hook return value
*/
public static function onCustomEditor( Article $article, User $user ) {
- if ( $article->getTitle()->inNamespace(
self::getIndexNamespaceId() ) ) { //TODO ExternalEditor case
+ if ( $article->getTitle()->inNamespace(
self::getIndexNamespaceId() ) ) { // TODO ExternalEditor case
$editor = new EditProofreadIndexPage( $article );
$editor->edit();
return false;
@@ -311,7 +311,7 @@
$title = $article->getTitle();
// if it's an index, update pr_index table
- if ( $title->inNamespace( ProofreadPage::getIndexNamespaceId()
) ) {//Move this part to EditProofreadIndexPage
+ if ( $title->inNamespace( ProofreadPage::getIndexNamespaceId()
) ) {// Move this part to EditProofreadIndexPage
ProofreadPage::updatePrIndex( $article );
return true;
}
@@ -661,14 +661,14 @@
*/
public static function onGetPreferences( $user, &$preferences ) {
- //Show header and footer fields when editing in the Page
namespace
+ // Show header and footer fields when editing in the Page
namespace
$preferences['proofreadpage-showheaders'] = [
'type' => 'toggle',
'label-message' =>
'proofreadpage-preferences-showheaders-label',
'section'=> 'editing/advancedediting',
];
- //Use horizontal layout when editing in the Page namespace
+ // Use horizontal layout when editing in the Page namespace
$preferences['proofreadpage-horizontal-layout'] = [
'type' => 'toggle',
'label-message' =>
'proofreadpage-preferences-horizontal-layout-label',
@@ -701,7 +701,7 @@
$updater->addExtensionTable( 'pr_index', $dir .
'ProofreadIndex.sql', true );
- //fix issue with content type hardcoded in database
+ // fix issue with content type hardcoded in database
if ( isset( $wgContentHandlerUseDB ) && $wgContentHandlerUseDB
) {
$updater->addPostDatabaseUpdateMaintenance(
'FixProofreadPagePagesContentModel' );
}
@@ -731,7 +731,7 @@
}
$page = ProofreadPagePage::newFromTitle( $title );
- //Image link
+ // Image link
try {
$image =
Context::getDefaultContext()->getFileProvider()->getForPagePage( $page );
$imageUrl = null;
@@ -749,7 +749,7 @@
$imageUrl = $image->getThumbUrl(
$thumbName );
}
} else {
- //The thumb returned is invalid for not
multipage pages when the width requested is the image width
+ // The thumb returned is invalid for not
multipage pages when the width requested is the image width
$imageUrl = $image->getViewURL();
}
@@ -764,7 +764,7 @@
catch ( FileNotFoundException $e ) {
}
- //Prev, Next and Index links
+
[MediaWiki-commits] [Gerrit] Hooks: Replace deprecated APIEditBeforeSave with EditFilterM... - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Hooks: Replace deprecated APIEditBeforeSave with
EditFilterMergedContent
..
Hooks: Replace deprecated APIEditBeforeSave with EditFilterMergedContent
Bug: T137832
Change-Id: I7b0e1d125b196379dd5bf26658ff642d32ba832a
---
M ProofreadPage.body.php
M extension.json
2 files changed, 34 insertions(+), 27 deletions(-)
Approvals:
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 53218ea..7e2916e 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -586,41 +586,48 @@
/**
* Make validation of the content in the edit API
-* @param $editPage EditPage
-* @param $text string
-* @param $resultArr array
+*
+* @param $context Object implementing the IContextSource interface.
+* @param $content Content of the edit box, as a Content object.
+* @param $status Status object to represent errors, etc.
+* @param $summary Edit summary for page
+* @param $user The User object representing the user whois performing
the edit.
+* @param $minoredit Whether the edit was marked as minor by the user.
* @return bool
*/
- public static function onAPIEditBeforeSave( EditPage $editPage, $text,
array &$resultArr ) {
- if ( $editPage->contentModel !== CONTENT_MODEL_PROOFREAD_PAGE )
{
+ public static function onEditFilterMergedContent( IContextSource
$context, Content $content,
+ Status $status, string $summary, User $user, boolean $minoredit
) {
+
+ // If the content's model isn't ours, ignore this; there's
nothing for us to do here.
+ if ( ! ( $content->contentModel instanceof ProofreadPageContent
) ) {
return true;
}
- $contentHandler = ContentHandler::getForModelID(
CONTENT_MODEL_PROOFREAD_PAGE );
- $article = $editPage->getArticle();
- $user = $article->getContext()->getUser();
- $oldContent = $article->getPage()->getContent(
Revision::FOR_THIS_USER, $user );
- $newContent = $contentHandler->unserializeContent( $text,
$editPage->contentFormat );
-
+ $oldContent = $context->getWikiPage()->getContent(
Revision::FOR_THIS_USER, $user );
if ( $oldContent === null ) {
- $oldContent = $contentHandler->makeEmptyContent();
- }
- $oldLevel = $oldContent->getLevel();
- $newLevel = $newContent->getLevel();
-
- if ( !$newContent->isValid() || $newLevel->getUser() === null
&& $oldLevel->getUser() !== null ) {
- $resultArr['badpage'] = wfMessage(
'proofreadpage_badpagetext' )->text();
- return false;
+ $oldContent = ContentHandler::getForModelID(
CONTENT_MODEL_PROOFREAD_PAGE )->makeEmptyContent();
}
- $oldLevel = $oldContent->getLevel();
- $newLevel = $newContent->getLevel();
- //if the user change the level, the change should be allowed
and the new User should be the editing user
+ // Fail if the content is invalid, or the level is being
removed.
if (
- !$newLevel->equals( $oldLevel ) &&
- ( $newLevel->getUser() === null ||
$newLevel->getUser()->getName() !== $user->getName() ||
!$oldLevel->isChangeAllowed( $newLevel ) )
+ !$content->isValid()
) {
- $resultArr['notallowed'] = wfMessage(
'proofreadpage_notallowedtext' )->text();
+ $ourStatus = Status::newFatal(
'proofreadpage_badpagetext' );
+ }
+
+ $oldLevel = $oldContent->getLevel();
+ $newLevel = $content->getLevel();
+
+ // Fail if the user changed the level and the change isn't
allowed
+ if (
+ !$newLevel->equals( $oldLevel ) &&
!$oldLevel->isChangeAllowed( $newLevel )
+ ) {
+ $ourStatus = Status::newFatal(
'proofreadpage_notallowedtext' );
+ }
+
+ if ( isset( $ourStatus ) ) {
+ $ourStatus->value = self::AS_HOOK_ERROR;
+ $status->merge( $ourStatus );
return false;
}
diff --git a/extension.json b/extension.json
index d0f17c0..7769786 100644
--- a/extension.json
+++ b/extension.json
@@ -301,8 +301,8 @@
"ContentHandlerDefaultModelFor": [
"ProofreadPage::onContentHandlerDefaultModelFor"
],
- "APIEditBeforeSave": [
- "ProofreadPage::onAPIEditB
[MediaWiki-commits] [Gerrit] [bugfix] pay attention to requests connection error - change (pywikibot...xqbot)
jenkins-bot has submitted this change and it was merged.
Change subject: [bugfix] pay attention to requests connection error
..
[bugfix] pay attention to requests connection error
Change-Id: I5813ceae1cf687db08605cfc19a7b82c76bd4fd4
---
M afd_notice.py
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/afd_notice.py b/afd_notice.py
index 7aecdd1..8b49ca6 100644
--- a/afd_notice.py
+++ b/afd_notice.py
@@ -30,7 +30,7 @@
import pywikibot
from pywikibot import config, pagegenerators, textlib
from pywikibot.bot import ExistingPageBot, SingleSiteBot
-from pywikibot.comms.http import fetch
+from pywikibot.comms.http import fetch, requests
msg = u'{{ers:user:xqbot/LD-Hinweis|%(page)s|%(action)s}}'
opt_out = u'Benutzer:Xqbot/Opt-out:LD-Hinweis'
@@ -202,7 +202,12 @@
return
url = ('https://tools.wmflabs.org/wikihistory/dewiki/getauthors.php?'
'page_id=%s' % page._pageid)
-r = fetch(url)
+try:
+r = fetch(url)
+except requests.exceptions.ConnectionError:
+pywikibot.exception()
+# TODO: implement fallback or save list to inform later
+return
if r.status not in (200, ):
pywikibot.warning('wikihistory request status is %d' % r.status)
return # TODO: try again?
--
To view, visit https://gerrit.wikimedia.org/r/295715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5813ceae1cf687db08605cfc19a7b82c76bd4fd4
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/bots/xqbot
Gerrit-Branch: master
Gerrit-Owner: Xqt
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removes dead code - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Removes dead code
..
Removes dead code
Change-Id: I31cff474041e13c6882ce83d7fea45ecd518450f
---
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 40baa84..6397a92 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -154,8 +154,6 @@
doc.createElement( 'footer' )
];
- sectionNodes[ 0 ].setAttribute( 'title', 'Hello' );
-
function bubbleUp( node ) {
var anchor;
while ( node.parentNode !== doc.body ) {
--
To view, visit https://gerrit.wikimedia.org/r/295725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31cff474041e13c6882ce83d7fea45ecd518450f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
