[MediaWiki-commits] [Gerrit] Fix the projectgid fact. - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181387
Change subject: Fix the projectgid fact.
..
Fix the projectgid fact.
This was weirdly circular before, where a ganglia manifest
created gmond.conf and then this fact (later) read that conf,
which was used in turn by ganglia.
Mostly moot now wince we aren't using ganglia in labs, but
this fact was still throwing warnings here and there.
Change-Id: I4e942515612b8da477b8782d9d7fc3c00c4bc304
---
M modules/base/lib/facter/projectgid.rb
1 file changed, 14 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/181387/1
diff --git a/modules/base/lib/facter/projectgid.rb
b/modules/base/lib/facter/projectgid.rb
index b76d06c..dcc091c 100644
--- a/modules/base/lib/facter/projectgid.rb
+++ b/modules/base/lib/facter/projectgid.rb
@@ -1,21 +1,30 @@
# projectgid.rb
#
# This fact provides project_gid (gidNumber) for projects in labs.
-# This is used to set the udp_send_channel port in ganglia's gmond.conf.
require 'facter'
Facter.add(:project_gid) do
setcode do
-if not File.exist? '/etc/ganglia/gmond.conf'
+# Dig deep in ldap for the project name. This code echoes that in the labs
+# firstboot.sh
+binddn=Facter::Util::Resolution.exec(grep 'binddn' /etc/ldap.conf | sed
's/.* //')
+bindpw=Facter::Util::Resolution.exec(grep 'bindpw' /etc/ldap.conf | sed
's/.* //')
+hostsou=Facter::Util::Resolution.exec(grep 'nss_base_hosts'
/etc/ldap.conf | sed 's/.* //')
+
+id=Facter::Util::Resolution.exec(curl
http://169.254.169.254/1.0/meta-data/instance-id 2 /dev/null)
+domain=Facter::Util::Resolution.exec(hostname -d)
+idfqdn=#{id}.#{domain}
+project=Facter::Util::Resolution.exec(ldapsearch -x -D #{binddn} -w
#{bindpw} -b #{hostsou} \dc=#{idfqdn}\ puppetvar | grep 'instanceproject' |
sed 's/.*=//')
+if not project
return none
end
-project_name = Facter::Util::Resolution.exec(egrep -A1 '^cluster {'
/etc/ganglia/gmond.conf | awk -F '\' '/name =/ {print $2}').chomp
-gid = Facter::Util::Resolution.exec(getent group project-#{project_name}
| cut -d : -f 3)
+
+gid = Facter::Util::Resolution.exec(getent group project-#{project} | cut
-d : -f 3)
if gid
gid.chomp
else
- none
+ none\n
end
end
end
--
To view, visit https://gerrit.wikimedia.org/r/181387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e942515612b8da477b8782d9d7fc3c00c4bc304
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Add initial set of uwsgi nodes - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181388
Change subject: tools: Add initial set of uwsgi nodes
..
tools: Add initial set of uwsgi nodes
Do not add it to any queue yet, still experimental
Change-Id: Ib621945c6ffc6406b0dbc6a51aa98c64bbc99e2b
---
A modules/toollabs/manifests/node/web/uwsgi.pp
1 file changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/181388/1
diff --git a/modules/toollabs/manifests/node/web/uwsgi.pp
b/modules/toollabs/manifests/node/web/uwsgi.pp
new file mode 100644
index 000..270b78d
--- /dev/null
+++ b/modules/toollabs/manifests/node/web/uwsgi.pp
@@ -0,0 +1,22 @@
+# Class: toollabs::node::web::uwsgi
+#
+# This configures the compute node as an uwsgi web server
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+class toollabs::node::web::uwsgi inherits toollabs::node::web {
+
+package { [
+'uwsgi',
+'uwsgi-plugin-python',
+'uwsgi-plugin-python3',
+]:
+ensure = latest,
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/181388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib621945c6ffc6406b0dbc6a51aa98c64bbc99e2b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Add initial set of uwsgi nodes - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: tools: Add initial set of uwsgi nodes
..
tools: Add initial set of uwsgi nodes
Do not add it to any queue yet, still experimental
Change-Id: Ib621945c6ffc6406b0dbc6a51aa98c64bbc99e2b
---
A modules/toollabs/manifests/node/web/uwsgi.pp
1 file changed, 22 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/node/web/uwsgi.pp
b/modules/toollabs/manifests/node/web/uwsgi.pp
new file mode 100644
index 000..270b78d
--- /dev/null
+++ b/modules/toollabs/manifests/node/web/uwsgi.pp
@@ -0,0 +1,22 @@
+# Class: toollabs::node::web::uwsgi
+#
+# This configures the compute node as an uwsgi web server
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+class toollabs::node::web::uwsgi inherits toollabs::node::web {
+
+package { [
+'uwsgi',
+'uwsgi-plugin-python',
+'uwsgi-plugin-python3',
+]:
+ensure = latest,
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/181388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib621945c6ffc6406b0dbc6a51aa98c64bbc99e2b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
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 the projectgid fact. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Fix the projectgid fact.
..
Fix the projectgid fact.
This was weirdly circular before, where a ganglia manifest
created gmond.conf and then this fact (later) read that conf,
which was used in turn by ganglia.
Mostly moot now wince we aren't using ganglia in labs, but
this fact was still throwing warnings here and there.
Change-Id: I4e942515612b8da477b8782d9d7fc3c00c4bc304
---
M modules/base/lib/facter/projectgid.rb
1 file changed, 13 insertions(+), 4 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/lib/facter/projectgid.rb
b/modules/base/lib/facter/projectgid.rb
index b76d06c..b83ad10 100644
--- a/modules/base/lib/facter/projectgid.rb
+++ b/modules/base/lib/facter/projectgid.rb
@@ -1,17 +1,26 @@
# projectgid.rb
#
# This fact provides project_gid (gidNumber) for projects in labs.
-# This is used to set the udp_send_channel port in ganglia's gmond.conf.
require 'facter'
Facter.add(:project_gid) do
setcode do
-if not File.exist? '/etc/ganglia/gmond.conf'
+# Dig deep in ldap for the project name. This code echoes that in the labs
+# firstboot.sh
+binddn=Facter::Util::Resolution.exec(grep 'binddn' /etc/ldap.conf | sed
's/.* //')
+bindpw=Facter::Util::Resolution.exec(grep 'bindpw' /etc/ldap.conf | sed
's/.* //')
+hostsou=Facter::Util::Resolution.exec(grep 'nss_base_hosts'
/etc/ldap.conf | sed 's/.* //')
+
+id=Facter::Util::Resolution.exec(curl
http://169.254.169.254/1.0/meta-data/instance-id 2 /dev/null)
+domain=Facter::Util::Resolution.exec(hostname -d)
+idfqdn=#{id}.#{domain}
+project=Facter::Util::Resolution.exec(ldapsearch -x -D #{binddn} -w
#{bindpw} -b #{hostsou} \dc=#{idfqdn}\ puppetvar | grep 'instanceproject' |
sed 's/.*=//')
+if not project
return none
end
-project_name = Facter::Util::Resolution.exec(egrep -A1 '^cluster {'
/etc/ganglia/gmond.conf | awk -F '\' '/name =/ {print $2}').chomp
-gid = Facter::Util::Resolution.exec(getent group project-#{project_name}
| cut -d : -f 3)
+
+gid = Facter::Util::Resolution.exec(getent group project-#{project} | cut
-d : -f 3)
if gid
gid.chomp
else
--
To view, visit https://gerrit.wikimedia.org/r/181387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e942515612b8da477b8782d9d7fc3c00c4bc304
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta: Add support for more language pairs - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Beta: Add support for more language pairs
..
Beta: Add support for more language pairs
* Updated needed apertium packages.
* Updated config to enable language pairs.
* Language pairs without MT support has empty language tools.
Bug: T84829
Change-Id: I70f1b26b4316beb5d21765f5dd25f042f728ba81
---
M modules/apertium/manifests/init.pp
M modules/cxserver/templates/config.erb
2 files changed, 70 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/apertium/manifests/init.pp
b/modules/apertium/manifests/init.pp
index b2b6e05..e9fdf83 100644
--- a/modules/apertium/manifests/init.pp
+++ b/modules/apertium/manifests/init.pp
@@ -7,9 +7,15 @@
package { [
'apertium',
'apertium-apy',
+'apertium-en-ca',
+'apertium-en-eo',
+'apertium-en-es',
'apertium-es-ca',
'apertium-es-pt',
+'apertium-id-ms',
+'apertium-nno-nob',
'apertium-pt-ca',
+'apertium-sv-da',
'apertium-lex-tools',
'lttoolbox'
]:
diff --git a/modules/cxserver/templates/config.erb
b/modules/cxserver/templates/config.erb
index c4c3731..4fc3e15 100644
--- a/modules/cxserver/templates/config.erb
+++ b/modules/cxserver/templates/config.erb
@@ -31,6 +31,39 @@
}
}
},
+ en: {
+ ca: {
+ mt: {
+ providers: [
+ 'Apertium'
+ ]
+ }
+ },
+ da: {
+ },
+ eo: {
+ mt: {
+ providers: [
+ 'Apertium'
+ ]
+ }
+ },
+ es: {
+ mt: {
+ providers: [
+ 'Apertium'
+ ]
+ }
+ },
+ id: {
+ },
+ ms: {
+ },
+ nob: {
+ },
+ pt: {
+ }
+ },
es: {
ca: {
dictionary: {
@@ -45,6 +78,33 @@
}
},
pt: {
+ mt: {
+ providers: [
+ 'Apertium'
+ ]
+ }
+ }
+ },
+ id: {
+ ms: {
+ mt: {
+ providers: [
+ 'Apertium'
+ ]
+ }
+ }
+ },
+ ms: {
+ id: {
+ mt: {
+ providers: [
+ 'Apertium'
+ ]
+ }
+ }
+ },
+ nno: {
+ nob: {
mt: {
providers: [
'Apertium'
@@ -67,6 +127,10 @@
]
}
}
+ },
+ sv: {
+ da: {
+ }
}
}
};
--
To view, visit https://gerrit.wikimedia.org/r/180724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70f1b26b4316beb5d21765f5dd25f042f728ba81
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] dynamicproxy: Enable uwsgi and fastcgi for urlproxy - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181389
Change subject: dynamicproxy: Enable uwsgi and fastcgi for urlproxy
..
dynamicproxy: Enable uwsgi and fastcgi for urlproxy
Change-Id: I201f2d2185fea82f5b3711f1c347d0425322591d
---
M modules/dynamicproxy/templates/urlproxy.conf
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/181389/1
diff --git a/modules/dynamicproxy/templates/urlproxy.conf
b/modules/dynamicproxy/templates/urlproxy.conf
index 9a01aa4..23f24d7 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -75,6 +75,9 @@
return 403;
}
+include uwsgi_params;
+include fastcgi_params;
+
location / {
set $backend '';
--
To view, visit https://gerrit.wikimedia.org/r/181389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I201f2d2185fea82f5b3711f1c347d0425322591d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dynamicproxy: Enable uwsgi and fastcgi for urlproxy - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: dynamicproxy: Enable uwsgi and fastcgi for urlproxy
..
dynamicproxy: Enable uwsgi and fastcgi for urlproxy
Change-Id: I201f2d2185fea82f5b3711f1c347d0425322591d
---
M modules/dynamicproxy/templates/urlproxy.conf
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dynamicproxy/templates/urlproxy.conf
b/modules/dynamicproxy/templates/urlproxy.conf
index 9a01aa4..23f24d7 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -75,6 +75,9 @@
return 403;
}
+include uwsgi_params;
+include fastcgi_params;
+
location / {
set $backend '';
--
To view, visit https://gerrit.wikimedia.org/r/181389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I201f2d2185fea82f5b3711f1c347d0425322591d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove redundant returns - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove redundant returns
..
Hygiene: Remove redundant returns
Change-Id: I9c8fd16e5ddd8bf62b1c2ef931b70f41d116cd41
---
M .jscsrc
M javascripts/modules/editor/EditorApi.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jscsrc b/.jscsrc
index c202df7..0ae6855 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -20,6 +20,7 @@
],
jsDoc: {
enforceExistence: true,
-checkReturnTypes: true
+checkReturnTypes: true,
+checkRedundantReturns: true
}
}
diff --git a/javascripts/modules/editor/EditorApi.js
b/javascripts/modules/editor/EditorApi.js
index 818f50c..3fb9231 100644
--- a/javascripts/modules/editor/EditorApi.js
+++ b/javascripts/modules/editor/EditorApi.js
@@ -118,7 +118,6 @@
/**
* Save content. Make an API request.
* @ignore
-* @returns {jquery.Deferred}
*/
function saveContent() {
var apiOptions = {
--
To view, visit https://gerrit.wikimedia.org/r/181099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c8fd16e5ddd8bf62b1c2ef931b70f41d116cd41
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct positioning of the selector dialog for RTL - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181390
Change subject: Correct positioning of the selector dialog for RTL
..
Correct positioning of the selector dialog for RTL
Bug: T85128
Change-Id: Icb62ed9352f72c282221fa0732a402a77a1c6aa7
---
M modules/source/ext.cx.source.selector.js
1 file changed, 1 insertion(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/90/181390/1
diff --git a/modules/source/ext.cx.source.selector.js
b/modules/source/ext.cx.source.selector.js
index d4b5a9a..b191155 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -591,9 +591,7 @@
* over the rest of the content on the page.
*/
CXSourceSelector.prototype.showAsDialog = function () {
- var top, left, dir;
-
- dir = $( 'html' ).prop( 'dir' );
+ var top, left;
if ( this.options.top ) {
top = this.options.top;
@@ -606,10 +604,6 @@
left = this.options.left;
} else {
left = ( $( window ).width() - this.$dialog.width() ) /
2;
- }
-
- if ( dir === 'rtl' ) {
- left = left - this.$dialog.width();
}
this.$dialog.css( {
--
To view, visit https://gerrit.wikimedia.org/r/181390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb62ed9352f72c282221fa0732a402a77a1c6aa7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explicit text-align for language labels in the selector - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181392
Change subject: Explicit text-align for language labels in the selector
..
Explicit text-align for language labels in the selector
This fixes display in RTL UI.
Bug: T85129
Change-Id: I836643a336698b69d7d4ca708c42c5f4c24a5a51
---
M modules/source/styles/ext.cx.source.selector.less
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/92/181392/1
diff --git a/modules/source/styles/ext.cx.source.selector.less
b/modules/source/styles/ext.cx.source.selector.less
index efe5648..8f28468 100644
--- a/modules/source/styles/ext.cx.source.selector.less
+++ b/modules/source/styles/ext.cx.source.selector.less
@@ -50,8 +50,9 @@
padding: 5px 10px;
background: #efefef;
cursor: pointer;
- text-align: inherit;
+ text-align: left;
position: relative;
+
:after {
.background-image-svg('../../tools/images/dropdown.svg',
'../../tools/images/dropdown.png');
content: ;
--
To view, visit https://gerrit.wikimedia.org/r/181392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I836643a336698b69d7d4ca708c42c5f4c24a5a51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Confine projectgid fact to the labs realm - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181393
Change subject: Confine projectgid fact to the labs realm
..
Confine projectgid fact to the labs realm
projectgid was always a Labs-only fact, but the latest changes
(72c13644804d19911dc4b8c1fe056277532dcfb6) make it especially noisy and
time-consuming in production so finally attempt to confine it.
Change-Id: Ib4b1d79ec7c01db3ea414c3215f9f9c33d74f451
---
M modules/base/lib/facter/projectgid.rb
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/181393/1
diff --git a/modules/base/lib/facter/projectgid.rb
b/modules/base/lib/facter/projectgid.rb
index b83ad10..5190634 100644
--- a/modules/base/lib/facter/projectgid.rb
+++ b/modules/base/lib/facter/projectgid.rb
@@ -5,6 +5,8 @@
require 'facter'
Facter.add(:project_gid) do
+ confine :realm = %w{labs}
+
setcode do
# Dig deep in ldap for the project name. This code echoes that in the labs
# firstboot.sh
--
To view, visit https://gerrit.wikimedia.org/r/181393
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4b1d79ec7c01db3ea414c3215f9f9c33d74f451
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Memoize results of the browser.js methods. - change (mediawiki...MobileFrontend)
Jhernandez has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181394
Change subject: Memoize results of the browser.js methods.
..
Memoize results of the browser.js methods.
Some browser detection methods are a bit involved (they create dom nodes and
do several things) to be calling them several times on page load. By caching
the results they will be calculated just once.
The isWideScreen method is not cached because the width of the browser may
change in desktop versions.
Change-Id: I0b8a863095fdcc84956b3e711baecf5936b99506
---
M javascripts/browser.js
1 file changed, 41 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/94/181394/1
diff --git a/javascripts/browser.js b/javascripts/browser.js
index 04abfd1..e67f810 100644
--- a/javascripts/browser.js
+++ b/javascripts/browser.js
@@ -2,6 +2,31 @@
var browser;
/**
+* Memoize a class method. Caches the result of the method based on the
+* arguments. Instances do not share a cache.
+* @ignore
+* @param {Function} method Method to be memoized
+* @returns {Function}
+*/
+ function memoize( method ) {
+ /**
+* Memoized version of the method
+* @ignore
+*/
+ var memoized = function () {
+ var cache = this[ '__cache' + memoized.cacheId ] ||
+ ( this[ '__cache' + memoized.cacheId ] = {} ),
+ key = [].join.call( arguments, '|' );
+ if ( cache.hasOwnProperty( key ) ) {
+ return cache[ key ];
+ }
+ return ( cache[ key ] = method.apply( this, arguments )
);
+ };
+ memoized.cacheId = '' + Date.now() + Math.random();
+ return memoized;
+ }
+
+ /**
* Representation of user's current browser
* @class Browser
* @param {String} ua the user agent of the current browser
@@ -21,9 +46,9 @@
* FIXME: jquery.client does not support iPad detection so we
cannot use it.
* @return {Boolean}
*/
- isIos: function () {
+ isIos: memoize( function () {
return /ipad|iphone|ipod/i.test( this.userAgent );
- },
+ } ),
/**
* Locks the viewport so that pinch zooming is disabled
*/
@@ -38,9 +63,9 @@
* @method
* @return {Boolean}
*/
- isAndroid2: function () {
+ isAndroid2: memoize( function () {
return /Android 2/.test( this.userAgent );
- },
+ } ),
/**
* Determine if a device has a widescreen.
* @method
@@ -60,7 +85,7 @@
*
* @returns {boolean}
*/
- supportsAnimations: function () {
+ supportsAnimations: memoize( function () {
var has3d, t,
el = $( 'p' )[0],
$iframe = $( 'iframe' ),
@@ -90,7 +115,7 @@
$iframe.remove();
return has3d !== undefined has3d.length 0 has3d
!== 'none';
- },
+ } ),
/**
* Detect if fixed position is supported in browser
*
http://www.quirksmode.org/blog/archives/2010/12/the_fifth_posit.html
@@ -99,7 +124,7 @@
* @method
* @return {Boolean}
*/
- supportsPositionFixed: function () {
+ supportsPositionFixed: memoize( function () {
var support = false,
userAgent = this.userAgent;
@@ -118,30 +143,30 @@
}
} );
return support;
- },
+ } ),
/**
* Whether touchstart and other touch events are supported by
the current browser.
*
* @method
* @return {Boolean}
*/
- supportsTouchEvents: function () {
+ supportsTouchEvents: memoize( function () {
return 'ontouchstart' in window;
- },
+ } ),
/**
* Detect if browser supports geolocation
* @method
* @return {Boolean}
*/
- supportsGeoLocation: function () {
+ supportsGeoLocation: memoize(
[MediaWiki-commits] [Gerrit] Revert Fix the projectgid fact - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181395
Change subject: Revert Fix the projectgid fact
..
Revert Fix the projectgid fact
In production, the greps are producting noise, but more importantly, the
fetch takes a long time to run before it times out.
This needs to be more well thought-out for prod.
This reverts commit 72c13644804d19911dc4b8c1fe056277532dcfb6.
Change-Id: I623bac06554790bd240239d07e92246a3fbc189e
---
M modules/base/lib/facter/projectgid.rb
1 file changed, 4 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/181395/1
diff --git a/modules/base/lib/facter/projectgid.rb
b/modules/base/lib/facter/projectgid.rb
index b83ad10..b76d06c 100644
--- a/modules/base/lib/facter/projectgid.rb
+++ b/modules/base/lib/facter/projectgid.rb
@@ -1,26 +1,17 @@
# projectgid.rb
#
# This fact provides project_gid (gidNumber) for projects in labs.
+# This is used to set the udp_send_channel port in ganglia's gmond.conf.
require 'facter'
Facter.add(:project_gid) do
setcode do
-# Dig deep in ldap for the project name. This code echoes that in the labs
-# firstboot.sh
-binddn=Facter::Util::Resolution.exec(grep 'binddn' /etc/ldap.conf | sed
's/.* //')
-bindpw=Facter::Util::Resolution.exec(grep 'bindpw' /etc/ldap.conf | sed
's/.* //')
-hostsou=Facter::Util::Resolution.exec(grep 'nss_base_hosts'
/etc/ldap.conf | sed 's/.* //')
-
-id=Facter::Util::Resolution.exec(curl
http://169.254.169.254/1.0/meta-data/instance-id 2 /dev/null)
-domain=Facter::Util::Resolution.exec(hostname -d)
-idfqdn=#{id}.#{domain}
-project=Facter::Util::Resolution.exec(ldapsearch -x -D #{binddn} -w
#{bindpw} -b #{hostsou} \dc=#{idfqdn}\ puppetvar | grep 'instanceproject' |
sed 's/.*=//')
-if not project
+if not File.exist? '/etc/ganglia/gmond.conf'
return none
end
-
-gid = Facter::Util::Resolution.exec(getent group project-#{project} | cut
-d : -f 3)
+project_name = Facter::Util::Resolution.exec(egrep -A1 '^cluster {'
/etc/ganglia/gmond.conf | awk -F '\' '/name =/ {print $2}').chomp
+gid = Facter::Util::Resolution.exec(getent group project-#{project_name}
| cut -d : -f 3)
if gid
gid.chomp
else
--
To view, visit https://gerrit.wikimedia.org/r/181395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I623bac06554790bd240239d07e92246a3fbc189e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Fix the projectgid fact - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Revert Fix the projectgid fact
..
Revert Fix the projectgid fact
In production, the greps are producting noise, but more importantly,
the fetch takes a long time to run before it times out.
This needs to be more well thought-out for prod.
This reverts commit 72c13644804d19911dc4b8c1fe056277532dcfb6.
Change-Id: I623bac06554790bd240239d07e92246a3fbc189e
---
M modules/base/lib/facter/projectgid.rb
1 file changed, 4 insertions(+), 13 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/lib/facter/projectgid.rb
b/modules/base/lib/facter/projectgid.rb
index b83ad10..b76d06c 100644
--- a/modules/base/lib/facter/projectgid.rb
+++ b/modules/base/lib/facter/projectgid.rb
@@ -1,26 +1,17 @@
# projectgid.rb
#
# This fact provides project_gid (gidNumber) for projects in labs.
+# This is used to set the udp_send_channel port in ganglia's gmond.conf.
require 'facter'
Facter.add(:project_gid) do
setcode do
-# Dig deep in ldap for the project name. This code echoes that in the labs
-# firstboot.sh
-binddn=Facter::Util::Resolution.exec(grep 'binddn' /etc/ldap.conf | sed
's/.* //')
-bindpw=Facter::Util::Resolution.exec(grep 'bindpw' /etc/ldap.conf | sed
's/.* //')
-hostsou=Facter::Util::Resolution.exec(grep 'nss_base_hosts'
/etc/ldap.conf | sed 's/.* //')
-
-id=Facter::Util::Resolution.exec(curl
http://169.254.169.254/1.0/meta-data/instance-id 2 /dev/null)
-domain=Facter::Util::Resolution.exec(hostname -d)
-idfqdn=#{id}.#{domain}
-project=Facter::Util::Resolution.exec(ldapsearch -x -D #{binddn} -w
#{bindpw} -b #{hostsou} \dc=#{idfqdn}\ puppetvar | grep 'instanceproject' |
sed 's/.*=//')
-if not project
+if not File.exist? '/etc/ganglia/gmond.conf'
return none
end
-
-gid = Facter::Util::Resolution.exec(getent group project-#{project} | cut
-d : -f 3)
+project_name = Facter::Util::Resolution.exec(egrep -A1 '^cluster {'
/etc/ganglia/gmond.conf | awk -F '\' '/name =/ {print $2}').chomp
+gid = Facter::Util::Resolution.exec(getent group project-#{project_name}
| cut -d : -f 3)
if gid
gid.chomp
else
--
To view, visit https://gerrit.wikimedia.org/r/181395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I623bac06554790bd240239d07e92246a3fbc189e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Separate the category widget from the sub-heading - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Separate the category widget from the sub-heading
..
Separate the category widget from the sub-heading
This simplifies the styling of the sub-heading.
Change-Id: Ic792507aea00c4cdbd512bd7a5ee8d6c2e3bb2b1
---
M modules/tools/ext.cx.tools.categories.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.categories.js
b/modules/tools/ext.cx.tools.categories.js
index 9e5418c..b9fd6a9 100644
--- a/modules/tools/ext.cx.tools.categories.js
+++ b/modules/tools/ext.cx.tools.categories.js
@@ -681,7 +681,7 @@
// Load widgets for the source column
if ( column === 'source' ) {
$( 'div.cx-column--source div.cx-column__sub-heading'
)
- .append(
categoryTool.widgets.source.counter.$view );
+ .after(
categoryTool.widgets.source.counter.$view );
$( 'div.cx-column--source div.cx-column__content' )
.after(
categoryTool.widgets.source.listing.$view );
}
@@ -689,7 +689,7 @@
// Load widgets for the translation column
if ( column === 'translation' ) {
$( 'div.cx-column--translation
div.cx-column__sub-heading' )
- .append(
categoryTool.widgets.target.counter.$view );
+ .after(
categoryTool.widgets.target.counter.$view );
$( 'div.cx-column--translation
div.cx-column__content' )
.after(
categoryTool.widgets.target.listing.$view );
}
--
To view, visit https://gerrit.wikimedia.org/r/181377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic792507aea00c4cdbd512bd7a5ee8d6c2e3bb2b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Jsahleen jsahl...@wikimedia.org
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enforce consistent column sub-heading styling - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Enforce consistent column sub-heading styling
..
Enforce consistent column sub-heading styling
Consistent line-height ensures that different language names
appear in the same size.
Bug: T76171
Change-Id: I813d7aac936c2e77005b30edc4ec2efc0964c270
---
M modules/translationview/styles/ext.cx.translationview.less
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
Pginer: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/translationview/styles/ext.cx.translationview.less
b/modules/translationview/styles/ext.cx.translationview.less
index 605b886..b8725f8 100644
--- a/modules/translationview/styles/ext.cx.translationview.less
+++ b/modules/translationview/styles/ext.cx.translationview.less
@@ -13,6 +13,7 @@
.cx-column__title {
font-size: 2.2em;
font-family: 'Linux Libertine', Georgia, Times, serif;
+ margin-bottom: 10px;
}
.cx-column--source p,
@@ -59,7 +60,8 @@
.cx-column__sub-heading {
.mw-ui-item;
.mw-ui-one-whole;
- padding-bottom: 10px;
+ padding-bottom: 5px;
+ line-height: 2;
}
.cx-column__content {
--
To view, visit https://gerrit.wikimedia.org/r/181378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I813d7aac936c2e77005b30edc4ec2efc0964c270
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Properly align indentation of = - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Properly align indentation of =
..
Properly align indentation of =
Change-Id: I8dc5216e22dfe3a496383a4953b395d60edce7ea
---
M modules/lvs/manifests/init.pp
M modules/solr/manifests/init.pp
2 files changed, 31 insertions(+), 31 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/lvs/manifests/init.pp b/modules/lvs/manifests/init.pp
index 287fddf..40e942b 100644
--- a/modules/lvs/manifests/init.pp
+++ b/modules/lvs/manifests/init.pp
@@ -22,26 +22,26 @@
define lvs::monitor_service_http_https ( $ip_address, $uri, $critical=true,
$contact_group=admins ) {
# Virtual resource for the monitoring host
@monitoring::host { $title:
-ip_address = $ip_address,
-group = lvs,
-critical = true,
+ip_address= $ip_address,
+group = lvs,
+critical = true,
contact_group = $contact_group
}
@monitoring::service { $title:
-host = $title,
-group = lvs,
-description = LVS HTTP IPv4,
+host = $title,
+group = lvs,
+description = LVS HTTP IPv4,
check_command = check_http_lvs!${uri},
-critical = $critical
+critical = $critical
}
@monitoring::service { ${title}_https:
-host = $title,
-group = lvs,
-description = LVS HTTPS IPv4,
+host = $title,
+group = lvs,
+description = LVS HTTPS IPv4,
check_command = check_https_url!${uri},
-critical = $critical
+critical = $critical
}
}
@@ -49,23 +49,23 @@
# Virtual resource for the monitoring host
@monitoring::host { ${title}_ipv6:
ip_address = $ip_address,
-group = lvs,
-critical = true
+group = lvs,
+critical = true
}
@monitoring::service { ${title}_ipv6:
-host = ${title}_ipv6,
-group = lvs,
-description = LVS HTTP IPv6,
+host = ${title}_ipv6,
+group = lvs,
+description = LVS HTTP IPv6,
check_command = check_http_lvs!${uri},
-critical = $critical
+critical = $critical
}
@monitoring::service { ${title}_ipv6_https:
-host = ${title}_ipv6,
-group = lvs,
-description = LVS HTTPS IPv6,
+host = ${title}_ipv6,
+group = lvs,
+description = LVS HTTPS IPv6,
check_command = check_https_url!${uri},
-critical = $critical
+critical = $critical
}
}
diff --git a/modules/solr/manifests/init.pp b/modules/solr/manifests/init.pp
index 85f3495..434b4a5 100644
--- a/modules/solr/manifests/init.pp
+++ b/modules/solr/manifests/init.pp
@@ -28,9 +28,9 @@
class solr::config ( $schema = undef, $replication_master = undef, $max_heap =
undef ) {
File {
-owner = 'jetty',
-group = 'root',
-mode = '0644',
+owner = 'jetty',
+group = 'root',
+mode= '0644',
require = Class[solr::install],
notify = Class[solr::service],
}
@@ -38,7 +38,7 @@
file {
/etc/default/jetty:
ensure = present,
- content = template(solr/jetty.erb),
+ content = template(solr/jetty.erb),
owner = 'root';
/etc/solr/conf/solrconfig.xml:
ensure = present,
@@ -71,10 +71,10 @@
cron { delete-old-jetty-logs:
command = find /var/log/jetty/* -mtime +7 -delete,
-user = root,
-hour = 0,
-minute = 0,
-ensure = present,
+user= root,
+hour= 0,
+minute = 0,
+ensure = present,
}
}
@@ -83,8 +83,8 @@
solr::service
class { solr::config:
-schema = $schema,
+schema = $schema,
replication_master = $replication_master,
-max_heap = $max_heap
+max_heap = $max_heap
}
}
--
To view, visit https://gerrit.wikimedia.org/r/181381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8dc5216e22dfe3a496383a4953b395d60edce7ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] If desktop site starts in 'www.', drop 'www.' for mobile site - change (analytics/aggregator)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/181396 Change subject: If desktop site starts in 'www.', drop 'www.' for mobile site .. If desktop site starts in 'www.', drop 'www.' for mobile site Wikidata just had the MobileFrontend extension set up. This makes a mobile site served at 'm.wikidata.org'. We add this new scheme for mobile site detection. Change-Id: Ia42d0859c4ac7e461f35bb262733da8edb3d4565 --- M aggregator/util.py M tests/test_util.py 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/aggregator refs/changes/96/181396/1 diff --git a/aggregator/util.py b/aggregator/util.py index e164e35..08ec886 100644 --- a/aggregator/util.py +++ b/aggregator/util.py @@ -131,6 +131,12 @@ abbreviation_split.insert(1, 'm') elif site == 'zero': abbreviation_split.insert(1, 'zero') + +# fix-up mobile site where desktop site is www, like +# www.m.wd to m.wd +if abbreviation_split[0] == 'www': +del abbreviation_split[0] + abbreviation = '.'.join(abbreviation_split) return abbreviation diff --git a/tests/test_util.py b/tests/test_util.py index c0b3c8d..c841aac 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -170,6 +170,11 @@ 'wikidatawiki') self.assertEqual(actual, 'www.wd') +def test_dbname_to_webstatscollector_abbreviation_wikidata_mobile(self): +actual = aggregator.dbname_to_webstatscollector_abbreviation( +'wikidatawiki', 'mobile') +self.assertEqual(actual, 'm.wd') + def test_dbname_to_webstatscollector_abbreviation_commons(self): actual = aggregator.dbname_to_webstatscollector_abbreviation( 'commonswiki') -- To view, visit https://gerrit.wikimedia.org/r/181396 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia42d0859c4ac7e461f35bb262733da8edb3d4565 Gerrit-PatchSet: 1 Gerrit-Project: analytics/aggregator Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct positioning of the selector dialog for RTL - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Correct positioning of the selector dialog for RTL
..
Correct positioning of the selector dialog for RTL
Bug: T85128
Change-Id: Icb62ed9352f72c282221fa0732a402a77a1c6aa7
---
M modules/source/ext.cx.source.selector.js
1 file changed, 1 insertion(+), 7 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
Jsahleen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/source/ext.cx.source.selector.js
b/modules/source/ext.cx.source.selector.js
index d4b5a9a..b191155 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -591,9 +591,7 @@
* over the rest of the content on the page.
*/
CXSourceSelector.prototype.showAsDialog = function () {
- var top, left, dir;
-
- dir = $( 'html' ).prop( 'dir' );
+ var top, left;
if ( this.options.top ) {
top = this.options.top;
@@ -606,10 +604,6 @@
left = this.options.left;
} else {
left = ( $( window ).width() - this.$dialog.width() ) /
2;
- }
-
- if ( dir === 'rtl' ) {
- left = left - this.$dialog.width();
}
this.$dialog.css( {
--
To view, visit https://gerrit.wikimedia.org/r/181390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb62ed9352f72c282221fa0732a402a77a1c6aa7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Jsahleen jsahl...@wikimedia.org
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explicit text-align for language labels in the selector - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Explicit text-align for language labels in the selector
..
Explicit text-align for language labels in the selector
This fixes display in RTL UI.
Bug: T85129
Change-Id: I836643a336698b69d7d4ca708c42c5f4c24a5a51
---
M modules/source/styles/ext.cx.source.selector.less
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/source/styles/ext.cx.source.selector.less
b/modules/source/styles/ext.cx.source.selector.less
index efe5648..8f28468 100644
--- a/modules/source/styles/ext.cx.source.selector.less
+++ b/modules/source/styles/ext.cx.source.selector.less
@@ -50,8 +50,9 @@
padding: 5px 10px;
background: #efefef;
cursor: pointer;
- text-align: inherit;
+ text-align: left;
position: relative;
+
:after {
.background-image-svg('../../tools/images/dropdown.svg',
'../../tools/images/dropdown.png');
content: ;
--
To view, visit https://gerrit.wikimedia.org/r/181392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I836643a336698b69d7d4ca708c42c5f4c24a5a51
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Jsahleen jsahl...@wikimedia.org
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta: Fix language codes for nno and nob - change (operations/puppet)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181397
Change subject: Beta: Fix language codes for nno and nob
..
Beta: Fix language codes for nno and nob
Change-Id: Idbc7b07cd929abb40991171579d8ed757c78ffe1
---
M modules/cxserver/templates/config.erb
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/181397/1
diff --git a/modules/cxserver/templates/config.erb
b/modules/cxserver/templates/config.erb
index 4fc3e15..39051bc 100644
--- a/modules/cxserver/templates/config.erb
+++ b/modules/cxserver/templates/config.erb
@@ -59,7 +59,7 @@
},
ms: {
},
- nob: {
+ nb: {
},
pt: {
}
@@ -103,8 +103,8 @@
}
}
},
- nno: {
- nob: {
+ nn: {
+ nb: {
mt: {
providers: [
'Apertium'
--
To view, visit https://gerrit.wikimedia.org/r/181397
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbc7b07cd929abb40991171579d8ed757c78ffe1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add dev.wikimedia.org - change (operations/dns)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/181398 Change subject: add dev.wikimedia.org .. add dev.wikimedia.org Adding a DNS entry for dev.wikimedia.org as suggested in T67074. Change-Id: I0f80c19829cbb4f16e44f06984a4f935df71ba96 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/98/181398/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index d633ab0..3bb46f4 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -431,6 +431,7 @@ dash.frdev 1H IN CNAMElutetium +dev 1H IN CNAMEmisc-web-lb.eqiad doc 1H IN CNAMEmisc-web-lb.eqiad ldap-mirror 1H IN CNAMEplutonium.wikimedia.org. -- To view, visit https://gerrit.wikimedia.org/r/181398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f80c19829cbb4f16e44f06984a4f935df71ba96 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Properly align indentation of = - change (operations/puppet)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181399
Change subject: Properly align indentation of =
..
Properly align indentation of =
Change-Id: Iff8bb3f36a38e26c3edeaa93b14274db0860b940
---
M modules/bacula/manifests/director.pp
M modules/bacula/tests/director.pp
M modules/varnish/manifests/zero_update.pp
3 files changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/181399/1
diff --git a/modules/bacula/manifests/director.pp
b/modules/bacula/manifests/director.pp
index 835d17f..dfbbe76 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -50,7 +50,7 @@
exec { 'bacula_cp_private_key':
command = /bin/cp /var/lib/puppet/ssl/private_keys/${::fqdn}.pem \
/var/lib/puppet/ssl/private_keys/bacula-${::fqdn}.pem,
-unless = /usr/bin/cmp /var/lib/puppet/ssl/private_keys/${::fqdn}.pem
\
+unless = /usr/bin/cmp
/var/lib/puppet/ssl/private_keys/${::fqdn}.pem \
/var/lib/puppet/ssl/private_keys/bacula-${::fqdn}.pem,
}
diff --git a/modules/bacula/tests/director.pp b/modules/bacula/tests/director.pp
index 8163b0b..41bacf1 100644
--- a/modules/bacula/tests/director.pp
+++ b/modules/bacula/tests/director.pp
@@ -6,16 +6,16 @@
}
bacula::director::catalog { 'MYDB':
-dbname = 'bacula',
-dbuser = 'bacula',
-dbhost = 'bacula-db.example.org',
-dbport = '3306',
-dbpassword = 'bacula',
+dbname = 'bacula',
+dbuser = 'bacula',
+dbhost = 'bacula-db.example.org',
+dbport = '3306',
+dbpassword = 'bacula',
}
bacula::director::schedule { 'Monthly-Sat':
runs = [
-{ 'level' = 'Full', 'at' = '1st Sat at 06:00', },
+{ 'level' = 'Full', 'at' = '1st Sat at 06:00', },
{ 'level' = 'Differential', 'at' = '2nd Sat at 06:00', },
],
}
@@ -27,12 +27,12 @@
}
bacula::director::fileset { 'root-var':
-includes = [ '/', '/var',],
-excludes = [ '/tmp', ],
+includes = [ '/', '/var',],
+excludes = [ '/tmp', ],
}
bacula::director::jobdefaults { '1st-sat-mypool':
-when= 'Monthly-Sat',
-pool= 'mypool',
+when = 'Monthly-Sat',
+pool = 'mypool',
}
diff --git a/modules/varnish/manifests/zero_update.pp
b/modules/varnish/manifests/zero_update.pp
index 9a1b25b..bc4b6b7 100644
--- a/modules/varnish/manifests/zero_update.pp
+++ b/modules/varnish/manifests/zero_update.pp
@@ -38,16 +38,16 @@
file { '/etc/zerofetcher':
ensure = directory,
-owner = 'root',
-group = 'root',
-mode = '0555',
+owner = 'root',
+group = 'root',
+mode = '0555',
}
file { '/etc/zerofetcher/zerofetcher.auth':
-owner = 'netmap',
-group = 'netmap',
-mode = '0400',
-source = $auth_src,
+owner = 'netmap',
+group = 'netmap',
+mode= '0400',
+source = $auth_src,
require = [File[/etc/zerofetcher]],
}
--
To view, visit https://gerrit.wikimedia.org/r/181399
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff8bb3f36a38e26c3edeaa93b14274db0860b940
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WMF] New Package Version with various bugfixes - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: [WMF] New Package Version with various bugfixes
..
[WMF] New Package Version with various bugfixes
- Upgrade to 3.3.1
- Fix a serious memleak (backport from 3.4)
- Fix wddx serialization (Bug T75531)
- Fix build-dependency on libjpeg-dev (Bug T73413)
- Fix Time Zone info (Bug T74556)
Change-Id: I6ba5c2adb6b92d103cca4764f8ddcbc8e3504546
---
M debian/changelog
M debian/control
A debian/patches/fix_libboost_memleak.patch
A debian/patches/htmlencode_wddx_serialize_value.patch
M debian/patches/series
A debian/patches/use_system_TZinfo.patch
6 files changed, 851 insertions(+), 4 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 0902f1e..03533fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
-hhvm (3.3.0+dfsg1-1+wm5) UNRELEASED; urgency=medium
+hhvm (3.3.1+dfsg1-1+wm1) UNRELEASED; urgency=medium
+
+ * Upgrade to 3.3.1
+ * Add a fix for a libbost memleak on trusty
+ * Add a fix for wddx serialization
+ * Make HHVM use the system tzinfo
+ * remove build-dep alternative for libjpeg62-dev which was confusing trusty
+
+ -- Giuseppe Lavagetto glavage...@wikimedia.org Wed, 17 Dec 2014 10:46:22
+0100
+
+hhvm (3.3.0+dfsg1-1+wm5) trusty-wikimedia; urgency=medium
* Add EZC fixes from https://github.com/facebook/hhvm/pull/4330
diff --git a/debian/control b/debian/control
index 1cff5b1..624acbb 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@
libicu-dev,
libinotifytools0-dev,
libjemalloc-dev,
- libjpeg62-dev | libjpeg-dev,
+ libjpeg-dev,
libjson-c-dev,
libldap2-dev,
liblz4-dev,
diff --git a/debian/patches/fix_libboost_memleak.patch
b/debian/patches/fix_libboost_memleak.patch
new file mode 100644
index 000..9dc46d1
--- /dev/null
+++ b/debian/patches/fix_libboost_memleak.patch
@@ -0,0 +1,61 @@
+Description: prevent use of libboost flat_set on certain versions.
+ A series of versions of libboost (including the one in Ubuntu trusty) have a
buggy
+ flat_set that will leak a sizeable amount of memory.
+Author: Josh Watzman jwatz...@fb.com
+Last-Update: 2014-12-12
+Origin: backport, https://github.com/facebook/hhvm/issues/4268
+
+---
+ hphp/runtime/vm/jit/containers.h | 16
+ 1 file changed, 16 insertions(+)
+
+diff --git a/hphp/runtime/base/smart-containers.h
b/hphp/runtime/base/smart-containers.h
+index af5793b..e501991 100644
+--- a/hphp/runtime/base/smart-containers.h
b/hphp/runtime/base/smart-containers.h
+@@ -26,8 +26,10 @@
+ #include unordered_map
+ #include unordered_set
+ #include vector
++#include set
+
+ #include boost/container/flat_map.hpp
++#include boost/version.hpp
+ #include limits
+ #include list
+ #include set
+diff --git a/hphp/runtime/vm/jit/containers.h
b/hphp/runtime/vm/jit/containers.h
+index 0d65eba..2ebcd31 100644
+--- a/hphp/runtime/vm/jit/containers.h
b/hphp/runtime/vm/jit/containers.h
+@@ -19,6 +19,8 @@
+
+ #include hphp/runtime/base/smart-containers.h
+ #include memory
++#include set
++#include boost/version.hpp
+
+ namespace HPHP {
+ namespace jit {
+@@ -51,7 +53,21 @@ templateclass T
+ using unique_ptr = std::unique_ptrT;
+
+ templateclass K, class Pred = std::lessK
++#if defined(BOOST_VERSION) BOOST_VERSION 105100 BOOST_VERSION 105500
++// There's some leak in boost's flat_set that caused serious memory problems
to
++// be reported externally: https://github.com/facebook/hhvm/issues/4268. The
++// bug looks to be https://svn.boost.org/trac/boost/ticket/9166 but it's not
++// totally clear. There were a ton of leaks fixed in 1.55 -- but FB is using
++// 1.51 internally and we aren't hitting the leak. So also unclear where it
was
++// *introduced*. So for now just picking those two bounds; they may need to be
++// adjusted with future reports.
++//
++// It sounds like the leak might affect other boost containers as well, but we
++// only definitively observed it mattering for flat_set.
++using flat_set = std::setK, Pred;
++#else
+ using flat_set = boost::container::flat_setK, Pred;
++#endif
+
+ templateclass K, class V, class Pred = std::lessK
+ using flat_map = boost::container::flat_mapK,V,Pred;
diff --git a/debian/patches/htmlencode_wddx_serialize_value.patch
b/debian/patches/htmlencode_wddx_serialize_value.patch
new file mode 100644
index 000..c8eff7f
--- /dev/null
+++ b/debian/patches/htmlencode_wddx_serialize_value.patch
@@ -0,0 +1,52 @@
+Description: Strings returned through wddx_serialize_value should be
HTMLEncode()'d during
+serialization.
+Author: Paul Bissonnette paulb...@fb.com
+Origin: backport, D1691695
+
+Signature: t1:1691695:1416530595:722bfcdaf7c0dbee379bea886cd4c43d997ca7dd
+---
+ hphp/runtime/ext/wddx/ext_wddx.cpp | 6 +-
+ hphp/test/slow/ext_wddx/htmlent.php| 5 +
+
[MediaWiki-commits] [Gerrit] ULS depends on EventLogging - change (integration/config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181400
Change subject: ULS depends on EventLogging
..
ULS depends on EventLogging
Bug: T85124
Change-Id: I8b2a4a5c3b9bb6a8b0101a9240d8864eb4cca842
---
M jjb/mediawiki-extensions.yaml
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/00/181400/1
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index e70032c..4948a3f 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -453,7 +453,7 @@
- ContactPage
- ContactPageFundraiser
- ContentTranslation:
-dependencies: 'UniversalLanguageSelector'
+dependencies: 'UniversalLanguageSelector,EventLogging'
- Contest
- ContributionReporting
- ContributionScores
@@ -948,6 +948,7 @@
- UnicodeConverter
- UnitTest
- UniversalLanguageSelector
+dependencies: 'EventLogging'
- UpdateMediaWiki
- UploadBlacklist
- UploadLocal
@@ -1047,7 +1048,7 @@
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: ContentTranslation
-dependencies: 'UniversalLanguageSelector'
+dependencies: 'UniversalLanguageSelector,EventLogging'
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: DataValues
--
To view, visit https://gerrit.wikimedia.org/r/181400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b2a4a5c3b9bb6a8b0101a9240d8864eb4cca842
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta: Fix language codes for nno and nob - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Beta: Fix language codes for nno and nob
..
Beta: Fix language codes for nno and nob
Change-Id: Idbc7b07cd929abb40991171579d8ed757c78ffe1
---
M modules/cxserver/templates/config.erb
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/cxserver/templates/config.erb
b/modules/cxserver/templates/config.erb
index 4fc3e15..39051bc 100644
--- a/modules/cxserver/templates/config.erb
+++ b/modules/cxserver/templates/config.erb
@@ -59,7 +59,7 @@
},
ms: {
},
- nob: {
+ nb: {
},
pt: {
}
@@ -103,8 +103,8 @@
}
}
},
- nno: {
- nob: {
+ nn: {
+ nb: {
mt: {
providers: [
'Apertium'
--
To view, visit https://gerrit.wikimedia.org/r/181397
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idbc7b07cd929abb40991171579d8ed757c78ffe1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Quote file modes - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: Quote file modes
..
Quote file modes
Change-Id: I672f90f62e4ad8370aec30f4cdd1cb03acb9f412
---
M modules/lvs/manifests/balancer/runcommand.pp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/lvs/manifests/balancer/runcommand.pp
b/modules/lvs/manifests/balancer/runcommand.pp
index fd57c38..cd9b97d 100644
--- a/modules/lvs/manifests/balancer/runcommand.pp
+++ b/modules/lvs/manifests/balancer/runcommand.pp
@@ -8,17 +8,17 @@
/etc/pybal/runcommand:
owner = root,
group = root,
-mode = 0755,
+mode = '0755',
ensure = directory;
/etc/pybal/runcommand/check-apache:
owner = root,
group = root,
-mode = 0555,
+mode = '0555',
source = puppet:///modules/${module_name}/pybal/check-apache;
/root/.ssh/pybal-check:
owner = root,
group = root,
-mode = 0600,
+mode = '0600',
source = puppet:///private/pybal/pybal-check;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/181380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I672f90f62e4ad8370aec30f4cdd1cb03acb9f412
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sure translator see license text even if use manually c... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Make sure translator see license text even if use manually
created URL
..
Make sure translator see license text even if use manually created URL
When users try to access the translation view directly for
an article that they have not explicitly started before,
instead of being directed to the translation view,
they will be directed to the translation dashboard.
There, the New translation dialog will open and they will be able
to start the translation with a single click
(after reading the legal terms, as we all usually do).
If draft URL parameter is present, this step is avoided because drafts
are created after following the above step. In case translators try
a URL with an invalid draft, there will be draft validation (it is
a separate task).
A domain level cookie with short expiration time is used as a token to
indicate that the translator went through the normal translation
workflow. Note that this cookie is not host level, but at domain level,
domain being .wikipedia.org for Wikipedia. This allows CX to redirect
users between source and target language wikis.
Make sure to test this in a multi-language wiki setup and with
the following line in LocalSettings.php:
$wgContentTranslationTranslateInTarget = true;
Bug: T76178
Change-Id: I640ebdd801f99f85a27733b8b30dede21f0a4e8c
---
M modules/dashboard/ext.cx.dashboard.js
M modules/source/ext.cx.source.js
M modules/source/ext.cx.source.selector.js
M specials/SpecialContentTranslation.php
4 files changed, 74 insertions(+), 9 deletions(-)
Approvals:
Jsahleen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dashboard/ext.cx.dashboard.js
b/modules/dashboard/ext.cx.dashboard.js
index 2f4f9f8..882ee74 100644
--- a/modules/dashboard/ext.cx.dashboard.js
+++ b/modules/dashboard/ext.cx.dashboard.js
@@ -58,7 +58,15 @@
};
CXDashboard.prototype.listen = function () {
- this.$newTranslationButton.cxSourceSelector();
+ var query,
+ sourceSelectorOptions = {};
+
+ query =new mw.Uri().query;
+ sourceSelectorOptions.sourceLanguage = query.from;
+ sourceSelectorOptions.targetLanguage = query.to;
+ sourceSelectorOptions.sourceTitle = query.page;
+ sourceSelectorOptions.targetTitle = query.targettitle;
+ this.$newTranslationButton.cxSourceSelector(
sourceSelectorOptions );
};
$.fn.cxDashboard = function ( siteMapper, options ) {
diff --git a/modules/source/ext.cx.source.js b/modules/source/ext.cx.source.js
index 974434f..52379c2 100644
--- a/modules/source/ext.cx.source.js
+++ b/modules/source/ext.cx.source.js
@@ -77,7 +77,7 @@
};
ContentTranslationSource.prototype.showDashboard = function () {
-location.href = mw.util.getUrl( 'Special:ContentTranslation' );
+ location.href = mw.util.getUrl( 'Special:ContentTranslation' );
};
/**
diff --git a/modules/source/ext.cx.source.selector.js
b/modules/source/ext.cx.source.selector.js
index b191155..79d4a31 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -55,11 +55,31 @@
*/
CXSourceSelector.prototype.init = function () {
var cxSourceSelector = this;
+
this.getLanguagePairs().then( function () {
cxSourceSelector.render();
cxSourceSelector.listen();
} );
+ };
+
+ /**
+* Prefill the selector if values are passed as options.
+*/
+ CXSourceSelector.prototype.prefill = function () {
+ if ( this.options.sourceLanguage ) {
+ this.sourceLanguageChangeHandler(
this.options.sourceLanguage );
+ }
+ if ( this.options.targetLanguage ) {
+ this.targetLanguageChangeHandler(
this.options.targetLanguage );
+ }
+ if ( this.options.sourceTitle ) {
+ this.$sourceTitleInput.val( this.options.sourceTitle
).trigger( 'input' );
+ this.show();
+ }
+ if ( this.options.targetTitle ) {
+ this.$targetTitleInput.val( this.options.targetTitle
).trigger( 'input' );
+ }
};
/**
@@ -676,21 +696,54 @@
};
/**
+* Set CX Token in cookie.
+* This token gurantees that the translator read the license agreement
+* and starting a translation from CX dashboard enabled as beta feature
+* from any wiki under the top domain.
+*
+* @param {string} sourceLanguage Source language
+* @param {string} targetLanguage Target language
+* @param {string}
[MediaWiki-commits] [Gerrit] Override beta feature preference if Special:CX accessed with... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Override beta feature preference if Special:CX accessed with
valid token
..
Override beta feature preference if Special:CX accessed with valid token
Translations in CX involve two languages. When creating a new translation,
CX redirects the user to the target Wikipedia so that articles are created
locally.
This means that a user in the Spanish Wikipedia CX dashboard can start a
translation
from Spanish to Catalan, and as a result he will be redirected to Catalan
Wikipedia's CX translate editor. This redirect allows CX to present an
integrated
view of all translations (the user does not have to figure out to which site to
start a translation from), but avoid cross-wiki saving issues.
When CX is isolated as a beta feature, the redirect may be problematic since
the user needs to have the beta feature enabled for each of the languages
involved. If that is not the case, the user will get a page not found error
instead which will break the user experience badly.
To avoid this issue, we allow access CX even if the beta feature is disabled
only
in the case of being part of the described redirection. The rationale is that
the user has already enabled the beta feature on a site,
and is clearly expressing the intent to start a new translation
for which reaching CX will provide less surprise than getting an error message.
Bug: T78001
Change-Id: Ia54f8912ef5f9dad20af5d2ebaaa966df767de67
---
M modules/dashboard/ext.cx.dashboard.js
M modules/dashboard/ext.cx.translationlist.js
M modules/source/ext.cx.source.selector.js
M specials/SpecialContentTranslation.php
4 files changed, 22 insertions(+), 16 deletions(-)
Approvals:
Jsahleen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dashboard/ext.cx.dashboard.js
b/modules/dashboard/ext.cx.dashboard.js
index 882ee74..44de4a9 100644
--- a/modules/dashboard/ext.cx.dashboard.js
+++ b/modules/dashboard/ext.cx.dashboard.js
@@ -61,7 +61,7 @@
var query,
sourceSelectorOptions = {};
- query =new mw.Uri().query;
+ query = new mw.Uri().query;
sourceSelectorOptions.sourceLanguage = query.from;
sourceSelectorOptions.targetLanguage = query.to;
sourceSelectorOptions.sourceTitle = query.page;
diff --git a/modules/dashboard/ext.cx.translationlist.js
b/modules/dashboard/ext.cx.translationlist.js
index 26af902..ff1fb8f 100644
--- a/modules/dashboard/ext.cx.translationlist.js
+++ b/modules/dashboard/ext.cx.translationlist.js
@@ -169,7 +169,7 @@
page: translation.sourceTitle,
targettitle:
translation.targetTitle,
draft: translation.status ===
'draft' ? translation.id : undefined
- } ).toString(),
+ } ).toString()
} ).text( translation.sourceTitle );
$sourceLanguage = $( 'div' )
.addClass( 'source-language' )
@@ -201,9 +201,9 @@
for ( i = 0; i languages.length; i++ ) {
$filter.append(
$( 'option' )
- // Todo: use translated language name
- .text( $.uls.data.getAutonym(
languages[ i ] ) )
- .attr( 'value', languages[ i ] )
+ // Todo: use translated language name
+ .text( $.uls.data.getAutonym( languages[ i ] ) )
+ .attr( 'value', languages[ i ] )
);
}
};
@@ -213,8 +213,7 @@
.addClass( 'translation-filter' );
this.$statusFilter = createSelect(
- 'translation-status-filter',
- {
+ 'translation-status-filter', {
'': mw.msg(
'cx-translation-filter-all-translations' ),
published: mw.msg(
'cx-translation-filter-published-translations' ),
draft: mw.msg(
'cx-translation-filter-draft-translations' )
@@ -222,15 +221,13 @@
);
this.$sourceLanguageFilter = createSelect(
- 'translation-source-language-filter',
- {
+ 'translation-source-language-filter', {
'': mw.msg(
'cx-translation-filter-from-any-language' )
}
);
this.$targetLanguageFilter = createSelect(
-
[MediaWiki-commits] [Gerrit] ULS width according to the number of languages - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: ULS width according to the number of languages
..
ULS width according to the number of languages
Bug: T76196
Change-Id: I369f879828315ca45c9fe9cf709ba6c81ae30ba0
---
M modules/source/ext.cx.source.selector.js
1 file changed, 26 insertions(+), 1 deletion(-)
Approvals:
Jsahleen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/source/ext.cx.source.selector.js
b/modules/source/ext.cx.source.selector.js
index 150fef6..1803392 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -51,6 +51,23 @@
}
/**
+* Return the appropriate menuWidth parameter for a given language count
+* @param {number} languagesCount Number of languages
+* return {string} wide, medium or narrow
+*/
+ function getUlsMenuWidth( languagesCount ) {
+ if ( languagesCount = 12 ) {
+ return 'narrow';
+ }
+
+ if ( languagesCount = 100 ) {
+ return 'medium';
+ }
+
+ return 'wide';
+ }
+
+ /**
* Initialize the plugin.
*/
CXSourceSelector.prototype.init = function () {
@@ -248,6 +265,7 @@
// Create a new target ULS
this.$targetLanguage.uls( {
languages: getAutonyms( this.targetLanguages ),
+ menuWidth: getUlsMenuWidth( this.targetLanguages.length
),
onSelect: function ( language ) {
cxSourceSelector.targetLanguageChangeHandler(
language );
},
@@ -595,13 +613,19 @@
* Show the CXSourceSelector
*/
CXSourceSelector.prototype.show = function () {
- var $container = this.options.container;
+ var sourceUls, targetUls,
+ $container = this.options.container;
if ( $container $container instanceof jQuery ) {
this.showAsEmbedded( $container );
} else {
this.showAsDialog();
}
+
+ sourceUls = this.$sourceLanguage.data( 'uls' );
+ sourceUls.left = this.$sourceLanguage.offset().left;
+ targetUls = this.$targetLanguage.data( 'uls' );
+ targetUls.left = this.$targetLanguage.offset().left;
};
/**
@@ -807,6 +831,7 @@
this.$sourceLanguage.uls( {
languages: getAutonyms( this.sourceLanguages ),
+ menuWidth: getUlsMenuWidth( this.sourceLanguages.length
),
onSelect: function ( language ) {
cxSourceSelector.sourceLanguageChangeHandler(
language );
},
--
To view, visit https://gerrit.wikimedia.org/r/177536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I369f879828315ca45c9fe9cf709ba6c81ae30ba0
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Jsahleen jsahl...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API support for datetime.datetime - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: API support for datetime.datetime .. API support for datetime.datetime A class Timestamp is a subclass of datetime.datetime that has extra functionality used to convert to and from the two datestamp formats used by MediaWiki. Timestamp.toISOformat outputs the datetime in the format required for parameters to the MediaWiki API, which is ISO 8601 with additional requirements, such as the 'Z' must exist even though the timezone info is not included. Timestamp.__str__ is an alias for Timestamp.toISOformat, and was used when building API requests using str(timestamp). Rather than require a Timestamp and implicitly use its __str__ to obtain the required formatted string, api.py now supports datetime directly and explicitly formats it using a format string to obtain the representation the API requires for parameters. Timestamp.isoformat now performs the same formatting, meaning its output is slightly different that of the superclass, however they are both valid ISO 8601 representations. Timestamp.toISOformat is deprecated. Change-Id: I6b975946bffd92f06dba53206f9097b573a0803d --- M pywikibot/__init__.py M pywikibot/data/api.py M pywikibot/site.py M tests/site_tests.py M tests/timestamp_tests.py 5 files changed, 103 insertions(+), 66 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 1cf0436..40dde82 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -125,13 +125,17 @@ mediawikiTSFormat = %Y%m%d%H%M%S ISO8601Format = %Y-%m-%dT%H:%M:%SZ +def clone(self): +Clone this instance. +return self.replace(microsecond=self.microsecond) + @classmethod def fromISOformat(cls, ts): Convert an ISO 8601 timestamp to a Timestamp object. # If inadvertantly passed a Timestamp object, use replace() # to create a clone. if isinstance(ts, cls): -return ts.replace(microsecond=ts.microsecond) +return ts.clone() return cls.strptime(ts, cls.ISO8601Format) @classmethod @@ -140,12 +144,21 @@ # If inadvertantly passed a Timestamp object, use replace() # to create a clone. if isinstance(ts, cls): -return ts.replace(microsecond=ts.microsecond) +return ts.clone() return cls.strptime(ts, cls.mediawikiTSFormat) -def toISOformat(self): -Convert object to an ISO 8601 timestamp. +def isoformat(self): + +Convert object to an ISO 8601 timestamp accepted by MediaWiki. + +datetime.datetime.isoformat does not postfix the ISO formatted date +with a 'Z' unless a timezone is included, which causes MediaWiki +~1.19 and earlier to fail. + return self.strftime(self.ISO8601Format) + +toISOformat = redirect_func(isoformat, old_name='toISOformat', +class_name='Timestamp') def totimestampformat(self): Convert object to a MediaWiki internal timestamp. @@ -153,7 +166,7 @@ def __str__(self): Return a string format recognized by the API. -return self.toISOformat() +return self.isoformat() def __add__(self, other): Perform addition, returning a Timestamp instead of datetime. diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 5b70fe1..3366eaf 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -600,6 +600,24 @@ and self.site.family.name in config.available_ssl_project): self.site = EnableSSLSiteWrapper(self.site) +@classmethod +def _format_value(cls, value): + +Format the MediaWiki API request parameter. + +Converts from Python datatypes to MediaWiki API parameter values. + +Supports: + * datetime.datetime + +All other datatypes are converted to string using unicode() on Python 2 +and str() on Python 3. + +if isinstance(value, datetime.datetime): +return value.strftime(pywikibot.Timestamp.ISO8601Format) +else: +return unicode(value) + # implement dict interface def __getitem__(self, key): return self._params[key] @@ -609,9 +627,12 @@ @param key: param key @type key: basestring -@param value: param value -@type value: list of unicode, unicode, or str in site encoding -Any string type may use a |-separated list +@param value: param value(s) +@type value: unicode or str in site encoding +(string types may be a |-separated list) +iterable, where items are converted to unicode +with special handling for datetime.datetime to convert it to a +string using the ISO 8601
[MediaWiki-commits] [Gerrit] Always try to set an email in CentralAuthUser::attemptAutoMi... - change (mediawiki...CentralAuth)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181401
Change subject: Always try to set an email in
CentralAuthUser::attemptAutoMigration
..
Always try to set an email in CentralAuthUser::attemptAutoMigration
Sometimes the home wiki might not have an email address set, but
a password confirmed account has, so use that, to prevent creating
global accounts without emails set.
Change-Id: I0d8e95b9fff6a2da68992e792759cb6c117c4d27
---
M includes/CentralAuthUser.php
1 file changed, 44 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/01/181401/1
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index ab617cd..5aca903 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -794,7 +794,7 @@
// Matches the pre-authenticated password, yay!
$method = 'password';
} elseif ( $local['emailAuthenticated'] isset(
$passingMail[$local['email']] ) ) {
- // Same email addresss as primary means we know
they could
+ // Same email addresss as primary or password
confirmed means we know they could
// reset their password, so we give them the
account.
// Authenticated email addresses only to
prevent merges with malicious users
$method = 'mail';
@@ -908,6 +908,39 @@
}
/**
+* Choose an email address to use from an array as obtained via
self::queryUnattached
+*
+* @param array[] $wikisToAttach
+*/
+ private function chooseEmail( $wikisToAttach ) {
+ if ( $this-mEmail ) {
+ return;
+ }
+
+ // Try authenticated emails first
+ foreach ( $wikisToAttach as $attachWiki ) {
+ if ( $attachWiki['email']
$attachWiki['emailAuthenticated'] ) {
+ $this-mEmail = $attachWiki['email'];
+ $this-mEmailAuthenticated =
$attachWiki['emailAuthenticated'];
+ break;
+ }
+ }
+
+ if ( $this-mEmail ) {
+ return;
+ }
+
+ // Let's try unconfirmed addresses, better than nothing
+ foreach ( $wikisToAttach as $attachWiki ) {
+ if ( $attachWiki['email'] ) {
+ $this-mEmail = $attachWiki['email'];
+ $this-mEmailAuthenticated =
$attachWiki['emailAuthenticated'];
+ break;
+ }
+ }
+ }
+
+ /**
* Pick a winning master account and try to auto-merge as many as
possible.
* @fixme add some locking or something
*
@@ -955,14 +988,20 @@
return false;
}
+ $wikisToAttach = array_intersect_key( $migrationSet, $attach );
+
+ // The home wiki might not have an email set, but maybe an
other account has one?
+ $this-chooseEmail( $wikisToAttach );
+
// storeGlobalData clears $this-mHomeWiki
$homeWiki = $this-mHomeWiki;
// Actually do the migration
$ok = $this-storeGlobalData(
- $home['id'],
- $home['password'],
- $home['email'],
- $home['emailAuthenticated'] );
+ $home['id'],
+ $home['password'],
+ $this-mEmail,
+ $this-mEmailAuthenticated
+ );
if ( !$ok ) {
wfDebugLog( 'CentralAuth',
--
To view, visit https://gerrit.wikimedia.org/r/181401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d8e95b9fff6a2da68992e792759cb6c117c4d27
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ULS depends on EventLogging - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: ULS depends on EventLogging
..
ULS depends on EventLogging
Bug: T85124
Change-Id: I8b2a4a5c3b9bb6a8b0101a9240d8864eb4cca842
---
M jjb/mediawiki-extensions.yaml
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
KartikMistry: Looks good to me, but someone else must approve
Amire80: Looks good to me, but someone else must approve
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index e70032c..e9a1dc5 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -453,7 +453,7 @@
- ContactPage
- ContactPageFundraiser
- ContentTranslation:
-dependencies: 'UniversalLanguageSelector'
+dependencies: 'UniversalLanguageSelector,EventLogging'
- Contest
- ContributionReporting
- ContributionScores
@@ -947,7 +947,8 @@
- UIFeedback
- UnicodeConverter
- UnitTest
- - UniversalLanguageSelector
+ - UniversalLanguageSelector:
+dependencies: 'EventLogging'
- UpdateMediaWiki
- UploadBlacklist
- UploadLocal
@@ -1047,7 +1048,7 @@
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: ContentTranslation
-dependencies: 'UniversalLanguageSelector'
+dependencies: 'UniversalLanguageSelector,EventLogging'
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: DataValues
--
To view, visit https://gerrit.wikimedia.org/r/181400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b2a4a5c3b9bb6a8b0101a9240d8864eb4cca842
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update upstream jquery.uls to 10777bb - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Update upstream jquery.uls to 10777bb
..
Update upstream jquery.uls to 10777bb
* Don't show region headings in narrow mode.
* Remove the map.
GitHub link:
https://github.com/wikimedia/jquery.uls/commit/10777bb25ea23dc5609a1109a27e901711cc264b
Change-Id: I4fcfba5a6ef46d0bda34331c6ea111cdedd157a7
---
M lib/jquery.uls/css/jquery.uls.compact.css
M lib/jquery.uls/css/jquery.uls.css
M lib/jquery.uls/i18n/en.json
M lib/jquery.uls/i18n/qqq.json
D lib/jquery.uls/images/world_map.png
D lib/jquery.uls/images/world_map.svg
M lib/jquery.uls/src/jquery.uls.core.js
M lib/jquery.uls/src/jquery.uls.languagefilter.js
M lib/jquery.uls/src/jquery.uls.lcd.js
M lib/jquery.uls/src/jquery.uls.regionfilter.js
10 files changed, 154 insertions(+), 326 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.uls/css/jquery.uls.compact.css
b/lib/jquery.uls/css/jquery.uls.compact.css
index f5e6e07..5600410 100644
--- a/lib/jquery.uls/css/jquery.uls.compact.css
+++ b/lib/jquery.uls/css/jquery.uls.compact.css
@@ -1,7 +1,5 @@
.uls-compact .uls-icon-close,
-.uls-compact .uls-title-region,
-.uls-compact .uls-map-block,
-.uls-compact #uls-settings-block {
+.uls-compact .uls-title-region {
display: none !important;
}
diff --git a/lib/jquery.uls/css/jquery.uls.css
b/lib/jquery.uls/css/jquery.uls.css
index 6074e60..f1fde4d 100644
--- a/lib/jquery.uls/css/jquery.uls.css
+++ b/lib/jquery.uls/css/jquery.uls.css
@@ -7,7 +7,6 @@
background-image: linear-gradient(transparent, transparent),
url('../images/icon-language.svg');
padding-left: 30px;
}
-
.uls-menu {
position: absolute;
z-index: 1000;
@@ -25,7 +24,6 @@
-moz-background-clip: padding;
background-clip: padding-box;
}
-
.uls-wide {
min-width: 715px;
width: 45%;
@@ -54,18 +52,14 @@
.uls-title-region a {
padding-left: 15px;
}
-
.uls-menu .uls-title {
font-weight: normal;
border: none;
- padding-top: 1.25em;
padding-left: 15px;
- padding-bottom: 3px;
font-size: 18pt;
line-height: 1.25em;
color: #555;
}
-
.uls-menu .uls-no-results-found-title {
font-size: 16pt;
font-weight: bold;
@@ -77,7 +71,6 @@
border-bottom: none;
color: #555;
}
-
.uls-menu .uls-lcd-region-section .uls-lcd-region-title {
color: #777;
font-size: 14pt;
@@ -88,17 +81,6 @@
margin-bottom: 10px;
border-bottom: none;
}
-
-.uls-worldmap {
- /* @embed */
- background: transparent url('../images/world_map.png') no-repeat scroll
right top;
- /* @embed */
- background-image: -webkit-linear-gradient(transparent, transparent),
url('../images/world_map.svg');
- /* @embed */
- background-image: linear-gradient(transparent, transparent),
url('../images/world_map.svg');
- background-size: 100%;
-}
-
div.uls-region {
cursor: pointer;
padding: 0;
@@ -107,11 +89,6 @@
border-bottom-color: transparent;
border-bottom-style: solid;
border-bottom-width: 2px;
-}
-
-.uls-worldmap .uls-region { /* The map doesn't flip */
- /* @noflip */
- float: left;
}
.uls-region a {
@@ -125,59 +102,6 @@
overflow: hidden;
text-overflow: ellipsis;
width: 99%;
-}
-
-.uls-region:hover {
- /*Cross-browser background transparency*/
- background: #3366bb;
- background: rgba(51, 102, 187, 0.1);
- filter:
progid:DXImageTransform.Microsoft.gradient(startColorstr=#253366bb,
endColorstr=#253366bb );
- -ms-filter:
progid:DXImageTransform.Microsoft.gradient(startColorstr=#253366bb,
endColorstr=#253366bb);
-}
-
-.uls-map-block .active {
- border-bottom-color: #3366bb;
- border-bottom-style: solid;
-}
-
-.uls-menu .row .uls-map-block {
- top: 1px;
- margin-right: 0;
- padding-right: 0;
- float: right;
- overflow: hidden;
- opacity: 0.7;
- -moz-transition: opacity 0.2s linear;
- -o-transition: opacity 0.2s linear;
- -webkit-transition: opacity 0.2s linear;
- transition: opacity 0.2s linear;
-}
-
-.uls-map-block a {
- color: #333;
- opacity: 0;
- -moz-transition: opacity 0.15s linear;
- -o-transition: opacity 0.15s linear;
- -webkit-transition: opacity 0.15s linear;
- transition: opacity 0.15s linear;
-}
-
-.uls-menu .uls-map-block:hover,
-.uls-menu .uls-map-block:hover a {
- opacity: 1;
- color: #333;
-}
-
-.uls-map-block .uls-region-1 {
- border-color: transparent;
-}
-
-.uls-map-block:hover .active {
- border-color: #3366bb;
-}
-
-.uls-map-block .active a {
- font-weight: bold;
}
.uls-icon-close {
@@ -205,11 +129,9 @@
-webkit-transition: border 0.15s
[MediaWiki-commits] [Gerrit] Publishing: Add publishing options dialog - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Publishing: Add publishing options dialog
..
Publishing: Add publishing options dialog
* Adds dialog and logic for when title to be published already exists
* Presents two options: Keep both versions and Publish anyway
* Keep both options adds a version number and saves that
* Publish anyway overrides the existing translation
Bug: T76464
Change-Id: I35b7a041cd9b2e2fefd8e9e271619a37e9a63e35
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
A modules/publish/ext.cx.publish.dialog.js
M modules/publish/ext.cx.publish.js
A modules/publish/images/clear.png
A modules/publish/images/clear.svg
A modules/publish/styles/ext.cx.publish.dialog.less
8 files changed, 358 insertions(+), 54 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 61078d4..9b317d6 100644
--- a/Resources.php
+++ b/Resources.php
@@ -466,6 +466,7 @@
'json',
'mediawiki.api.edit',
'mediawiki.cookie',
+ 'ext.cx.publish.dialog',
),
'messages' = array(
'cx-publish-page-success',
@@ -475,6 +476,23 @@
),
) + $resourcePaths;
+$wgResourceModules['ext.cx.publish.dialog'] = array(
+ 'scripts' = array(
+ 'publish/ext.cx.publish.dialog.js',
+ ),
+ 'styles' = array(
+ 'publish/styles/ext.cx.publish.dialog.less',
+ ),
+ 'dependencies' = array(
+ 'ext.cx.model',
+ ),
+ 'messages' = array(
+ 'cx-publishing-dialog-message',
+ 'cx-publishing-dialog-keep-button',
+ 'cx-publishing-dialog-publish-anyway-button',
+ ),
+) + $resourcePaths;
+
$wgResourceModules['ext.cx.eventlogging'] = array(
'scripts' = 'eventlogging/ext.cx.eventlogging.js',
'dependencies' = array(
diff --git a/i18n/en.json b/i18n/en.json
index e66d5e2..e257b51 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -122,5 +122,8 @@
cx-save-draft-tooltip: Translation drafts are saved automatically,
cx-contributions: New contribution,
cx-contributions-translation: Translation,
- cx-contributions-media: Upload media file
+ cx-contributions-media: Upload media file,
+ cx-publishing-dialog-message: The page $1 already exists. The
current content will be replaced by your translation. Do you want to publish
anyway?,
+ cx-publishing-dialog-keep-button: Keep both versions,
+ cx-publishing-dialog-publish-anyway-button: Publish anyway
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 17b2cb5..1b651b0 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -125,5 +125,8 @@
cx-save-draft-tooltip: Tooltip text shown for the save status
indicator text in the header of [[Special:ContentTranslation]].\n\nParameters:
\n* $1 - the number of minutes ago the translation was saved.,
cx-contributions: Text of a button which opens a dropdown,
cx-contributions-translation: Dropdown
item\n{{Identical|Translation}},
- cx-contributions-media: Dropdown item
+ cx-contributions-media: Dropdown item,
+ cx-publishing-dialog-message: Message that shows in the publishing
options dialog when there is an existing page with the same title already
published.\n\nParameters:\n* $1 - The link to the existing page with just the
title as text.,
+ cx-publishing-dialog-keep-button: Button label for publishing
options dialog. Clicking button preserves both the existing translation and the
new translation.,
+ cx-publishing-dialog-publish-anyway-button: Button label for
publishing options dialog. Clicking button overwrites the existing translation
with the new translation.
}
diff --git a/modules/publish/ext.cx.publish.dialog.js
b/modules/publish/ext.cx.publish.dialog.js
new file mode 100644
index 000..d8e2a3f
--- /dev/null
+++ b/modules/publish/ext.cx.publish.dialog.js
@@ -0,0 +1,186 @@
+/**
+ * ContentTranslation Tools
+ * A tool that allows editors to translate pages from one language
+ * to another with the help of machine translation and other translation tools
+ *
+ * @file
+ * @ingroup Extensions
+ * @copyright See AUTHORS.txt
+ * @license GPL-2.0+
+ */
+( function ( $, mw ) {
+ 'use strict';
+
+ /**
+* Handles show the publishing options dialog.
+*
+* @class
+*/
+ function CXPublishingDialog( trigger ) {
+ this.$trigger = $( trigger );
+ this.$dialog = null;
+ this.$close = null;
+ this.$message = null;
+ this.init();
+ }
+
+ /**
+* Initializes the publishing dialog instance.
+* @param {string} title The title of the existing article
+*/
+ CXPublishingDialog.prototype.init = function () {
+
[MediaWiki-commits] [Gerrit] jQuery.live is no more, so let's use .on instead - change (mediawiki...ArticleFeedbackv5)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181402
Change subject: jQuery.live is no more, so let's use .on instead
..
jQuery.live is no more, so let's use .on instead
This fixes this extension for MediaWiki 1.24+.
Change-Id: I4d6f964dded544f5b55206f5af0bf930e34f0108
---
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/02/181402/1
diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
index 167c5d3..0fb2e9a 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
@@ -2919,7 +2919,7 @@
}
}
if ( hasTipsy ) {
- $( '.articleFeedbackv5-form-flyover-closebutton'
).live( 'click', function ( e ) {
+ $( '.articleFeedbackv5-form-flyover-closebutton' ).on(
'click', function ( e ) {
e.preventDefault();
var $host = $(
'.articleFeedbackv5-trigger-link-' + $( e.target ).attr( 'rel' ) );
$host.tipsy( 'hide' );
--
To view, visit https://gerrit.wikimedia.org/r/181402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d6f964dded544f5b55206f5af0bf930e34f0108
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] T58916: Parse extension parameters as plain text - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: T58916: Parse extension parameters as plain text
..
T58916: Parse extension parameters as plain text
Also encode cite ids properly as now they can contain arbitrary
text. Change in blacklist due to this.
TODO: Investigate if it would be better to do this directly in
the tokenizer.
Change-Id: Ic112124e90d256d73a351d0d57fe3c7546fa065f
---
M lib/ext.Cite.js
M lib/ext.core.ExtensionHandler.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
4 files changed, 35 insertions(+), 28 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ext.Cite.js b/lib/ext.Cite.js
index 6e5c720..ffe92ff 100644
--- a/lib/ext.Cite.js
+++ b/lib/ext.Cite.js
@@ -154,7 +154,8 @@
// Looks like Cite.php doesn't try to fix ids that already have
// a _ in them. Ex: name=a b and name=a_b are considered
// identical. Not sure if this is a feature or a bug.
- return val.replace(/\s/g, '_');
+ // It also encodes them and then substitutes '%' with '.'.
+ return encodeURIComponent(val.replace(/\s/g, '_')).replace(/%/g, '.');
}
RefGroup.prototype.add = function(references, refName, about, skipLinkback) {
diff --git a/lib/ext.core.ExtensionHandler.js b/lib/ext.core.ExtensionHandler.js
index f993c58..74bccf3 100644
--- a/lib/ext.core.ExtensionHandler.js
+++ b/lib/ext.core.ExtensionHandler.js
@@ -97,16 +97,23 @@
};
function normalizeExtOptions(options) {
- // Normalize whitespace in extension attribute values
// Mimics Sanitizer::decodeTagAttributes from the PHP parser
//
- // Expects all values to have been fully expanded to string
+ // Extension options should always be interpreted as plain text. The
+ // tokenizer parses them to tokens in case they are for an HTML tag,
+ // but here we use the text source instead.
for (var i = 0, n = options.length; i n; i++) {
- var o = options[i];
- // SSS FIXME: This wont normalize options in all cases.
- if (o.v o.v.constructor === String) {
- o.v = o.v.trim().replace(/(\s+)/g, ' ');
+ var o = options[i], v;
+ if (!o.v !o.vsrc) {
+ continue;
}
+
+ // Use the source if present. If not use the value, but ensure
it's a
+ // string, as it can be a token stream if the parser has
recognized it
+ // as a directive.
+ v = o.vsrc || ((o.v.constructor === String) ? o.v :
Util.tokensToString(o.v));
+ // Normalize whitespace in extension attribute values
+ o.v = v.trim().replace(/(\s+)/g, ' ');
}
return options;
}
@@ -122,24 +129,6 @@
if ( nativeHandler ) {
// No caching for native extensions for now.
token.setAttribute('options',
normalizeExtOptions(token.getAttribute('options')));
-
- // SSS FIXME: We seem to have a problem on our hands here.
- //
- // AttributeExpander runs after ExtensionHandler which means
- // the native handlers will not receive fully expanded tokens.
- //
- // In the case of Cite.ref and Cite.references, this is not an
issue
- // since the final processing takes place in the DOM PP phase,
- // by which time the marker tokens would have had everything
expanded.
- // But, this may not be true for other exensions.
- //
- // So, we wont be able to robustly support templated ext.
attributes
- // without a fix for this since attribute values might be
ext-generated
- // and ext-attribute values might be templated.
- //
- // The fix might require breaking this cycle by
expliclitly-expanding
- // ext-attribute-values here in a new pipeline. TO BE DONE.
-
nativeHandler(token, cb);
} else if ( cachedExpansion ) {
//console.log('cache hit for',
JSON.stringify(cacheKey.substr(0, 50)));
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index d6d50ca..62d3461 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -524,7 +524,7 @@
add(wt2wt, Ref: 9. unclosed comments should not leak out of ref-body, A
reffoo !/ref B C\nreferences /);
add(wt2wt, Ref: 10. Unclosed HTML tags should not leak out of ref-body, A
refb foo /ref B C\n\nreferences /);
add(wt2wt, References: 5. ref tags in references should be processed while
ignoring all other content, A ref name=\a\ /\nB ref
name=\b\bar/ref\n\nreferences\nref
name=\a\foo/ref\n/references);
-add(wt2wt, Entities in ref name, ref name=\test
[MediaWiki-commits] [Gerrit] Don't add VisualEditor related modules if VE isn't installed - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181403
Change subject: Don't add VisualEditor related modules if VE isn't installed
..
Don't add VisualEditor related modules if VE isn't installed
Bug: T85007
Change-Id: I9943957b50c0d9bfb93c346078b75bc6a0237248
---
M includes/Resources.php
1 file changed, 36 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/03/181403/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 24e61e5..a8e0504 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -347,32 +347,6 @@
),
),
- 'mobile.editor.ve' = $wgMFResourceBoilerplate + array(
- 'dependencies' = array(
- 'ext.visualEditor.mobileViewTarget',
- 'mobile.stable',
- 'mobile.templates',
- 'mobile.editor.common',
- 'mobile.overlays',
- ),
- 'styles' = array(
- 'less/modules/editor/VisualEditorOverlay.less',
- ),
- 'scripts' = array(
- 'javascripts/modules/editor/VisualEditorOverlay.js',
- ),
- 'templates' = array(
- 'contentVE.hogan' =
'templates/modules/editor/contentVE.hogan',
- ),
- 'messages' = array(
- 'mobile-frontend-page-edit-summary',
- 'mobile-frontend-editor-editing',
- ),
- 'targets' = array(
- 'mobile',
- ),
- ),
-
'mobile.editor.overlay' = $wgMFResourceFileModuleBoilerplate + array(
'dependencies' = array(
'mobile.editor.common',
@@ -1082,6 +1056,37 @@
) );
/**
+ * Mobile VisualEditor related modules
+ */
+$wgMobileVEModules = array(
+ 'mobile.editor.ve' = $wgMFResourceBoilerplate + array(
+ 'dependencies' = array(
+ 'ext.visualEditor.mobileViewTarget',
+ 'mobile.stable',
+ 'mobile.templates',
+ 'mobile.editor.common',
+ 'mobile.overlays',
+ ),
+ 'styles' = array(
+ 'less/modules/editor/VisualEditorOverlay.less',
+ ),
+ 'scripts' = array(
+ 'javascripts/modules/editor/VisualEditorOverlay.js',
+ ),
+ 'templates' = array(
+ 'contentVE.hogan' =
'templates/modules/editor/contentVE.hogan',
+ ),
+ 'messages' = array(
+ 'mobile-frontend-page-edit-summary',
+ 'mobile-frontend-editor-editing',
+ ),
+ 'targets' = array(
+ 'mobile',
+ ),
+ ),
+);
+
+/**
* Special page modules
* @todo FIXME: Remove the need for these by making more reusable CSS
*
@@ -1372,6 +1377,11 @@
$wgResourceModules = array_merge( $wgResourceModules, $wgMinervaStyleModules );
$wgResourceModules = array_merge( $wgResourceModules,
$wgMinervaBootstrapModules );
+// add VisualEditor related modules only, if VisualEditor seems to be
installed - T85007
+if ( class_exists( 'VisualEditorHooks' ) ) {
+ $wgResourceModules = array_merge( $wgResourceModules,
$wgMobileVEModules );
+}
+
// Module customizations
$wgResourceModuleSkinStyles['minerva'] = $wgMFResourceBoilerplate + array(
'mediawiki.skinning.content.parsoid' = array(),
--
To view, visit https://gerrit.wikimedia.org/r/181403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9943957b50c0d9bfb93c346078b75bc6a0237248
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed spacing and alignment - change (operations/puppet)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181404
Change subject: Fixed spacing and alignment
..
Fixed spacing and alignment
This fixes lint 'two-space soft tabs not used'.
Change-Id: I78aae2a826ba663711964faaea9040247cd0022e
---
M modules/bacula/manifests/client/job.pp
M modules/diamond/manifests/init.pp
M modules/install-server/manifests/dhcp-server.pp
M modules/labs_lvm/manifests/volume.pp
M modules/postgresql/manifests/user.pp
M modules/puppet_compiler/manifests/packages.pp
6 files changed, 37 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/181404/1
diff --git a/modules/bacula/manifests/client/job.pp
b/modules/bacula/manifests/client/job.pp
index 698ad35..4663249 100644
--- a/modules/bacula/manifests/client/job.pp
+++ b/modules/bacula/manifests/client/job.pp
@@ -25,9 +25,9 @@
# }
#
define bacula::client::job(
- $fileset,
- $jobdefaults,
- $extras=undef) {
+$fileset,
+$jobdefaults,
+$extras=undef) {
$director = $::bacula::client::director
diff --git a/modules/diamond/manifests/init.pp
b/modules/diamond/manifests/init.pp
index 3926fcd..42e43c0 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -58,8 +58,9 @@
$path_prefix = 'servers',
$keep_logs_for = '5',
$service = running,
-$settings = { host = 'localhost',
- port = '8125',
+$settings = {
+host = 'localhost',
+port = '8125',
},
) {
if os_version('debian = jessie || ubuntu = precise') {
diff --git a/modules/install-server/manifests/dhcp-server.pp
b/modules/install-server/manifests/dhcp-server.pp
index b1fbac8..64daaa6 100644
--- a/modules/install-server/manifests/dhcp-server.pp
+++ b/modules/install-server/manifests/dhcp-server.pp
@@ -38,9 +38,10 @@
service { $service_name:
ensure= running,
-require = [ Package[$package_name],
- File[$confdir]
- ],
+require = [
+Package[$package_name],
+File[$confdir]
+],
subscribe = File[$confdir],
}
}
diff --git a/modules/labs_lvm/manifests/volume.pp
b/modules/labs_lvm/manifests/volume.pp
index 7b4cc4a..89d0a0a 100644
--- a/modules/labs_lvm/manifests/volume.pp
+++ b/modules/labs_lvm/manifests/volume.pp
@@ -42,9 +42,9 @@
unless = /bin/mountpoint -q '$mountat',
logoutput = 'on_failure',
require = [
- File['/usr/local/sbin/make-instance-vol'],
- Exec['create-volume-group']
- ],
+File['/usr/local/sbin/make-instance-vol'],
+Exec['create-volume-group']
+],
command = /usr/local/sbin/make-instance-vol '$volname' '$size'
'$fstype' $mkfs_opt,
}
@@ -62,9 +62,9 @@
options = $options,
fstype = $fstype,
require = [
- Exec[create-vd-$volname],
- File[$mountat],
- ],
+Exec[create-vd-$volname],
+File[$mountat],
+],
}
labs_lvm::extend { $mountat:
diff --git a/modules/postgresql/manifests/user.pp
b/modules/postgresql/manifests/user.pp
index 59dd3f6..c48f89f 100644
--- a/modules/postgresql/manifests/user.pp
+++ b/modules/postgresql/manifests/user.pp
@@ -25,16 +25,16 @@
# Based upon https://github.com/uggedal/puppet-module-postgresql
#
define postgresql::user(
- $user,
- $password,
- $database = 'template1',
- $type = 'host',
- $method = 'md5',
- $cidr = '127.0.0.1/32',
- $pgversion = '9.1',
- $attrs = '',
- $ensure = 'present'
- ) {
+$user,
+$password,
+$database = 'template1',
+$type = 'host',
+$method = 'md5',
+$cidr = '127.0.0.1/32',
+$pgversion = '9.1',
+$attrs = '',
+$ensure = 'present'
+) {
# Check if our user exists and store it
$userexists = /usr/bin/psql --tuples-only -c \'SELECT rolname FROM
pg_catalog.pg_roles;\' | /bin/grep \'^ ${user}\'
diff --git a/modules/puppet_compiler/manifests/packages.pp
b/modules/puppet_compiler/manifests/packages.pp
index 09344dd..56a6088 100644
--- a/modules/puppet_compiler/manifests/packages.pp
+++ b/modules/puppet_compiler/manifests/packages.pp
@@ -1,16 +1,16 @@
class puppet_compiler::packages($ensure = $puppet_compiler::ensure) {
include stdlib
$list = [
- 'curl',
- 'python-dev',
- 'rubygems',
- 'ruby-bundler',
- 'ruby1.8-dev',
- 'mysql-server',
- 'mysql-client',
- 'ruby-mysql',
- 'ruby-bcrypt',
- 'nginx'
- ]
+'curl',
+'python-dev',
+
[MediaWiki-commits] [Gerrit] Make upload.wikimedia.org set Timing-Allow-Origin - change (operations/puppet)
Unicodesnowman has uploaded a new change for review. https://gerrit.wikimedia.org/r/181405 Change subject: Make upload.wikimedia.org set Timing-Allow-Origin .. Make upload.wikimedia.org set Timing-Allow-Origin Cross-domain security restrictions limit the timing the timing data that is available for images and media files. This patch makes upload.wikimedia.org serve Timing-Allow-Origin: * for the frontend, allowing the full timing data to be accessed. Bug: T76020 Change-Id: Iaf4fbeffb62033ef59cb8287c248c96255384688 --- M templates/varnish/upload-frontend.inc.vcl.erb 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/05/181405/1 diff --git a/templates/varnish/upload-frontend.inc.vcl.erb b/templates/varnish/upload-frontend.inc.vcl.erb index c19cfc0..8cb1a95 100644 --- a/templates/varnish/upload-frontend.inc.vcl.erb +++ b/templates/varnish/upload-frontend.inc.vcl.erb @@ -118,4 +118,5 @@ set resp.http.Access-Control-Allow-Origin = *; set resp.http.Access-Control-Expose-Headers = Age, Date, Content-Length, Content-Range, X-Content-Duration, X-Cache, X-Varnish; + set resp.http.Timing-Allow-Origin = *; } -- To view, visit https://gerrit.wikimedia.org/r/181405 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf4fbeffb62033ef59cb8287c248c96255384688 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Unicodesnowman ad...@glados.cc ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] replace: Use correct notation for format - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181406
Change subject: [FIX] replace: Use correct notation for format
..
[FIX] replace: Use correct notation for format
When supplying multiple values to format via an iterable (e.g. a tuple)
it must be preceded by an asterisk to use each value as a positional
value.
Change-Id: I5ae457b7f9a9670b4f2c25e42c2ae45e41ea6083
---
M scripts/replace.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/06/181406/1
diff --git a/scripts/replace.py b/scripts/replace.py
index c13d421..a8fc8cd 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -519,7 +519,7 @@
summary_messages.insert(0, self.summary)
else:
default_summary = ', '.join(
-u'-{0} +{1}'.format(default_summary)
+u'-{0} +{1}'.format(*default_summary)
for default_summary in default_summaries)
summary_messages.insert(0, i18n.twtranslate(
pywikibot.Site(), 'replace-replacing',
--
To view, visit https://gerrit.wikimedia.org/r/181406
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ae457b7f9a9670b4f2c25e42c2ae45e41ea6083
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use the new version of 'archivebot-older-than' - change (pywikibot/compat)
Ricordisamoa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181407
Change subject: use the new version of 'archivebot-older-than'
..
use the new version of 'archivebot-older-than'
with the 'duration' parameter
per mailing list:
http://comments.gmane.org/gmane.comp.python.pywikipediabot.general/14160
corresponding change in the i18n file:
I507b0b38a87fe8e97b850a71d9c1764ec16fbeb1
backport of Ie4699550def701a728abaca3e62287e1c36ce3b0 from core
Change-Id: Ifefc1c289120edd62747480cee497f846e6810c8
---
M archivebot.py
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/07/181407/1
diff --git a/archivebot.py b/archivebot.py
index c4fe7c4..7c80de0 100644
--- a/archivebot.py
+++ b/archivebot.py
@@ -412,7 +412,9 @@
#return 'unsigned'
maxage = str2time(reT.group(1))
if self.now - self.timestamp maxage:
-return message('archivebot-older-than') + ' ' + reT.group(1)
+return i18n.twtranslate(Site.language,
+'archivebot-older-than',
+{'duration': reT.group(1)})
return ''
--
To view, visit https://gerrit.wikimedia.org/r/181407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifefc1c289120edd62747480cee497f846e6810c8
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa ricordisa...@openmailbox.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mw.site.interwikiMap - change (mediawiki...Scribunto)
Mr. Stradivarius has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181408
Change subject: Add mw.site.interwikiMap
..
Add mw.site.interwikiMap
This makes the interwiki map available to Lua modules. The code is
based on the API interwiki map code in core (the appendInterwikiMap
method of includes/api/ApiQuerySiteInfo.php.) Everything that the
API includes is added, apart from iw_api and iw_wikiid, which I
couldn't think of a use for from Lua modules.
Accessing the interwiki map would be useful for modules like
enwiki's Module:InterwikiTable,[1] as it would stop module writers
having to duplicate the data.
[1] https://en.wikipedia.org/wiki/Module:InterwikiTable
Change-Id: Ie8ad2582aaf5e422824f7da51714a347bb4041d1
---
M engines/LuaCommon/SiteLibrary.php
M engines/LuaCommon/lualib/mw.site.lua
M tests/engines/LuaCommon/SiteLibraryTests.lua
3 files changed, 111 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto
refs/changes/08/181408/1
diff --git a/engines/LuaCommon/SiteLibrary.php
b/engines/LuaCommon/SiteLibrary.php
index 5f945d2..b4ed448 100644
--- a/engines/LuaCommon/SiteLibrary.php
+++ b/engines/LuaCommon/SiteLibrary.php
@@ -12,6 +12,7 @@
'pagesInCategory' = array( $this, 'pagesInCategory' ),
'pagesInNamespace' = array( $this, 'pagesInNamespace'
),
'usersInGroup' = array( $this, 'usersInGroup' ),
+ 'interwikiMap' = array( $this, 'interwikiMap' ),
);
$info = array(
'siteName' = $GLOBALS['wgSitename'],
@@ -130,4 +131,50 @@
$name = trim( preg_replace( '/[\s_]+/', '_', $name ), '_' );
return array( $wgContLang-getNsIndex( $name ) );
}
+
+ public function interwikiMap( $filter = null ) {
+ $this-checkTypeOptional( 'interwikiMap', 1, $filter, 'string',
null );
+ global $wgLocalInterwikis, $wgExtraInterlanguageLinkPrefixes;
+ static $interwikiMapCache = array();
+
+ $local = null;
+ if ( $filter === 'local' ) {
+ $local = 1;
+ } elseif ( $filter === '!local' ) {
+ $local = 0;
+ } elseif ( $filter !== null ) {
+ throw new Scribunto_LuaError(
+ bad argument #1 to 'interwikiMap' (unknown
filter '$filter')
+ );
+ }
+
+ if ( !isset( $interwikiMapCache[$local] ) ) {
+ $interwikiMap = array();
+ $prefixes = Interwiki::getAllPrefixes( $local );
+ foreach ( $prefixes as $row ) {
+ $prefix = $row['iw_prefix'];
+ $val = array(
+ 'prefix' = $prefix,
+ 'url' = wfExpandUrl( $row['iw_url'],
PROTO_CURRENT ),
+ 'isLocal' = isset( $row['iw_local'] )
$row['iw_local'] == '1',
+ 'isTranscludable' = isset(
$row['iw_trans'] ) $row['iw_trans'] == '1',
+ 'isCurrentWiki' = in_array( $prefix,
$wgLocalInterwikis ),
+ 'isExtraLanguageLink' = in_array(
$prefix, $wgExtraInterlanguageLinkPrefixes ),
+ );
+ if ( $val['isExtraLanguageLink'] ) {
+ $name = wfMessage(
interlanguage-link-$prefix );
+ if ( !$name-isDisabled() ) {
+ $val['name'] = $name-text();
+ }
+ $description = wfMessage(
interlanguage-link-sitename-$prefix );
+ if ( !$description-isDisabled() ) {
+ $val['description'] =
$description-text();
+ }
+ }
+ $interwikiMap[$prefix] = $val;
+ }
+ $interwikiMapCache[$local] = $interwikiMap;
+ }
+ return array( $interwikiMapCache[$local] );
+ }
}
diff --git a/engines/LuaCommon/lualib/mw.site.lua
b/engines/LuaCommon/lualib/mw.site.lua
index 504faa2..09943a8 100644
--- a/engines/LuaCommon/lualib/mw.site.lua
+++ b/engines/LuaCommon/lualib/mw.site.lua
@@ -15,6 +15,7 @@
site.stats.pagesInCategory = php.pagesInCategory
site.stats.pagesInNamespace = php.pagesInNamespace
site.stats.usersInGroup = php.usersInGroup
+ site.interwikiMap = php.interwikiMap
--
[MediaWiki-commits] [Gerrit] Properly align indentation of = - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: Properly align indentation of =
..
Properly align indentation of =
Change-Id: Iff8bb3f36a38e26c3edeaa93b14274db0860b940
---
M modules/bacula/manifests/director.pp
M modules/bacula/tests/director.pp
M modules/varnish/manifests/zero_update.pp
3 files changed, 18 insertions(+), 18 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/bacula/manifests/director.pp
b/modules/bacula/manifests/director.pp
index 835d17f..dfbbe76 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -50,7 +50,7 @@
exec { 'bacula_cp_private_key':
command = /bin/cp /var/lib/puppet/ssl/private_keys/${::fqdn}.pem \
/var/lib/puppet/ssl/private_keys/bacula-${::fqdn}.pem,
-unless = /usr/bin/cmp /var/lib/puppet/ssl/private_keys/${::fqdn}.pem
\
+unless = /usr/bin/cmp
/var/lib/puppet/ssl/private_keys/${::fqdn}.pem \
/var/lib/puppet/ssl/private_keys/bacula-${::fqdn}.pem,
}
diff --git a/modules/bacula/tests/director.pp b/modules/bacula/tests/director.pp
index 8163b0b..41bacf1 100644
--- a/modules/bacula/tests/director.pp
+++ b/modules/bacula/tests/director.pp
@@ -6,16 +6,16 @@
}
bacula::director::catalog { 'MYDB':
-dbname = 'bacula',
-dbuser = 'bacula',
-dbhost = 'bacula-db.example.org',
-dbport = '3306',
-dbpassword = 'bacula',
+dbname = 'bacula',
+dbuser = 'bacula',
+dbhost = 'bacula-db.example.org',
+dbport = '3306',
+dbpassword = 'bacula',
}
bacula::director::schedule { 'Monthly-Sat':
runs = [
-{ 'level' = 'Full', 'at' = '1st Sat at 06:00', },
+{ 'level' = 'Full', 'at' = '1st Sat at 06:00', },
{ 'level' = 'Differential', 'at' = '2nd Sat at 06:00', },
],
}
@@ -27,12 +27,12 @@
}
bacula::director::fileset { 'root-var':
-includes = [ '/', '/var',],
-excludes = [ '/tmp', ],
+includes = [ '/', '/var',],
+excludes = [ '/tmp', ],
}
bacula::director::jobdefaults { '1st-sat-mypool':
-when= 'Monthly-Sat',
-pool= 'mypool',
+when = 'Monthly-Sat',
+pool = 'mypool',
}
diff --git a/modules/varnish/manifests/zero_update.pp
b/modules/varnish/manifests/zero_update.pp
index 9a1b25b..bc4b6b7 100644
--- a/modules/varnish/manifests/zero_update.pp
+++ b/modules/varnish/manifests/zero_update.pp
@@ -38,16 +38,16 @@
file { '/etc/zerofetcher':
ensure = directory,
-owner = 'root',
-group = 'root',
-mode = '0555',
+owner = 'root',
+group = 'root',
+mode = '0555',
}
file { '/etc/zerofetcher/zerofetcher.auth':
-owner = 'netmap',
-group = 'netmap',
-mode = '0400',
-source = $auth_src,
+owner = 'netmap',
+group = 'netmap',
+mode= '0400',
+source = $auth_src,
require = [File[/etc/zerofetcher]],
}
--
To view, visit https://gerrit.wikimedia.org/r/181399
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff8bb3f36a38e26c3edeaa93b14274db0860b940
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Add Mono fastcgi server package to exec_environ - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/181409 Change subject: tools: Add Mono fastcgi server package to exec_environ .. tools: Add Mono fastcgi server package to exec_environ Bug: T85142 Change-Id: I18770b5a69e57b44fe3ffc3f04f4a3b89c2ccd4f --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/09/181409/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 6397f9c..8691140 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -48,6 +48,7 @@ 'golang', 'luarocks', 'mono-complete', +'mono-fastcgi-server', # Bug T85142 'nodejs', 'openjdk-7-jre-headless', 'python3', -- To view, visit https://gerrit.wikimedia.org/r/181409 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I18770b5a69e57b44fe3ffc3f04f4a3b89c2ccd4f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Add Mono fastcgi server package to exec_environ - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: tools: Add Mono fastcgi server package to exec_environ .. tools: Add Mono fastcgi server package to exec_environ Bug: T85142 Change-Id: I18770b5a69e57b44fe3ffc3f04f4a3b89c2ccd4f --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 6397f9c..8691140 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -48,6 +48,7 @@ 'golang', 'luarocks', 'mono-complete', +'mono-fastcgi-server', # Bug T85142 'nodejs', 'openjdk-7-jre-headless', 'python3', -- To view, visit https://gerrit.wikimedia.org/r/181409 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I18770b5a69e57b44fe3ffc3f04f4a3b89c2ccd4f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: coren mpellet...@wikimedia.org 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] replace: Use correct notation for format - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] replace: Use correct notation for format
..
[FIX] replace: Use correct notation for format
When supplying multiple values to format via an iterable (e.g. a tuple)
it must be preceded by an asterisk to use each value as a positional
value.
Change-Id: I5ae457b7f9a9670b4f2c25e42c2ae45e41ea6083
---
M scripts/replace.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/replace.py b/scripts/replace.py
index c13d421..a8fc8cd 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -519,7 +519,7 @@
summary_messages.insert(0, self.summary)
else:
default_summary = ', '.join(
-u'-{0} +{1}'.format(default_summary)
+u'-{0} +{1}'.format(*default_summary)
for default_summary in default_summaries)
summary_messages.insert(0, i18n.twtranslate(
pywikibot.Site(), 'replace-replacing',
--
To view, visit https://gerrit.wikimedia.org/r/181406
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ae457b7f9a9670b4f2c25e42c2ae45e41ea6083
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Really allow Extensions to make a new gallery format - change (mediawiki/core)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/181410 Change subject: Really allow Extensions to make a new gallery format .. Really allow Extensions to make a new gallery format Adjust GalleryGetModes call to fit Hooks::run() signature. Change-Id: I916dade31d6d67de4bb82582cc71585e83fec1c9 --- M includes/gallery/ImageGalleryBase.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/10/181410/1 diff --git a/includes/gallery/ImageGalleryBase.php b/includes/gallery/ImageGalleryBase.php index bb9a903..2a888a5 100644 --- a/includes/gallery/ImageGalleryBase.php +++ b/includes/gallery/ImageGalleryBase.php @@ -120,7 +120,7 @@ 'packed-overlay' = 'PackedOverlayImageGallery', ); // Allow extensions to make a new gallery format. - Hooks::run( 'GalleryGetModes', self::$modeMapping ); + Hooks::run( 'GalleryGetModes', array( self::$modeMapping ) ); } } -- To view, visit https://gerrit.wikimedia.org/r/181410 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I916dade31d6d67de4bb82582cc71585e83fec1c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use the new version of 'archivebot-older-than' - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged.
Change subject: use the new version of 'archivebot-older-than'
..
use the new version of 'archivebot-older-than'
with the 'duration' parameter
per mailing list:
http://comments.gmane.org/gmane.comp.python.pywikipediabot.general/14160
corresponding change in the i18n file:
I507b0b38a87fe8e97b850a71d9c1764ec16fbeb1
backport of Ie4699550def701a728abaca3e62287e1c36ce3b0 from core
Change-Id: Ifefc1c289120edd62747480cee497f846e6810c8
---
M archivebot.py
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/archivebot.py b/archivebot.py
index c4fe7c4..7c80de0 100644
--- a/archivebot.py
+++ b/archivebot.py
@@ -412,7 +412,9 @@
#return 'unsigned'
maxage = str2time(reT.group(1))
if self.now - self.timestamp maxage:
-return message('archivebot-older-than') + ' ' + reT.group(1)
+return i18n.twtranslate(Site.language,
+'archivebot-older-than',
+{'duration': reT.group(1)})
return ''
--
To view, visit https://gerrit.wikimedia.org/r/181407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifefc1c289120edd62747480cee497f846e6810c8
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa ricordisa...@openmailbox.org
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Ricordisamoa ricordisa...@openmailbox.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Add uwsgi machines to the appropriate queue - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181411
Change subject: tools: Add uwsgi machines to the appropriate queue
..
tools: Add uwsgi machines to the appropriate queue
Change-Id: I5b687e398bee5a9144df661de7dc54b20894f3d9
---
M modules/toollabs/manifests/node/web/uwsgi.pp
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/181411/1
diff --git a/modules/toollabs/manifests/node/web/uwsgi.pp
b/modules/toollabs/manifests/node/web/uwsgi.pp
index 270b78d..ca244c5 100644
--- a/modules/toollabs/manifests/node/web/uwsgi.pp
+++ b/modules/toollabs/manifests/node/web/uwsgi.pp
@@ -12,11 +12,16 @@
#
class toollabs::node::web::uwsgi inherits toollabs::node::web {
-package { [
+package { [
'uwsgi',
'uwsgi-plugin-python',
'uwsgi-plugin-python3',
]:
ensure = latest,
}
+
+
+class { 'toollabs::queues':
+queues = [ 'webgrid-uwsgi' ],
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/181411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b687e398bee5a9144df661de7dc54b20894f3d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Add uwsgi machines to the appropriate queue - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: tools: Add uwsgi machines to the appropriate queue
..
tools: Add uwsgi machines to the appropriate queue
Change-Id: I5b687e398bee5a9144df661de7dc54b20894f3d9
---
M modules/toollabs/manifests/node/web/uwsgi.pp
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/node/web/uwsgi.pp
b/modules/toollabs/manifests/node/web/uwsgi.pp
index 270b78d..ca244c5 100644
--- a/modules/toollabs/manifests/node/web/uwsgi.pp
+++ b/modules/toollabs/manifests/node/web/uwsgi.pp
@@ -12,11 +12,16 @@
#
class toollabs::node::web::uwsgi inherits toollabs::node::web {
-package { [
+package { [
'uwsgi',
'uwsgi-plugin-python',
'uwsgi-plugin-python3',
]:
ensure = latest,
}
+
+
+class { 'toollabs::queues':
+queues = [ 'webgrid-uwsgi' ],
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/181411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b687e398bee5a9144df661de7dc54b20894f3d9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] etherpad: remove SSL stanza - change (operations/puppet)
John F. Lewis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181413
Change subject: etherpad: remove SSL stanza
..
etherpad: remove SSL stanza
For move to behind misc, remove the SSL stanza from
etherpad.wikimedia.org.erb as this is no longer needed.
Change-Id: I359c2582ad5c28e222bae8d2038dda79c6e96965
---
M templates/misc/etherpad.wikimedia.org.erb
1 file changed, 0 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/181413/1
diff --git a/templates/misc/etherpad.wikimedia.org.erb
b/templates/misc/etherpad.wikimedia.org.erb
index a3a22c7..c908dc2 100644
--- a/templates/misc/etherpad.wikimedia.org.erb
+++ b/templates/misc/etherpad.wikimedia.org.erb
@@ -44,51 +44,3 @@
/Proxy
/VirtualHost
-
-
-VirtualHost *:443
-
-ServerName %= @etherpad_host %
-
-SSLEngine on
-SSLCertificateFile %= @etherpad_ssl_cert %
-SSLCertificateKeyFile %= @etherpad_ssl_key %
-SSLCACertificatePath /etc/ssl/certs
-%= @ssl_settings.join(\n) %
-
-RewriteEngine on
-ProxyVia On
-ProxyRequests Off
-ProxyPass / http://%= @etherpad_ip %:%= @etherpad_port %/ retry=15
-ProxyPassReverse / http://%= @etherpad_ip %:%= @etherpad_port %/
-ProxyPreserveHost On
-RewriteRule /p/*$ https://%= @etherpad_host %/ [NC,L]
-RewriteCond %{REQUEST_URI} !^/locales/
-RewriteCond %{REQUEST_URI} !^/locales.json
-RewriteCond %{REQUEST_URI} !^/admin
-RewriteCond %{REQUEST_URI} !^/p/
-RewriteCond %{REQUEST_URI} !^/static/
-RewriteCond %{REQUEST_URI} !^/pluginfw/
-RewriteCond %{REQUEST_URI} !^/javascripts/
-RewriteCond %{REQUEST_URI} !^/socket.io/
-RewriteCond %{REQUEST_URI} !^/ep/
-RewriteCond %{REQUEST_URI} !^/minified/
-RewriteCond %{REQUEST_URI} !^/api/
-RewriteCond %{REQUEST_URI} !^/ro/
-RewriteCond %{REQUEST_URI} !^/error/
-RewriteCond %{REQUEST_URI} !^/jserror
-RewriteCond %{REQUEST_URI} !/favicon.ico
-RewriteCond %{REQUEST_URI} !/robots.txt
-RewriteRule ^/+(.+)$ https://%= @etherpad_host %/p/$1 [L]
-
-RewriteCond %{HTTP_HOST} !%= @etherpad_host %
-RewriteRule ^/+(.+)$ https://%= @etherpad_host %/$1 [R=301,L]
-
-Proxy *
-Options FollowSymLinks MultiViews
-AllowOverride All
-Order allow,deny
-Allow from all
-/Proxy
-
-/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/181413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I359c2582ad5c28e222bae8d2038dda79c6e96965
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] etherpad: add Varnish misc config - change (operations/puppet)
John F. Lewis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181412
Change subject: etherpad: add Varnish misc config
..
etherpad: add Varnish misc config
Add etherpad.wikimedia.org to misc Varnish config to
set backend to zirconium.
Change-Id: Ied6b8fa8f08c022407ee7cefb9ef93d6774c3070
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/181412/1
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index a407513..8249415 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -49,6 +49,9 @@
return (pass);
} elsif (req.http.Host == noc.wikimedia.org) {
set req.backend = terbium;
+ } elsif (req.http.Host == etherpad.wikimedia.org) {
+ set req.backend = zirconium;
+ return (pass);
} else {
error 404 Domain not served here;
}
--
To view, visit https://gerrit.wikimedia.org/r/181412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied6b8fa8f08c022407ee7cefb9ef93d6774c3070
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use defined() instead of constant() - change (mediawiki...TextExtracts)
Ricordisamoa has uploaded a new change for review. https://gerrit.wikimedia.org/r/181414 Change subject: Use defined() instead of constant() .. Use defined() instead of constant() To check for the existance of ApiBase::PARAM_HELP_MSG while preventing warnings from being issued: http://php.net/manual/en/function.constant.php#refsect1-function.constant-errors https://www.mediawiki.org/wiki/Thread:Extension_talk:TextExtracts/PHp_Warnings_in_version_1.24 Fixes commit 9207edfa8157a402f7abcd7ba3256543fddd31d3 Change-Id: Iceaf4e424cd929df7b3df46544844a4b0001f4d7 --- M ApiQueryExtracts.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TextExtracts refs/changes/14/181414/1 diff --git a/ApiQueryExtracts.php b/ApiQueryExtracts.php index add3993..693eb6e 100644 --- a/ApiQueryExtracts.php +++ b/ApiQueryExtracts.php @@ -361,7 +361,7 @@ 'continue' = array( ApiBase::PARAM_TYPE = 'integer', /** @todo Once support for MediaWiki 1.25 is dropped, just use ApiBase::PARAM_HELP_MSG directly */ - constant( 'ApiBase::PARAM_HELP_MSG' ) ?: '' = 'api-help-param-continue', + defined( 'ApiBase::PARAM_HELP_MSG' ) ?: '' = 'api-help-param-continue', ), // Used implicitly by LanguageConverter 'variant' = array( -- To view, visit https://gerrit.wikimedia.org/r/181414 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iceaf4e424cd929df7b3df46544844a4b0001f4d7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TextExtracts Gerrit-Branch: master Gerrit-Owner: Ricordisamoa ricordisa...@openmailbox.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cache: install the planet SSL cert on misc-web - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/181415 Change subject: cache: install the planet SSL cert on misc-web .. cache: install the planet SSL cert on misc-web We would like to move planet.wikimedia.org behind misc-web nginx/varnish. Planet has its own SSL wildcard cert for *.planet.wikimedia.org because we serve many language versions like en.planet.wikimedia.org etc. So before we can move this we need that cert on misc-web. The regular unified cert won't match it. Change-Id: I26af3f3c7efc0652a0bc94aef801c48334f7137e Bugs: T60048 --- M manifests/role/cache.pp 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/15/181415/1 diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 297b9c2..3b66372 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -621,7 +621,11 @@ 'wmfusercontent.org': certname = 'star.wmfusercontent.org', server_name = 'wmfusercontent.org', -server_aliases = ['*.wmfusercontent.org'], +server_aliases = ['*.wmfusercontent.org']; +'planet.wikimedia.org': +certname = 'planet.wikimedia.org', +server_name= 'planet.wikimedia.org', +server_aliases = ['*.planet.wikimedia.org']; } } -- To view, visit https://gerrit.wikimedia.org/r/181415 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26af3f3c7efc0652a0bc94aef801c48334f7137e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FEAT] Get shared FilePage and make checks dynamic - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181416
Change subject: [FEAT] Get shared FilePage and make checks dynamic
..
[FEAT] Get shared FilePage and make checks dynamic
With version 1.22 the meta property 'filerepoinfo' was introduced which
allows pywikibot to dynamically detect if a file is shared and also to
create a FilePage instance from another FilePage instance which is
actually in the shared repository (to do checks there for example).
To support older wikis, families can use 'file_repositories' which is a
dictionary. It contains for each repository name either the boolean
False (to indicate it's a local repository) or the URL in the
interwikimap style (//commons.wikimedia.org/wiki/$1 for example).
Change-Id: Iab8b8dbbccfe5294223096586a00bb88d94a11ac
---
M pywikibot/family.py
M pywikibot/page.py
M pywikibot/site.py
3 files changed, 76 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/16/181416/1
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 412996e..6a06e0c 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -38,6 +38,9 @@
if not hasattr(self, 'langs'):
self.langs = {}
+if not hasattr(self, 'file_repositories'):
+self.file_repositories = {}
+
# For interwiki sorting order see
# https://meta.wikimedia.org/wiki/Interwiki_sorting_order
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 2fcb3a5..2c1a222 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1933,11 +1933,22 @@
self._imagePageHtml = http.request(self.site, path)
return self._imagePageHtml
+@property
+def _imageinfo(self):
+if not hasattr(self, '__imageinfo'):
+self.__imageinfo = self.site.loadimageinfo(self)
+return self.__imageinfo
+
+@property
+def imagerepository(self):
+Return the name of the image repository.
+if not hasattr(self, '_imagerepository'):
+self._imageinfo
+return self._imagerepository
+
def fileUrl(self):
Return the URL for the file described on this page.
# TODO add scaling option?
-if not hasattr(self, '_imageinfo'):
-self._imageinfo = self.site.loadimageinfo(self)
return self._imageinfo['url']
@deprecated(fileIsShared)
@@ -1964,6 +1975,23 @@
return self.fileUrl().startswith(
'https://upload.wikimedia.org/wikipedia/commons/')
+def shared_file(self):
+
+Return a FilePage on the shared file repository.
+
+@return: The file with the site of the shared file repository.
+@rtype: FilePage
+@raises NoPage: When this file is not a shared file
+
+if not self.is_shared_file():
+raise pywikibot.NoPage()
+return pywikibot.FilePage(self.site.get_remote_filerepository(
+self.imagerepository), self.title(withNamespace=True))
+
+def is_shared_file(self):
+Return if this is on a shared file repository.
+return self.site.is_remote_filerepository(self.imagerepository)
+
@deprecated(FilePage.getFileSHA1Sum())
def getFileMd5Sum(self):
Return image file's MD5 checksum.
@@ -1979,8 +2007,6 @@
def getFileSHA1Sum(self):
Return the file's SHA1 checksum.
-if not hasattr(self, '_imageinfo'):
-self._imageinfo = self.site.loadimageinfo(self)
return self._imageinfo['sha1']
def getFileVersionHistory(self):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index c4cd53d..dce1a92 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -2218,6 +2218,47 @@
# 'title' is expected to be URL-encoded already
return self.siteinfo[articlepath].replace($1, title)
+_repositories = None
+
+def _get_repo(self, repo_name):
+def _concat_url(data):
+return data['server'] + data['articlepath']
+
+def _from_base_url(data):
+return data['descBaseUrl'][:data['descBaseUrl'].rfind('/')] + '/$1'
+if self._repositories is None:
+if self.version() MediaWikiVersion('1.22'):
+# Older versions don't have such API access, fallback to family
+self._repositories = self.family.file_repositories
+else:
+prop = ['name', 'local']
+gen = None
+if self.version() = MediaWikiVersion('1.25wmf1'):
+prop += ['descBaseUrl']
+parser = _from_base_url
+else:
+prop += ['server', 'articlepath']
+parser = _concat_url
+gen = api.QueryGenerator(site=self, action='query',
+ meta='filerepoinfo', friprop=prop)
+gen.resultkey =
[MediaWiki-commits] [Gerrit] Make mw.title:getContent() expensive and cached - change (mediawiki...Scribunto)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181417
Change subject: Make mw.title:getContent() expensive and cached
..
Make mw.title:getContent() expensive and cached
Now that creating mw.title objects is no longer expensive,
title:getContent() should be. Otherwise people can get the content for
extreme numbers of pages.
Change-Id: Ic2ec3e9c0562048c9167658e2d02cad7b851d8f9
---
M engines/LuaCommon/TitleLibrary.php
M tests/engines/LuaCommon/TitleLibraryTests.lua
2 files changed, 47 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto
refs/changes/17/181417/1
diff --git a/engines/LuaCommon/TitleLibrary.php
b/engines/LuaCommon/TitleLibrary.php
index 635683b..c4eb717 100644
--- a/engines/LuaCommon/TitleLibrary.php
+++ b/engines/LuaCommon/TitleLibrary.php
@@ -7,6 +7,7 @@
// incrementExpensiveFunctionCount()
private $titleCache = array();
private $idCache = array( 0 = null );
+ private $contentCache = array();
function register() {
$lib = array(
@@ -243,32 +244,38 @@
function getContent( $text ) {
$this-checkType( 'getContent', 1, $text, 'string' );
+
$title = Title::newFromText( $text );
if ( !$title ) {
return array( null );
}
- // Record in templatelinks, so edits cause the page to be
refreshed
- $this-getParser()-getOutput()-addTemplate(
- $title, $title-getArticleID(), $title-getLatestRevID()
- );
- if ( $title-equals( $this-getTitle() ) ) {
- $this-getParser()-getOutput()-setFlag(
'vary-revision' );
- }
+ $key = $title-getPrefixedDBkey();
+ if ( !array_key_exists( $key, $this-contentCache ) ) {
+ $this-incrementExpensiveFunctionCount();
+ $this-contentCache[$key] = null;
- if ( is_callable( array( $this-getParser(),
'fetchCurrentRevisionOfTitle' ) ) ) {
- $rev = $this-getParser()-fetchCurrentRevisionOfTitle(
$title );
- } else {
- $rev = Revision::newFromTitle( $title );
+ // Record in templatelinks, so edits cause the page to
be refreshed
+ $this-getParser()-getOutput()-addTemplate(
+ $title, $title-getArticleID(),
$title-getLatestRevID()
+ );
+ if ( $title-equals( $this-getTitle() ) ) {
+ $this-getParser()-getOutput()-setFlag(
'vary-revision' );
+ }
+
+ if ( is_callable( array( $this-getParser(),
'fetchCurrentRevisionOfTitle' ) ) ) {
+ $rev =
$this-getParser()-fetchCurrentRevisionOfTitle( $title );
+ } else {
+ $rev = Revision::newFromTitle( $title );
+ }
+ if ( $rev ) {
+ $content = $rev-getContent();
+ if ( $content ) {
+ $this-contentCache[$key] =
$content-serialize();
+ }
+ }
}
- if ( !$rev ) {
- return array( null );
- }
- $content = $rev-getContent();
- if ( !$content ) {
- return array( null );
- }
- return array( $content-serialize() );
+ return array( $this-contentCache[$key] );
}
function getFileInfo( $text ) {
diff --git a/tests/engines/LuaCommon/TitleLibraryTests.lua
b/tests/engines/LuaCommon/TitleLibraryTests.lua
index ed7c146..06a7874 100644
--- a/tests/engines/LuaCommon/TitleLibraryTests.lua
+++ b/tests/engines/LuaCommon/TitleLibraryTests.lua
@@ -74,6 +74,20 @@
return mw.title.new( 'ScribuntoTestPage' ):getContent()
end
+local function test_getContent_expensive()
+ for i = 1, 11 do
+ local _ = mw.title.new( tostring( i ) ):getContent()
+ end
+ return 'did not error'
+end
+
+local function test_getContent_cached( count )
+ for i = 1, 100 do
+ local _ = mw.title.new( 'Title' ):getContent()
+ end
+ return 'did not error'
+end
+
-- Tests
local tests = {
{ name = 'tostring', func = identity, type = 'ToString',
@@ -382,6 +396,13 @@
{ name = inexpensive actions shouldn't count as expensive, func =
test_inexpensive,
expect = { 'did not error' }
},
+
+ { name = '.getContent() is expensive', func = test_getContent_expensive,
+ expect = 'too many expensive function
[MediaWiki-commits] [Gerrit] Add support for uwsgi webservices - change (labs/toollabs)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181418
Change subject: Add support for uwsgi webservices
..
Add support for uwsgi webservices
Change-Id: Id1431d09d20ca55a4f7936b598365ac14f8eacb5
---
M misctools/webservice2
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs
refs/changes/18/181418/1
diff --git a/misctools/webservice2 b/misctools/webservice2
index 12d6a01..5f1de08 100644
--- a/misctools/webservice2
+++ b/misctools/webservice2
@@ -125,7 +125,7 @@
parser = argparse.ArgumentParser()
parser.add_argument('server', help='Type of server to start',
-choices=['lighttpd', 'tomcat'], default='lighttpd',
nargs='?')
+choices=['lighttpd', 'tomcat', 'uwsgi'],
default='lighttpd', nargs='?')
parser.add_argument('action', help='Action to perform',
choices=['stop', 'start', 'restart'])
parser.add_argument('--release', help='Which Ubuntu release the node running
the webservice sould be on',
@@ -137,6 +137,10 @@
job_id = get_job_id(queue_name, job_name)
+# And no precise for uwsgi, so default to trusty
+if args.server == 'uwsgi':
+args.release = trusty
+
if args.action == 'start':
if job_id is not None:
print 'Your webservice is already running'
--
To view, visit https://gerrit.wikimedia.org/r/181418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1431d09d20ca55a4f7936b598365ac14f8eacb5
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] planets: add Varnish statement - change (operations/puppet)
John F. Lewis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181419
Change subject: planets: add Varnish statement
..
planets: add Varnish statement
Uses regex to catch *.planet.wikimedia.org as there are currently
24 subdomains. Listing them off separately in a line is possible
but looks ugly vs this ugly regex.
Bug: T60048
Change-Id: I5c13fab0f5777acd7847731f18d0e35b0f5c066a
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/181419/1
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index a407513..8d9e262 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -49,6 +49,8 @@
return (pass);
} elsif (req.http.Host == noc.wikimedia.org) {
set req.backend = terbium;
+ } elsif (req.http.Host ~ .*\.planet\.wikimedia\.org) {
+ set req.backend = zirconium;
} else {
error 404 Domain not served here;
}
--
To view, visit https://gerrit.wikimedia.org/r/181419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c13fab0f5777acd7847731f18d0e35b0f5c066a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP Show a panel explaining CVV field for WorldPay - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181420
Change subject: WIP Show a panel explaining CVV field for WorldPay
..
WIP Show a panel explaining CVV field for WorldPay
One version of a CVV explanation. In this one, a click on the
question mark icon reveals a panel below the CVV field with a text
explanation
Change-Id: I5d272abeacdc74cc14def5751aac43228e7925cf
---
A gateway_forms/includes/questionmark.png
M worldpay_gateway/forms/css/worldpay.css
M worldpay_gateway/forms/html/_wp_ott_form/FR.html
M worldpay_gateway/forms/html/_wp_ott_form/US.html
M worldpay_gateway/forms/js/worldpay.js
5 files changed, 32 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/20/181420/1
diff --git a/gateway_forms/includes/questionmark.png
b/gateway_forms/includes/questionmark.png
new file mode 100644
index 000..8818c4b
--- /dev/null
+++ b/gateway_forms/includes/questionmark.png
Binary files differ
diff --git a/worldpay_gateway/forms/css/worldpay.css
b/worldpay_gateway/forms/css/worldpay.css
index 10b4515..e103eef 100644
--- a/worldpay_gateway/forms/css/worldpay.css
+++ b/worldpay_gateway/forms/css/worldpay.css
@@ -195,3 +195,12 @@
.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7,
.col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
padding: 0 3px 0 3px !important;
}
+img#cvv-info {
+ vertical-align: top;
+ cursor: pointer;
+}
+#cvv-codes {
+ display: none;
+ padding: 10px;
+ cursor: pointer;
+}
\ No newline at end of file
diff --git a/worldpay_gateway/forms/html/_wp_ott_form/FR.html
b/worldpay_gateway/forms/html/_wp_ott_form/FR.html
index c5eb9fe..10491ea 100644
--- a/worldpay_gateway/forms/html/_wp_ott_form/FR.html
+++ b/worldpay_gateway/forms/html/_wp_ott_form/FR.html
@@ -29,7 +29,7 @@
placeholder='05/2015'/
/div
div class=col-md-3
- label for=cvc
id=cvc-label%donate_interface-cvv%/label
+ label for=cvc id=cvc-label%donate_interface-cvv%
img
src=@script_path/extensions/DonationInterface/gateway_forms/includes/questionmark.png
id=cvv-info /label
input type=text class=form-control id=cvc
pattern=\d*
autocomplete=off
placeholder='123'/
@@ -39,6 +39,12 @@
div class=row-fluid
div class=col-md-12
+ div id=cvv-codes%donate_interface-cvv-explain%/div
+ /div
+/div
+
+div class=row-fluid
+ div class=col-md-12
div class=ccError ccNumberErrorbull;
%donate_interface-error-msg-card-num%/div
div class=ccError ccExpiryErrorbull;
%donate_interface-error-msg-expiration%/div
div class=ccError ccCVCErrorbull;
%donate_interface-error-msg-cvv%/div
diff --git a/worldpay_gateway/forms/html/_wp_ott_form/US.html
b/worldpay_gateway/forms/html/_wp_ott_form/US.html
index f8c3600..0437bcf 100644
--- a/worldpay_gateway/forms/html/_wp_ott_form/US.html
+++ b/worldpay_gateway/forms/html/_wp_ott_form/US.html
@@ -30,7 +30,7 @@
placeholder='05/2015'/
/div
div class=col-md-3
- label for=cvc
id=cvc-label%donate_interface-cvv%/label
+ label for=cvc
id=cvc-label%donate_interface-cvv%/labelimg
src=@script_path/extensions/DonationInterface/gateway_forms/includes/questionmark.png
id=cvv-info
input type=text class=form-control id=cvc
pattern=\d*
autocomplete=off
placeholder='123'/
diff --git a/worldpay_gateway/forms/js/worldpay.js
b/worldpay_gateway/forms/js/worldpay.js
index d4b45c2..64e04ec 100644
--- a/worldpay_gateway/forms/js/worldpay.js
+++ b/worldpay_gateway/forms/js/worldpay.js
@@ -208,5 +208,20 @@
$( '#ddTestOptions').click( function () {
$( '#ddTestCCArea'
).removeClass('hide').addClass('show');
});
+ $( '#cvv-info' ).click( function () {
+ $( '#cvv-codes' ).toggle( 400 );
+ });
+ $( '#cvv-codes' ).click( function () {
+ $( '#cvv-codes' ).hide( 400 );
+ });
+ /*$( '#cvv-info' ).click( function () {
+ $( '#cvv-codes' ).addClass( 'popped' ).show();
+ $( 'body' ).addClass( 'pop-shown' );
+ return false;
+ });
+ $( document ).on( 'click', 'body.pop-shown', function () {
+ $( '.popped' ).removeClass( 'popped' ).hide();
+ $( 'body' ).removeClass( 'pop-shown' );
+ });*/
});
})( jQuery, mediaWiki );
--
To view,
[MediaWiki-commits] [Gerrit] admin: add krenair to deployers - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/181421 Change subject: admin: add krenair to deployers .. admin: add krenair to deployers See Bug T84818 for details Change-Id: I08e9197922c12f1e586022d41b48a73c005d5534 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/admin/data/data.yaml 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/181421/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index a5f0cba..510b90b 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -43,7 +43,7 @@ gjg, gwicke, halfak, hashar, hoo, kaldari, kartik, khorn, krinkle, manybubbles, maxsem, mattflaschen, marktraceur, milimetric, mlitn, nikerabbit, reedy, rmoen, robla, spage, ssastry, tomasz, yurik, - tgr, phuedx, bsimmers, ejegg, twentyafterfour, legoktm, catrope, qchris] + tgr, phuedx, bsimmers, ejegg, twentyafterfour, legoktm, catrope, qchris, krenair] restricted: gid: 706 description: access to terbium, fluorine (private data) and bastion hosts @@ -1225,3 +1225,10 @@ realname: Stas Malyshev ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQCpDNpAh83SAftCCJtjnvyTkN8uag0OmMk/Wpn+iAtZz5THTocU7MLdggW5scut+lMfog6Mf7aECC5vPo2eGtGkCXbmsGMhHsuA4mxo4vhnI5PduLY6F9PU4YCRe477NTEFfffy/HxDQR9gHNnuLyoHGqEgCQmmEtQoD1ChEiVHbwM35m6OVZjraMyy5Hfcnr7txHjOnVBGFW3Nn+bT3S42YdJDy3l9SIOg7NGi1WHo+cZaKIpO+wTelDSem1o7m+ERk10XaDOakCpznjnxmzfoy0WKeJWAkG0uGiE7vVAKzOhNw4/v6vaSSXWNRMD7MBea6iDaFduA1ghnq8i6Xf7f smalys...@wikimedia.org] uid: 10977 + krenair: +ensure: present +gid: 500 +name: krenair +realname: Alex Monk +ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQC3fwEjFgGqoTgucR2/co8DuWJfztYEzBULOmsOzkuRHVd7lHwyFmTVU9b2KRmHAEWTLQK1XOf0IxsN2OwU1Rx8awciGcQIaIRT2OBR/qcBFaq7HiECLQS8cQamVTnyERYJl06NKeh1PKtegxgnDS5nt1GrsHQqCS24CZ4Vhk0nWDNzQNKPugXJzckr7yPkU+9hoVMwG0zEZVH/vvPRdkrHXClXoieaP5QNbcFEADGrFVwgrcPUT3qM1xfHYVG8mBy+KSg9eVTsT/tG5x/Sb6S3h8Vk1OZu+JFIULW/zu52WzCQyMssbjA3CeTxAnNK1Y1n25PaZnqWljfYmrGtEZH7 kren...@gmail.com prod] +uid: 2170 -- To view, visit https://gerrit.wikimedia.org/r/181421 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08e9197922c12f1e586022d41b48a73c005d5534 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP tooltip explanation of CVV field for WorldPay - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181422
Change subject: WIP tooltip explanation of CVV field for WorldPay
..
WIP tooltip explanation of CVV field for WorldPay
Image tooltip shows on hover for desktop, on click for mobile.
HTML changes only made to FR till we decide which to use, this or
3325adb
Change-Id: Ibc996ecc8d9b253fcf6b4bfc7a743d35f3f4552c
---
A gateway_forms/includes/questionmark.png
M worldpay_gateway/forms/css/worldpay.css
M worldpay_gateway/forms/html/_wp_ott_form/FR.html
M worldpay_gateway/forms/html/_wp_ott_form/US.html
M worldpay_gateway/forms/js/worldpay.js
5 files changed, 32 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/22/181422/1
diff --git a/gateway_forms/includes/questionmark.png
b/gateway_forms/includes/questionmark.png
new file mode 100644
index 000..8818c4b
--- /dev/null
+++ b/gateway_forms/includes/questionmark.png
Binary files differ
diff --git a/worldpay_gateway/forms/css/worldpay.css
b/worldpay_gateway/forms/css/worldpay.css
index 10b4515..f402f73 100644
--- a/worldpay_gateway/forms/css/worldpay.css
+++ b/worldpay_gateway/forms/css/worldpay.css
@@ -195,3 +195,18 @@
.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7,
.col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
padding: 0 3px 0 3px !important;
}
+img#cvv-info {
+ vertical-align: top;
+ cursor: pointer;
+}
+#cvv-codes {
+ background-color: white;
+ border: 1px solid #c0c0c0;
+ bottom: 100%;
+ display: none;
+ padding: 10px;
+ cursor: pointer;
+ position: absolute;
+ right: 3px;
+ border-radius: 4px;
+}
\ No newline at end of file
diff --git a/worldpay_gateway/forms/html/_wp_ott_form/FR.html
b/worldpay_gateway/forms/html/_wp_ott_form/FR.html
index c5eb9fe..7a739d7 100644
--- a/worldpay_gateway/forms/html/_wp_ott_form/FR.html
+++ b/worldpay_gateway/forms/html/_wp_ott_form/FR.html
@@ -29,7 +29,8 @@
placeholder='05/2015'/
/div
div class=col-md-3
- label for=cvc
id=cvc-label%donate_interface-cvv%/label
+ label for=cvc id=cvc-label%donate_interface-cvv%
img
src=@script_path/extensions/DonationInterface/gateway_forms/includes/questionmark.png
id=cvv-info /label
+ div id=cvv-codesimg
src=@script_path/extensions/DonationInterface/gateway_forms/includes/security-code.png
//div
input type=text class=form-control id=cvc
pattern=\d*
autocomplete=off
placeholder='123'/
diff --git a/worldpay_gateway/forms/html/_wp_ott_form/US.html
b/worldpay_gateway/forms/html/_wp_ott_form/US.html
index f8c3600..0437bcf 100644
--- a/worldpay_gateway/forms/html/_wp_ott_form/US.html
+++ b/worldpay_gateway/forms/html/_wp_ott_form/US.html
@@ -30,7 +30,7 @@
placeholder='05/2015'/
/div
div class=col-md-3
- label for=cvc
id=cvc-label%donate_interface-cvv%/label
+ label for=cvc
id=cvc-label%donate_interface-cvv%/labelimg
src=@script_path/extensions/DonationInterface/gateway_forms/includes/questionmark.png
id=cvv-info
input type=text class=form-control id=cvc
pattern=\d*
autocomplete=off
placeholder='123'/
diff --git a/worldpay_gateway/forms/js/worldpay.js
b/worldpay_gateway/forms/js/worldpay.js
index d4b45c2..625784f 100644
--- a/worldpay_gateway/forms/js/worldpay.js
+++ b/worldpay_gateway/forms/js/worldpay.js
@@ -208,5 +208,19 @@
$( '#ddTestOptions').click( function () {
$( '#ddTestCCArea'
).removeClass('hide').addClass('show');
});
+ $( '#cvv-info' ).hover( function () {
+ $( '#cvv-codes' ).show();
+ }, function() {
+ $( '#cvv-codes' ).hide();
+ });
+ $( '#cvv-info' ).click( function () {
+ $( '#cvv-codes' ).addClass( 'popped' ).show();
+ $( 'body' ).addClass( 'pop-shown' );
+ return false;
+ });
+ $( document ).on( 'click', 'body.pop-shown', function () {
+ $( '.popped' ).removeClass( 'popped' ).hide();
+ $( 'body' ).removeClass( 'pop-shown' );
+ });
});
})( jQuery, mediaWiki );
--
To view, visit https://gerrit.wikimedia.org/r/181422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc996ecc8d9b253fcf6b4bfc7a743d35f3f4552c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
[MediaWiki-commits] [Gerrit] Improve/ sanitize protected_titles handling - change (mediawiki/core)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181423
Change subject: Improve/ sanitize protected_titles handling
..
Improve/ sanitize protected_titles handling
Moved the b/c handling only relevant to MovePage into MovePage,
thus unbreaking Title::getTitleProtection, which in turn fixes
the protection form.
Also no longer assume we can get more than one row in
Title::getTitleProtection (but we only used the first row here
anyway).
On top of that I removed the old handling for csv `pt_create_perm`
fields, as that's not being used anywhere... I checked all Wikimedia
wikis by running:
SELECT COUNT(*) FROM protected_titles WHERE pt_create_perm LIKE %,%;
Bug: T85108
Change-Id: If3ee0e637ee3a3b2e260710abf79bcd5a45a74ac
---
M includes/MovePage.php
M includes/Title.php
2 files changed, 12 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/23/181423/1
diff --git a/includes/MovePage.php b/includes/MovePage.php
index 065e189..11cc1ca 100644
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -75,6 +75,13 @@
} else {
$tp = $this-newTitle-getTitleProtection();
if ( $tp !== false ) {
+ if ( $tp['permission'] === 'sysop' ) {
+ $tp['permission'] = 'editprotected'; //
B/C
+ }
+ if ( $tp['permission'] === 'autoconfirmed' ) {
+ $tp['permission'] =
'editsemiprotected'; // B/C
+ }
+
if ( !$user-isAllowed( $tp['permission'] ) ) {
$status-fatal(
'cantmove-titleprotected' );
}
diff --git a/includes/Title.php b/includes/Title.php
index 4b60bcb..33d1d38 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2550,7 +2550,7 @@
if ( $this-mTitleProtection === null ) {
$dbr = wfGetDB( DB_SLAVE );
- $res = $dbr-select(
+ $row = $dbr-selectRow(
'protected_titles',
array(
'user' = 'pt_user',
@@ -2562,17 +2562,7 @@
__METHOD__
);
- // fetchRow returns false if there are no rows.
- $row = $dbr-fetchRow( $res );
- if ( $row ) {
- if ( $row['permission'] == 'sysop' ) {
- $row['permission'] = 'editprotected';
// B/C
- }
- if ( $row['permission'] == 'autoconfirmed' ) {
- $row['permission'] =
'editsemiprotected'; // B/C
- }
- }
- $this-mTitleProtection = $row;
+ $this-mTitleProtection = (array)$row;
}
return $this-mTitleProtection;
}
@@ -3000,7 +2990,9 @@
if ( !$expiry || $expiry $now ) {
// Apply the restrictions
$this-mRestrictionsExpiry['create'] = $expiry;
- $this-mRestrictions['create']
= explode( ',', trim( $title_protection['permission'] ) );
+
+ // BC: This always used to be
an array, although it never had more than one entry
+ $this-mRestrictions['create']
= array( $title_protection['permission'] );
} else { // Get rid of the old
restrictions
Title::purgeExpiredRestrictions();
$this-mTitleProtection = false;
--
To view, visit https://gerrit.wikimedia.org/r/181423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3ee0e637ee3a3b2e260710abf79bcd5a45a74ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Annotations API - change (analytics/dashiki)
Mforns has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181424
Change subject: Add Annotations API
..
Add Annotations API
Adds an API to get metric annotations from Mediawiki.
The API uses mediawiki-storage to retrieve the pages.
Also, performs the following validations
on annotations read from mediawiki pages:
* Checks that dates are valid or undefined
* Checks that start date = end date
* Checks that note is a string
If an annotation is not valid, it is filtered
and the others are returned.
Bug: T78151
Change-Id: If372e9d6065aefc7ad0d6abb49894b18f06b7caf
---
A src/app/apis/annotations-api.js
M src/app/require.config.js
M test/app/apis.js
3 files changed, 263 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/24/181424/1
diff --git a/src/app/apis/annotations-api.js b/src/app/apis/annotations-api.js
new file mode 100644
index 000..44af7d8
--- /dev/null
+++ b/src/app/apis/annotations-api.js
@@ -0,0 +1,138 @@
+/**
+ * This module gets metric annotations that reside in Mediawiki.
+ * To get them, it uses mediawiki-storage library.
+ */
+define(['mediawiki-storage', 'moment'], function (mediawikiStorage, moment) {
+'use strict';
+
+function AnnotationsApi () {
+// only fetch annotations for a given metric
+// once per app life and keep their promise
+this._promises = {};
+
+// default promise for empty responses
+this._emptyPromise = $.Deferred().resolve([]);
+}
+
+
+/**
+ * Retrieves the annotations for the given metric.
+ *
+ * Parameters
+ *
+ * metric : Metric object containing (or not) the following fields:
+ * {
+ * ...
+ * annotations: {
+ * host: 'mediawiki.host',
+ * pageName: 'PageName'
+ * },
+ * ...
+ * }
+ * If it contains this substructure, the method
+ * will try to get the data from mediawiki.
+ * Otherwise, it will return en empty list.
+ *
+ * success : [optional] A function that will be called when finished
+ * with the resulting data as single parameter.
+ *
+ * error : [optional] A function that will be called in case
+ * of failure with the risen error as single parameter.
+ *
+ * Returns
+ *
+ * A jquery promise where 'done' and 'fail' callbacks can be submitted.
+ * These, will receive the same parameters as success and error callbacks
+ * respectively. In case of success, this will be the annotation's
format:
+ * [
+ * {
+ * start : '2013-01-01 17:32:13',
+ * end : '2014-02-02 03:55:08',
+ * note : 'Annotation text.'
+ * },
+ * ...
+ * ]
+ **/
+AnnotationsApi.prototype.get = function (metric, success, error) {
+if (typeof metric !== 'object') {
+throw new TypeError('function must receive an object');
+}
+
+var params = metric.annotations;
+if (!this._checkParams(params)) {
+// accept metrics without annotation params
+// and just return an empty array
+return this._emptyPromise.done(success);
+}
+
+if (!this._promises[params]) {
+// the requested annotations have not been found in cache
+// so they must be retrieved and cached for further use
+var deferred = $.Deferred(),
+that = this;
+
+mediawikiStorage.get({
+host: params.host,
+pageName: params.pageName
+})
+.fail(deferred.reject)
+.done(function (data) {
+that._checkAnnotations(data, deferred);
+});
+
+this._promises[params] = deferred.promise();
+}
+
+return this._promises[params].done(success).fail(error);
+};
+
+AnnotationsApi.prototype._checkParams = function (params) {
+return (
+typeof params === 'object'
+typeof params.host === 'string'
+typeof params.pageName === 'string'
+);
+};
+
+AnnotationsApi.prototype._checkDate = function (date) {
+return (
+date === void 0 ||
+typeof date === 'string'
+moment(date).isValid()
+);
+};
+
+AnnotationsApi.prototype._checkInterval = function (start, end) {
+// assumes both dates have passed _checkDate
+return (
+start === void 0 ||
+end === void 0 ||
+moment(start) = moment(end)
+);
+};
+
+AnnotationsApi.prototype._checkAnnotations = function (data, deferred) {
+if (!(data
[MediaWiki-commits] [Gerrit] Include the campaign property's Wikidata label - change (mediawiki...WikiGrok)
jenkins-bot has submitted this change and it was merged.
Change subject: Include the campaign property's Wikidata label
..
Include the campaign property's Wikidata label
* Add the WikiGrok\WikibaseConnector#getLabelForProperty method, which
returns the label for the property in the content language of the host
wiki
* Modify WikiGrok\QuestionPicker#getQuestions to filter campaigns that
don't have labels and to include the labels in its result
* Migrating the property ID from 'property' to 'propertyId'
* Incrementing FORMAT_VERSION
Change-Id: I97bfd010ac18b6a6ef8129086028c040df38f4fc
---
M includes/QuestionPicker.php
M includes/QuestionStore.php
M includes/WikibaseConnector.php
3 files changed, 27 insertions(+), 3 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/QuestionPicker.php b/includes/QuestionPicker.php
index 5b12ac5..6971c04 100644
--- a/includes/QuestionPicker.php
+++ b/includes/QuestionPicker.php
@@ -52,6 +52,8 @@
$requestedProps = array();
$linkedProps = array();
$linkSearchOnly = true;
+ $campaignPropertyLabels = array();
+
foreach ( $campaigns as $campaign ) {
$requestedProps +=
$campaign-getRequestedCurrentPageProps();
$linkSearchOnly = $linkSearchOnly
$campaign-getNumLinks() 0;
@@ -66,6 +68,16 @@
unset( $campaigns[$name] );
continue;
}
+
+ $campaignPropertyLabel =
$this-wikibase-getLabelForProperty( $campaign-getProperty() );
+
+ if ( !$campaignPropertyLabel ) {
+ unset( $campaigns[$name] );
+ continue;
+ }
+
+ $campaignPropertyLabels[$name] = $campaignPropertyLabel;
+
$numLinks = max( $numLinks, $campaign-getNumLinks() );
$linkedProps += $campaign-getRequestedLinkedProps();
}
@@ -85,7 +97,8 @@
$suggestions = $campaign-getQuestions( $props, $data );
if ( $suggestions ) {
$results[$name] = array(
- 'property' = $campaign-getProperty(),
+ 'propertyId' =
$campaign-getProperty(),
+ 'propertyName' =
$campaignPropertyLabels[$name],
'questions' = $suggestions,
);
diff --git a/includes/QuestionStore.php b/includes/QuestionStore.php
index 5772ccb..2279ed9 100644
--- a/includes/QuestionStore.php
+++ b/includes/QuestionStore.php
@@ -9,7 +9,7 @@
* Stores campaign questions in a permanent storage
*/
class QuestionStore {
- const FORMAT_VERSION = 1;
+ const FORMAT_VERSION = 2;
public function store( Title $title, array $campaigns ) {
$profileSection = new ProfileSection( __METHOD__ );
diff --git a/includes/WikibaseConnector.php b/includes/WikibaseConnector.php
index 5ecfb1d..40f45c9 100644
--- a/includes/WikibaseConnector.php
+++ b/includes/WikibaseConnector.php
@@ -97,6 +97,17 @@
}
/**
+* Gets the Wikidata label of the property in the content language of
the
+* host wiki.
+*
+* @param string $property
+* @return string
+*/
+ public function getLabelForProperty( $property ) {
+ return $this-getLabel( new PropertyId( $property ) );
+ }
+
+ /**
* Returns a list of values of given properties of a given Wikidata item
*
* @param string $itemId: item identifier
@@ -139,4 +150,4 @@
return $values;
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/180811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97bfd010ac18b6a6ef8129086028c040df38f4fc
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sanitize | characters in descriptions - change (mediawiki...UploadWizard)
MarkTraceur has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181425
Change subject: Sanitize | characters in descriptions
..
Sanitize | characters in descriptions
Bug: T78336
Change-Id: I058e1e687c664c0f290a2642d84ae1d916adcd41
---
M resources/uw/model/uw.model.Description.js
M tests/qunit/mw.uw.model.Description.test.js
2 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/25/181425/1
diff --git a/resources/uw/model/uw.model.Description.js
b/resources/uw/model/uw.model.Description.js
index 76ac9e2..9c11393 100644
--- a/resources/uw/model/uw.model.Description.js
+++ b/resources/uw/model/uw.model.Description.js
@@ -65,7 +65,7 @@
return '';
}
- return '{{' + this.language + '|1=' + this.text + '}}';
+ return '{{' + this.language + '|1=' + this.text.replace( /\|/g,
'{{!}}' ) + '}}';
};
/**
diff --git a/tests/qunit/mw.uw.model.Description.test.js
b/tests/qunit/mw.uw.model.Description.test.js
index 7a32861..a695bfc 100644
--- a/tests/qunit/mw.uw.model.Description.test.js
+++ b/tests/qunit/mw.uw.model.Description.test.js
@@ -17,7 +17,7 @@
( function ( uw ) {
QUnit.module( 'uw.model.Description', QUnit.newMwEnvironment( {} ) );
- QUnit.test( 'getValue', 3, function ( assert ) {
+ QUnit.test( 'getValue', 4, function ( assert ) {
var desc = new uw.model.Description();
assert.strictEqual( desc.getValue(), '', 'Empty value returns
empty string.' );
@@ -27,5 +27,8 @@
desc.setLanguage( 'en' );
assert.strictEqual( desc.getValue(), '{{en|1=Blah}}', 'Setting
language returns template call to that language template.' );
+
+ desc.setText( 'Blah | blah' );
+ assert.strictEqual( desc.getValue(), '{{en|1=Blah {{!}}
blah}}', 'Escaping of | characters' );
} );
}( mediaWiki.uploadWizard ) );
--
To view, visit https://gerrit.wikimedia.org/r/181425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I058e1e687c664c0f290a2642d84ae1d916adcd41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur mtrac...@member.fsf.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old b/c code not needed since late summer - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Remove old b/c code not needed since late summer .. Remove old b/c code not needed since late summer Change-Id: Ic23dc6797add0726933016de6cf911c56e9f676e --- M includes/MobileContext.php 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, but someone else must approve Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/MobileContext.php b/includes/MobileContext.php index 391fc95..14f7c0c 100644 --- a/includes/MobileContext.php +++ b/includes/MobileContext.php @@ -536,14 +536,6 @@ 'secure' = false, ) ); - // Bug 66888: cookies were set with current wiki's prefix instead of an empty prefix. - // Delete them. - // @todo: Remove this 30 days after deploying - $this-getRequest()-response()-setcookie( 'stopMobileRedirect', '', -3600, - array( - 'domain' = $this-getStopMobileRedirectCookieDomain(), - ) - ); } /** -- To view, visit https://gerrit.wikimedia.org/r/181212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic23dc6797add0726933016de6cf911c56e9f676e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org 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 NS invert on SpecialNewPages - change (mediawiki/core)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/181426 Change subject: Fix NS invert on SpecialNewPages .. Fix NS invert on SpecialNewPages Follow up: I5c03dc543b910aab27a26a5a223341be50893cf3 Bug: T85145 Change-Id: Ia5cec6db48c3e900ebb07169015e55a2fb72b792 --- M includes/specials/SpecialNewpages.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/26/181426/1 diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index 9dad5a2..82cd0a1 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -228,7 +228,7 @@ ), 'nsinvert' = array( 'type' = 'check', - 'name' = 'nsinvert', + 'name' = 'invert', 'label-message' = 'invert', 'default' = $nsinvert, 'tooltip' = $this-msg( 'tooltip-invert' )-text(), -- To view, visit https://gerrit.wikimedia.org/r/181426 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5cec6db48c3e900ebb07169015e55a2fb72b792 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add unit test for isbn script - change (pywikibot/core)
M4tx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181427
Change subject: Add unit test for isbn script
..
Add unit test for isbn script
Bug: T72336
Change-Id: I006570c68e83c52ae5cb0051ad7336eb5e02f93f
---
A tests/isbn_tests.py
1 file changed, 81 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/27/181427/1
diff --git a/tests/isbn_tests.py b/tests/isbn_tests.py
new file mode 100644
index 000..bf15f15
--- /dev/null
+++ b/tests/isbn_tests.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+Tests for isbn script.
+#
+# (C) Pywikibot team, 2014
+#
+# Distributed under the terms of the MIT license.
+#
+__version__ = '$Id$'
+
+import unittest
+from scripts.isbn import ISBN10, ISBN13, InvalidIsbnException as IsbnExc, \
+getIsbn, hyphenateIsbnNumbers, convertIsbn10toIsbn13
+from tests.aspects import TestCase
+
+
+class TestIsbn(TestCase):
+net = False
+
+Test ISBN-related classes and helper functions.
+
+def test_isbn10(self):
+Test ISBN10.
+# Test general features
+isbn = ISBN10('097522980x')
+isbn.format()
+self.assertEqual(isbn.code, '0-9752298-0-X')
+self.assertEqual(isbn.digits(),
+ ['0', '9', '7', '5', '2', '2', '9', '8', '0', 'X'])
+
+# Converting to ISBN13
+isbn13 = isbn.toISBN13()
+self.assertEqual(isbn13.code, '978-0-9752298-0-4')
+
+# Errors
+self.assertRaises(IsbnExc, ISBN10, '0975229LOL') # Invalid characters
+self.assertRaises(IsbnExc, ISBN10, '0975229801') # Invalid checksum
+self.assertRaises(IsbnExc, ISBN10, '09752298') # Invalid length
+self.assertRaises(IsbnExc, ISBN10, '09752X9801') # X in the middle
+
+def test_isbn13(self):
+Test ISBN13.
+# Test general features
+isbn = ISBN13('9783161484100')
+isbn.format()
+self.assertEqual(isbn.code, '978-3-16-148410-0')
+self.assertEqual(isbn.digits(),
+ [9, 7, 8, 3, 1, 6, 1, 4, 8, 4, 1, 0, 0])
+
+# Errors
+self.assertRaises(IsbnExc, ISBN13, '9783161484LOL') # Invalid chars
+self.assertRaises(IsbnExc, ISBN13, '9783161484105') # Invalid checksum
+self.assertRaises(IsbnExc, ISBN13, '9783161484') # Invalid length
+
+def test_general(self):
+Test things that apply both to ISBN10 and ISBN13.
+# getIsbn
+self.assertIsInstance(getIsbn('097522980x'), ISBN10)
+self.assertIsInstance(getIsbn('9783161484100'), ISBN13)
+self.assertRaises(IsbnExc, getIsbn, '097522')
+
+# hyphenateIsbnNumbers
+self.assertEqual(hyphenateIsbnNumbers('ISBN 097522980x'),
+ 'ISBN 0-9752298-0-X')
+self.assertEqual(hyphenateIsbnNumbers('ISBN 0975229801'),
+ 'ISBN 0975229801') # Invalid ISBN - no changes
+
+# convertIsbn10toIsbn13
+self.assertEqual(convertIsbn10toIsbn13('ISBN 0-9752298-0-X'),
+ 'ISBN 978-0-9752298-0-4')
+self.assertEqual(convertIsbn10toIsbn13('ISBN 0-9752298-0-1'),
+ 'ISBN 0-9752298-0-1') # Invalid ISBN - no changes
+
+# Errors
+isbn = ISBN10('9492098059')
+self.assertRaises(IsbnExc, isbn.format) # Invalid group number
+isbn = ISBN10('9095012042')
+self.assertRaises(IsbnExc, isbn.format) # Invalid publisher number
+
+
+if __name__ == __main__:
+unittest.main()
--
To view, visit https://gerrit.wikimedia.org/r/181427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I006570c68e83c52ae5cb0051ad7336eb5e02f93f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: M4tx m...@m4tx.pl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sure campaign data isn't set to false - change (mediawiki...WikiGrok)
jenkins-bot has submitted this change and it was merged.
Change subject: Make sure campaign data isn't set to false
..
Make sure campaign data isn't set to false
If for some reason the stored data can't be properly unserialized
(e.g. there's a syntax error), unserialize() will return false. We
should catch this condition rather than passing false as the value
to the client.
Change-Id: I635243f00917d6c6c683d2aab29e71296608e996
---
M includes/QuestionStore.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/QuestionStore.php b/includes/QuestionStore.php
index 5772ccb..7ec7322 100644
--- a/includes/QuestionStore.php
+++ b/includes/QuestionStore.php
@@ -68,7 +68,10 @@
$campaigns = array();
foreach ( $res as $row ) {
- $campaigns[$row-wgq_campaign] = unserialize(
$row-wgq_data );
+ $campaignData = unserialize( $row-wgq_data );
+ if ( $campaignData ) {
+ $campaigns[$row-wgq_campaign] = $campaignData;
+ }
}
return $campaigns;
}
--
To view, visit https://gerrit.wikimedia.org/r/179985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I635243f00917d6c6c683d2aab29e71296608e996
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n/Hygiene: Use Wikibase for infobox labels - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: i18n/Hygiene: Use Wikibase for infobox labels
..
i18n/Hygiene: Use Wikibase for infobox labels
Change-Id: Id7c8e2efa3be6b51f026fd0947d28d0bc3c7432a
---
M javascripts/modules/infobox/Infobox.js
1 file changed, 81 insertions(+), 77 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/infobox/Infobox.js
b/javascripts/modules/infobox/Infobox.js
index 7fa0daf..a19a65e 100644
--- a/javascripts/modules/infobox/Infobox.js
+++ b/javascripts/modules/infobox/Infobox.js
@@ -57,56 +57,56 @@
id: 'P18'
},
{
- label: 'Director',
+ // Director
id: 'P57'
},
{
- label: 'Produced by',
+ // Produced by
id: 'P162'
},
{
- label: 'Story by',
+ // Story by
id: 'P58'
},
{
- label: 'Based on',
+ // Based on
id: 'P144'
},
{
- label: 'Starring',
+ // Starring
id: 'P161'
},
{
- label: 'Music by',
+ // Music by
id: 'P86'
},
{
- label: 'Cinematography',
+ // Cinematography
id: 'P344'
},
{
- label: 'Film editor',
+ // Film editor
id: 'P1040'
},
{
- label: 'Production company',
+ // Production company
id: 'P272'
},
{
- label: 'Distributor',
+ // Distributor
id: 'P750'
},
{
- label: 'Released',
+ // Released'
id: 'P577'
},
// FIXME: running time is not available
on Wikidata
{
- label: 'Country of origin',
+ //Country of origin
id: 'P495'
},
{
- label: 'Original language',
+ //Original language
id: 'P364'
}
// FIXME: budget is not available on
Wikidata
@@ -120,19 +120,19 @@
id: 'P18'
},
{
- label: 'Conservation status',
+ // Conservation status
id: 'P141'
[MediaWiki-commits] [Gerrit] Remove images from infoboxes - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove images from infoboxes
..
Remove images from infoboxes
These are now in the cover photo so unnecessary and look strange
when repeated.
Change-Id: I714fe60d675b11dffeb9af05c0f0715663fdae13
---
M javascripts/modules/infobox/Infobox.js
1 file changed, 0 insertions(+), 24 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
Bmansurov: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/javascripts/modules/infobox/Infobox.js
b/javascripts/modules/infobox/Infobox.js
index a19a65e..2155970 100644
--- a/javascripts/modules/infobox/Infobox.js
+++ b/javascripts/modules/infobox/Infobox.js
@@ -53,10 +53,6 @@
movie: {
rows: [
{
- // image
- id: 'P18'
- },
- {
// Director
id: 'P57'
},
@@ -116,10 +112,6 @@
taxon: {
rows: [
{
- // image
- id: 'P18'
- },
- {
// Conservation status
id: 'P141'
},
@@ -139,10 +131,6 @@
},
country: {
rows: [
- {
- // image
- id: 'P18'
- },
{
// Flag
id: 'P41'
@@ -210,10 +198,6 @@
city: {
rows: [
{
- // image
- id: 'P18'
- },
- {
// Flag
id: 'P41'
},
@@ -253,10 +237,6 @@
},
human: {
rows: [
- {
- // Image
- id: 'P18'
- },
{
// Born
id: 'P569'
@@ -331,10 +311,6 @@
},
default: {
rows: [
- {
- // image
- id: 'P18'
- },
{
// Official website
id: 'P856'
--
To view, visit https://gerrit.wikimedia.org/r/181197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I714fe60d675b11dffeb9af05c0f0715663fdae13
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] phabricator: Change security_topic from default: none to ... - change (operations/puppet)
Rush has submitted this change and it was merged. Change subject: phabricator: Change security_topic from default: none to default: default .. phabricator: Change security_topic from default: none to default: default Fixes Changed none to none bug. Bug: T479 Change-Id: I0aca869d0ada5ad5bb199504f1815eda3a1699e1 --- M modules/phabricator/data/fixed_settings.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, but someone else must approve Rush: Verified; Looks good to me, approved 20after4: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/phabricator/data/fixed_settings.yaml b/modules/phabricator/data/fixed_settings.yaml index 17e9ca2..8cb3a90 100644 --- a/modules/phabricator/data/fixed_settings.yaml +++ b/modules/phabricator/data/fixed_settings.yaml @@ -76,7 +76,7 @@ description: Used for security oriented custom extensions search: true type: select -default: none +default: default options: default: none security-bug: 'Security or Sensitive Bug' -- To view, visit https://gerrit.wikimedia.org/r/179407 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0aca869d0ada5ad5bb199504f1815eda3a1699e1 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: 20after4 mmod...@wikimedia.org Gerrit-Reviewer: 20after4 mmod...@wikimedia.org Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: MZMcBride w...@mzmcbride.com Gerrit-Reviewer: Qgil q...@wikimedia.org Gerrit-Reviewer: Rush r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ensure file page mobile views have the proper title in context - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Ensure file page mobile views have the proper title in context
..
Ensure file page mobile views have the proper title in context
Bug: T78003
Change-Id: Ic78e1b4b5f3cb3d252158e4cdd66ae12172905fe
---
M includes/api/ApiMobileView.php
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, but someone else must approve
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index 5821b24..7e7a94f 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -598,11 +598,13 @@
private function getFilePage( Title $title ) {
//HACK: HACK: HACK:
wfProfileIn( __METHOD__ );
+ $context = new DerivativeContext( $this-getContext() );
+ $context-setTitle( $title );
+ $context-setOutput( new OutputPage( $context ) );
$page = new ImagePage( $title );
- $page-setContext( $this-getContext() );
+ $page-setContext( $context );
$page-view();
- global $wgOut;
- $html = $wgOut-getHTML();
+ $html = $context-getOutput()-getHTML();
wfProfileOut( __METHOD__ );
return $html;
}
--
To view, visit https://gerrit.wikimedia.org/r/181178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic78e1b4b5f3cb3d252158e4cdd66ae12172905fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update scripts in light of recent changes - change (analytics/limn-mobile-data)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181428
Change subject: Update scripts in light of recent changes
..
Update scripts in light of recent changes
Change-Id: If828c64cfe50b07213d19c8904b70ea670ab0893
---
M README.md
D generate-graph.py
M scripts/localurl
M scripts/remoteurl
M scripts/ssh
5 files changed, 9 insertions(+), 191 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-mobile-data
refs/changes/28/181428/1
diff --git a/README.md b/README.md
index 7a7883f..ca5dc85 100644
--- a/README.md
+++ b/README.md
@@ -45,15 +45,11 @@
## Adding your own Graphs
-(Specific to Mobile right now, limitation will be removed *soon*)
-
- Write an SQL Query that returns data in the appropriate format, and place it
in `mobile/name.sql`
-- Add `name` to appropriate position in `dashboards/reportcard.json`
+- Add
`http://datasets.wikimedia.org/limn-public-data/mobile/datafiles/name.csv` to
appropriate position in `dashboards/reportcard.json`
- Add the graph to `mobile/config.yaml`
-- Generate data for the graph `python generate.py -c scripts/config.yaml
mobile -g graphname`
-- Run `python generate-graph.py -g graphname`
-
+- Generate the datafile (csv) for the graph `python generate.py -c
scripts/config.yaml mobile -g graphname`
## Testing using local data
@@ -75,7 +71,7 @@
Now, you should be able to run `generate.py` with config overrides:
-$ python generate.py -c scripts/config.yaml mobile
+$ python generate.py -c scripts/config.yaml mobile -g my_graph_id
When all the data is generated you still need to do one more thing to let
Limn know that it should use the local data. The hacky solution is to replace
diff --git a/generate-graph.py b/generate-graph.py
deleted file mode 100644
index 22702bf..000
--- a/generate-graph.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# Tool to generate appropriate files in the datasources and graphs directory
-# TOUSE:
-import argparse
-import json
-import copy
-import yaml
-import io
-
-
-def make_datasource(name):
-try:
-f = open(datafiles/%s.csv % name, r)
-headers = f.readlines()[0]
-columns = headers.split(',')
-f.close()
-ds_columns = []
-for i in range(len(columns)):
-column = {}
-label = columns[i].strip()
-column[id] = label
-if i == 0:
-column[type] = date
-else:
-column[type] = int
-column[label] = label
-ds_columns.append(column)
-
-ds = {
-url:
http://stat1001.wikimedia.org/limn-public-data/mobile/datafiles/%s.csv; % name,
-format: csv,
-type: timeseries,
-id: name,
-name: name,
-columns: ds_columns
-}
-print Writing datasource...
-f = open(datasources/%s.json % name, w)
-dump = json.dumps(ds, indent=4)
-f.writelines(dump)
-f.close()
-return True
-except IOError:
-print First you must run:\npython generate.py -c scripts/config.yaml
mobile -g %s % name
-return False
-
-
-def get_graph_config(name):
-config_path = 'mobile/config.yaml'
-with io.open(config_path, encoding='utf-8') as config_file:
-config = yaml.load(config_file)
-return config[graphs][name]
-
-
-def get_datasource(name):
-f = open(datasources/%s.json % name, r)
-jsonds = '\n'.join(f.readlines())
-ds = json.loads(jsonds)
-f.close()
-return ds
-
-
-def generate_graph(name):
-config = get_graph_config(name)
-ds = get_datasource(name)
-ds_columns = ds[columns]
-
-graph_columns = []
-for i in range(len(ds_columns)):
-if i 0:
-ds_column = ds_columns[i]
-column = {
-nodeType: line,
-metric: {
-sourceId: name,
-sourceCol: ds_column[id]
-}
-}
-graph_columns.append(column)
-
-axis = {disabled: False, nodeType: axis}
-axis_x = copy.deepcopy(axis)
-axis_y = copy.deepcopy(axis)
-axis_x[options] = {
-dimension: x,
-}
-axis_y[options] = {
-dimension: y,
-}
-grid = {
-nodeType: grid,
-options: {
-ticks: 10,
-dimension: x
-}
-}
-grid_x = grid
-grid_y = copy.deepcopy(grid)
-grid_y[options][dimension] = y
-
-callout = {
-nodeType: callout,
-target: latest,
-steps: [
-1y,
-1M
-],
-metricRef: 0,
-options: {
-deltaPercent: True,
-dateFormat: MMM ,
-colorDelta: True
-}
-}
-legend = {
-nodeType: legend,
-options: {
-shortLabels: True,
-dateFormat: DD MMM
-
[MediaWiki-commits] [Gerrit] Timebox before summing. - change (analytics/limn-mobile-data)
jenkins-bot has submitted this change and it was merged.
Change subject: Timebox before summing.
..
Timebox before summing.
Change-Id: I9244af007556b7d48752e4d424126d82f209ceb1
---
M mobile/config.yaml
M mobile/diff-activity.sql
M mobile/main-menu-daily.sql
M mobile/page-ui-daily.sql
M mobile/watchlist-activity.sql
5 files changed, 35 insertions(+), 31 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mobile/config.yaml b/mobile/config.yaml
index 554775a..ccc1b75 100644
--- a/mobile/config.yaml
+++ b/mobile/config.yaml
@@ -140,12 +140,12 @@
page-ui-daily:
title: Page UI activity
frequency: hourly
-starts: 2014-12-08
+starts: 2014-12-12
timeboxed: true
main-menu-daily:
title: Main menu activity
frequency: hourly
-starts: 2014-12-08
+starts: 2014-12-12
timeboxed: true
watchlist-activity:
title: Watchlist activity
diff --git a/mobile/diff-activity.sql b/mobile/diff-activity.sql
index 99dc4a1..bf24783 100644
--- a/mobile/diff-activity.sql
+++ b/mobile/diff-activity.sql
@@ -1,5 +1,5 @@
SELECT
- sum(view) as 'User page link',
+ sum(view) as 'View page link',
sum(user) as 'User page link',
sum(prev_or_next) as 'Clicks previous or next (beta only)',
sum(thank) as 'Thanks'
@@ -9,10 +9,12 @@
sum(if(event_name = 'diff-view', 1, 0)) as view,
sum(if(event_name = 'diff-user', 1, 0)) as user,
sum(if(event_name = 'diff-prev-or-next', 1, 0)) as prev_or_next,
- sum(if(event_name = 'diff-thank', 1, 0)) as thank,
- timestamp
+ sum(if(event_name = 'diff-thank', 1, 0)) as thank
FROM
MobileWebClickTracking_5929948
+WHERE
+ timestamp = '{from_timestamp}' and
+ timestamp = '{to_timestamp}'
)
UNION
(
@@ -20,12 +22,11 @@
sum(if(event_name = 'view', 1, 0)) as view,
sum(if(event_name = 'user', 1, 0)) as user,
sum(if(event_name = 'prev-or-next', 1, 0)) as prev_or_next,
- sum(if(event_name = 'thank', 1, 0)) as thank,
- timestamp
+ sum(if(event_name = 'thank', 1, 0)) as thank
FROM
MobileWebDiffClickTracking_10720373
+WHERE
+ timestamp = '{from_timestamp}' and
+ timestamp = '{to_timestamp}'
)
) AS MobileWebDiffClickTracking
-WHERE
-MobileWebDiffClickTracking.timestamp = '{from_timestamp}' and
-MobileWebDiffClickTracking.timestamp = '{to_timestamp}'
diff --git a/mobile/main-menu-daily.sql b/mobile/main-menu-daily.sql
index 9d15059..4cd6a2b 100644
--- a/mobile/main-menu-daily.sql
+++ b/mobile/main-menu-daily.sql
@@ -19,10 +19,12 @@
sum(if(event_name = 'hamburger-settings', 1, 0)) as Settings,
sum(if(event_name = 'hamburger-profile', 1, 0)) as Profile,
sum(if(event_name = 'hamburger-logout', 1, 0)) as Logout,
- sum(if(event_name = 'hamburger-login', 1, 0)) as Login,
- timestamp
+ sum(if(event_name = 'hamburger-login', 1, 0)) as Login
FROM
MobileWebClickTracking_5929948
+ WHERE
+ timestamp = '{from_timestamp}' AND
+ timestamp = '{to_timestamp}'
)
UNION
(
@@ -35,12 +37,11 @@
sum(if(event_name = 'settings', 1, 0)) as Settings,
sum(if(event_name = 'profile', 1, 0)) as Profile,
sum(if(event_name = 'logout', 1, 0)) as Logout,
- sum(if(event_name = 'login', 1, 0)) as Login,
- timestamp
+ sum(if(event_name = 'login', 1, 0)) as Login
FROM
MobileWebMainMenuClickTracking_10703095
+ WHERE
+ timestamp = '{from_timestamp}' AND
+ timestamp = '{to_timestamp}'
)
) AS MobileWebMainMenuClickTracking
-WHERE
-MobileWebMainMenuClickTracking.timestamp = '{from_timestamp}' AND
-MobileWebMainMenuClickTracking.timestamp = '{to_timestamp}'
diff --git a/mobile/page-ui-daily.sql b/mobile/page-ui-daily.sql
index 78a31a7..0260964 100644
--- a/mobile/page-ui-daily.sql
+++ b/mobile/page-ui-daily.sql
@@ -27,10 +27,12 @@
sum(if(event_name = 'nearby-button', 1, 0)) as nearby_button,
sum(if(event_name = 'category-button', 1, 0)) as category_button,
sum(if(event_name = 'fontchanger-menu', 1, 0)) as fontchanger_menu,
- sum(if(event_name = 'fontchanger-font-change', 1, 0)) as
fontchanger_font_change,
- timestamp
+ sum(if(event_name = 'fontchanger-font-change', 1, 0)) as
fontchanger_font_change
FROM
MobileWebClickTracking_5929948
+ WHERE
+ timestamp = '{from_timestamp}' AND
+ timestamp = '{to_timestamp}'
)
UNION
(
@@ -47,12 +49,11 @@
sum(if(event_name = 'nearby-button', 1, 0)) as nearby_button,
sum(if(event_name = 'category-button', 1, 0)) as category_button,
sum(if(event_name = 'fontchanger-menu', 1, 0)) as fontchanger_menu,
[MediaWiki-commits] [Gerrit] Fix NS invert on SpecialNewPages - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Fix NS invert on SpecialNewPages .. Fix NS invert on SpecialNewPages Follow up: I5c03dc543b910aab27a26a5a223341be50893cf3 Bug: T85145 Change-Id: Ia5cec6db48c3e900ebb07169015e55a2fb72b792 --- M includes/specials/SpecialNewpages.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index 9dad5a2..82cd0a1 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -228,7 +228,7 @@ ), 'nsinvert' = array( 'type' = 'check', - 'name' = 'nsinvert', + 'name' = 'invert', 'label-message' = 'invert', 'default' = $nsinvert, 'tooltip' = $this-msg( 'tooltip-invert' )-text(), -- To view, visit https://gerrit.wikimedia.org/r/181426 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5cec6db48c3e900ebb07169015e55a2fb72b792 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Move file upload support detection to browser.js - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Move file upload support detection to browser.js
..
Hygiene: Move file upload support detection to browser.js
Change-Id: I696e0a112babe38631d1cec573288fb92155abff
---
M javascripts/browser.js
M javascripts/modules/uploads/PhotoUploaderButton.js
2 files changed, 31 insertions(+), 26 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/browser.js b/javascripts/browser.js
index 7e7b4c3..9a97c67 100644
--- a/javascripts/browser.js
+++ b/javascripts/browser.js
@@ -187,6 +187,32 @@
} catch ( e ) {
return false;
}
+ },
+ /**
+* Detect if we support file input uploads
+* @return {Boolean}
+*/
+ supportsFileUploads: function () {
+ var browserSupported;
+ // If already calculated, just return it
+ if ( this._fileUploads !== undefined ) {
+ return this._fileUploads;
+ }
+
+ // deal with known false positives which don't support
file input (bug 47374)
+ if ( this.userAgent.match( /Windows Phone (OS 7|8.0)/ )
) {
+ this._fileUploads = false;
+ } else {
+ browserSupported = (
+ typeof FileReader !== 'undefined'
+ typeof FormData !== 'undefined'
+ // Firefox OS 1.0 turns input
type=file into input type=text
+ ( $( 'input type=file/' ).prop(
'type' ) === 'file' )
+ );
+ this._fileUploads = browserSupported
+ !mw.config.get( 'wgImagesDisabled',
false );
+ }
+ return this._fileUploads;
}
};
diff --git a/javascripts/modules/uploads/PhotoUploaderButton.js
b/javascripts/modules/uploads/PhotoUploaderButton.js
index 37a6eb3..197a3ff 100644
--- a/javascripts/modules/uploads/PhotoUploaderButton.js
+++ b/javascripts/modules/uploads/PhotoUploaderButton.js
@@ -1,5 +1,6 @@
-( function ( M, $ ) {
- var View = M.require( 'View' ),
+( function ( M ) {
+ var browser = M.require( 'browser' ),
+ View = M.require( 'View' ),
Icon = M.require( 'Icon' ),
photoIcon = new Icon( {
name: 'photo',
@@ -7,28 +8,6 @@
additionalClassNames: 'mw-ui-progressive mw-ui-button
button'
} ),
PhotoUploaderButton;
-
- /**
-* Check whether photo upload is supported
-* FIXME: Move to Browser.js
-* @method
-* @ignore
-* @returns {Boolean}
-*/
- function isSupported() {
- // FIXME: create a module for browser detection stuff
- // deal with known false positives which don't support file
input (bug 47374)
- if ( navigator.userAgent.match( /Windows Phone (OS 7|8.0)/ ) ) {
- return false;
- }
- var browserSupported = (
- typeof FileReader !== 'undefined'
- typeof FormData !== 'undefined'
- ( $( 'input type=file/' ).prop( 'type' ) === 'file'
) // Firefox OS 1.0 turns input type=file into input type=text
- );
-
- return browserSupported !mw.config.get( 'wgImagesDisabled',
false );
- }
/**
* @class PhotoUploaderButton
@@ -90,8 +69,8 @@
}
} );
- PhotoUploaderButton.isSupported = isSupported();
+ PhotoUploaderButton.isSupported = browser.supportsFileUploads();
M.define( 'modules/uploads/PhotoUploaderButton', PhotoUploaderButton );
-}( mw.mobileFrontend, jQuery ) );
+}( mw.mobileFrontend ) );
--
To view, visit https://gerrit.wikimedia.org/r/180824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I696e0a112babe38631d1cec573288fb92155abff
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] Don't transmit search results events in TitleSearchFragment ... - change (apps...wikipedia)
Deskana has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181429
Change subject: Don't transmit search results events in TitleSearchFragment
funnel.
..
Don't transmit search results events in TitleSearchFragment funnel.
The search funnel is meant to track user-perceived performance of search, and
since the autoswitching means the user never perceives a zero result event for
a title search, it doesn't make sense to log it.
Change-Id: Ie974ef89eb3ff15a608ee3303b1c8574a78f136f
---
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/29/181429/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
index 988211d..9192d97 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
@@ -294,7 +294,12 @@
if (!isAdded()) {
return;
}
-searchFragment.getFunnel().searchResults(false,
result.size(), (int)(System.currentTimeMillis() - startMillis));
+/*
+ Don't transmit searchResults events in this fragment
right now, since the
+ autoswitching means the user never perceives zero
results within the context
+ of this fragment.
+ searchFragment.getFunnel().searchResults(false,
result.size(), (int)(System.currentTimeMillis() - startMillis));
+ */
((PageActivity)getActivity()).updateProgressBar(false,
true, 0);
searchNetworkError.setVisibility(View.GONE);
displayResults(result);
--
To view, visit https://gerrit.wikimedia.org/r/181429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie974ef89eb3ff15a608ee3303b1c8574a78f136f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana dga...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Instrumentation to report when alterImpressionData is not found - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged.
Change subject: Instrumentation to report when alterImpressionData is not found
..
Instrumentation to report when alterImpressionData is not found
This is to help diagnose a possible race condition, where the script tags
injected into the DOM by insertBanner may be executed asynchronously, and
the conditional which checks for alterImpressionData is run before the
function is created by banner javascript.
Change-Id: Ifef70bc81205da788abf7be1e87d2b14cc61271b
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index 214f038..e5247eb 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -471,6 +471,8 @@
var bannerShown = true;
if ( typeof
mw.centralNotice.bannerData.alterImpressionData === 'function' ) {
bannerShown =
mw.centralNotice.bannerData.alterImpressionData( impressionData );
+ } else {
+ impressionData.alterFunctionMissing =
true;
}
// eventually we want to unify the ordering
here and always return
--
To view, visit https://gerrit.wikimedia.org/r/181236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifef70bc81205da788abf7be1e87d2b14cc61271b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Mwalker mwal...@khaosdev.com
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Really allow Extensions to make a new gallery format - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Really allow Extensions to make a new gallery format .. Really allow Extensions to make a new gallery format Adjust GalleryGetModes call to fit Hooks::run() signature. Follow up: I33462a8b52502ed76aeb163b66e3704c8618ba23 Change-Id: I916dade31d6d67de4bb82582cc71585e83fec1c9 --- M docs/hooks.txt M includes/gallery/ImageGalleryBase.php 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/hooks.txt b/docs/hooks.txt index f83a6c3..8d024d6 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -1261,7 +1261,7 @@ 'GalleryGetModes': Get list of classes that can render different modes of a gallery -$modeArray: An associative array mapping mode names to classes that implement +$modeArray: An associative array mapping mode names to classes that implement that mode. It is expected all registered classes are a subclass of ImageGalleryBase. diff --git a/includes/gallery/ImageGalleryBase.php b/includes/gallery/ImageGalleryBase.php index bb9a903..2a888a5 100644 --- a/includes/gallery/ImageGalleryBase.php +++ b/includes/gallery/ImageGalleryBase.php @@ -120,7 +120,7 @@ 'packed-overlay' = 'PackedOverlayImageGallery', ); // Allow extensions to make a new gallery format. - Hooks::run( 'GalleryGetModes', self::$modeMapping ); + Hooks::run( 'GalleryGetModes', array( self::$modeMapping ) ); } } -- To view, visit https://gerrit.wikimedia.org/r/181410 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I916dade31d6d67de4bb82582cc71585e83fec1c9 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes to neglected Mobile upload interface (for 3rd parties) - change (mediawiki...MobileFrontend)
Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181430
Change subject: Fixes to neglected Mobile upload interface (for 3rd parties)
..
Fixes to neglected Mobile upload interface (for 3rd parties)
Adding mw-ui-input class to description field as this is now needed
for textareas to be properly styled.
Moving 'text-align: center' up one element so that the upload button is
also centered (like all the other content on the page).
Change-Id: I1c1164002625ea6a933bb913474d5d86e5a1523c
---
M less/specials/uploads.less
M templates/modules/uploads/PhotoUploadOverlay.hogan
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/30/181430/1
diff --git a/less/specials/uploads.less b/less/specials/uploads.less
index 52d9628..de8bc3c 100644
--- a/less/specials/uploads.less
+++ b/less/specials/uploads.less
@@ -16,12 +16,12 @@
}
.ctaUploadPhoto {
+ text-align: center;
padding: .5em;
h2 {
font-size: 1.25em;
margin: 0 0 .5em;
- text-align: center;
}
}
diff --git a/templates/modules/uploads/PhotoUploadOverlay.hogan
b/templates/modules/uploads/PhotoUploadOverlay.hogan
index d8c391d..a739908 100644
--- a/templates/modules/uploads/PhotoUploadOverlay.hogan
+++ b/templates/modules/uploads/PhotoUploadOverlay.hogan
@@ -2,6 +2,6 @@
{{{spinner}}}
div class=preview/div
p{{ownerStatement}} a href=#/upload-tutorial class=help
inline{{help}}/a/p
- textarea name=description
placeholder={{descriptionPlaceholder}}/textarea
+ textarea class=mw-ui-input name=description
placeholder={{descriptionPlaceholder}}/textarea
p class=license{{{license}}}/p
/div
--
To view, visit https://gerrit.wikimedia.org/r/181430
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c1164002625ea6a933bb913474d5d86e5a1523c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove 1.25wmf2 through 1.25wmf4 - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/181431 Change subject: Remove 1.25wmf2 through 1.25wmf4 .. Remove 1.25wmf2 through 1.25wmf4 Change-Id: I6cb65ab0daf5adffdd01f196b85d4d3457d5bb4a --- D docroot/bits/static-1.25wmf2/extensions D docroot/bits/static-1.25wmf2/resources D docroot/bits/static-1.25wmf2/skins D docroot/bits/static-1.25wmf3/extensions D docroot/bits/static-1.25wmf3/resources D docroot/bits/static-1.25wmf3/skins D docroot/bits/static-1.25wmf4/extensions D docroot/bits/static-1.25wmf4/resources D docroot/bits/static-1.25wmf4/skins D docroot/bits/static-1.25wmf5/extensions D docroot/bits/static-1.25wmf5/resources D docroot/bits/static-1.25wmf5/skins M docroot/bits/static-current/extensions M docroot/bits/static-current/resources M docroot/bits/static-current/skins M php D w/static-1.25wmf2/extensions D w/static-1.25wmf2/resources D w/static-1.25wmf2/skins D w/static-1.25wmf3/extensions D w/static-1.25wmf3/resources D w/static-1.25wmf3/skins D w/static-1.25wmf4/extensions D w/static-1.25wmf4/resources D w/static-1.25wmf4/skins D w/static-1.25wmf5/extensions D w/static-1.25wmf5/resources D w/static-1.25wmf5/skins 28 files changed, 4 insertions(+), 28 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/31/181431/1 diff --git a/docroot/bits/static-1.25wmf2/extensions b/docroot/bits/static-1.25wmf2/extensions deleted file mode 12 index da2f3b9..000 --- a/docroot/bits/static-1.25wmf2/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf2/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf2/resources b/docroot/bits/static-1.25wmf2/resources deleted file mode 12 index 32719e3..000 --- a/docroot/bits/static-1.25wmf2/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf2/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf2/skins b/docroot/bits/static-1.25wmf2/skins deleted file mode 12 index 1595a9d..000 --- a/docroot/bits/static-1.25wmf2/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf2/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf3/extensions b/docroot/bits/static-1.25wmf3/extensions deleted file mode 12 index 28d13cb..000 --- a/docroot/bits/static-1.25wmf3/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf3/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf3/resources b/docroot/bits/static-1.25wmf3/resources deleted file mode 12 index b4e23ed..000 --- a/docroot/bits/static-1.25wmf3/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf3/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf3/skins b/docroot/bits/static-1.25wmf3/skins deleted file mode 12 index 94e5d5e..000 --- a/docroot/bits/static-1.25wmf3/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf3/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf4/extensions b/docroot/bits/static-1.25wmf4/extensions deleted file mode 12 index 0ab4010..000 --- a/docroot/bits/static-1.25wmf4/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf4/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf4/resources b/docroot/bits/static-1.25wmf4/resources deleted file mode 12 index f99b09c..000 --- a/docroot/bits/static-1.25wmf4/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf4/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf4/skins b/docroot/bits/static-1.25wmf4/skins deleted file mode 12 index fe98745..000 --- a/docroot/bits/static-1.25wmf4/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf4/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf5/extensions b/docroot/bits/static-1.25wmf5/extensions deleted file mode 12 index 5ab6ec6..000 --- a/docroot/bits/static-1.25wmf5/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf5/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf5/resources b/docroot/bits/static-1.25wmf5/resources deleted file mode 12 index b459642..000 --- a/docroot/bits/static-1.25wmf5/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf5/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf5/skins b/docroot/bits/static-1.25wmf5/skins deleted file mode 12 index 7e4aa7a..000 --- a/docroot/bits/static-1.25wmf5/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf5/skins/ \ No newline at end of file diff --git a/docroot/bits/static-current/extensions b/docroot/bits/static-current/extensions index e1d76f6..d8d3db6 12 --- a/docroot/bits/static-current/extensions +++ b/docroot/bits/static-current/extensions @@ -1 +1 @@
[MediaWiki-commits] [Gerrit] phabricator: strip Ubuntu 12.04 (precise) support - change (operations/puppet)
Rush has submitted this change and it was merged.
Change subject: phabricator: strip Ubuntu 12.04 (precise) support
..
phabricator: strip Ubuntu 12.04 (precise) support
iridium is trusty and presumably attempts to set up Labs test instances
will need to follow production. There's no reason to convolute our
manifests to support precise anymore.
The hardcoded php.ini isn't very future proof and should be probably be
replaced with something else (wmflib's php_ini? augeas?) but that should
follow in a separate commit.
Change-Id: Ib086e009ab71a0b3d0ac093a85388c52d863e801
---
M modules/phabricator/manifests/init.pp
M modules/phabricator/templates/phabricator-default.conf.erb
R modules/phabricator/templates/php.ini.erb
D modules/phabricator/templates/precise_php.ini.erb
4 files changed, 2 insertions(+), 1,899 deletions(-)
Approvals:
Rush: Looks good to me, approved
20after4: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/phabricator/manifests/init.pp
b/modules/phabricator/manifests/init.pp
index 8d3d8f6..256584b 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -213,13 +213,8 @@
path= '/usr/bin:/bin',
}
-case $::operatingsystemrelease {
-'12.04': { $php_ini = '/etc/php5/apache2filter/php.ini' }
-default: { $php_ini = '/etc/php5/apache2/php.ini'}
-}
-
-file { $php_ini:
-content = template(phabricator/${::lsbdistcodename}_php.ini.erb),
+file { '/etc/php5/apache2/php.ini':
+content = template(phabricator/php.ini.erb),
notify = Service['apache2'],
require = Package['php5'],
}
diff --git a/modules/phabricator/templates/phabricator-default.conf.erb
b/modules/phabricator/templates/phabricator-default.conf.erb
index 608ad34..87d5375 100644
--- a/modules/phabricator/templates/phabricator-default.conf.erb
+++ b/modules/phabricator/templates/phabricator-default.conf.erb
@@ -1,12 +1,6 @@
# Apache configuration for Phabricator (%= @phab_servername %)
# This file is managed by Puppet.
-%# Apache Prior to 2.3.11 %
-%# http://httpd.apache.org/docs/current/mod/core.html %
-% if @lsbdistcodename == 'precise'%
- NameVirtualHost *:%= @port %
-% end -%
-
VirtualHost *:80
ServerName %= @phab_servername.gsub('http://', '').gsub('https://', '') %
@@ -25,21 +19,10 @@
# enable HTTP Strict Transport Security
Header set Strict-Transport-Security max-age=31536000
-%# Apache 2.4 and Newer %
-% if @lsbdistcodename == 'trusty'%
Directory %= @docroot %
Options Indexes FollowSymLinks MultiViews
Require all granted
/Directory
-%# Apache Older Than 2.4 %
-% else %
- Directory %= @docroot %
-Options Indexes FollowSymLinks MultiViews
-AllowOverride None
-Order allow,deny
-allow from all
- /Directory
-% end -%
ErrorLog /var/log/apache2/%= @name %_error.log
LogLevel warn
diff --git a/modules/phabricator/templates/trusty_php.ini.erb
b/modules/phabricator/templates/php.ini.erb
similarity index 100%
rename from modules/phabricator/templates/trusty_php.ini.erb
rename to modules/phabricator/templates/php.ini.erb
diff --git a/modules/phabricator/templates/precise_php.ini.erb
b/modules/phabricator/templates/precise_php.ini.erb
deleted file mode 100644
index b6bcf48..000
--- a/modules/phabricator/templates/precise_php.ini.erb
+++ /dev/null
@@ -1,1875 +0,0 @@
-[PHP]
-;;;
-; About php.ini ;
-;;;
-; PHP's initialization file, generally called php.ini, is responsible for
-; configuring many of the aspects of PHP's behavior.
-
-; PHP attempts to find and load this configuration from a number of locations.
-; The following is a summary of its search order:
-; 1. SAPI module specific location.
-; 2. The PHPRC environment variable. (As of PHP 5.2.0)
-; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0)
-; 4. Current working directory (except CLI)
-; 5. The web server's directory (for SAPI modules), or directory of PHP
-; (otherwise in Windows)
-; 6. The directory from the --with-config-file-path compile time option, or the
-; Windows directory (C:\windows or C:\winnt)
-; See the PHP docs for more specific information.
-; http://php.net/configuration.file
-
-; The syntax of the file is extremely simple. Whitespace and Lines
-; beginning with a semicolon are silently ignored (as you probably guessed).
-; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future.
-
-; Directives following the section heading [PATH=/www/mysite] only
-; apply to PHP files in the /www/mysite directory. Directives
-; following the section heading [HOST=www.example.com] only apply to
-; PHP files served from www.example.com. Directives set in these
-; special sections cannot be overridden by
[MediaWiki-commits] [Gerrit] Move to using the core nowait: key code - change (mediawiki...PoolCounter)
jenkins-bot has submitted this change and it was merged.
Change subject: Move to using the core nowait: key code
..
Move to using the core nowait: key code
Change-Id: If769148ed72c469699663f88f18f76300c872580
---
M PoolCounterClient_body.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 6 insertions(+), 43 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PoolCounterClient_body.php b/PoolCounterClient_body.php
index 8d9d3ba..23f9c5d 100644
--- a/PoolCounterClient_body.php
+++ b/PoolCounterClient_body.php
@@ -76,17 +76,6 @@
*/
private $conn;
/**
-* @var boolean could this request wait if there aren't execution slots
-* available?
-*/
- private $mightWait;
- /**
-* @var boolean has this process acquired and not yet released a request
-* that might wait
-*/
- private static $acquiredMightWait = false;
-
- /**
* @var PoolCounter_ConnectionManager
*/
static private $manager;
@@ -97,7 +86,6 @@
global $wgPoolCountClientConf;
self::$manager = new PoolCounter_ConnectionManager(
$wgPoolCountClientConf );
}
- $this-mightWait = !preg_match( '/^nowait:/', $this-key );
}
/**
@@ -144,10 +132,10 @@
$responseType = $parts[0];
switch ( $responseType ) {
case 'LOCKED':
- self::$acquiredMightWait |= $this-mightWait;
+ $this-onAcquire();
break;
case 'RELEASED':
- self::$acquiredMightWait = !$this-mightWait;
+ $this-onRelease();
break;
case 'DONE':
case 'NOT_LOCKED':
@@ -169,7 +157,7 @@
*/
function acquireForMe() {
wfProfileIn( __METHOD__ );
- $status = $this-precheck();
+ $status = $this-precheckAcquire();
if ( !$status-isGood() ) {
return $status;
}
@@ -183,36 +171,13 @@
*/
function acquireForAnyone() {
wfProfileIn( __METHOD__ );
- $status = $this-precheck();
+ $status = $this-precheckAcquire();
if ( !$status-isGood() ) {
return $status;
}
$status = $this-sendCommand( 'ACQ4ANY', $this-key,
$this-workers, $this-maxqueue, $this-timeout );
wfProfileOut( __METHOD__ );
return $status;
- }
-
- /**
-* Checks that the lock request is sane.
-* @return Status - good for sane requests fatal for insane
-*/
- private function precheck() {
- if ( $this-mightWait ) {
- if ( self::$acquiredMightWait ) {
- /*
-* The poolcounter itself is quite happy to
allow you to wait
-* on another lock while you have a lock you
waited on already
-* but we think that it is unlikely to be a
good idea. So we
-* made it an error. If you are _really_
_really_ sure it is a
-* good idea then feel free to implement an
unsafe flag or
-* something.
-*/
- return Status::newFatal(
'poolcounter-usage-error', 'You may only aquire a single non-nowait lock.' );
- }
- } elseif ( $this-timeout !== 0 ) {
- return Status::newFatal( 'poolcounter-usage-error',
'Locks starting in nowait: must have 0 timeout.' );
- }
- return Status::newGood();
}
/**
diff --git a/i18n/en.json b/i18n/en.json
index abd93af..cd4c637 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,6 +8,5 @@
poolcounter-connection-error: Error connecting to pool counter server:
$1,
poolcounter-read-error: Error reading from pool counter server.,
poolcounter-write-error: Error writing to pool counter server.,
-poolcounter-remote-error: Pool counter server error: $1,
-poolcounter-usage-error: Usage error: $1
+poolcounter-remote-error: Pool counter server error: $1
}
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b40c828..90fc908 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -12,6 +12,5 @@
poolcounter-connection-error: Used at least in the MediaWiki message
{{msg-mw|view-pool-error}}.\n\nUsed as fatal error message.\n\nParameters:\n*
$1 - error message
[MediaWiki-commits] [Gerrit] Moved nowait: key code to PoolCounter in core - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Moved nowait: key code to PoolCounter in core
..
Moved nowait: key code to PoolCounter in core
Change-Id: I5286e6c6052289e1107314a04d72703b44a8fbc6
---
M includes/poolcounter/PoolCounter.php
M includes/poolcounter/PoolCounterRedis.php
M languages/i18n/en.json
M languages/i18n/qqq.json
4 files changed, 72 insertions(+), 1 deletion(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/poolcounter/PoolCounter.php
b/includes/poolcounter/PoolCounter.php
index e77ffd7..5692d73 100644
--- a/includes/poolcounter/PoolCounter.php
+++ b/includes/poolcounter/PoolCounter.php
@@ -34,7 +34,10 @@
* minutes and hundreds of read hits.
*
* The PoolCounter provides semaphore semantics for restricting the number
- * of workers that may be concurrently performing such single task.
+ * of workers that may be concurrently performing such single task. Only one
+ * key can be locked by any PoolCounter instance of a process, except for keys
+ * that start with nowait:. However, only 0 timeouts (non-blocking requests)
+ * can be used with nowait: keys.
*
* By default PoolCounter_Stub is used, which provides no locking. You
* can get a useful one in the PoolCounter extension.
@@ -68,6 +71,15 @@
protected $timeout;
/**
+* @var boolean Whether the key is a might wait key
+*/
+ private $isMightWaitKey;
+ /**
+* @var boolean Whether this process holds a might wait lock key
+*/
+ private static $acquiredMightWaitKey = 0;
+
+ /**
* @param array $conf
* @param string $type
* @param string $key
@@ -84,6 +96,7 @@
$key = $this-hashKeyIntoSlots( $key, $this-slots );
}
$this-key = $key;
+ $this-isMightWaitKey = !preg_match( '/^nowait:/', $this-key );
}
/**
@@ -137,6 +150,48 @@
abstract public function release();
/**
+* Checks that the lock request is sane.
+* @return Status - good for sane requests fatal for insane
+* @since 1.25
+*/
+ final protected function precheckAcquire() {
+ if ( $this-isMightWaitKey ) {
+ if ( self::$acquiredMightWaitKey ) {
+ /*
+* The poolcounter itself is quite happy to
allow you to wait
+* on another lock while you have a lock you
waited on already
+* but we think that it is unlikely to be a
good idea. So we
+* made it an error. If you are _really_
_really_ sure it is a
+* good idea then feel free to implement an
unsafe flag or
+* something.
+*/
+ return Status::newFatal(
'poolcounter-usage-error',
+ 'You may only aquire a single
non-nowait lock.' );
+ }
+ } elseif ( $this-timeout !== 0 ) {
+ return Status::newFatal( 'poolcounter-usage-error',
+ 'Locks starting in nowait: must have 0
timeout.' );
+ }
+ return Status::newGood();
+ }
+
+ /**
+* Update any lock tracking information when the lock is acquired
+* @since 1.25
+*/
+ final protected function onAcquire() {
+ self::$acquiredMightWaitKey |= $this-isMightWaitKey;
+ }
+
+ /**
+* Update any lock tracking information when the lock is released
+* @since 1.25
+*/
+ final protected function onRelease() {
+ self::$acquiredMightWaitKey = !$this-isMightWaitKey;
+ }
+
+ /**
* Given a key (any string) and the number of lots, returns a slot
number (an integer from the [0..($slots-1)] range).
* This is used for a global limit on the number of instances of a
given type that can acquire a lock.
* The hashing is deterministic so that PoolCounter::$workers is always
an upper limit of how many instances with
diff --git a/includes/poolcounter/PoolCounterRedis.php
b/includes/poolcounter/PoolCounterRedis.php
index d609f61..0f025f3 100644
--- a/includes/poolcounter/PoolCounterRedis.php
+++ b/includes/poolcounter/PoolCounterRedis.php
@@ -123,11 +123,21 @@
function acquireForMe() {
$section = new ProfileSection( __METHOD__ );
+ $status = $this-precheckAcquire();
+ if ( !$status-isGood() ) {
+ return $status;
+ }
+
return $this-waitForSlotOrNotif( self::AWAKE_ONE );
}
function
[MediaWiki-commits] [Gerrit] Remove 1.25wmf2 through 1.25wmf5 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Remove 1.25wmf2 through 1.25wmf5 .. Remove 1.25wmf2 through 1.25wmf5 Change-Id: I6cb65ab0daf5adffdd01f196b85d4d3457d5bb4a --- D docroot/bits/static-1.25wmf2/extensions D docroot/bits/static-1.25wmf2/resources D docroot/bits/static-1.25wmf2/skins D docroot/bits/static-1.25wmf3/extensions D docroot/bits/static-1.25wmf3/resources D docroot/bits/static-1.25wmf3/skins D docroot/bits/static-1.25wmf4/extensions D docroot/bits/static-1.25wmf4/resources D docroot/bits/static-1.25wmf4/skins D docroot/bits/static-1.25wmf5/extensions D docroot/bits/static-1.25wmf5/resources D docroot/bits/static-1.25wmf5/skins M docroot/bits/static-current/extensions M docroot/bits/static-current/resources M docroot/bits/static-current/skins M php D w/static-1.25wmf2/extensions D w/static-1.25wmf2/resources D w/static-1.25wmf2/skins D w/static-1.25wmf3/extensions D w/static-1.25wmf3/resources D w/static-1.25wmf3/skins D w/static-1.25wmf4/extensions D w/static-1.25wmf4/resources D w/static-1.25wmf4/skins D w/static-1.25wmf5/extensions D w/static-1.25wmf5/resources D w/static-1.25wmf5/skins 28 files changed, 4 insertions(+), 28 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/bits/static-1.25wmf2/extensions b/docroot/bits/static-1.25wmf2/extensions deleted file mode 12 index da2f3b9..000 --- a/docroot/bits/static-1.25wmf2/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf2/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf2/resources b/docroot/bits/static-1.25wmf2/resources deleted file mode 12 index 32719e3..000 --- a/docroot/bits/static-1.25wmf2/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf2/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf2/skins b/docroot/bits/static-1.25wmf2/skins deleted file mode 12 index 1595a9d..000 --- a/docroot/bits/static-1.25wmf2/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf2/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf3/extensions b/docroot/bits/static-1.25wmf3/extensions deleted file mode 12 index 28d13cb..000 --- a/docroot/bits/static-1.25wmf3/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf3/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf3/resources b/docroot/bits/static-1.25wmf3/resources deleted file mode 12 index b4e23ed..000 --- a/docroot/bits/static-1.25wmf3/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf3/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf3/skins b/docroot/bits/static-1.25wmf3/skins deleted file mode 12 index 94e5d5e..000 --- a/docroot/bits/static-1.25wmf3/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf3/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf4/extensions b/docroot/bits/static-1.25wmf4/extensions deleted file mode 12 index 0ab4010..000 --- a/docroot/bits/static-1.25wmf4/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf4/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf4/resources b/docroot/bits/static-1.25wmf4/resources deleted file mode 12 index f99b09c..000 --- a/docroot/bits/static-1.25wmf4/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf4/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf4/skins b/docroot/bits/static-1.25wmf4/skins deleted file mode 12 index fe98745..000 --- a/docroot/bits/static-1.25wmf4/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf4/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf5/extensions b/docroot/bits/static-1.25wmf5/extensions deleted file mode 12 index 5ab6ec6..000 --- a/docroot/bits/static-1.25wmf5/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf5/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf5/resources b/docroot/bits/static-1.25wmf5/resources deleted file mode 12 index b459642..000 --- a/docroot/bits/static-1.25wmf5/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf5/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf5/skins b/docroot/bits/static-1.25wmf5/skins deleted file mode 12 index 7e4aa7a..000 --- a/docroot/bits/static-1.25wmf5/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf5/skins/ \ No newline at end of file diff --git a/docroot/bits/static-current/extensions b/docroot/bits/static-current/extensions index e1d76f6..d8d3db6 12 --- a/docroot/bits/static-current/extensions +++ b/docroot/bits/static-current/extensions @@ -1 +1 @@ -/srv/mediawiki/php-1.25wmf11/extensions \ No newline at end of file
[MediaWiki-commits] [Gerrit] Bug fix in heading escaping - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Bug fix in heading escaping
..
Bug fix in heading escaping
* Only run when opts.isLastChild of the heading.
Bug: T84903
Change-Id: I46d7dad9a6f97fbae9389e2b4530de46f80d6392
---
M lib/wts.escapeWikitext.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 6 insertions(+), 15 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/wts.escapeWikitext.js b/lib/wts.escapeWikitext.js
index 5f7618c..59ad35c 100644
--- a/lib/wts.escapeWikitext.js
+++ b/lib/wts.escapeWikitext.js
@@ -34,7 +34,9 @@
}
// Only = at the extremities trigger escaping
- if (opts.isLastChild
DU.isText(DU.firstNonDeletedChildNode(headingNode))) {
+ if ( opts.node.parentNode === headingNode opts.isLastChild
+DU.isText(DU.firstNonDeletedChildNode(headingNode))
+ ) {
var line = state.currLine.text;
if (line.length === 0) {
line = text;
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 62d3461..6ae203f 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -525,7 +525,6 @@
add(wt2wt, Ref: 10. Unclosed HTML tags should not leak out of ref-body, A
refb foo /ref B C\n\nreferences /);
add(wt2wt, References: 5. ref tags in references should be processed while
ignoring all other content, A ref name=\a\ /\nB ref
name=\b\bar/ref\n\nreferences\nref
name=\a\foo/ref\n/references);
add(wt2wt, Entities in ref name, ref name=\test amp;amp;
me\hi/ref\n);
-add(wt2wt, Headings: 4a'. No escaping needed (Parsoid bug T84903), =
''nowiki=/nowiki''foo= =\n);
add(wt2wt, HTML tag with broken attribute value quoting, span
title=\Hello world\Foo/span\n);
add(wt2wt, Parsoid-only: HTML tag with broken attribute value quoting,
span title=\Hello world\Foo/span\n);
add(wt2wt, Table with broken attribute value quoting, {|\n| title=\Hello
world\ |Foo\n|});
@@ -2785,8 +2784,6 @@
add(selser, References: 5. ref tags in references should be processed while
ignoring all other content [0,2,0], A ref name=\a\ /\nB ref
name=\b\bar/ref\n\nky16pugtafywrk9\n\nreferences\nref
name=\a\foo/ref\nThis should just get lost.\n/references);
add(selser, Entities in ref name [2], 72oie2a08o69wwmi\n\nref
name=\test amp; me\hi/ref);
add(selser, Entities in ref name [1], ref name=\test amp;
me\hi/ref);
-add(selser, Headings: 4a'. No escaping needed (Parsoid bug T84903) [2],
qj77lglp8h5jnhfr\n= ''=''foo= =);
-add(selser, Headings: 4a'. No escaping needed (Parsoid bug T84903) [1], =
''=''foo= =);
add(selser, Headings: 5. Empty headings [[2],3,2,0,4,4,0,2,1,3,0],
=hnjo2713bjvjwcdinowiki/=\nx2d05yq3dapaxlxr\n==nowiki/==\n\nkaovt9si227ta9k9\n\nb2688fvzpaocrf6r\nnowiki/\nljshl952j0emte29\n\n=nowiki/=\n\n==nowiki/==);
add(selser, Headings: 6a. Heading chars in SOL context (with trailing
spaces) [4,0,1,0,4,4,[2],3], o4fu7yz6zedvlsor\n\nnowiki=a=/nowiki
\n\nfzi337zwgfmbzkt9\n\nrziif3qr3rspp66r\n\nzm9kz709iqpsnhfrnowiki=a=/nowiki
\t);
add(selser, 1a. Quotes inside b and i
[[[0,2,0],3,0,0,2,0,1,2,0,[4,2,2],0,1,3,0,2,[4,4,[2,0],0],3,[3],0,0,1,3,2,4,0,[2,0],1,0,3,4,2,0,3,0,0,0,0,2,0,0,0,2,4,0,0,4]],
''nowiki/bt5073jrxz2gldi'foo'nowiki/nowiki''foo''/nowiki''\n6563iftvc71wz5mi''nowiki'''foo'''/nowiki''\n''foo''yv6gd1r11qbyb9nowiki/'s\n'''ge4wqkqzeoqg2e29ycci4uro5wx6flxr'foo'onh4xihxdek4kj4inowiki/'''\n'''nowiki''foo''/nowikinowiki'''foo'''/nowiki'''f1gwwblkysii19k9\n'''em5maqbfah71ra4izwselowkgxu07ldi''fmyr1ptercf2yb9bar'nowiki/''baz'''nowiki/'s\n'''foo''s1x6z3q0pwfgk3xr''foo''eo98hc80ue7mn29'\n''luf993p203a6ecdifoo'nowiki/''nowiki/'\n'9ixyk03e6k73nmib3uz6pdpbziod2t9nowiki/'\n'\n'''foo'''nowiki/'\n'n8h003eevc1pp66rnowiki/'''foo'''nowiki/'\nqzypu69mxf450zfr''fools'span
errand/span''f9fa9v2yqf7s0pb9''spanfool/span's
errand''\na|!*#-:;+-~[]{}b'eeuga531ydivbo6r\n);
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 964203b..4c15c58 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -20053,6 +20053,8 @@
== foo= ==
= = =
+
+= ''=''foo= =
!! html/parsoid
h1=foo/h1
h1foo=/h1
@@ -20061,18 +20063,8 @@
h2=foo/h2
h2foo=/h2
h1=/h1
-!!end
-
-!! test
-Headings: 4a'. No escaping needed (Parsoid bug T84903)
-!! wikitext
-= ''=''foo= =
-!! html/php
-h1span class=mw-headline id=.3Dfoo.3Di=/ifoo=/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: =foo=edit/aspan
class=mw-editsection-bracket]/span/span/h1
-
-!! html/parsoid
h1i=/ifoo=/h1
-!! end
+!!end
!! test
Headings: 4b. No escaping needed (inside p-tags)
--
To view, visit https://gerrit.wikimedia.org/r/181270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
[MediaWiki-commits] [Gerrit] Use print_function - change (labs...extdist)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181432
Change subject: Use print_function
..
Use print_function
Change-Id: Iacefa7d6c4603e5a7cda384716f6c36ef5452af0
---
M nightly.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/extdist
refs/changes/32/181432/1
diff --git a/nightly.py b/nightly.py
index dddcd21..d07806a 100644
--- a/nightly.py
+++ b/nightly.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
nightly.py - tarball creator
@@ -247,7 +248,7 @@
with open(os.path.join(os.path.dirname(__file__), local_fname), 'r')
as f:
conf = json.load(f)
else:
-print 'extdist is not configured properly.'
+print('extdist is not configured properly.')
quit()
if '--all' in sys.argv:
repos = None
--
To view, visit https://gerrit.wikimedia.org/r/181432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacefa7d6c4603e5a7cda384716f6c36ef5452af0
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use RotatingFileHandler for logging, set to ~100MB - change (labs...extdist)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181433
Change subject: Use RotatingFileHandler for logging, set to ~100MB
..
Use RotatingFileHandler for logging, set to ~100MB
Change-Id: I25c23aa98cb7a912340f15e9bf56fb61432249ea
---
M nightly.py
1 file changed, 27 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/extdist
refs/changes/33/181433/1
diff --git a/nightly.py b/nightly.py
index d07806a..d6d1c53 100644
--- a/nightly.py
+++ b/nightly.py
@@ -21,6 +21,7 @@
import glob
import json
import logging
+import logging.handlers
import os
import subprocess
import sys
@@ -42,7 +43,15 @@
self._repo_list = None
self._extension_config = None
self.force = force
-pass
+
+# Set up logging
+self.logger = logging.getLogger(__file__)
+self.logger.setLevel(logging.DEBUG)
+handler = logging.handlers.RotatingFileHandler(self.LOG_FILE,
maxBytes=10)
+handler.setLevel(logging.DEBUG)
+formatter = logging.Formatter('%(asctime)s %(levelname)s:%(message)s')
+handler.setFormatter(formatter)
+self.logger.addHandler(handler)
@property
def repo_list(self):
@@ -58,7 +67,7 @@
Does an API request to get the complete list of extensions.
Do not call directly.
-logging.debug('Fetching list of all %s...' % self.REPO_TYPE)
+self.logger.debug('Fetching list of all %s...' % self.REPO_TYPE)
data = {
'action': 'query',
'list': 'extdistrepos',
@@ -83,7 +92,7 @@
Fetch the ExtensionDistributor configuration from the API
Do not call this directly.
-logging.debug('Fetching ExtensionDistributor config from API...')
+self.logger.debug('Fetching ExtensionDistributor config from API...')
data = {
'action': 'query',
'meta': 'siteinfo',
@@ -103,12 +112,6 @@
Does basic initialization
-# Set up logging
-logging.basicConfig(
-filename=self.LOG_FILE,
-level=logging.DEBUG,
-format='%(asctime)s %(levelname)s:%(message)s'
-)
# Check to make sure nightly.py isn't already running
if os.path.exists(self.PID_FILE):
@@ -116,7 +119,7 @@
old_pid = f.read()
if self.check_pid(int(old_pid)):
-logging.warning('Another process of nightly.py is still
running, quitting this one')
+self.logger.warning('Another process of nightly.py is still
running, quitting this one')
quit()
self.create_pid_file()
@@ -141,15 +144,15 @@
create new tarballs if needed
full_path = os.path.join(self.EXT_PATH, ext)
-logging.info('Starting update for %s' % ext)
+self.logger.info('Starting update for %s' % ext)
if not os.path.exists(full_path):
os.chdir(self.EXT_PATH)
-logging.debug('Cloning %s' % ext)
+self.logger.debug('Cloning %s' % ext)
self.shell_exec(['git', 'clone', self.GIT_URL % ext, ext])
pass
for branch in self.supported_versions:
os.chdir(full_path)
-logging.info('Creating %s for %s' % (branch, ext))
+self.logger.info('Creating %s for %s' % (branch, ext))
# Update remotes
self.shell_exec(['git', 'fetch'])
try:
@@ -161,7 +164,7 @@
self.shell_exec(['git', 'checkout', 'origin/%s' % branch])
except subprocess.CalledProcessError:
# Just a warning because this is expected for some extensions
-logging.warning('could not checkout origin/%s' % branch)
+self.logger.warning('could not checkout origin/%s' % branch)
continue
# Reset everything, again.
self.shell_exec(['git', 'clean', '-ffd'])
@@ -173,10 +176,10 @@
rev = self.shell_exec(['git', 'rev-parse', '--short',
'HEAD']).strip()
tarball_fname = '%s-%s-%s.tar.gz' % (ext, branch, rev)
if not self.force and os.path.exists(os.path.join(self.DIST_PATH,
tarball_fname)):
-logging.debug('No updates to branch, tarball already exists.')
+self.logger.debug('No updates to branch, tarball already
exists.')
continue
if self.COMPOSER and os.path.exists('composer.json'):
-logging.debug('Running composer install for %s' % ext)
+self.logger.debug('Running composer install for %s' % ext)
self.shell_exec([self.COMPOSER, 'install'])
pass
# Create a 'version' file with basic info about the tarball
@@ -185,19 +188,19 @@
[MediaWiki-commits] [Gerrit] Instrumentation to report when alterImpressionData is not found - change (mediawiki...CentralNotice)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181434
Change subject: Instrumentation to report when alterImpressionData is not found
..
Instrumentation to report when alterImpressionData is not found
This is to help diagnose a possible race condition, where the script tags
injected into the DOM by insertBanner may be executed asynchronously, and
the conditional which checks for alterImpressionData is run before the
function is created by banner javascript.
Change-Id: Ifef70bc81205da788abf7be1e87d2b14cc61271b
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/34/181434/1
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index 26891cd..3db5fa3 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -469,6 +469,8 @@
var bannerShown = true;
if ( typeof
mw.centralNotice.bannerData.alterImpressionData === 'function' ) {
bannerShown =
mw.centralNotice.bannerData.alterImpressionData( impressionData );
+ } else {
+ impressionData.alterFunctionMissing =
true;
}
// eventually we want to unify the ordering
here and always return
--
To view, visit https://gerrit.wikimedia.org/r/181434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifef70bc81205da788abf7be1e87d2b14cc61271b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Awight awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use print_function - change (labs...extdist)
jenkins-bot has submitted this change and it was merged.
Change subject: Use print_function
..
Use print_function
Change-Id: Iacefa7d6c4603e5a7cda384716f6c36ef5452af0
---
M nightly.py
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/nightly.py b/nightly.py
index dddcd21..d07806a 100644
--- a/nightly.py
+++ b/nightly.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
nightly.py - tarball creator
@@ -247,7 +248,7 @@
with open(os.path.join(os.path.dirname(__file__), local_fname), 'r')
as f:
conf = json.load(f)
else:
-print 'extdist is not configured properly.'
+print('extdist is not configured properly.')
quit()
if '--all' in sys.argv:
repos = None
--
To view, visit https://gerrit.wikimedia.org/r/181432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacefa7d6c4603e5a7cda384716f6c36ef5452af0
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Register some missing autoload classes, to satisfy structure... - change (mediawiki...CentralNotice)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/181435 Change subject: Register some missing autoload classes, to satisfy structure tests .. Register some missing autoload classes, to satisfy structure tests Change-Id: Ia9bb37624ec00441a91f3b70cb0766497eac440b --- M CentralNotice.hooks.php 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/35/181435/1 diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php index 55cd063..6f5e7a4 100644 --- a/CentralNotice.hooks.php +++ b/CentralNotice.hooks.php @@ -83,14 +83,23 @@ $wgAutoloadClasses[ 'BannerChoiceDataProvider' ] = $includeDir . 'BannerChoiceDataProvider.php'; $wgAutoloadClasses[ 'CNBannerChoiceDataResourceLoaderModule' ] = $includeDir . 'CNBannerChoiceDataResourceLoaderModule.php'; $wgAutoloadClasses[ 'Campaign' ] = $includeDir . 'Campaign.php'; + $wgAutoloadClasses['CampaignCriteria'] = $specialDir . 'SpecialGlobalAllocation.php'; + $wgAutoloadClasses['CampaignExistenceException'] = $includeDir . 'Campaign.php'; $wgAutoloadClasses[ 'CampaignLog' ] = $includeDir . 'CampaignLog.php'; + $wgAutoloadClasses['CentralNoticeHtmlForm'] = $specialDir . 'SpecialCentralNoticeBanners.php'; $wgAutoloadClasses[ 'CNBannerPager' ] = $includeDir . 'CNBannerPager.php'; $wgAutoloadClasses[ 'CNCampaignPager' ] = $includeDir . 'CNCampaignPager.php'; $wgAutoloadClasses[ 'CNDeviceTarget' ] = $includeDir . 'CNDeviceTarget.php'; + $wgAutoloadClasses['EmptyBannerException'] = $specialDir . 'SpecialBannerLoader.php'; $wgAutoloadClasses[ 'GeoTarget' ] = $includeDir . 'GeoTarget.php'; + $wgAutoloadClasses['HTMLBannerPagerNavigation'] = $includeDir . 'CNBannerPager.php'; + $wgAutoloadClasses['HTMLLargeMultiSelectField'] = $specialDir . 'SpecialCentralNoticeBanners.php'; $wgAutoloadClasses[ 'IBannerMixin' ] = $includeDir . 'IBannerMixin.php'; $wgAutoloadClasses[ 'AllocationContext' ] = $includeDir . 'AllocationContext.php'; + $wgAutoloadClasses['LanguageSelectHeaderElement'] = $specialDir . 'SpecialCentralNoticeBanners.php'; + $wgAutoloadClasses['MissingRequiredParamsException'] = $specialDir . 'SpecialBannerLoader.php'; $wgAutoloadClasses[ 'MixinController' ] = $includeDir . 'MixinController.php'; + $wgAutoloadClasses['MixinNotFoundException'] = $includeDir . 'MixinController.php'; $wgAutoloadClasses[ 'HTMLCentralNoticeBanner' ] = $htmlFormDir . 'HTMLCentralNoticeBanner.php'; $wgAutoloadClasses[ 'HTMLCentralNoticeBannerMessage' ] = $htmlFormDir . 'HTMLCentralNoticeBannerMessage.php'; -- To view, visit https://gerrit.wikimedia.org/r/181435 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9bb37624ec00441a91f3b70cb0766497eac440b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: Awight awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Register some missing autoload classes, to satisfy structure... - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged. Change subject: Register some missing autoload classes, to satisfy structure tests .. Register some missing autoload classes, to satisfy structure tests Change-Id: Ia9bb37624ec00441a91f3b70cb0766497eac440b --- M CentralNotice.hooks.php 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php index 55cd063..6f5e7a4 100644 --- a/CentralNotice.hooks.php +++ b/CentralNotice.hooks.php @@ -83,14 +83,23 @@ $wgAutoloadClasses[ 'BannerChoiceDataProvider' ] = $includeDir . 'BannerChoiceDataProvider.php'; $wgAutoloadClasses[ 'CNBannerChoiceDataResourceLoaderModule' ] = $includeDir . 'CNBannerChoiceDataResourceLoaderModule.php'; $wgAutoloadClasses[ 'Campaign' ] = $includeDir . 'Campaign.php'; + $wgAutoloadClasses['CampaignCriteria'] = $specialDir . 'SpecialGlobalAllocation.php'; + $wgAutoloadClasses['CampaignExistenceException'] = $includeDir . 'Campaign.php'; $wgAutoloadClasses[ 'CampaignLog' ] = $includeDir . 'CampaignLog.php'; + $wgAutoloadClasses['CentralNoticeHtmlForm'] = $specialDir . 'SpecialCentralNoticeBanners.php'; $wgAutoloadClasses[ 'CNBannerPager' ] = $includeDir . 'CNBannerPager.php'; $wgAutoloadClasses[ 'CNCampaignPager' ] = $includeDir . 'CNCampaignPager.php'; $wgAutoloadClasses[ 'CNDeviceTarget' ] = $includeDir . 'CNDeviceTarget.php'; + $wgAutoloadClasses['EmptyBannerException'] = $specialDir . 'SpecialBannerLoader.php'; $wgAutoloadClasses[ 'GeoTarget' ] = $includeDir . 'GeoTarget.php'; + $wgAutoloadClasses['HTMLBannerPagerNavigation'] = $includeDir . 'CNBannerPager.php'; + $wgAutoloadClasses['HTMLLargeMultiSelectField'] = $specialDir . 'SpecialCentralNoticeBanners.php'; $wgAutoloadClasses[ 'IBannerMixin' ] = $includeDir . 'IBannerMixin.php'; $wgAutoloadClasses[ 'AllocationContext' ] = $includeDir . 'AllocationContext.php'; + $wgAutoloadClasses['LanguageSelectHeaderElement'] = $specialDir . 'SpecialCentralNoticeBanners.php'; + $wgAutoloadClasses['MissingRequiredParamsException'] = $specialDir . 'SpecialBannerLoader.php'; $wgAutoloadClasses[ 'MixinController' ] = $includeDir . 'MixinController.php'; + $wgAutoloadClasses['MixinNotFoundException'] = $includeDir . 'MixinController.php'; $wgAutoloadClasses[ 'HTMLCentralNoticeBanner' ] = $htmlFormDir . 'HTMLCentralNoticeBanner.php'; $wgAutoloadClasses[ 'HTMLCentralNoticeBannerMessage' ] = $htmlFormDir . 'HTMLCentralNoticeBannerMessage.php'; -- To view, visit https://gerrit.wikimedia.org/r/181435 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia9bb37624ec00441a91f3b70cb0766497eac440b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Instrumentation to report when alterImpressionData is not found - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged.
Change subject: Instrumentation to report when alterImpressionData is not found
..
Instrumentation to report when alterImpressionData is not found
This is to help diagnose a possible race condition, where the script tags
injected into the DOM by insertBanner may be executed asynchronously, and
the conditional which checks for alterImpressionData is run before the
function is created by banner javascript.
Change-Id: Ifef70bc81205da788abf7be1e87d2b14cc61271b
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index 26891cd..3db5fa3 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -469,6 +469,8 @@
var bannerShown = true;
if ( typeof
mw.centralNotice.bannerData.alterImpressionData === 'function' ) {
bannerShown =
mw.centralNotice.bannerData.alterImpressionData( impressionData );
+ } else {
+ impressionData.alterFunctionMissing =
true;
}
// eventually we want to unify the ordering
here and always return
--
To view, visit https://gerrit.wikimedia.org/r/181434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifef70bc81205da788abf7be1e87d2b14cc61271b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Mwalker mwal...@khaosdev.com
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/181436 Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: Id16b77f2c0778d948595dd9bbe1aa5272dc9cbe0 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/36/181436/1 diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 08858dc..6b22bfb 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 08858dc42d4cbf7323d7705f0a8b5c52825e8489 +Subproject commit 6b22bfb53aa64430e3803814c7052bd585153034 -- To view, visit https://gerrit.wikimedia.org/r/181436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id16b77f2c0778d948595dd9bbe1aa5272dc9cbe0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf12 Gerrit-Owner: Awight awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/181437 Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: I3dbf60ca850799a624f672f0d0d016bca6efc849 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/37/181437/1 diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 08858dc..6b22bfb 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 08858dc42d4cbf7323d7705f0a8b5c52825e8489 +Subproject commit 6b22bfb53aa64430e3803814c7052bd585153034 -- To view, visit https://gerrit.wikimedia.org/r/181437 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3dbf60ca850799a624f672f0d0d016bca6efc849 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf13 Gerrit-Owner: Awight awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] make-release: Include CiteThisPage in 1.25+ tarballs - change (mediawiki...release)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181438
Change subject: make-release: Include CiteThisPage in 1.25+ tarballs
..
make-release: Include CiteThisPage in 1.25+ tarballs
It was split from the Cite extension
Change-Id: I19b3cddfac281baadc4e0a3936dc5f4363005fed
---
M make-release/make-release.py
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/38/181438/1
diff --git a/make-release/make-release.py b/make-release/make-release.py
index ca3bddd..800fd77 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -78,6 +78,9 @@
extensions.remove('Vector')
extensions.remove('SimpleAntiSpam')
+if version = '1.25':
+extensions.append('CiteThisPage') # Split from E:Cite, T85126
+
# Return unique elements (order not preserved)
return list(set(extensions))
--
To view, visit https://gerrit.wikimedia.org/r/181438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I19b3cddfac281baadc4e0a3936dc5f4363005fed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has submitted this change and it was merged. Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: Id16b77f2c0778d948595dd9bbe1aa5272dc9cbe0 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Verified; Looks good to me, approved diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 08858dc..6b22bfb 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 08858dc42d4cbf7323d7705f0a8b5c52825e8489 +Subproject commit 6b22bfb53aa64430e3803814c7052bd585153034 -- To view, visit https://gerrit.wikimedia.org/r/181436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id16b77f2c0778d948595dd9bbe1aa5272dc9cbe0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf12 Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: Awight awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has submitted this change and it was merged. Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: I3dbf60ca850799a624f672f0d0d016bca6efc849 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Verified; Looks good to me, approved diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 08858dc..6b22bfb 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 08858dc42d4cbf7323d7705f0a8b5c52825e8489 +Subproject commit 6b22bfb53aa64430e3803814c7052bd585153034 -- To view, visit https://gerrit.wikimedia.org/r/181437 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3dbf60ca850799a624f672f0d0d016bca6efc849 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf13 Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: Awight awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
