[MediaWiki-commits] [Gerrit] install gnupg on download-wikimedia server - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: install gnupg on download-wikimedia server
..
install gnupg on download-wikimedia server
a download-wikimedia server (currently dataset2)
should have gnupg installed to check signatures of
files when adding them to download.wm.org
we do that,and it is currently installed on dataset2,
just puppetizing it
Change-Id: Ia09f8173cee49f4fdf6a1cbf28d8d1773683c240
---
M manifests/misc/download.pp
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/download.pp b/manifests/misc/download.pp
index ca94655..e542d8a 100644
--- a/manifests/misc/download.pp
+++ b/manifests/misc/download.pp
@@ -55,6 +55,10 @@
require = [ Package[nfs-kernel-server], File[/etc/exports] ],
}
+ package { 'gnupg':
+ ensure = latest;
+ }
+
include generic::higher_min_free_kbytes
monitor_service { lighttpd http: description = Lighttpd HTTP,
check_command = check_http }
--
To view, visit https://gerrit.wikimedia.org/r/92570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia09f8173cee49f4fdf6a1cbf28d8d1773683c240
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@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] remove last of sq38-42, 45-47, decommed long ago - change (operations/dns)
ArielGlenn has submitted this change and it was merged.
Change subject: remove last of sq38-42, 45-47, decommed long ago
..
remove last of sq38-42, 45-47, decommed long ago
rt tickets: sq38 #2017, sq39,40,46 #2581, sq41 #5618,
sq42 #5754, sq45 #5803, sq47 #1597
Change-Id: Ia5c578684549dbbedcdf1bede99f0c1b38aeb7d6
---
M templates/wmnet
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/wmnet b/templates/wmnet
index 75c6989..380554b 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -853,8 +853,13 @@
; GENERATES FOR MANGEMENT
; Squid Mangement Range
-; sq37-86
-{% for i in range(37, 87) %}
+sq371H IN A10.1.3.37
+
+sq431H IN A10.1.3.43
+sq441H IN A10.1.3.44
+
+; sq48-86
+{% for i in range(48, 87) %}
sq{{ i }} 1H IN A10.1.3.{{ i }}
{%- endfor %}
--
To view, visit https://gerrit.wikimedia.org/r/92491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5c578684549dbbedcdf1bede99f0c1b38aeb7d6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@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] remove entries for sq87-106, these hosts never existed - change (operations/dns)
ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/92613 Change subject: remove entries for sq87-106, these hosts never existed .. remove entries for sq87-106, these hosts never existed Change-Id: Id1751710cfbdc49af91ad24df40d36edcaa6d15a --- M templates/152.80.208.in-addr.arpa M templates/wikimedia.org 2 files changed, 0 insertions(+), 40 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/13/92613/1 diff --git a/templates/152.80.208.in-addr.arpa b/templates/152.80.208.in-addr.arpa index ce710b3..509aceb 100644 --- a/templates/152.80.208.in-addr.arpa +++ b/templates/152.80.208.in-addr.arpa @@ -42,18 +42,10 @@ 31 1H IN PTR cp10.wikimedia.org. 32 1H IN PTR virt0.wikimedia.org. 33 1H IN PTR labs-ns0.wikimedia.org. -34 1H IN PTR sq90.wikimedia.org. -35 1H IN PTR sq91.wikimedia.org. -36 1H IN PTR sq92.wikimedia.org. -37 1H IN PTR sq93.wikimedia.org. -38 1H IN PTR sq94.wikimedia.org. -39 1H IN PTR sq95.wikimedia.org. -40 1H IN PTR sq96.wikimedia.org. 47 1H IN PTR sq37.wikimedia.org. 48 1H IN PTR ms10.wikimedia.org. -50 1H IN PTR sq89.wikimedia.org. 53 1H IN PTR sq43.wikimedia.org. 54 1H IN PTR sq44.wikimedia.org. @@ -96,17 +88,7 @@ 94 1H IN PTR sq84.wikimedia.org. 95 1H IN PTR sq85.wikimedia.org. 96 1H IN PTR sq86.wikimedia.org. -97 1H IN PTR sq87.wikimedia.org. -98 1H IN PTR sq88.wikimedia.org. -1011H IN PTR sq97.wikimedia.org. -1021H IN PTR sq98.wikimedia.org. -1031H IN PTR sq99.wikimedia.org. -1041H IN PTR sq100.wikimedia.org. -1051H IN PTR sq101.wikimedia.org. -1061H IN PTR sq102.wikimedia.org. -107 1H IN PTR sq103.wikimedia.org. -1081H IN PTR sq104.wikimedia.org. 1101H IN PTR lvs5.wikimedia.org. 1111H IN PTR lvs6.wikimedia.org. @@ -163,8 +145,6 @@ 1811H IN PTR pdf3.wikimedia.org. -1821H IN PTR sq105.wikimedia.org. -1831H IN PTR sq106.wikimedia.org. 1841H IN PTR emery.wikimedia.org. 1851H IN PTR dataset2.wikimedia.org. 1861H IN PTR mchenry.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index af7b844..4a71e69 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -256,26 +256,6 @@ sq84 1H IN A208.80.152.94 sq85 1H IN A208.80.152.95 sq86 1H IN A208.80.152.96 -sq87 1H IN A208.80.152.97 -sq88 1H IN A208.80.152.98 -sq89 1H IN A208.80.152.50 -sq90 1H IN A208.80.152.34 -sq91 1H IN A208.80.152.35 -sq92 1H IN A208.80.152.36 -sq93 1H IN A208.80.152.37 -sq94 1H IN A208.80.152.38 -sq95 1H IN A208.80.152.39 -sq96 1H IN A208.80.152.40 -sq97 1H IN A208.80.152.101 -sq98 1H IN A208.80.152.102 -sq99 1H IN A208.80.152.103 -sq100 1H IN A208.80.152.104 -sq101 1H IN A208.80.152.105 -sq102 1H IN A208.80.152.106 -sq103 1H IN A208.80.152.107 -sq104 1H IN A208.80.152.108 -sq105 1H IN A208.80.152.182 -sq106 1H IN A208.80.152.183 ssl10011H IN A208.80.154.133 1H IN 2620:0:861:2:208:80:154:133 ssl10021H IN A208.80.154.134 -- To view, visit https://gerrit.wikimedia.org/r/92613 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1751710cfbdc49af91ad24df40d36edcaa6d15a Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: ArielGlenn ar...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove sq31-36 from last of dsh files - change (operations/puppet)
ArielGlenn has submitted this change and it was merged. Change subject: remove sq31-36 from last of dsh files .. remove sq31-36 from last of dsh files Change-Id: Ia23f372ba7647e86f0838aecbf3ebf59b94ba46b --- M files/dsh/group/sq.old 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/files/dsh/group/sq.old b/files/dsh/group/sq.old index 10cdc48..21cb733 100644 --- a/files/dsh/group/sq.old +++ b/files/dsh/group/sq.old @@ -1,9 +1,3 @@ -sq31 -sq32 -sq33 -sq34 -sq35 -sq36 sq37 sq43 -- To view, visit https://gerrit.wikimedia.org/r/92614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia23f372ba7647e86f0838aecbf3ebf59b94ba46b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@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] Enable backups - change (translatewiki)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92615
Change subject: Enable backups
..
Enable backups
Change-Id: Iae2bd9fad95d0717ea3460b83d6dae18fbad1cf1
---
M puppet/modules/backup/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/15/92615/1
diff --git a/puppet/modules/backup/manifests/init.pp
b/puppet/modules/backup/manifests/init.pp
index 707175a..88cf30f 100644
--- a/puppet/modules/backup/manifests/init.pp
+++ b/puppet/modules/backup/manifests/init.pp
@@ -14,7 +14,7 @@
file { /etc/cron.d/backup:
# Enable when new server is primary
-ensure = absent,
+ensure = present,
content = template(backup/backup.erb),
}
--
To view, visit https://gerrit.wikimedia.org/r/92615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae2bd9fad95d0717ea3460b83d6dae18fbad1cf1
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add required package for irc bots - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Add required package for irc bots
..
Add required package for irc bots
Also - '
Change-Id: Id36ebc4419eed13185847a5a402588cd0df10b1b
---
M puppet/modules/wiki/manifests/init.pp
1 file changed, 11 insertions(+), 6 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/wiki/manifests/init.pp
b/puppet/modules/wiki/manifests/init.pp
index fae5295..c141de7 100644
--- a/puppet/modules/wiki/manifests/init.pp
+++ b/puppet/modules/wiki/manifests/init.pp
@@ -17,15 +17,20 @@
# }
#
class wiki ($config, $user) {
- file { /etc/cron.d/wikimaintenance:
-content = template(wiki/wikimaintenance.erb),
+ file { '/etc/cron.d/wikimaintenance':
+content = template('wiki/wikimaintenance.erb'),
}
- file { /etc/cron.d/wikiservices:
-content = template(wiki/wikiservices.erb),
+ file { '/etc/cron.d/wikiservices':
+content = template('wiki/wikiservices.erb'),
}
- file { /etc/cron.d/wikistats:
-content = template(wiki/wikistats.erb),
+ file { '/etc/cron.d/wikistats':
+content = template('wiki/wikistats.erb'),
+ }
+
+ # This one is needed for the irc bots
+ package { 'libpoe-component-irc-perl':
+ ensure = present,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/92506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id36ebc4419eed13185847a5a402588cd0df10b1b
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@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] Fix mailman web interface - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix mailman web interface
..
Fix mailman web interface
Change-Id: I5cf7a111386dd03e67c1d822e58d9eab94f7cde4
---
M puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
1 file changed, 15 insertions(+), 11 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
b/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
index d72ce4c..f5dbde5 100644
--- a/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
+++ b/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
@@ -10,17 +10,21 @@
ssl_certificate /etc/ssl/private/translatewiki.net.pem;
ssl_certificate_key /etc/ssl/private/translatewiki.net.key;
- root /usr/lib/cgi-bin;
+ root /usr/lib/cgi-bin/mailman;
- location = / {
- rewrite ^ /mailman/listinfo permanent;
- }
+ location = / {
+ rewrite ^ /listinfo;
+ }
- location = /mailman {
- fastcgi_split_path_info (^/mailman/[^/]*)(.*)$;
- fastcgi_param SCRIPT_FILENAME
$document_root$fastcgi_script_name;
- fastcgi_param PATH_INFO $fastcgi_path_info;
- include /etc/nginx/fastcgi_params;
- fastcgi_pass unix:/var/run/fcgiwrap.socket;
- }
+ location /doc/mailman/ {
+ alias /usr/share/doc/mailman/;
+ }
+
+ location / {
+ fastcgi_split_path_info (^/[^/]*)(.*)$;
+ fastcgi_param SCRIPT_FILENAME
$document_root$fastcgi_script_name;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ include fastcgi_params;
+ fastcgi_pass unix:/var/run/fcgiwrap.socket;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/92518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5cf7a111386dd03e67c1d822e58d9eab94f7cde4
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@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] Instructions for unautomated wikidiff2 - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Instructions for unautomated wikidiff2 .. Instructions for unautomated wikidiff2 Change-Id: Ia9700fc0feca78574f2cdabbbed94ffd539a5e32 --- M puppet/README M puppet/modules/base/manifests/init.pp 2 files changed, 20 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/README b/puppet/README index 6ba2f08..909a657 100644 --- a/puppet/README +++ b/puppet/README @@ -11,3 +11,18 @@ extension=syck.so And restart php5-fpm + +-- + +Install wikidiff + +cd /www/translatewiki.net/w/extensions/wikidiff2 +b phpize +b ./configure +b make +sudo make install + +Create /etc/php5/conf.d/20-wikidiff2.ini: + extension=wikidiff2.so + +And restart php5-fpm if needed. diff --git a/puppet/modules/base/manifests/init.pp b/puppet/modules/base/manifests/init.pp index 66979ad..6fe87b6 100644 --- a/puppet/modules/base/manifests/init.pp +++ b/puppet/modules/base/manifests/init.pp @@ -29,6 +29,11 @@ # Other 'mysqltuner', + +# Dependencies for compiling wikidiff2 +'g++', +'pkg-config', +'libthai-dev', ]: ensure = present, } -- To view, visit https://gerrit.wikimedia.org/r/92580 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia9700fc0feca78574f2cdabbbed94ffd539a5e32 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@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] Enable backups - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Enable backups
..
Enable backups
Change-Id: Iae2bd9fad95d0717ea3460b83d6dae18fbad1cf1
---
M puppet/modules/backup/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/backup/manifests/init.pp
b/puppet/modules/backup/manifests/init.pp
index 707175a..88cf30f 100644
--- a/puppet/modules/backup/manifests/init.pp
+++ b/puppet/modules/backup/manifests/init.pp
@@ -14,7 +14,7 @@
file { /etc/cron.d/backup:
# Enable when new server is primary
-ensure = absent,
+ensure = present,
content = template(backup/backup.erb),
}
--
To view, visit https://gerrit.wikimedia.org/r/92615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae2bd9fad95d0717ea3460b83d6dae18fbad1cf1
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@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] Verify User-Agent versus source proxy for X-CS=502-16. - change (mediawiki...ZeroRatedMobileAccess)
jenkins-bot has submitted this change and it was merged.
Change subject: Verify User-Agent versus source proxy for X-CS=502-16.
..
Verify User-Agent versus source proxy for X-CS=502-16.
* Related to bug 56119.
Change-Id: I47e94c39b30b1bb0b29de10c9aaaeac2f7f7e06c
---
M includes/PageRenderingHooks.php
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 1b42699..1a8e326 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -342,6 +342,13 @@
$out-addModules( 'mobile.zero.scripts' );
}
+ // @TODO: Delete this section after a collection window
+ if ( $this-getConfigId() === '502-16' mt_rand( 1, 50 ) ===
42 ) {
+ $omr = $this-request-getHeader( 'X-OperaMini-Route' );
+ $ua = $this-request-getHeader( 'User-Agent' );
+ wfDebugLog( 'zero', 502-16 $omr $ua );
+ }
+
$out-addVaryHeader( 'X-CS' );
$out-addVaryHeader( 'X-Subdomain' );
$out-addVaryHeader( 'X-Images' );
--
To view, visit https://gerrit.wikimedia.org/r/92038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47e94c39b30b1bb0b29de10c9aaaeac2f7f7e06c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@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 javascript types so that they get compressed by nginx - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/92616 Change subject: Fix javascript types so that they get compressed by nginx .. Fix javascript types so that they get compressed by nginx MediaWiki uses text/javascript, static files probably application/javascript and nothing application/x-javascript. Change-Id: Ie06f0d65b6bed6dce7066490287505e014150df0 --- M puppet/modules/nginx/files/nginx.conf 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/16/92616/1 diff --git a/puppet/modules/nginx/files/nginx.conf b/puppet/modules/nginx/files/nginx.conf index dca6ef1..353a988 100644 --- a/puppet/modules/nginx/files/nginx.conf +++ b/puppet/modules/nginx/files/nginx.conf @@ -28,7 +28,7 @@ gzip on; gzip_comp_level 8; gzip_disable msie6; - gzip_types text/plain text/css application/json application/x-javascript text/xml application/atom+xml; + gzip_types text/plain text/css application/json application/javascript text/javascript text/xml application/atom+xml; gzip_buffers 16 8k; include /etc/nginx/sites-enabled/*; -- To view, visit https://gerrit.wikimedia.org/r/92616 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie06f0d65b6bed6dce7066490287505e014150df0 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Escape index entry name in regex - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Escape index entry name in regex
..
Escape index entry name in regex
Change-Id: Icdcd033e8b2d7e57e969bd3a540c772f9dafc5bb
---
M includes/index/ProofreadIndexPage.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tpt: Looks good to me, approved
Rtdwivedi: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/index/ProofreadIndexPage.php
b/includes/index/ProofreadIndexPage.php
index 47adf88..d722219 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -200,7 +200,7 @@
$text = $this-getText();
$values = array();
foreach( $this-config as $varName = $property ) {
- $tagPattern = /\n\| . $varName .
=(.*?)\n(\||\}\})/is;
+ $tagPattern = /\n\| . preg_quote( $varName, '/' ) .
=(.*?)\n(\||\}\})/is;
if ( preg_match( $tagPattern, $text, $matches ) ) {
$values[$varName] = $matches[1];
}
--
To view, visit https://gerrit.wikimedia.org/r/92284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icdcd033e8b2d7e57e969bd3a540c772f9dafc5bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: Rtdwivedi ellydwivedi2...@gmail.com
Gerrit-Reviewer: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki-core-regression-REL1_22 - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92617
Change subject: mediawiki-core-regression-REL1_22
..
mediawiki-core-regression-REL1_22
Branch got cut a few days ago.
Change-Id: Ie6182ff8efe2f1ca0c76b4c696d347212d8ec13d
---
M mediawiki-extensions.yaml
M mediawiki.yaml
2 files changed, 2 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/17/92617/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 00f5f56..8f4c505 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -397,6 +397,7 @@
mwbranch:
- master
# Commented out since they are not triggered for now.
+# - REL1_22
# - REL1_21
# - REL1_20
# - REL1_19
diff --git a/mediawiki.yaml b/mediawiki.yaml
index cffb3e6..fddd9cb 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -225,6 +225,7 @@
- REL1_19
- REL1_20
- REL1_21
+ - REL1_22
# Find a way to support WMF branches
jobs:
- 'mediawiki-core-regression-{branch}'
--
To view, visit https://gerrit.wikimedia.org/r/92617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6182ff8efe2f1ca0c76b4c696d347212d8ec13d
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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] mediawiki-core-regression-REL1_22 - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/92618 Change subject: mediawiki-core-regression-REL1_22 .. mediawiki-core-regression-REL1_22 Branch got cut a few days ago. Change-Id: Ie6182ff8efe2f1ca0c76b4c696d347212d8ec13d --- M layout.yaml 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/18/92618/1 diff --git a/layout.yaml b/layout.yaml index 2c57e2a..5f28db2 100644 --- a/layout.yaml +++ b/layout.yaml @@ -453,10 +453,10 @@ voting: false - name: mediawiki-core-jsduck -branch: ^(REL1_21|master)$ +branch: ^(REL1_21|REL1_22|master)$ - name: mediawiki-core-jsduck-publish -branch: ^(REL1_21|master)$ +branch: ^(REL1_21|REL1_22|master)$ # not working yet, might need some dependency - name: ^mwext-ContributionTracking-testextensions-.* @@ -522,6 +522,8 @@ branch: ^REL1_20$ - name: mediawiki-core-regression-REL1_21 branch: ^REL1_21 + - name: mediawiki-core-regression-REL1_22 +branch: ^REL1_22 # Extensions for which tests are non-functional or absent: - name: ^mwext-EtherEditor-testextensions.* @@ -680,6 +682,7 @@ - mediawiki-core-regression-REL1_19 - mediawiki-core-regression-REL1_20 - mediawiki-core-regression-REL1_21 + - mediawiki-core-regression-REL1_22 - mediawiki-core-regression-phpcs-HEAD - mediawiki-core-doxygen-publish publish: -- To view, visit https://gerrit.wikimedia.org/r/92618 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6182ff8efe2f1ca0c76b4c696d347212d8ec13d Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-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] mediawiki-core-regression-REL1_22 - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki-core-regression-REL1_22
..
mediawiki-core-regression-REL1_22
Branch got cut a few days ago.
Change-Id: Ie6182ff8efe2f1ca0c76b4c696d347212d8ec13d
---
M mediawiki-extensions.yaml
M mediawiki.yaml
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 00f5f56..8f4c505 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -397,6 +397,7 @@
mwbranch:
- master
# Commented out since they are not triggered for now.
+# - REL1_22
# - REL1_21
# - REL1_20
# - REL1_19
diff --git a/mediawiki.yaml b/mediawiki.yaml
index cffb3e6..fddd9cb 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -225,6 +225,7 @@
- REL1_19
- REL1_20
- REL1_21
+ - REL1_22
# Find a way to support WMF branches
jobs:
- 'mediawiki-core-regression-{branch}'
--
To view, visit https://gerrit.wikimedia.org/r/92617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6182ff8efe2f1ca0c76b4c696d347212d8ec13d
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki-core-regression-REL1_22 - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: mediawiki-core-regression-REL1_22 .. mediawiki-core-regression-REL1_22 Branch got cut a few days ago. Change-Id: Ie6182ff8efe2f1ca0c76b4c696d347212d8ec13d --- M layout.yaml 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 2c57e2a..5f28db2 100644 --- a/layout.yaml +++ b/layout.yaml @@ -453,10 +453,10 @@ voting: false - name: mediawiki-core-jsduck -branch: ^(REL1_21|master)$ +branch: ^(REL1_21|REL1_22|master)$ - name: mediawiki-core-jsduck-publish -branch: ^(REL1_21|master)$ +branch: ^(REL1_21|REL1_22|master)$ # not working yet, might need some dependency - name: ^mwext-ContributionTracking-testextensions-.* @@ -522,6 +522,8 @@ branch: ^REL1_20$ - name: mediawiki-core-regression-REL1_21 branch: ^REL1_21 + - name: mediawiki-core-regression-REL1_22 +branch: ^REL1_22 # Extensions for which tests are non-functional or absent: - name: ^mwext-EtherEditor-testextensions.* @@ -680,6 +682,7 @@ - mediawiki-core-regression-REL1_19 - mediawiki-core-regression-REL1_20 - mediawiki-core-regression-REL1_21 + - mediawiki-core-regression-REL1_22 - mediawiki-core-regression-phpcs-HEAD - mediawiki-core-doxygen-publish publish: -- To view, visit https://gerrit.wikimedia.org/r/92618 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie6182ff8efe2f1ca0c76b4c696d347212d8ec13d Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Path to PHPUnit as deployed by Wikimedia deployment system. - change (integration/jenkins)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92619
Change subject: Path to PHPUnit as deployed by Wikimedia deployment system.
..
Path to PHPUnit as deployed by Wikimedia deployment system.
The path is passed to MediaWiki php wrapper using --with-phpunitdir. It
should match a local checkout of integration/phpunit.git repository
which contains PHPUnit as it is installed by Composer. The local copy
should be deployed on all slaves via the role::ci::slave puppet class
includes: deployment::target { # 'contint-production-slaves': }
Impacts the jobs:
mediawiki-core-phpunit-api
mediawiki-core-phpunit-databaseless
mediawiki-core-phpunit-misc
mediawiki-core-phpunit-parser
mediawiki-core-regression-REL1_19
mediawiki-core-regression-REL1_20
mediawiki-core-regression-REL1_21
mediawiki-core-regression-REL1_22
mediawiki-core-regression-master
Change-Id: I8651f2fb0e09d4e868c2139b5a7d1b640de61784
---
M bin/mw-run-phpunit.sh
1 file changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/19/92619/1
diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh
index abac3e5..f04edd0 100755
--- a/bin/mw-run-phpunit.sh
+++ b/bin/mw-run-phpunit.sh
@@ -23,6 +23,15 @@
# - Stub : not implemented tests
PHPUNIT_EXCLUDE_GROUP=Broken,ParserFuzz,Stub
+# Path to PHPUnit as deployed by Wikimedia deployment system.
+#
+# The path is passed to MediaWiki php wrapper using --with-phpunitdir. It
+# should match a local checkout of integration/phpunit.git repository which
+# contains PHPUnit as it is installed by Composer. The local copy should be
+# deployed on all slaves via the role::ci::slave puppet class includes:
+# deployment::target { # 'contint-production-slaves': }
+PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
+
# Setup Junit destination
LOG_DIR=$WORKSPACE/log
mkdir -p $LOG_DIR
@@ -79,7 +88,9 @@
set -x
cd ${WORKSPACE}/tests/phpunit
-php phpunit.php $PHPUNIT_GROUP_OPT \
+php phpunit.php \
+ --with-phpunitdir $PHPUNIT_DIR \
+ $PHPUNIT_GROUP_OPT \
--exclude-group $PHPUNIT_EXCLUDE_GROUP \
--conf $WORKSPACE/LocalSettings.php \
--log-junit $JUNIT_DEST
--
To view, visit https://gerrit.wikimedia.org/r/92619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8651f2fb0e09d4e868c2139b5a7d1b640de61784
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
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] Path to PHPUnit as deployed by Wikimedia deployment system. - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged.
Change subject: Path to PHPUnit as deployed by Wikimedia deployment system.
..
Path to PHPUnit as deployed by Wikimedia deployment system.
The path is passed to MediaWiki php wrapper using --with-phpunitdir. It
should match a local checkout of integration/phpunit.git repository
which contains PHPUnit as it is installed by Composer. The local copy
should be deployed on all slaves via the role::ci::slave puppet class
includes: deployment::target { # 'contint-production-slaves': }
Impacts the jobs:
mediawiki-core-phpunit-api
mediawiki-core-phpunit-databaseless
mediawiki-core-phpunit-misc
mediawiki-core-phpunit-parser
mediawiki-core-regression-REL1_19
mediawiki-core-regression-REL1_20
mediawiki-core-regression-REL1_21
mediawiki-core-regression-REL1_22
mediawiki-core-regression-master
Change-Id: I8651f2fb0e09d4e868c2139b5a7d1b640de61784
---
M bin/mw-run-phpunit.sh
1 file changed, 12 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh
index abac3e5..f04edd0 100755
--- a/bin/mw-run-phpunit.sh
+++ b/bin/mw-run-phpunit.sh
@@ -23,6 +23,15 @@
# - Stub : not implemented tests
PHPUNIT_EXCLUDE_GROUP=Broken,ParserFuzz,Stub
+# Path to PHPUnit as deployed by Wikimedia deployment system.
+#
+# The path is passed to MediaWiki php wrapper using --with-phpunitdir. It
+# should match a local checkout of integration/phpunit.git repository which
+# contains PHPUnit as it is installed by Composer. The local copy should be
+# deployed on all slaves via the role::ci::slave puppet class includes:
+# deployment::target { # 'contint-production-slaves': }
+PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
+
# Setup Junit destination
LOG_DIR=$WORKSPACE/log
mkdir -p $LOG_DIR
@@ -79,7 +88,9 @@
set -x
cd ${WORKSPACE}/tests/phpunit
-php phpunit.php $PHPUNIT_GROUP_OPT \
+php phpunit.php \
+ --with-phpunitdir $PHPUNIT_DIR \
+ $PHPUNIT_GROUP_OPT \
--exclude-group $PHPUNIT_EXCLUDE_GROUP \
--conf $WORKSPACE/LocalSettings.php \
--log-junit $JUNIT_DEST
--
To view, visit https://gerrit.wikimedia.org/r/92619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8651f2fb0e09d4e868c2139b5a7d1b640de61784
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactor Sticky input methods - change (mediawiki...UniversalLanguageSelector)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92620
Change subject: Refactor Sticky input methods
..
Refactor Sticky input methods
Change-Id: I20ee4e7b90ec9aaa3155fe2e357cf04388d0994c
---
M tests/browser/features/ime.feature
M tests/browser/features/step_definitions/ime_steps.rb
M tests/browser/features/support/pages/ime_page.rb
M tests/browser/features/support/pages/random_page.rb
4 files changed, 11 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/20/92620/1
diff --git a/tests/browser/features/ime.feature
b/tests/browser/features/ime.feature
index d854156..c44cd60 100644
--- a/tests/browser/features/ime.feature
+++ b/tests/browser/features/ime.feature
@@ -26,7 +26,6 @@
And I should see a list of available input methods
And I should see a list of suggested languages
- @commons.wikimedia.beta.wmflabs.org
Scenario: Unsupported input language
User visits a wiki with content language that does not have have an input
@@ -36,6 +35,7 @@
When I open the input method menu
Then I should see input methods for Kotava
+ @commons.wikimedia.beta.wmflabs.org
Scenario: Sticky input methods
Chosen input method selection persists across page loads.
diff --git a/tests/browser/features/step_definitions/ime_steps.rb
b/tests/browser/features/step_definitions/ime_steps.rb
index 10cc792..5ea6281 100644
--- a/tests/browser/features/step_definitions/ime_steps.rb
+++ b/tests/browser/features/step_definitions/ime_steps.rb
@@ -16,9 +16,7 @@
When(/^I open the input method menu$/) do
step 'I click on an input box'
- pending('Bug in ULS with unsupported languages like avk') do
-on(IMEPage).input_method_element.when_present.click
- end
+ on(IMEPage).input_method_element.when_present.click
end
Then(/^I should see the input method indicator$/) do
@@ -38,7 +36,7 @@
end
When(/^I choose (.+?) as the input language$/) do |language|
- on(RandomPage) do |page|
+ on(IMEPage) do |page|
page.more_languages
page.language_filter = language
# firefox only works with :return
@@ -49,11 +47,11 @@
end
When(/^I click on the Malayalam InScript 2 menu item$/) do
- on(RandomPage).uls_malayalam_inscript2_item_element.click
+ on(IMEPage).malayalam_inscript2_element.click
end
-When(/^I press Control\-M$/) do
- on(RandomPage).search_input_element.send_keys [:control, 'm']
+When(/^I press Control-M$/) do
+ on(IMEPage).search_input_element.send_keys [:control, 'm']
end
When(/^I go to another random page$/) do
@@ -62,7 +60,7 @@
Then(/^in it there must be an element with Malayalam text$/) do
# 'input_method_enabled' alone only returns []
- on(RandomPage).input_method_enabled_element.text.should == 'ഇൻസ്ക്രിപ്റ്റ് 2'
+ on(IMEPage).input_method_enabled_element.text.should == 'ഇൻസ്ക്രിപ്റ്റ് 2'
end
When(/^I visit page in Vector skin$/) do
diff --git a/tests/browser/features/support/pages/ime_page.rb
b/tests/browser/features/support/pages/ime_page.rb
index be34e23..e0619f9 100644
--- a/tests/browser/features/support/pages/ime_page.rb
+++ b/tests/browser/features/support/pages/ime_page.rb
@@ -2,8 +2,12 @@
include PageObject
div(:input_method, class: 'imeselector imeselector-toggle')
+ a(:input_method_enabled, class: 'ime-name imeselector-toggle')
h3(:input_method_ime_list_title, class: 'ime-list-title')
ul(:input_method_language_list, class: 'ime-language-list')
div(:input_method_selector_menu, class: 'imeselector-menu')
+ text_field(:language_filter, id: 'languagefilter')
+ li(:malayalam_inscript2, data_ime_inputmethod: 'ml-inscript2')
+ a(:more_languages, class: 'ime-selector-more-languages')
text_field(:search_input, id: 'searchInput')
end
diff --git a/tests/browser/features/support/pages/random_page.rb
b/tests/browser/features/support/pages/random_page.rb
index edc8181..c6c1ace 100644
--- a/tests/browser/features/support/pages/random_page.rb
+++ b/tests/browser/features/support/pages/random_page.rb
@@ -8,14 +8,10 @@
a(:create_a_book, text: 'Create a book')
a(:download_as_pdf, text: 'Download as PDF')
a(:download_the_file, text: 'Download the file')
- a(:input_method_enabled, class: 'ime-name imeselector-toggle')
- text_field(:language_filter, id: 'languagefilter')
li(:main_page, id: 'n-mainpage-description')
a(:malayalam_link, title: 'Malayalam')
- a(:more_languages, class: 'ime-selector-more-languages')
a(:print_export, text: 'Print/export')
a(:printable_version, text: 'Printable version')
- li(:uls_malayalam_inscript2_item, data_ime_inputmethod: 'ml-inscript2')
button(:search_button, id: 'searchButton')
a(:uls_trigger, class: 'uls-trigger')
end
--
To view, visit https://gerrit.wikimedia.org/r/92620
To unsubscribe, visit
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki/core)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/92621 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I8651f2fb0e09d4e868c2139b5a7d1b640de61784 --- A JENKINS A jenkins-testfile.py A jenkins.js A jenkins.php A jenkins.rb 5 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/21/92621/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/92621 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8651f2fb0e09d4e868c2139b5a7d1b640de61784 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] remove dup wtp1003 entry - change (operations/dns)
ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/92622 Change subject: remove dup wtp1003 entry .. remove dup wtp1003 entry Change-Id: I297e6b6018da41fed73be5d23db1bce5d73b8a11 --- M templates/wmnet 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/22/92622/1 diff --git a/templates/wmnet b/templates/wmnet index 272d743..e0a892c 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -1603,7 +1603,6 @@ wtp1001 1H IN A10.64.32.78 wtp10021H IN A10.64.32.73 wtp10031H IN A10.64.32.74 -wtp10031H IN A10.64.32.74 wtp10041H IN A10.64.32.75 wtp1005 1H IN A10.64.32.84 wtp1006 1H IN A10.64.32.85 -- To view, visit https://gerrit.wikimedia.org/r/92622 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I297e6b6018da41fed73be5d23db1bce5d73b8a11 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: ArielGlenn ar...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove dup wtp1003 entry - change (operations/dns)
ArielGlenn has submitted this change and it was merged. Change subject: remove dup wtp1003 entry .. remove dup wtp1003 entry Change-Id: I297e6b6018da41fed73be5d23db1bce5d73b8a11 --- M templates/wmnet 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wmnet b/templates/wmnet index 272d743..e0a892c 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -1603,7 +1603,6 @@ wtp1001 1H IN A10.64.32.78 wtp10021H IN A10.64.32.73 wtp10031H IN A10.64.32.74 -wtp10031H IN A10.64.32.74 wtp10041H IN A10.64.32.75 wtp1005 1H IN A10.64.32.84 wtp1006 1H IN A10.64.32.85 -- To view, visit https://gerrit.wikimedia.org/r/92622 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I297e6b6018da41fed73be5d23db1bce5d73b8a11 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@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] Extensions point to PHPUnit deployed by WMF deployment system - change (integration/jenkins)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92623
Change subject: Extensions point to PHPUnit deployed by WMF deployment system
..
Extensions point to PHPUnit deployed by WMF deployment system
See 313d629
Change-Id: Ib8eb320ec5c2e9f8332f09c50e06cfed0d7f5fdf
---
M bin/mw-run-phpunit-allexts.sh
M bin/mw-run-phpunit.sh
2 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/23/92623/1
diff --git a/bin/mw-run-phpunit-allexts.sh b/bin/mw-run-phpunit-allexts.sh
index bb8acb8..cc7ac96 100755
--- a/bin/mw-run-phpunit-allexts.sh
+++ b/bin/mw-run-phpunit-allexts.sh
@@ -10,6 +10,9 @@
mkdir -p $LOG_DIR
JUNIT_DEST=$LOG_DIR/junit-phpunit-allexts.xml
+# See documentation in mw-run-phpunit.sh
+PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
+
# Make sure to compress MediaWiki log dir after phpunit has ran
function compress_log_dir() {
echo Compressing logs under $LOG_DIR
@@ -24,4 +27,7 @@
# of the workspace, so make sure we use an absolute path.
cd $WORKSPACE/tests/phpunit
-php phpunit.php --log-junit $JUNIT_DEST --testsuite extensions
+php phpunit.php \
+ --with-phpunitdir $PHPUNIT_DIR \
+ --log-junit $JUNIT_DEST \
+ --testsuite extensions
diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh
index f04edd0..4cb9734 100755
--- a/bin/mw-run-phpunit.sh
+++ b/bin/mw-run-phpunit.sh
@@ -30,6 +30,10 @@
# contains PHPUnit as it is installed by Composer. The local copy should be
# deployed on all slaves via the role::ci::slave puppet class includes:
# deployment::target { # 'contint-production-slaves': }
+#
+#
+# WARNING: don't forget to update mw-run-phpunit-allexts.sh as well
+#
PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
# Setup Junit destination
--
To view, visit https://gerrit.wikimedia.org/r/92623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8eb320ec5c2e9f8332f09c50e06cfed0d7f5fdf
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
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] Extensions point to PHPUnit deployed by WMF deployment system - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged.
Change subject: Extensions point to PHPUnit deployed by WMF deployment system
..
Extensions point to PHPUnit deployed by WMF deployment system
See 313d629
Change-Id: Ib8eb320ec5c2e9f8332f09c50e06cfed0d7f5fdf
---
M bin/mw-run-phpunit-allexts.sh
M bin/mw-run-phpunit.sh
2 files changed, 11 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/mw-run-phpunit-allexts.sh b/bin/mw-run-phpunit-allexts.sh
index bb8acb8..cc7ac96 100755
--- a/bin/mw-run-phpunit-allexts.sh
+++ b/bin/mw-run-phpunit-allexts.sh
@@ -10,6 +10,9 @@
mkdir -p $LOG_DIR
JUNIT_DEST=$LOG_DIR/junit-phpunit-allexts.xml
+# See documentation in mw-run-phpunit.sh
+PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
+
# Make sure to compress MediaWiki log dir after phpunit has ran
function compress_log_dir() {
echo Compressing logs under $LOG_DIR
@@ -24,4 +27,7 @@
# of the workspace, so make sure we use an absolute path.
cd $WORKSPACE/tests/phpunit
-php phpunit.php --log-junit $JUNIT_DEST --testsuite extensions
+php phpunit.php \
+ --with-phpunitdir $PHPUNIT_DIR \
+ --log-junit $JUNIT_DEST \
+ --testsuite extensions
diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh
index f04edd0..4cb9734 100755
--- a/bin/mw-run-phpunit.sh
+++ b/bin/mw-run-phpunit.sh
@@ -30,6 +30,10 @@
# contains PHPUnit as it is installed by Composer. The local copy should be
# deployed on all slaves via the role::ci::slave puppet class includes:
# deployment::target { # 'contint-production-slaves': }
+#
+#
+# WARNING: don't forget to update mw-run-phpunit-allexts.sh as well
+#
PHPUNIT_DIR=/srv/deployment/integration/phpunit/vendor/phpunit/phpunit
# Setup Junit destination
--
To view, visit https://gerrit.wikimedia.org/r/92623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8eb320ec5c2e9f8332f09c50e06cfed0d7f5fdf
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mw coverage points to PHPUnit deployed by WMF deployment system - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/92624 Change subject: mw coverage points to PHPUnit deployed by WMF deployment system .. mw coverage points to PHPUnit deployed by WMF deployment system bug: 56317 Change-Id: Ieb45b7fbb1c59b0ad502ce5361ea0fc551701d46 --- M mediawiki.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/24/92624/1 diff --git a/mediawiki.yaml b/mediawiki.yaml index fddd9cb..a30ec0f 100644 --- a/mediawiki.yaml +++ b/mediawiki.yaml @@ -206,8 +206,10 @@ - get-mw-core: branch: 'master' - mw-install-sqlite + # FIXME should use the mw-run-phpunit.sh wrapper - shell: | nice -n 19 php tests/phpunit/phpunit.php \ +--with-phpunitdir /srv/deployment/integration/phpunit/vendor/phpunit/phpunit \ --exclude-group Dump,Broken,ParserFuzz,Stub \ --coverage-html /srv/org/wikimedia/integration/cover/mediawiki-core/master/php echo Code coverage report is available at: -- To view, visit https://gerrit.wikimedia.org/r/92624 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb45b7fbb1c59b0ad502ce5361ea0fc551701d46 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-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] mw coverage points to PHPUnit deployed by WMF deployment system - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: mw coverage points to PHPUnit deployed by WMF deployment system .. mw coverage points to PHPUnit deployed by WMF deployment system bug: 56317 Change-Id: Ieb45b7fbb1c59b0ad502ce5361ea0fc551701d46 --- M mediawiki.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki.yaml b/mediawiki.yaml index fddd9cb..a30ec0f 100644 --- a/mediawiki.yaml +++ b/mediawiki.yaml @@ -206,8 +206,10 @@ - get-mw-core: branch: 'master' - mw-install-sqlite + # FIXME should use the mw-run-phpunit.sh wrapper - shell: | nice -n 19 php tests/phpunit/phpunit.php \ +--with-phpunitdir /srv/deployment/integration/phpunit/vendor/phpunit/phpunit \ --exclude-group Dump,Broken,ParserFuzz,Stub \ --coverage-html /srv/org/wikimedia/integration/cover/mediawiki-core/master/php echo Code coverage report is available at: -- To view, visit https://gerrit.wikimedia.org/r/92624 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb45b7fbb1c59b0ad502ce5361ea0fc551701d46 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] label some jobs needing PHPUnit - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92625
Change subject: label some jobs needing PHPUnit
..
label some jobs needing PHPUnit
We now have PHPUnit deployed on all slaves (bug 54762 and bug 56317),
some jobs using PHPUnit were not being applied the 'hasPhpUnit' which
would prevent them from running on all slaves.
Jobs updated:
mediawiki-core-regression-REL1_19
mediawiki-core-regression-REL1_20
mediawiki-core-regression-REL1_21
mediawiki-core-regression-REL1_22
mediawiki-core-regression-master
mwext-Wikibase-client-tests
mwext-Wikibase-repo-tests
mwext-Wikibase-repoapi-tests
bug: 53594
Change-Id: I5c164190ec0b32dae5f36550c201b93f9de1c395
---
M mediawiki-extensions.yaml
M mediawiki.yaml
2 files changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/25/92625/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 8f4c505..f834dbf 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -115,7 +115,7 @@
# and server configurations.
- job-template:
name: 'mwext-Wikibase-{kind}-tests'
-node: hasSlaveScripts
+node: (hasSlaveScripts hasPhpUnit)
defaults: use-zuul-for-mw-ext
ext-name: 'Wikibase'
triggers:
diff --git a/mediawiki.yaml b/mediawiki.yaml
index a30ec0f..8abab96 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -182,7 +182,7 @@
- job-template:
name: 'mediawiki-core-regression-{branch}'
-node: hasSlaveScripts
+node: (hasSlaveScripts hasPhpUnit)
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
--
To view, visit https://gerrit.wikimedia.org/r/92625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c164190ec0b32dae5f36550c201b93f9de1c395
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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] label some jobs needing PHPUnit - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: label some jobs needing PHPUnit
..
label some jobs needing PHPUnit
We now have PHPUnit deployed on all slaves (bug 54762 and bug 56317),
some jobs using PHPUnit were not being applied the 'hasPhpUnit' which
would prevent them from running on all slaves.
Jobs updated:
mediawiki-core-regression-REL1_19
mediawiki-core-regression-REL1_20
mediawiki-core-regression-REL1_21
mediawiki-core-regression-REL1_22
mediawiki-core-regression-master
mwext-Wikibase-client-tests
mwext-Wikibase-repo-tests
mwext-Wikibase-repoapi-tests
bug: 53594
Change-Id: I5c164190ec0b32dae5f36550c201b93f9de1c395
---
M mediawiki-extensions.yaml
M mediawiki.yaml
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 8f4c505..f834dbf 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -115,7 +115,7 @@
# and server configurations.
- job-template:
name: 'mwext-Wikibase-{kind}-tests'
-node: hasSlaveScripts
+node: (hasSlaveScripts hasPhpUnit)
defaults: use-zuul-for-mw-ext
ext-name: 'Wikibase'
triggers:
diff --git a/mediawiki.yaml b/mediawiki.yaml
index a30ec0f..8abab96 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -182,7 +182,7 @@
- job-template:
name: 'mediawiki-core-regression-{branch}'
-node: hasSlaveScripts
+node: (hasSlaveScripts hasPhpUnit)
defaults: use-zuul
scm:
- git-mwcore-nosubmodules
--
To view, visit https://gerrit.wikimedia.org/r/92625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c164190ec0b32dae5f36550c201b93f9de1c395
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] /var/lib/jenkins - /srv/slave-scripts - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92626
Change subject: /var/lib/jenkins - /srv/slave-scripts
..
/var/lib/jenkins - /srv/slave-scripts
The slave scripts are now under /srv/slave-scripts and kept up-to-date
by puppet. So remove reference to the old path that was only on gallium.
THIS CHANGE UPDATES ALL JOBS!
bug: 53594
Change-Id: I9674b0751cbf55940aff529b6da26edf5c4a5ce0
---
M macro.yaml
M mediawiki.yaml
M mobile.yaml
M operations-puppet.yaml
M parsoid.yaml
5 files changed, 19 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/26/92626/1
diff --git a/macro.yaml b/macro.yaml
index a6fb455..1cbe975 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -6,14 +6,14 @@
name: erblint-HEAD
builders:
- shell: |
-/var/lib/jenkins/bin/git-changed-in-head erb \
+/srv/slave-scripts/bin/git-changed-in-head erb \
| xargs -n1 -I {} -t sh -c 'erb -P -x -T - {} | ruby -c'
- builder:
name: pplint-HEAD
builders:
- shell: |
-/var/lib/jenkins/bin/git-changed-in-head pp \
+/srv/slave-scripts/bin/git-changed-in-head pp \
| xargs -n1 -t puppet parser validate
# Lint whitespace in directory {dir}. Usefull when the Git repository has
@@ -63,8 +63,8 @@
- shell: |
#!/bin/bash -xe
cd {dir}
-/var/lib/jenkins/bin/jshint --version
-/var/lib/jenkins/bin/jshint .
+/srv/slave-scripts/bin/jshint --version
+/srv/slave-scripts/bin/jshint .
- builder:
name: jshint
@@ -134,7 +134,7 @@
curl --include
http://localhost:9412/$TEST_ID/index.php?title=Special:BlankPage; | head -n42
curl --include
http://localhost:9412/$TEST_ID/load.php?debug=truemodules=startuponly=scripts;
| head -n42
# Run QUnit tests via PhantomJS
-/var/lib/jenkins/bin/wmfgrunt qunit --verbose
--qunit-url=http://localhost:9412/$TEST_ID/index.php?title=Special:JavaScriptTest/qunit;
+/srv/slave-scripts/bin/wmfgrunt qunit --verbose
--qunit-url=http://localhost:9412/$TEST_ID/index.php?title=Special:JavaScriptTest/qunit;
gqec=$?
# Clean up
rm /srv/localhost/qunit/$TEST_ID
@@ -200,7 +200,7 @@
- builder:
name: mw-get-extensions
builders:
-- shell: /var/lib/jenkins/tools/fetch-mw-ext {dependencies}
+- shell: /srv/slave-scripts/tools/fetch-mw-ext {dependencies}
- builder:
name: mw-run-update-script
@@ -295,7 +295,7 @@
name: phplint
builders:
- shell: |
-/var/lib/jenkins/bin/git-changed-in-head php php5 inc phtml \
+/srv/slave-scripts/bin/git-changed-in-head php php5 inc phtml \
| xargs -n1 -t php -l
# run phpcs on any .php and .inc files in the workspace
@@ -306,7 +306,7 @@
- shell: |
phpcs -v -s . \
--encoding=utf-8 \
- --standard=/var/lib/jenkins/tools/mwcodesniffer/MediaWiki \
+ --standard=/srv/slave-scripts/tools/mwcodesniffer/MediaWiki \
--extensions=php,inc \
--ignore=languages/messages/Messages*.php,*.i18n.php \
--report-checkstyle=checkstyle-phpcs.xml \
@@ -319,7 +319,7 @@
name: phpcs-HEAD
builders:
- shell: |
-PHPCS_FILES=$(/var/lib/jenkins/bin/git-changed-in-head php php5 inc
sample)
+PHPCS_FILES=$(/srv/slave-scripts/bin/git-changed-in-head php php5 inc
sample)
# No file? No point in proceeding any further (bug 44567)
if [ -z $PHPCS_FILES ]; then
echo Skipping phpcs: no file remaining to process
@@ -328,7 +328,7 @@
phpcs -v -s $PHPCS_FILES \
--encoding=utf-8 \
- --standard=/var/lib/jenkins/tools/mwcodesniffer/MediaWiki \
+ --standard=/srv/slave-scripts/tools/mwcodesniffer/MediaWiki \
--ignore=languages/messages/Messages,*.i18n.php \
--report-checkstyle=checkstyle-phpcs.xml \
--report-full
@@ -336,22 +336,22 @@
- builder:
name: phpcs-strict
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh
- builder:
name: phpcs-strict-HEAD
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh HEAD
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh HEAD
- builder:
name: phpcs-lenient
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh nowarnings
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh nowarnings
- builder:
name: phpcs-lenient-HEAD
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh nowarnings HEAD
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh nowarnings HEAD
- publisher:
name: phpcs
@@ -400,7 +400,7 @@
- builder:
name: yaml-lint
builders:
- - shell: '/var/lib/jenkins/tools/yamllint.py $WORKSPACE'
+ - shell:
[MediaWiki-commits] [Gerrit] /var/lib/jenkins - /srv/slave-scripts - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: /var/lib/jenkins - /srv/slave-scripts
..
/var/lib/jenkins - /srv/slave-scripts
The slave scripts are now under /srv/slave-scripts and kept up-to-date
by puppet. So remove reference to the old path that was only on gallium.
THIS CHANGE UPDATES ALL JOBS!
bug: 53594
Change-Id: I9674b0751cbf55940aff529b6da26edf5c4a5ce0
---
M macro.yaml
M mediawiki.yaml
M mobile.yaml
M operations-puppet.yaml
M parsoid.yaml
5 files changed, 19 insertions(+), 19 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index a6fb455..1cbe975 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -6,14 +6,14 @@
name: erblint-HEAD
builders:
- shell: |
-/var/lib/jenkins/bin/git-changed-in-head erb \
+/srv/slave-scripts/bin/git-changed-in-head erb \
| xargs -n1 -I {} -t sh -c 'erb -P -x -T - {} | ruby -c'
- builder:
name: pplint-HEAD
builders:
- shell: |
-/var/lib/jenkins/bin/git-changed-in-head pp \
+/srv/slave-scripts/bin/git-changed-in-head pp \
| xargs -n1 -t puppet parser validate
# Lint whitespace in directory {dir}. Usefull when the Git repository has
@@ -63,8 +63,8 @@
- shell: |
#!/bin/bash -xe
cd {dir}
-/var/lib/jenkins/bin/jshint --version
-/var/lib/jenkins/bin/jshint .
+/srv/slave-scripts/bin/jshint --version
+/srv/slave-scripts/bin/jshint .
- builder:
name: jshint
@@ -134,7 +134,7 @@
curl --include
http://localhost:9412/$TEST_ID/index.php?title=Special:BlankPage; | head -n42
curl --include
http://localhost:9412/$TEST_ID/load.php?debug=truemodules=startuponly=scripts;
| head -n42
# Run QUnit tests via PhantomJS
-/var/lib/jenkins/bin/wmfgrunt qunit --verbose
--qunit-url=http://localhost:9412/$TEST_ID/index.php?title=Special:JavaScriptTest/qunit;
+/srv/slave-scripts/bin/wmfgrunt qunit --verbose
--qunit-url=http://localhost:9412/$TEST_ID/index.php?title=Special:JavaScriptTest/qunit;
gqec=$?
# Clean up
rm /srv/localhost/qunit/$TEST_ID
@@ -200,7 +200,7 @@
- builder:
name: mw-get-extensions
builders:
-- shell: /var/lib/jenkins/tools/fetch-mw-ext {dependencies}
+- shell: /srv/slave-scripts/tools/fetch-mw-ext {dependencies}
- builder:
name: mw-run-update-script
@@ -295,7 +295,7 @@
name: phplint
builders:
- shell: |
-/var/lib/jenkins/bin/git-changed-in-head php php5 inc phtml \
+/srv/slave-scripts/bin/git-changed-in-head php php5 inc phtml \
| xargs -n1 -t php -l
# run phpcs on any .php and .inc files in the workspace
@@ -306,7 +306,7 @@
- shell: |
phpcs -v -s . \
--encoding=utf-8 \
- --standard=/var/lib/jenkins/tools/mwcodesniffer/MediaWiki \
+ --standard=/srv/slave-scripts/tools/mwcodesniffer/MediaWiki \
--extensions=php,inc \
--ignore=languages/messages/Messages*.php,*.i18n.php \
--report-checkstyle=checkstyle-phpcs.xml \
@@ -319,7 +319,7 @@
name: phpcs-HEAD
builders:
- shell: |
-PHPCS_FILES=$(/var/lib/jenkins/bin/git-changed-in-head php php5 inc
sample)
+PHPCS_FILES=$(/srv/slave-scripts/bin/git-changed-in-head php php5 inc
sample)
# No file? No point in proceeding any further (bug 44567)
if [ -z $PHPCS_FILES ]; then
echo Skipping phpcs: no file remaining to process
@@ -328,7 +328,7 @@
phpcs -v -s $PHPCS_FILES \
--encoding=utf-8 \
- --standard=/var/lib/jenkins/tools/mwcodesniffer/MediaWiki \
+ --standard=/srv/slave-scripts/tools/mwcodesniffer/MediaWiki \
--ignore=languages/messages/Messages,*.i18n.php \
--report-checkstyle=checkstyle-phpcs.xml \
--report-full
@@ -336,22 +336,22 @@
- builder:
name: phpcs-strict
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh
- builder:
name: phpcs-strict-HEAD
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh HEAD
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh HEAD
- builder:
name: phpcs-lenient
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh nowarnings
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh nowarnings
- builder:
name: phpcs-lenient-HEAD
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh nowarnings HEAD
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh nowarnings HEAD
- publisher:
name: phpcs
@@ -400,7 +400,7 @@
- builder:
name: yaml-lint
builders:
- - shell: '/var/lib/jenkins/tools/yamllint.py $WORKSPACE'
+ - shell: '/srv/slave-scripts/tools/yamllint.py $WORKSPACE'
- publisher:
name:
[MediaWiki-commits] [Gerrit] Removed default event handler generation from toolbarcontroller - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92627
Change subject: Removed default event handler generation from toolbarcontroller
..
Removed default event handler generation from toolbarcontroller
Reducing toolbarcontroller's complexity by removing the automatic generation of
default
event handlers which only were used for referenceview's add toolbar anyway.
Change-Id: I9f96876397bd66700fc4d20c0e34f0e3fed5768d
---
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
M lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
3 files changed, 32 insertions(+), 56 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/27/92627/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 95ab7d2..c9006bd 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -536,8 +536,22 @@
id: 'referenceview-snakview',
selector: '.wb-statement-references .wb-referenceview',
events: {
- referenceviewstartediting: 'create',
- referenceviewafterstopediting: 'destroy',
+ referenceviewstartediting: function( event ) {
+ $( event.target ).addtoolbar( {
+ customAction: function( event, $parent ) {
+ $parent.data( 'referenceview'
).enterNewItem();
+ },
+ eventPrefix:
$.wikibase.referenceview.prototype.widgetEventPrefix
+ } );
+ },
+ referenceviewafterstopediting: function( event ) {
+ var $node = $( event.target );
+ if ( $node.data( 'addtoolbar' ) ) {
+ $node.data( 'addtoolbar' ).destroy();
+ $node.removeData( 'addtoolbar' );
+ $node.children( '.' +
$.wikibase.addtoolbar.prototype.widgetBaseClass ).remove();
+ }
+ },
referenceviewchange: function( event ) {
var $referenceview = $( event.target ).closest(
':wikibase-referenceview' ),
referenceview = $referenceview.data(
'referenceview' ),
@@ -556,12 +570,6 @@
addToolbar.toolbar.enable();
}
}
- },
- options: {
- customAction: function( event, $parent ) {
- $parent.data( 'referenceview' ).enterNewItem();
- },
- eventPrefix:
$.wikibase.referenceview.prototype.widgetEventPrefix
}
} );
diff --git
a/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
b/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
index 5292b03..72f8cbe 100644
--- a/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
+++ b/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
@@ -83,18 +83,22 @@
*- events
* An object containing custom events to react on:
* {
-*{string} unprefixed event name: {string|function}
keyword or function[,
+*{string} unprefixed event name: {function} function[,
*...]
* }
-* Basically, keywords are placeholders for default functions:
create will create the
-* toolbar, destroy will destroy it.
-* Event parameters:
-* (1) {jQuery.Event} Event
-* (2) {jQuery} Node the toolbar has be initialized on
* Example:
* {
-*startediting: 'create',
-*afterstopediting: 'destroy',
+*startediting: function( event ) {
+* $( event.taget ).addtoolbar( { ... } );
+*},
+*afterstopediting: function( event ) {
+* var $node = $( event.target );
+* if ( $node.data( 'addtoolbar' ) ) {
+*$node.data( 'addtoolbar' ).destroy();
+*$node.removeData( 'addtoolbar' );
+*$node.children( '.' +
$.wikibase.addtoolbar.prototype.widgetBaseClass ).remove();
+* }
+*},
*change: function( event ) {
* var referenceView = $( event.target ).data(
'referenceview' ),
* addToolbar = $(
[MediaWiki-commits] [Gerrit] en.planet - add Wikistaycation blog - change (operations/puppet)
Odder has uploaded a new change for review. https://gerrit.wikimedia.org/r/92628 Change subject: en.planet - add Wikistaycation blog .. en.planet - add Wikistaycation blog Requested by AdamBMorgan at [[m:Planet Wikimedia]] on Oct 29. Change-Id: I0bf1145970a756d7326bf4418a378e3424f775a7 --- M templates/planet/en_config.erb 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/28/92628/1 diff --git a/templates/planet/en_config.erb b/templates/planet/en_config.erb index 6fc4227..44a2b8a 100644 --- a/templates/planet/en_config.erb +++ b/templates/planet/en_config.erb @@ -561,3 +561,6 @@ [http://blog.pragunbhutani.in/feed.xml] name=Pragun Bhutani + +[https://wikistaycation.wordpress.com/feed/] +name=Wikistaycation \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/92628 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0bf1145970a756d7326bf4418a378e3424f775a7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Odder tom...@twkozlowski.net ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Default initial MW page is Main Page (capitalized P) - change (mediawiki...Parsoid)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92629
Change subject: Default initial MW page is Main Page (capitalized P)
..
Default initial MW page is Main Page (capitalized P)
Change-Id: I755f6ecc679188e698993b87b1ff279c951cb2e7
---
M js/lib/mediawiki.parser.environment.js
M js/tests/parse.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/29/92629/1
diff --git a/js/lib/mediawiki.parser.environment.js
b/js/lib/mediawiki.parser.environment.js
index 10240e8..6d20872 100644
--- a/js/lib/mediawiki.parser.environment.js
+++ b/js/lib/mediawiki.parser.environment.js
@@ -66,7 +66,7 @@
var MWParserEnvironment = function ( parsoidConfig, wikiConfig ) {
// page information
this.page = {
- name: 'Main page',
+ name: 'Main Page',
relativeLinkPrefix: '',
id: null,
src: null,
diff --git a/js/tests/parse.js b/js/tests/parse.js
index b5405c7..760f35f 100755
--- a/js/tests/parse.js
+++ b/js/tests/parse.js
@@ -153,7 +153,7 @@
'pagename': {
description: 'The page name, returned for
{{PAGENAME}}.',
'boolean': false,
- 'default': 'Main page'
+ 'default': 'Main Page'
},
'oldtext': {
description: 'The old page text for a
selective-serialization (see --selser)',
--
To view, visit https://gerrit.wikimedia.org/r/92629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I755f6ecc679188e698993b87b1ff279c951cb2e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactoring Input method menu is not offscreen - change (mediawiki...UniversalLanguageSelector)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92630
Change subject: Refactoring Input method menu is not offscreen
..
Refactoring Input method menu is not offscreen
Change-Id: Iff83160eb6c99d6109098e431341240a21274665
---
M tests/browser/features/ime.feature
M tests/browser/features/step_definitions/ime_steps.rb
A tests/browser/features/support/modules/language_module.rb
M tests/browser/features/support/pages/ime_page.rb
M tests/browser/features/support/pages/panel_page.rb
5 files changed, 47 insertions(+), 55 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/30/92630/1
diff --git a/tests/browser/features/ime.feature
b/tests/browser/features/ime.feature
index c44cd60..ad35c88 100644
--- a/tests/browser/features/ime.feature
+++ b/tests/browser/features/ime.feature
@@ -52,31 +52,15 @@
Then I should see the input method indicator
And in it there must be an element with Malayalam text
- @login @reset-preferences-after
- Scenario: Input method menu is not offscreen
-
- Input method indicator is not offscreen for English and RTL languages.
-
-Given I am logged in
-Given I set English as the interface language
-When I visit page in Vector skin
- And I open the input method menu
+ @commons.wikimedia.beta.wmflabs.org
+ Scenario Outline: Input method menu is completely visible
+Given I visit a random page with skin skin and language as the
interface language
+When I open the input method menu
Then I should see the input method menu is not offscreen
-Given I am logged in
-Given I set Hebrew as the interface language
-When I visit page in Monobook skin
- And I open the input method menu
-Then I should see the input method menu is not offscreen
-
-Given I am logged in
-Given I set English as the interface language
-When I visit page in Monobook skin
- And I open the input method menu
-Then I should see the input method menu is not offscreen
-
-Given I am logged in
-Given I set Hebrew as the interface language
-When I visit page in Vector skin
- And I open the input method menu
-Then I should see the input method menu is not offscreen
+ Examples:
+| skin | language |
+| Vector | English |
+| Vector | Hebrew |
+| Monobook | English |
+#| Monobook | Hebrew |
diff --git a/tests/browser/features/step_definitions/ime_steps.rb
b/tests/browser/features/step_definitions/ime_steps.rb
index 5ea6281..68203db 100644
--- a/tests/browser/features/step_definitions/ime_steps.rb
+++ b/tests/browser/features/step_definitions/ime_steps.rb
@@ -63,20 +63,10 @@
on(IMEPage).input_method_enabled_element.text.should == 'ഇൻസ്ക്രിപ്റ്റ് 2'
end
-When(/^I visit page in Vector skin$/) do
- visit(PanelPage, :using_params = {:extra = useskin=vector})
-end
-
-When(/^I visit page in Monobook skin$/) do
- visit(PanelPage, :using_params = {:extra = useskin=monobook})
+Given(/^I visit a random page with (.+) skin and (.+) as the interface
language$/) do |skin, language|
+ visit(IMEPage, :using_params = {:extra =
useskin=#{skin.downcase}uselang=#{on(IMEPage).language_to_code(language)}})
end
Then(/^I should see the input method menu is not offscreen$/) do
- @browser.execute_script(
-var $selectorMenu = $( '.imeselector-menu' ),
-menuLeft = $selectorMenu.offset().left,
-menuRight = menuLeft + $selectorMenu.width();
-
-return ( menuLeft = 0 menuRight = $( window ).width() );
- ).should == true
+ on(IMEPage).ime_input_method_menu_onscreen?.should == true
end
diff --git a/tests/browser/features/support/modules/language_module.rb
b/tests/browser/features/support/modules/language_module.rb
new file mode 100644
index 000..b385260
--- /dev/null
+++ b/tests/browser/features/support/modules/language_module.rb
@@ -0,0 +1,20 @@
+module LanguageModule
+ include PageObject
+
+ def language_to_code(language)
+ case language
+ when 'German'
+ 'de'
+ when 'English'
+ 'en'
+ when 'Finnish'
+ 'fi'
+ when 'Hebrew'
+ 'he'
+ when 'Hindi'
+ 'hi'
+ else
+ pending
+ end
+ end
+end
diff --git a/tests/browser/features/support/pages/ime_page.rb
b/tests/browser/features/support/pages/ime_page.rb
index e0619f9..b126f8b 100644
--- a/tests/browser/features/support/pages/ime_page.rb
+++ b/tests/browser/features/support/pages/ime_page.rb
@@ -1,5 +1,9 @@
class IMEPage
include PageObject
+ include LanguageModule
+
+ include URL
+
[MediaWiki-commits] [Gerrit] Just testing - change (test...examples)
Rcdeboer has uploaded a new change for review. https://gerrit.wikimedia.org/r/92631 Change subject: Just testing .. Just testing Change-Id: Ieab1968c537528364181e100db620a1bed5a2add --- M Someone_was_here 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/test/mediawiki/extensions/examples refs/changes/31/92631/1 diff --git a/Someone_was_here b/Someone_was_here index ea699f6..3e1b5bc 100644 --- a/Someone_was_here +++ b/Someone_was_here @@ -1,2 +1,3 @@ Dak was here. +Me too! -- To view, visit https://gerrit.wikimedia.org/r/92631 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieab1968c537528364181e100db620a1bed5a2add Gerrit-PatchSet: 1 Gerrit-Project: test/mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: Rcdeboer remcocdeb...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] /var/lib/jenkins/ -- /srv/slave-scripts/ - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged.
Change subject: /var/lib/jenkins/ -- /srv/slave-scripts/
..
/var/lib/jenkins/ -- /srv/slave-scripts/
Change-Id: I6101ca509658a7527e6dd0bedd81e574deae26df
---
M bin/run-phpcs-mw.sh
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/run-phpcs-mw.sh b/bin/run-phpcs-mw.sh
index 9f2266e..d11b983 100755
--- a/bin/run-phpcs-mw.sh
+++ b/bin/run-phpcs-mw.sh
@@ -61,7 +61,7 @@
done
if $HEAD_ONLY; then
- PHPCS_FILES=$(/var/lib/jenkins/bin/git-changed-in-head ${PHP_EXTS[@]})
+ PHPCS_FILES=$(/srv/slave-scripts/bin/git-changed-in-head
${PHP_EXTS[@]})
if [[ -z $PHPCS_FILES ]]; then
echo Skipping phpcs run on HEAD: no file matching '$PHP_EXTS'
exit 0
@@ -83,7 +83,7 @@
set -xe
phpcs -v -s $PHPCS_FILES \
--encoding=utf-8 \
- --standard=/var/lib/jenkins/tools/mwcodesniffer/MediaWiki \
+ --standard=/srv/slave-scripts/tools/mwcodesniffer/MediaWiki \
$PHPCS_OPTS \
--ignore=$IGNORE_WITH_SEP \
--report-checkstyle=checkstyle-phpcs.xml \
--
To view, visit https://gerrit.wikimedia.org/r/92632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6101ca509658a7527e6dd0bedd81e574deae26df
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] /var/lib/jenkins/ -- /srv/slave-scripts/ - change (integration/jenkins)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92632
Change subject: /var/lib/jenkins/ -- /srv/slave-scripts/
..
/var/lib/jenkins/ -- /srv/slave-scripts/
Change-Id: I6101ca509658a7527e6dd0bedd81e574deae26df
---
M bin/run-phpcs-mw.sh
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/32/92632/1
diff --git a/bin/run-phpcs-mw.sh b/bin/run-phpcs-mw.sh
index 9f2266e..d11b983 100755
--- a/bin/run-phpcs-mw.sh
+++ b/bin/run-phpcs-mw.sh
@@ -61,7 +61,7 @@
done
if $HEAD_ONLY; then
- PHPCS_FILES=$(/var/lib/jenkins/bin/git-changed-in-head ${PHP_EXTS[@]})
+ PHPCS_FILES=$(/srv/slave-scripts/bin/git-changed-in-head
${PHP_EXTS[@]})
if [[ -z $PHPCS_FILES ]]; then
echo Skipping phpcs run on HEAD: no file matching '$PHP_EXTS'
exit 0
@@ -83,7 +83,7 @@
set -xe
phpcs -v -s $PHPCS_FILES \
--encoding=utf-8 \
- --standard=/var/lib/jenkins/tools/mwcodesniffer/MediaWiki \
+ --standard=/srv/slave-scripts/tools/mwcodesniffer/MediaWiki \
$PHPCS_OPTS \
--ignore=$IGNORE_WITH_SEP \
--report-checkstyle=checkstyle-phpcs.xml \
--
To view, visit https://gerrit.wikimedia.org/r/92632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6101ca509658a7527e6dd0bedd81e574deae26df
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
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] Use page-less Parsoid API for Flow - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92633
Change subject: Use page-less Parsoid API for Flow
..
Use page-less Parsoid API for Flow
Relevant Parsoid change at https://gerrit.wikimedia.org/r/#/c/91321/
Bug: 55682
Change-Id: I0cbb164f9ec7cb269b77f765bfdadee074b3770c
---
M includes/ParsoidUtils.php
1 file changed, 20 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/33/92633/1
diff --git a/includes/ParsoidUtils.php b/includes/ParsoidUtils.php
index 280d272..820d71c 100644
--- a/includes/ParsoidUtils.php
+++ b/includes/ParsoidUtils.php
@@ -36,43 +36,37 @@
* @return string
*/
protected static function parsoid( $from, $to, $content ) {
- if ( !class_exists( 'ApiVisualEditor' ) ) {
- throw new \MWException( 'VisualEditor is unavailable' );
- }
+ global $wgVisualEditorParsoidURL, $wgVisualEditorParsoidPrefix,
$wgVisualEditorParsoidTimeout;
- if ( $to === 'html' ) {
- $action = 'parsefragment';
- } elseif ( $to === 'wikitext' ) {
- $action = 'serialize';
+ if ( $from == 'html' ) {
+ $from = 'html';
+ } elseif ( in_array( $from, array( 'wt', 'wikitext' ) ) ) {
+ $from = 'wt';
} else {
throw new \MWException( 'Unknown format: '. $to );
}
- global $wgRequest;
- $params = new \DerivativeRequest(
- $wgRequest,
+ $response = \Http::post(
+ $wgVisualEditorParsoidURL . '/' .
$wgVisualEditorParsoidPrefix . '/',
array(
- 'action' = 'visualeditor',
- 'page' = \SpecialPage::getTitleFor( 'Flow'
)-getPrefixedDBkey(),
- // 'basetimestamp' = ?,
- // 'starttimestamp' = ?,
- 'paction' = $action,
- 'oldid' = '',
- $from = $content,
- ),
- true // POST
+ 'postData' = array( $from = $content ),
+ 'timeout' = $wgVisualEditorParsoidTimeout
+ )
);
- wfDebugLog( __CLASS__, __FUNCTION__ . : Roundtripping parsoid
for $from = $to );
- $api = new \ApiMain( $params, true );
- $api-execute();
- $result = $api-getResultData();
+ // Full HTML document is returned, we only want what's inside
body
+ if ( $to == 'html' ) {
+ $dom = new \DOMDocument();
+ $dom-loadHTML( $response );
+ $body = $dom-getElementsByTagName( 'body' )-item(0);
- if ( !isset( $result['visualeditor']['content'] ) ) {
- throw new \MWException( 'Unable to parse content' );
+ $response = '';
+ foreach( $body-childNodes as $child ) {
+ $response .= $child-ownerDocument-saveXML(
$child );
+ }
}
- return $result['visualeditor']['content'];
+ return $response;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/92633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbb164f9ec7cb269b77f765bfdadee074b3770c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (hotfix) Checking for property to lock property input - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92634
Change subject: (hotfix) Checking for property to lock property input
..
(hotfix) Checking for property to lock property input
(bug 56296)
Instead of checking for the value, the property id needs to be checked to lock
the
property input element. This prevents the property input box from receiving
focus
when adding a new claim to an already existing claim list.
Change-Id: I8260becda68d4f3027f01d154e1e52ab7e852f8b
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/34/92634/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 2b59489..148bcbf 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -136,7 +136,7 @@
},
locked: {
mainSnak: {
- property:
!!value
+ property:
!!propertyId
}
}
};
--
To view, visit https://gerrit.wikimedia.org/r/92634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8260becda68d4f3027f01d154e1e52ab7e852f8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add explicit dependency to jquery.json - change (mediawiki...TwnMainPage)
jenkins-bot has submitted this change and it was merged. Change subject: Add explicit dependency to jquery.json .. Add explicit dependency to jquery.json Change-Id: Ib5d0d2ad68cb0f508c2794a4d39742d6f88d7047 --- M Resources.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Santhosh: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index f8b65cd..b035125 100644 --- a/Resources.php +++ b/Resources.php @@ -35,6 +35,7 @@ 'ext.uls.interface', 'mediawiki.api', 'mediawiki.api.login', + 'jquery.json', ), ) + $resourcePaths; -- To view, visit https://gerrit.wikimedia.org/r/92059 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5d0d2ad68cb0f508c2794a4d39742d6f88d7047 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com 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] Editor: do not show Suggestions when no suggestions - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Editor: do not show Suggestions when no suggestions
..
Editor: do not show Suggestions when no suggestions
If the only suggestion was the current translation of the
message, which is filtered out, the heading would be shown
but no suggestions were visible.
Change-Id: I5f7bceaf05dbaee00d93215bec4735f017a32428
---
M resources/js/ext.translate.editor.helpers.js
1 file changed, 12 insertions(+), 6 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.editor.helpers.js
b/resources/js/ext.translate.editor.helpers.js
index af739c7..deea609 100644
--- a/resources/js/ext.translate.editor.helpers.js
+++ b/resources/js/ext.translate.editor.helpers.js
@@ -255,18 +255,19 @@
* @param {array} suggestions A ttmserver array as returned by
API.
*/
showTranslationMemory: function ( suggestions ) {
- var $tmSuggestions, $translationTextarea,
+ var $heading, $tmSuggestions, $translationTextarea,
translateEditor = this;
if ( !suggestions.length ) {
return;
}
- $tmSuggestions = $( 'div' )
- .addClass( 'tm-suggestions' );
- this.$editor.find( '.tm-suggestions-title' )
- .removeClass( 'hide' )
- .after( $tmSuggestions );
+ // Container for the suggestions
+ $tmSuggestions = $( 'div' ).addClass(
'tm-suggestions' );
+
+ $heading = this.$editor.find( '.tm-suggestions-title' );
+ $heading.after( $tmSuggestions );
+
$translationTextarea = this.$editor.find(
'.tux-textarea-translation' );
$.each( suggestions, function ( index, translation ) {
@@ -326,6 +327,11 @@
$tmSuggestions.append( $translation );
} );
+
+ // Show the heading only if we actually have suggestions
+ if ( $tmSuggestions.length ) {
+ $heading.removeClass( 'hide' );
+ }
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/91591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f7bceaf05dbaee00d93215bec4735f017a32428
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
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] Install optipng - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/92635 Change subject: Install optipng .. Install optipng Change-Id: I0e7cc7ff46ee0f0774264b17a9aeb5fa8c868ce4 --- M puppet/modules/base/manifests/init.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/35/92635/1 diff --git a/puppet/modules/base/manifests/init.pp b/puppet/modules/base/manifests/init.pp index 6fe87b6..cf2d43f 100644 --- a/puppet/modules/base/manifests/init.pp +++ b/puppet/modules/base/manifests/init.pp @@ -26,6 +26,7 @@ # Development extras 'git-review', +'optipng', # Other 'mysqltuner', -- To view, visit https://gerrit.wikimedia.org/r/92635 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e7cc7ff46ee0f0774264b17a9aeb5fa8c868ce4 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update order of CSS properties - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Update order of CSS properties
..
Update order of CSS properties
Bug: 56138
Change-Id: I1fe0fbf2c33a45d7b67378d0f74b5ea8425b446b
---
M resources/css/ext.uls.css
M resources/css/ext.uls.displaysettings.css
M resources/css/ext.uls.inputsettings.css
3 files changed, 10 insertions(+), 23 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/css/ext.uls.css b/resources/css/ext.uls.css
index f5a2ba8..1206bf6 100644
--- a/resources/css/ext.uls.css
+++ b/resources/css/ext.uls.css
@@ -42,7 +42,6 @@
background: -webkit-gradient(linear, left top, left bottom,
from(#FBFBFB), to(#F0F0F0));
background: -webkit-linear-gradient(top, #FBFBFB, #F0F0F0);
background: -moz-linear-gradient(top, #FBFBFB, #F0F0F0);
- background: -ms-linear-gradient(top, #FBFBFB, #F0F0F0);
background: -o-linear-gradient(top, #FBFBFB, #F0F0F0);
background: linear-gradient(#FBFBFB, #F0F0F0);
padding-left: 10px;
@@ -151,12 +150,11 @@
background-color: #e6e6e6;
background-image: -moz-linear-gradient(top, #f0f0f0, #e6e6e6);
background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #f0f0f0), color-stop(100%, #e6e6e6));
- background-image: -ms-linear-gradient(top, #f0f0f0, #e6e6e6);
- background-image: linear-gradient(#f0f0f0, #e6e6e6);
background-image: -webkit-linear-gradient(top, #f0f0f0, #e6e6e6);
+ background-image: linear-gradient(#f0f0f0, #e6e6e6);
border: 1px #c9c9c9 solid;
- -webkit-border-radius: 3px;
-moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
border-radius: 3px;
-ms-filter:
progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0f0f0',
endColorstr='#e6e6e6', GradientType=0);
filter:
progid:dximagetransform.microsoft.gradient(startColorstr='#f0f0f0',
endColorstr='#e6e6e6', GradientType=0);
@@ -165,7 +163,6 @@
button.button:hover {
background-color: #f0f0f0;
background-image: -moz-linear-gradient(top, #f8f8f8, #f0f0f0);
- background-image: -ms-linear-gradient(top, #f8f8f8, #f0f0f0);
background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #f8f8f8), color-stop(100%, #f0f0f0));
background-image: -webkit-linear-gradient(top, #f8f8f8, #f0f0f0);
background-image: linear-gradient(#f8f8f8, #f0f0f0);
@@ -178,7 +175,6 @@
button.button.down {
background-color: #d8d8d8;
background-image: -moz-linear-gradient(top, #d3d3d3, #d8d8d8);
- background-image: -ms-linear-gradient(top, #d3d3d3, #d8d8d8);
background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #d3d3d3), color-stop(100%, #d8d8d8));
background-image: -webkit-linear-gradient(top, #d3d3d3, #d8d8d8);
background-image: linear-gradient(#d3d3d3, #d8d8d8);
@@ -195,10 +191,9 @@
cursor: default;
background-color: #f0f0f0;
background-image: -moz-linear-gradient(top, #f0f0f0, #f0f0f0);
- background-image: -ms-linear-gradient(top, #f0f0f0, #f0f0f0);
background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #f0f0f0), color-stop(100%, #f0f0f0));
- background-image: linear-gradient(#f0f0f0, #f0f0f0);
background-image: -webkit-linear-gradient(top, #f0f0f0, #f0f0f0);
+ background-image: linear-gradient(#f0f0f0, #f0f0f0);
border-color: #e3e3e3;
-ms-filter:
progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0f0f0',
endColorstr='#f0f0f0', GradientType=0);
filter:
progid:dximagetransform.microsoft.gradient(startColorstr='#f0f0f0',
endColorstr='#f0f0f0', GradientType=0);
@@ -208,11 +203,10 @@
color: #ff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #3366bb;
- background-image: -ms-linear-gradient(top, #3670c8, #3366bb);
background-image: -moz-linear-gradient(top, #3670c8, #3366bb);
- background-image: linear-gradient(#3670c8, #3366bb);
background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #3670c8), color-stop(100%, #3366bb));
background-image: -webkit-linear-gradient(top, #3670c8, #3366bb);
+ background-image: linear-gradient(#3670c8, #3366bb);
border: 1px #33589f solid;
-ms-filter:
progid:DXImageTransform.Microsoft.gradient(startColorstr='#3670c8',
endColorstr='#3366bb', GradientType=0);
filter:
progid:dximagetransform.microsoft.gradient(startColorstr='#3670c8',
endColorstr='#3366bb', GradientType=0);
@@ -221,7 +215,6 @@
button.button.blue:hover {
background-color: #3f77d7;
background-image: -moz-linear-gradient(top, #4c84da, #3f77d7);
- background-image: -ms-linear-gradient(top, #4c84da, #3f77d7);
[MediaWiki-commits] [Gerrit] Remove use of deprecated apibase result methods - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92636
Change subject: Remove use of deprecated apibase result methods
..
Remove use of deprecated apibase result methods
Change-Id: I8fcc9680a9a16aa189e7919939183f4749e63e0b
---
M repo/includes/api/ApiWikibase.php
M repo/includes/api/EditEntity.php
M repo/includes/api/LinkTitles.php
M repo/includes/api/SetAliases.php
M repo/includes/api/SetDescription.php
M repo/includes/api/SetLabel.php
M repo/includes/api/SetSiteLink.php
7 files changed, 20 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/36/92636/1
diff --git a/repo/includes/api/ApiWikibase.php
b/repo/includes/api/ApiWikibase.php
index 352dd4b..8c3a117 100644
--- a/repo/includes/api/ApiWikibase.php
+++ b/repo/includes/api/ApiWikibase.php
@@ -97,32 +97,6 @@
return 'https://www.mediawiki.org/wiki/Extension:Wikibase/API#'
. $this-getModuleName();
}
- /** @deprecated */
- protected function addAliasesToResult( array $aliases, $path, $name =
'aliases', $tag = 'alias' ) {
- $builder = new ResultBuilder( $this-getResult() );
- $builder-addAliases( $aliases, $path, $name, $tag );
- }
- /** @deprecated */
- protected function addSiteLinksToResult( array $siteLinks, $path, $name
= 'sitelinks', $tag = 'sitelink', $options = null ) {
- $builder = new ResultBuilder( $this-getResult() );
- $builder-addSiteLinks( $siteLinks, $path, $name, $tag,
$options );
- }
- /** @deprecated */
- protected function addDescriptionsToResult( array $descriptions, $path,
$name = 'descriptions', $tag = 'description' ) {
- $builder = new ResultBuilder( $this-getResult() );
- $builder-addDescriptions( $descriptions, $path, $name, $tag );
- }
- /** @deprecated */
- protected function addLabelsToResult( array $labels, $path, $name =
'labels', $tag = 'label' ) {
- $builder = new ResultBuilder( $this-getResult() );
- $builder-addLabels( $labels, $path, $name, $tag );
- }
- /** @deprecated */
- protected function addClaimsToResult( array $claims, $path, $name =
'claims', $tag = 'claim' ) {
- $builder = new ResultBuilder( $this-getResult() );
- $builder-addClaims( $claims, $path, $name, $tag );
- }
-
/**
* Returns the permissions that are required to perform the operation
specified by
* the parameters.
diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index 3d05727..c5afeba 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -467,15 +467,17 @@
* @param Entity $entity
*/
protected function buildResult( Entity $entity ) {
- $this-addLabelsToResult( $entity-getLabels(), 'entity' );
- $this-addDescriptionsToResult( $entity-getDescriptions(),
'entity' );
- $this-addAliasesToResult( $entity-getAllAliases(), 'entity' );
+ $builder = new ResultBuilder( $this-getResult() );
+
+ $builder-addLabels( $entity-getLabels(), 'entity' );
+ $builder-addDescriptions( $entity-getDescriptions(), 'entity'
);
+ $builder-addAliases( $entity-getAllAliases(), 'entity' );
if ( $entity instanceof Item ) {
- $this-addSiteLinksToResult(
$entity-getSimpleSiteLinks(), 'entity' );
+ $builder-addSiteLinks( $entity-getSimpleSiteLinks(),
'entity' );
}
- $this-addClaimsToResult( $entity-getClaims(), 'entity' );
+ $builder-addClaims( $entity-getClaims(), 'entity' );
}
/**
diff --git a/repo/includes/api/LinkTitles.php b/repo/includes/api/LinkTitles.php
index ca170dd..2d5b0a7 100644
--- a/repo/includes/api/LinkTitles.php
+++ b/repo/includes/api/LinkTitles.php
@@ -109,7 +109,8 @@
$this-dieUsage( 'No common item detected, unable to
link titles' , 'no-common-item' );
}
- $this-addSiteLinksToResult( $return, 'entity' );
+ $builder = new ResultBuilder( $this-getResult() );
+ $builder-addSiteLinks( $return, 'entity' );
$status = $this-getAttemptSaveStatus( $itemContent, $summary,
$flags );
$this-buildResult( $itemContent, $status );
wfProfileOut( __METHOD__ );
diff --git a/repo/includes/api/SetAliases.php b/repo/includes/api/SetAliases.php
index 4a8afe8..3f1ce5a 100644
--- a/repo/includes/api/SetAliases.php
+++ b/repo/includes/api/SetAliases.php
@@ -89,8 +89,9 @@
}
$aliases = $entity-getAliases( $language );
+ $builder = new
[MediaWiki-commits] [Gerrit] switch mediawiki jobs to use git:// ZUUL repository - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92637
Change subject: switch mediawiki jobs to use git:// ZUUL repository
..
switch mediawiki jobs to use git:// ZUUL repository
When MediaWiki core jobs are running on a slave, they should fetch the
Zuul change using git://integration.wikimedia.org/ instead of the non
existent /srv/ssd/zuul/..
Change-Id: I7caa2421d735ddf43bbaf1d8240ab92b5362eab8
---
M mediawiki.yaml
1 file changed, 7 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/37/92637/1
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 63b8788..9b8d3f0 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -10,7 +10,7 @@
node: hasSlaveScripts
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
builders:
@@ -22,7 +22,7 @@
node: hasSlaveScripts
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
@@ -35,7 +35,7 @@
name: '{name}-jsduck'
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
builders:
@@ -47,7 +47,7 @@
node: gallium
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
builders:
@@ -66,7 +66,7 @@
node: gallium
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
builders:
@@ -112,7 +112,7 @@
name: '{name}-install-{databasetype}'
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
@@ -185,7 +185,7 @@
node: (hasSlaveScripts hasPhpUnit)
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
--
To view, visit https://gerrit.wikimedia.org/r/92637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7caa2421d735ddf43bbaf1d8240ab92b5362eab8
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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] switch mediawiki jobs to use git:// ZUUL repository - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: switch mediawiki jobs to use git:// ZUUL repository
..
switch mediawiki jobs to use git:// ZUUL repository
When MediaWiki core jobs are running on a slave, they should fetch the
Zuul change using git://integration.wikimedia.org/ instead of the non
existent /srv/ssd/zuul/..
Change-Id: I7caa2421d735ddf43bbaf1d8240ab92b5362eab8
---
M mediawiki.yaml
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 63b8788..9b8d3f0 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -10,7 +10,7 @@
node: hasSlaveScripts
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
builders:
@@ -22,7 +22,7 @@
node: hasSlaveScripts
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
@@ -35,7 +35,7 @@
name: '{name}-jsduck'
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
builders:
@@ -47,7 +47,7 @@
node: gallium
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
builders:
@@ -66,7 +66,7 @@
node: gallium
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
builders:
@@ -112,7 +112,7 @@
name: '{name}-install-{databasetype}'
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
@@ -185,7 +185,7 @@
node: (hasSlaveScripts hasPhpUnit)
defaults: use-zuul
scm:
- - git-mwcore-nosubmodules
+ - git-mwcore
triggers:
- zuul
--
To view, visit https://gerrit.wikimedia.org/r/92637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7caa2421d735ddf43bbaf1d8240ab92b5362eab8
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
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 building path for reading in global_south.csv portable - change (analytics/geowiki)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/92638 Change subject: Make building path for reading in global_south.csv portable .. Make building path for reading in global_south.csv portable Change-Id: I02454d26b9f93d6a098dfe7dee9b18ef2eebc9b8 --- M scripts/make_limn_files.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/geowiki refs/changes/38/92638/1 diff --git a/scripts/make_limn_files.py b/scripts/make_limn_files.py index f133259..df5f698 100755 --- a/scripts/make_limn_files.py +++ b/scripts/make_limn_files.py @@ -349,7 +349,7 @@ #write_project_country_language(project, cursor, basedir) def plot_gs_editor_fraction(basedir): -df = pd.read_csv(basedir + '/datafiles/global_south.csv', index_col='date', parse_dates=['date']) +df = pd.read_csv(os.path.join(basedir, 'datafiles', 'global_south.csv'), index_col='date', parse_dates=['date']) df['Global South Fraction (100+)'] = df['Global South (100+)'] / (df['Global South (100+)'] + df['Global North (100+)'] + df['Unkown (100+)']).apply(float) df['Global South Fraction (5+)'] = df['Global South (5+)'] / (df['Global South (5+)'] + df['Global North (5+)'] + df['Unkown (5+)']).apply(float) df['Global South Fraction (all)'] = df['Global South (all)'] / (df['Global South (all)'] + df['Global North (all)'] + df['Unkown (all)']).apply(float) @@ -392,7 +392,7 @@ For the computation of the data, this function relies solely on the global_south.csv file. -df = pd.read_csv(basedir_source + '/datafiles/global_south.csv', index_col='date', parse_dates=['date']) +df = pd.read_csv(os.path.join(basedir_source, 'datafiles', 'global_south.csv'), index_col='date', parse_dates=['date']) df['Active Editors Total'] = (df['Global South (5+)'] + df['Global North (5+)'] + df['Unkown (5+)'] ).apply(float) df_total = df[['Active Editors Total']] -- To view, visit https://gerrit.wikimedia.org/r/92638 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02454d26b9f93d6a098dfe7dee9b18ef2eebc9b8 Gerrit-PatchSet: 1 Gerrit-Project: analytics/geowiki 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] /var/lib/git - /srv/ssd/gerrit - change (integration/jenkins)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92639
Change subject: /var/lib/git - /srv/ssd/gerrit
..
/var/lib/git - /srv/ssd/gerrit
Change-Id: Id90733e9a7daa0d0670b8bc31a3979ed41694aa1
---
M jobs/_shared/build.xml
M jobs/_shared/default.properties
M tools/fetch-mw-ext
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/39/92639/1
diff --git a/jobs/_shared/build.xml b/jobs/_shared/build.xml
index 33705f6..7b0d1e1 100644
--- a/jobs/_shared/build.xml
+++ b/jobs/_shared/build.xml
@@ -773,7 +773,7 @@
Usage Example:
git-snapshot
- remote=/var/lib/git/mediawiki/core
+ remote=/srv/ssd/gerrit/mediawiki/core
treeish=master
dest=/tmp/snapshot
/
diff --git a/jobs/_shared/default.properties b/jobs/_shared/default.properties
index 1367c75..a1ae827 100644
--- a/jobs/_shared/default.properties
+++ b/jobs/_shared/default.properties
@@ -42,7 +42,7 @@
gerrit.baseurl=https://gerrit.wikimedia.org/r/p
# Where to clone repositories
-git.shared.dir=/var/lib/git
+git.shared.dir=/srv/ssd/gerrit
# Nightly build settings
diff --git a/tools/fetch-mw-ext b/tools/fetch-mw-ext
index 0b305dc..8486249 100755
--- a/tools/fetch-mw-ext
+++ b/tools/fetch-mw-ext
@@ -4,7 +4,7 @@
GERRIT_BASE=https://gerrit.wikimedia.org/r/p/;
# Path where Gerrit replicates repositories:
-GIT_BARE_BASE=/var/lib/git
+GIT_BARE_BASE=/srv/ssd/gerrit
# Helper functions
function warn() { echo $@ 12; }
--
To view, visit https://gerrit.wikimedia.org/r/92639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id90733e9a7daa0d0670b8bc31a3979ed41694aa1
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
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] /var/lib/git - /srv/ssd/gerrit - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged.
Change subject: /var/lib/git - /srv/ssd/gerrit
..
/var/lib/git - /srv/ssd/gerrit
Change-Id: Id90733e9a7daa0d0670b8bc31a3979ed41694aa1
---
M jobs/_shared/build.xml
M jobs/_shared/default.properties
M tools/fetch-mw-ext
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jobs/_shared/build.xml b/jobs/_shared/build.xml
index 33705f6..7b0d1e1 100644
--- a/jobs/_shared/build.xml
+++ b/jobs/_shared/build.xml
@@ -773,7 +773,7 @@
Usage Example:
git-snapshot
- remote=/var/lib/git/mediawiki/core
+ remote=/srv/ssd/gerrit/mediawiki/core
treeish=master
dest=/tmp/snapshot
/
diff --git a/jobs/_shared/default.properties b/jobs/_shared/default.properties
index 1367c75..a1ae827 100644
--- a/jobs/_shared/default.properties
+++ b/jobs/_shared/default.properties
@@ -42,7 +42,7 @@
gerrit.baseurl=https://gerrit.wikimedia.org/r/p
# Where to clone repositories
-git.shared.dir=/var/lib/git
+git.shared.dir=/srv/ssd/gerrit
# Nightly build settings
diff --git a/tools/fetch-mw-ext b/tools/fetch-mw-ext
index 0b305dc..8486249 100755
--- a/tools/fetch-mw-ext
+++ b/tools/fetch-mw-ext
@@ -4,7 +4,7 @@
GERRIT_BASE=https://gerrit.wikimedia.org/r/p/;
# Path where Gerrit replicates repositories:
-GIT_BARE_BASE=/var/lib/git
+GIT_BARE_BASE=/srv/ssd/gerrit
# Helper functions
function warn() { echo $@ 12; }
--
To view, visit https://gerrit.wikimedia.org/r/92639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id90733e9a7daa0d0670b8bc31a3979ed41694aa1
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
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 global var access - change (mediawiki...SemanticMediaWiki)
Jeroen De Dauw has submitted this change and it was merged. Change subject: Fix global var access .. Fix global var access Change-Id: If5cd1954cd078a86e1bceb3e87f0b9261ccee9a2 --- M SemanticMediaWiki.settings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jeroen De Dauw: Looks good to me, approved jenkins-bot: Verified diff --git a/SemanticMediaWiki.settings.php b/SemanticMediaWiki.settings.php index 9b01058..db4db8f 100644 --- a/SemanticMediaWiki.settings.php +++ b/SemanticMediaWiki.settings.php @@ -30,7 +30,7 @@ # web. Change it if required ($wgScriptPath is the path to the base directory # of your wiki). No final slash. ## -$smwgScriptPath = ( $wgExtensionAssetsPath === false ? $wgScriptPath . '/extensions' : $wgExtensionAssetsPath ) . '/SemanticMediaWiki'; +$GLOBALS['smwgScriptPath'] = ( $GLOBALS['wgExtensionAssetsPath'] === false ? $GLOBALS['wgScriptPath'] . '/extensions' : $GLOBALS['wgExtensionAssetsPath'] ) . '/SemanticMediaWiki'; ## ### -- To view, visit https://gerrit.wikimedia.org/r/92609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If5cd1954cd078a86e1bceb3e87f0b9261ccee9a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticMediaWiki Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Jeroen De Dauw jeroended...@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] remove entries for sq87-106, these hosts never existed - change (operations/dns)
Lcarr has submitted this change and it was merged. Change subject: remove entries for sq87-106, these hosts never existed .. remove entries for sq87-106, these hosts never existed Change-Id: Id1751710cfbdc49af91ad24df40d36edcaa6d15a --- M templates/152.80.208.in-addr.arpa M templates/wikimedia.org 2 files changed, 0 insertions(+), 40 deletions(-) Approvals: Lcarr: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/152.80.208.in-addr.arpa b/templates/152.80.208.in-addr.arpa index ce710b3..509aceb 100644 --- a/templates/152.80.208.in-addr.arpa +++ b/templates/152.80.208.in-addr.arpa @@ -42,18 +42,10 @@ 31 1H IN PTR cp10.wikimedia.org. 32 1H IN PTR virt0.wikimedia.org. 33 1H IN PTR labs-ns0.wikimedia.org. -34 1H IN PTR sq90.wikimedia.org. -35 1H IN PTR sq91.wikimedia.org. -36 1H IN PTR sq92.wikimedia.org. -37 1H IN PTR sq93.wikimedia.org. -38 1H IN PTR sq94.wikimedia.org. -39 1H IN PTR sq95.wikimedia.org. -40 1H IN PTR sq96.wikimedia.org. 47 1H IN PTR sq37.wikimedia.org. 48 1H IN PTR ms10.wikimedia.org. -50 1H IN PTR sq89.wikimedia.org. 53 1H IN PTR sq43.wikimedia.org. 54 1H IN PTR sq44.wikimedia.org. @@ -96,17 +88,7 @@ 94 1H IN PTR sq84.wikimedia.org. 95 1H IN PTR sq85.wikimedia.org. 96 1H IN PTR sq86.wikimedia.org. -97 1H IN PTR sq87.wikimedia.org. -98 1H IN PTR sq88.wikimedia.org. -1011H IN PTR sq97.wikimedia.org. -1021H IN PTR sq98.wikimedia.org. -1031H IN PTR sq99.wikimedia.org. -1041H IN PTR sq100.wikimedia.org. -1051H IN PTR sq101.wikimedia.org. -1061H IN PTR sq102.wikimedia.org. -107 1H IN PTR sq103.wikimedia.org. -1081H IN PTR sq104.wikimedia.org. 1101H IN PTR lvs5.wikimedia.org. 1111H IN PTR lvs6.wikimedia.org. @@ -163,8 +145,6 @@ 1811H IN PTR pdf3.wikimedia.org. -1821H IN PTR sq105.wikimedia.org. -1831H IN PTR sq106.wikimedia.org. 1841H IN PTR emery.wikimedia.org. 1851H IN PTR dataset2.wikimedia.org. 1861H IN PTR mchenry.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index af7b844..4a71e69 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -256,26 +256,6 @@ sq84 1H IN A208.80.152.94 sq85 1H IN A208.80.152.95 sq86 1H IN A208.80.152.96 -sq87 1H IN A208.80.152.97 -sq88 1H IN A208.80.152.98 -sq89 1H IN A208.80.152.50 -sq90 1H IN A208.80.152.34 -sq91 1H IN A208.80.152.35 -sq92 1H IN A208.80.152.36 -sq93 1H IN A208.80.152.37 -sq94 1H IN A208.80.152.38 -sq95 1H IN A208.80.152.39 -sq96 1H IN A208.80.152.40 -sq97 1H IN A208.80.152.101 -sq98 1H IN A208.80.152.102 -sq99 1H IN A208.80.152.103 -sq100 1H IN A208.80.152.104 -sq101 1H IN A208.80.152.105 -sq102 1H IN A208.80.152.106 -sq103 1H IN A208.80.152.107 -sq104 1H IN A208.80.152.108 -sq105 1H IN A208.80.152.182 -sq106 1H IN A208.80.152.183 ssl10011H IN A208.80.154.133 1H IN 2620:0:861:2:208:80:154:133 ssl10021H IN A208.80.154.134 -- To view, visit https://gerrit.wikimedia.org/r/92613 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id1751710cfbdc49af91ad24df40d36edcaa6d15a Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Lcarr lc...@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] git-mwcore macro used wrong reference - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/92640 Change subject: git-mwcore macro used wrong reference .. git-mwcore macro used wrong reference The git-mwcore macro 203c8f2c https://gerrit.wikimedia.org/r/#/c/84949/ was not using the proper reference repository, having /srv/ssd/zuul/git/mediawiki/core instead of the Gerrit replicated bare repository. Jobs updated: mediawiki-core-doxygen-publish mediawiki-core-install-sqlite mediawiki-core-jsduck mediawiki-core-jsduck-publish mediawiki-core-lint mediawiki-core-phpunit-api mediawiki-core-phpunit-databaseless mediawiki-core-phpunit-misc mediawiki-core-phpunit-parser mediawiki-core-qunit mediawiki-core-regression-REL1_19 mediawiki-core-regression-REL1_20 mediawiki-core-regression-REL1_21 mediawiki-core-regression-REL1_22 mediawiki-core-regression-master mediawiki-core-whitespaces Change-Id: I59223a2d13978b23317109fda0e3b0d23e977acd --- M macro-scm.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/40/92640/1 diff --git a/macro-scm.yaml b/macro-scm.yaml index 15e47e2..7dbd2cb 100644 --- a/macro-scm.yaml +++ b/macro-scm.yaml @@ -28,7 +28,7 @@ scm: - git: url: 'git://integration.wikimedia.org/mediawiki/core' -reference-repo: '/srv/ssd/zuul/git/mediawiki/core' +reference-repo: '/srv/ssd/gerrit/mediawiki/core.git' branches: - '$ZUUL_COMMIT' refspec: '$ZUUL_REF' -- To view, visit https://gerrit.wikimedia.org/r/92640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59223a2d13978b23317109fda0e3b0d23e977acd Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-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] Update tags - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/92641 Change subject: Update tags .. Update tags Change-Id: I3f0e94d480ceb3c8bc05085f428d11963925f481 --- M groups/Blockly/Blockly.yaml 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/41/92641/1 diff --git a/groups/Blockly/Blockly.yaml b/groups/Blockly/Blockly.yaml index b963c85..7b72014 100644 --- a/groups/Blockly/Blockly.yaml +++ b/groups/Blockly/Blockly.yaml @@ -61,9 +61,20 @@ - LOGIC_NULL_HELPURL - LOGIC_OPERATION_HELPURL - LOGIC_TERNARY_HELPURL -- MATH_CHANGE_HELPURL +- MATH_ADDITION_SYMBOL - MATH_CONSTRAIN_HELPURL +- MATH_DIVISION_SYMBOL +- MATH_MULTIPLICATION_SYMBOL +- MATH_MULTIPLICATION_SYMBOL - MATH_ONLIST_HELPURL +- MATH_POWER_SYMBOL +- MATH_SUBTRACTION_SYMBOL +- MATH_TRIG_ACOS +- MATH_TRIG_ASIN +- MATH_TRIG_ATAN +- MATH_TRIG_COS +- MATH_TRIG_SIN +- MATH_TRIG_TAN - ORDINAL_NUMBER_SUFFIX - PROCEDURES_CALLNORETURN_CALL - PROCEDURES_DEFNORETURN_DO -- To view, visit https://gerrit.wikimedia.org/r/92641 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f0e94d480ceb3c8bc05085f428d11963925f481 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update tags - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Update tags .. Update tags Change-Id: I3f0e94d480ceb3c8bc05085f428d11963925f481 --- M groups/Blockly/Blockly.yaml 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/Blockly/Blockly.yaml b/groups/Blockly/Blockly.yaml index b963c85..7b72014 100644 --- a/groups/Blockly/Blockly.yaml +++ b/groups/Blockly/Blockly.yaml @@ -61,9 +61,20 @@ - LOGIC_NULL_HELPURL - LOGIC_OPERATION_HELPURL - LOGIC_TERNARY_HELPURL -- MATH_CHANGE_HELPURL +- MATH_ADDITION_SYMBOL - MATH_CONSTRAIN_HELPURL +- MATH_DIVISION_SYMBOL +- MATH_MULTIPLICATION_SYMBOL +- MATH_MULTIPLICATION_SYMBOL - MATH_ONLIST_HELPURL +- MATH_POWER_SYMBOL +- MATH_SUBTRACTION_SYMBOL +- MATH_TRIG_ACOS +- MATH_TRIG_ASIN +- MATH_TRIG_ATAN +- MATH_TRIG_COS +- MATH_TRIG_SIN +- MATH_TRIG_TAN - ORDINAL_NUMBER_SUFFIX - PROCEDURES_CALLNORETURN_CALL - PROCEDURES_DEFNORETURN_DO -- To view, visit https://gerrit.wikimedia.org/r/92641 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f0e94d480ceb3c8bc05085f428d11963925f481 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@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] decommissioned cp1-10 - change (operations/dns)
Lcarr has uploaded a new change for review. https://gerrit.wikimedia.org/r/92642 Change subject: decommissioned cp1-10 .. decommissioned cp1-10 Change-Id: I27d90e78db2f3e3268c79454e6977c90999d054b --- M templates/152.80.208.in-addr.arpa M templates/wikimedia.org 2 files changed, 0 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/42/92642/1 diff --git a/templates/152.80.208.in-addr.arpa b/templates/152.80.208.in-addr.arpa index 509aceb..88cc9d3 100644 --- a/templates/152.80.208.in-addr.arpa +++ b/templates/152.80.208.in-addr.arpa @@ -30,16 +30,6 @@ 19 1H IN PTR ssl4.wikimedia.org. 20 1H IN PTR gurvin.wikimedia.org. 21 1H IN PTR yvon.wikimedia.org. -22 1H IN PTR cp1.wikimedia.org. -23 1H IN PTR cp2.wikimedia.org. -24 1H IN PTR cp3.wikimedia.org. -25 1H IN PTR cp4.wikimedia.org. -26 1H IN PTR cp5.wikimedia.org. -27 1H IN PTR cp6.wikimedia.org. -28 1H IN PTR cp7.wikimedia.org. -29 1H IN PTR cp8.wikimedia.org. -30 1H IN PTR cp9.wikimedia.org. -31 1H IN PTR cp10.wikimedia.org. 32 1H IN PTR virt0.wikimedia.org. 33 1H IN PTR labs-ns0.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 4a71e69..59a0fce 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -120,16 +120,6 @@ chromium 1H IN A208.80.154.157 1H IN 2620:0:861:2:208:80:154:157 colby 1H IN A208.80.152.135 -cp11H IN A208.80.152.22 -cp21H IN A208.80.152.23 -cp31H IN A208.80.152.24 -cp41H IN A208.80.152.25 -cp51H IN A208.80.152.26 -cp61H IN A208.80.152.27 -cp71H IN A208.80.152.28 -cp81H IN A208.80.152.29 -cp91H IN A208.80.152.30 -cp10 1H IN A208.80.152.31 dataset2 1H IN A208.80.152.185 dataset10011H IN A208.80.154.11 db61 1H IN A208.80.152.231 -- To view, visit https://gerrit.wikimedia.org/r/92642 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27d90e78db2f3e3268c79454e6977c90999d054b Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Lcarr lc...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] decommissioned cp1-10 - change (operations/dns)
Lcarr has submitted this change and it was merged. Change subject: decommissioned cp1-10 .. decommissioned cp1-10 Change-Id: I27d90e78db2f3e3268c79454e6977c90999d054b --- M templates/152.80.208.in-addr.arpa M templates/wikimedia.org 2 files changed, 0 insertions(+), 20 deletions(-) Approvals: Lcarr: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/152.80.208.in-addr.arpa b/templates/152.80.208.in-addr.arpa index 509aceb..88cc9d3 100644 --- a/templates/152.80.208.in-addr.arpa +++ b/templates/152.80.208.in-addr.arpa @@ -30,16 +30,6 @@ 19 1H IN PTR ssl4.wikimedia.org. 20 1H IN PTR gurvin.wikimedia.org. 21 1H IN PTR yvon.wikimedia.org. -22 1H IN PTR cp1.wikimedia.org. -23 1H IN PTR cp2.wikimedia.org. -24 1H IN PTR cp3.wikimedia.org. -25 1H IN PTR cp4.wikimedia.org. -26 1H IN PTR cp5.wikimedia.org. -27 1H IN PTR cp6.wikimedia.org. -28 1H IN PTR cp7.wikimedia.org. -29 1H IN PTR cp8.wikimedia.org. -30 1H IN PTR cp9.wikimedia.org. -31 1H IN PTR cp10.wikimedia.org. 32 1H IN PTR virt0.wikimedia.org. 33 1H IN PTR labs-ns0.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 4a71e69..59a0fce 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -120,16 +120,6 @@ chromium 1H IN A208.80.154.157 1H IN 2620:0:861:2:208:80:154:157 colby 1H IN A208.80.152.135 -cp11H IN A208.80.152.22 -cp21H IN A208.80.152.23 -cp31H IN A208.80.152.24 -cp41H IN A208.80.152.25 -cp51H IN A208.80.152.26 -cp61H IN A208.80.152.27 -cp71H IN A208.80.152.28 -cp81H IN A208.80.152.29 -cp91H IN A208.80.152.30 -cp10 1H IN A208.80.152.31 dataset2 1H IN A208.80.152.185 dataset10011H IN A208.80.154.11 db61 1H IN A208.80.152.231 -- To view, visit https://gerrit.wikimedia.org/r/92642 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27d90e78db2f3e3268c79454e6977c90999d054b Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Lcarr lc...@wikimedia.org Gerrit-Reviewer: Lcarr lc...@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] Split data directory into public and private part - change (analytics/geowiki)
Milimetric has submitted this change and it was merged.
Change subject: Split data directory into public and private part
..
Split data directory into public and private part
Card: analytics 1168
Change-Id: Ib915bbf8abeec37a409c315dea36e371f20834b8
---
M scripts/make_and_push_limn_files.sh
M scripts/make_limn_files.py
2 files changed, 60 insertions(+), 35 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/scripts/make_and_push_limn_files.sh
b/scripts/make_and_push_limn_files.sh
index 0634528..91acd0b 100755
--- a/scripts/make_and_push_limn_files.sh
+++ b/scripts/make_and_push_limn_files.sh
@@ -41,7 +41,8 @@
#---
# Filtering parameters
CRON_MODE=no
-BASE_DIR_REL=
+BASE_DIR_PUBLIC_DIR_REL=
+BASE_DIR_PRIVATE_DIR_REL=
for PARAM in $@
do
case $PARAM in
@@ -49,8 +50,11 @@
$MAIN_SCRIPT_FILE_ABS --help
exit 0
;;
- --basedir=* | -d=* )
- BASE_DIR_REL=${PARAM//*=/}
+ --basedir_public=* | -d=* )
+ BASE_DIR_PUBLIC_DIR_REL=${PARAM//*=/}
+ ;;
+ --basedir_private=* )
+ BASE_DIR_PRIVATE_DIR_REL=${PARAM//*=/}
;;
esac
done
@@ -72,28 +76,42 @@
exit $EXIT_CODE
fi
-if [ -z $BASE_DIR_REL ]
+if [ -z $BASE_DIR_PUBLIC_DIR_REL ]
then
- error No --basedir provided.
+ error No --basedir_public provided.
+fi
+
+if [ -z $BASE_DIR_PRIVATE_DIR_REL ]
+then
+ error No --basedir_private provided.
fi
#---
# Actual making and pushing of limn files
-# Cleaning data repo
-cd $BASE_DIR_REL
-git reset --hard
-git pull
-cd -
+# Cleaning data repos
+for REPO_DIR_REL in $BASE_DIR_PUBLIC_DIR_REL $BASE_DIR_PRIVATE_DIR_REL
+do
+ pushd $REPO_DIR_REL /dev/null
+ git reset --hard
+ git pull
+ popd /dev/null
+done
# Recompute limn files
$MAIN_SCRIPT_FILE_ABS $@
-# Commit and push limn files
-cd $BASE_DIR_REL
-git add -A
-LAST_DATE=$(tail --lines=1 datafiles/en_all.csv | cut --field=1 --delimiter=,
)
+# Get the most recent date. We assume en_all.csv always has at least one
+# editor on any given day :-)
+LAST_DATE=$(tail --lines=1 $BASE_DIR_PRIVATE_DIR_REL/datafiles/en_all.csv |
cut --field=1 --delimiter=, )
LAST_DATE=${LAST_DATE-}
-git commit -m Automatic commit of data up to $LAST_DATE
-git push
-cd -
+
+# Commit and push limn files
+for REPO_DIR_REL in $BASE_DIR_PUBLIC_DIR_REL $BASE_DIR_PRIVATE_DIR_REL
+do
+ pushd $REPO_DIR_REL /dev/null
+ git add -A
+ git commit -m Automatic commit of data up to $LAST_DATE
+ git push
+ popd /dev/null
+done
diff --git a/scripts/make_limn_files.py b/scripts/make_limn_files.py
index 9055bda..f133259 100755
--- a/scripts/make_limn_files.py
+++ b/scripts/make_limn_files.py
@@ -276,9 +276,13 @@
nargs='+',
help='any number of appropriately named json files')
parser.add_argument(
-'-d','--basedir',
-default='/home/erosen/src/dashboard/geowiki/data',
-help='directory in which to find or create the datafiles and
datasources directories for the *.csv and *.yaml files')
+'-d', '--basedir_public',
+default=os.path.join(os.path.expanduser('~'), 'geowiki',
'data-public'),
+help='directory in which to find or create the public datafiles and
public datasources directories for the *.csv and *.json files')
+parser.add_argument(
+'--basedir_private',
+default=os.path.join(os.path.expanduser('~'), 'geowiki',
'data-private'),
+help='directory in which to find or create the private datafiles and
private datasources directories for the *.csv and *.json files')
parser.add_argument(
'-b', '--basename',
default='geo_editors',
@@ -371,21 +375,24 @@
for widget in g.graph[root][children] \
if nodeType not in widget or widget[nodeType] != callout ]
-def plot_active_editor_totals(basedir):
+def plot_active_editor_totals(basedir_source, basedir_destination):
Write out files for 'Active Editors Total' graph
Keyword arguments:
-basedir -- string. Path to the data repository
+basedir_source -- string. Path to the data repository to read
+global_south.csv from
+basedir_destination -- string. Path to the data repository to store
+the comupted data in
This function computes the total number of active editors and
writes out the necessary datafile, datasource, and graph files to
show them in Limn. Those files get written into the corresponding
-subdirectories of basedir.
+subdirectories of basedir_destination.
For the computation of the data, this function relies solely on
the
[MediaWiki-commits] [Gerrit] Make building path for reading in global_south.csv portable - change (analytics/geowiki)
Milimetric has submitted this change and it was merged. Change subject: Make building path for reading in global_south.csv portable .. Make building path for reading in global_south.csv portable Change-Id: I02454d26b9f93d6a098dfe7dee9b18ef2eebc9b8 --- M scripts/make_limn_files.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Milimetric: Verified; Looks good to me, approved diff --git a/scripts/make_limn_files.py b/scripts/make_limn_files.py index f133259..df5f698 100755 --- a/scripts/make_limn_files.py +++ b/scripts/make_limn_files.py @@ -349,7 +349,7 @@ #write_project_country_language(project, cursor, basedir) def plot_gs_editor_fraction(basedir): -df = pd.read_csv(basedir + '/datafiles/global_south.csv', index_col='date', parse_dates=['date']) +df = pd.read_csv(os.path.join(basedir, 'datafiles', 'global_south.csv'), index_col='date', parse_dates=['date']) df['Global South Fraction (100+)'] = df['Global South (100+)'] / (df['Global South (100+)'] + df['Global North (100+)'] + df['Unkown (100+)']).apply(float) df['Global South Fraction (5+)'] = df['Global South (5+)'] / (df['Global South (5+)'] + df['Global North (5+)'] + df['Unkown (5+)']).apply(float) df['Global South Fraction (all)'] = df['Global South (all)'] / (df['Global South (all)'] + df['Global North (all)'] + df['Unkown (all)']).apply(float) @@ -392,7 +392,7 @@ For the computation of the data, this function relies solely on the global_south.csv file. -df = pd.read_csv(basedir_source + '/datafiles/global_south.csv', index_col='date', parse_dates=['date']) +df = pd.read_csv(os.path.join(basedir_source, 'datafiles', 'global_south.csv'), index_col='date', parse_dates=['date']) df['Active Editors Total'] = (df['Global South (5+)'] + df['Global North (5+)'] + df['Unkown (5+)'] ).apply(float) df_total = df[['Active Editors Total']] -- To view, visit https://gerrit.wikimedia.org/r/92638 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02454d26b9f93d6a098dfe7dee9b18ef2eebc9b8 Gerrit-PatchSet: 1 Gerrit-Project: analytics/geowiki Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at Gerrit-Reviewer: Milimetric dandree...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use a job to handle link updates. - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92643
Change subject: Use a job to handle link updates.
..
Use a job to handle link updates.
This job will immediately execute itself if it is built in the CLI.
In a web process it'll be queued for later execution.
Bug: 55848
Change-Id: I7bad34fef368a3177c7658d066092c86efec24ad
---
M CirrusSearch.php
A includes/CirrusSearchLinksUpdateJob.php
M includes/CirrusSearchUpdater.php
3 files changed, 72 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/43/92643/1
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 69d4aa0..b393ef3 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -130,6 +130,7 @@
$wgAutoloadClasses['CirrusSearch'] = $includes . 'CirrusSearch.body.php';
$wgAutoloadClasses['CirrusSearchAnalysisConfigBuilder'] = $includes .
'CirrusSearchAnalysisConfigBuilder.php';
$wgAutoloadClasses['CirrusSearchConnection'] = $includes .
'CirrusSearchConnection.php';
+$wgAutoloadClasses['CirrusSearchLinksUpdateJob'] = $includes .
'CirrusSearchLinksUpdateJob.php';
$wgAutoloadClasses['CirrusSearchFullTextResultsType'] = $includes .
'CirrusSearchResultsType.php';
$wgAutoloadClasses['CirrusSearchMappingConfigBuilder'] = $includes .
'CirrusSearchMappingConfigBuilder.php';
$wgAutoloadClasses['CirrusSearchReindexForkController'] = $includes .
'CirrusSearchReindexForkController.php';
@@ -144,7 +145,7 @@
/**
* Hooks
*/
-$wgHooks['LinksUpdateComplete'][] =
'CirrusSearchUpdater::linksUpdateCompletedHook';
+$wgHooks['LinksUpdateComplete'][] =
'CirrusSearchLinksUpdateJob::linksUpdateCompletedHook';
// Install our prefix search hook only if we're enabled.
$wgExtensionFunctions[] = function() {
global $wgSearchType, $wgHooks;
@@ -157,3 +158,8 @@
* i18n
*/
$wgExtensionMessagesFiles['CirrusSearch'] = __DIR__ . '/CirrusSearch.i18n.php';
+
+/**
+ * Jobs
+ */
+$wgJobClasses[ 'cirrusSearchLinksUpdate' ] = 'CirrusSearchLinksUpdateJob';
\ No newline at end of file
diff --git a/includes/CirrusSearchLinksUpdateJob.php
b/includes/CirrusSearchLinksUpdateJob.php
new file mode 100644
index 000..8e898f6
--- /dev/null
+++ b/includes/CirrusSearchLinksUpdateJob.php
@@ -0,0 +1,64 @@
+?php
+/**
+ * Hooks linksUpdateCompleted to update pages either in process or by queueing
+ * this job.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+class CirrusSearchLinksUpdateJob extends Job {
+ /**
+* Hooked to update the search index for pages when templates that they
include are changed
+* and to kick off updating linked articles.
+* @param $linksUpdate LinksUpdate
+*/
+ public static function linksUpdateCompletedHook( $linksUpdate ) {
+ $inCli = PHP_SAPI == 'cli';
+ // In the web process the title update will be taken care of by
the SearchEngine infrastructure
+ // so no need to update it in the job.
+ $titleNeedsUpdate = $inCli;
+ $addedLinks = $linksUpdate-getAddedLinks();
+ $removedLinks = $linksUpdate-getRemovedLinks();
+ if ( !$titleNeedsUpdate count( $addedLinks ) === 0 count(
$removedLinks ) === 0 ) {
+ // Nothing to do
+ return;
+ }
+ $job = new CirrusSearchLinksUpdateJob(
$linksUpdate-getTitle(), array(
+ 'addedLinks' = $addedLinks,
+ 'removedLinks' = $removedLinks,
+ 'titleNeedsUpdate' = $titleNeedsUpdate,
+ ) );
+ if ( $inCli ) {
+ // We are already on the cli (probably already running
jobs) then there is no reason
+ // to fork this job from the hook - just run them right
now.
+ $job-run();
+ } else {
+ // We're in a web process so we should push this job on
the queue and get to it later
+ JobQueueGroup::singleton()-push( $job );
+ }
+ }
+
+ public function __construct( $title, $params, $id = 0 )
[MediaWiki-commits] [Gerrit] Make dumpJson.php robust against failures. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92644
Change subject: Make dumpJson.php robust against failures.
..
Make dumpJson.php robust against failures.
This introduces an ExceptionHandler interface to handle
exceptions in a way other than throwing them. This is used
to continue processing after logging errors that may occurr
when generating a (potentially very large) json dump.
Change-Id: I282d5304e584c48355950de7011c90dbe60f52e3
---
M lib/includes/Dumpers/JsonDumpGenerator.php
M lib/includes/IO/EntityIdReader.php
M lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
A lib/tests/phpunit/IO/EntityIdReaderTest.bad.txt
M lib/tests/phpunit/IO/EntityIdReaderTest.txt
M lib/tests/phpunit/IO/EntrityIdReaderTest.php
M repo/Wikibase.classes.php
M repo/maintenance/dumpJson.php
8 files changed, 285 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/44/92644/1
diff --git a/lib/includes/Dumpers/JsonDumpGenerator.php
b/lib/includes/Dumpers/JsonDumpGenerator.php
index 09c8439..49703b8 100644
--- a/lib/includes/Dumpers/JsonDumpGenerator.php
+++ b/lib/includes/Dumpers/JsonDumpGenerator.php
@@ -2,7 +2,11 @@
namespace Wikibase\Dumpers;
+use ExceptionHandler;
+use MessageReporter;
use MWException;
+use NullMessageReporter;
+use RethrowingExceptionHandler;
use Traversable;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\EntityLookup;
@@ -23,6 +27,11 @@
* @var int flags to use with json_encode as a bit field, see PHP's
JSON_XXX constants.
*/
public $jsonFlags = 0;
+
+ /**
+* @var int interval at which to output progress messages.
+*/
+ public $progressInterval = 100;
/**
* @var resource File handle for output
@@ -55,6 +64,16 @@
protected $entityType = null;
/**
+* @var MessageReporter
+*/
+ protected $progressReporter;
+
+ /**
+* @var ExceptionHandler
+*/
+ protected $exceptionHandler;
+
+ /**
* @param resource $out
* @param \Wikibase\EntityLookup $lookup
* @param Serializer $entitySerializer
@@ -69,6 +88,55 @@
$this-out = $out;
$this-entitySerializer = $entitySerializer;
$this-entityLookup = $lookup;
+
+ $this-progressReporter = new NullMessageReporter();
+ $this-exceptionHandler = new RethrowingExceptionHandler();
+ }
+
+ /**
+* Sets the interval for progress reporting
+*
+* @param int $progressInterval
+*/
+ public function setProgressInterval( $progressInterval ) {
+ $this-progressInterval = $progressInterval;
+ }
+
+ /**
+* Returns the interval for progress reporting
+*
+* @return int
+*/
+ public function getProgressInterval() {
+ return $this-progressInterval;
+ }
+
+ /**
+* @param \MessageReporter $progressReporter
+*/
+ public function setProgressReporter( MessageReporter $progressReporter
) {
+ $this-progressReporter = $progressReporter;
+ }
+
+ /**
+* @return \MessageReporter
+*/
+ public function getProgressReporter() {
+ return $this-progressReporter;
+ }
+
+ /**
+* @param \ExceptionHandler $exceptionHandler
+*/
+ public function setExceptionHandler( ExceptionHandler $exceptionHandler
) {
+ $this-exceptionHandler = $exceptionHandler;
+ }
+
+ /**
+* @return \ExceptionHandler
+*/
+ public function getExceptionHandler() {
+ return $this-exceptionHandler;
}
/**
@@ -134,15 +202,25 @@
}
$entity = $this-entityLookup-getEntity( $id );
+
+ if ( !$entity ) {
+ throw new StorageException( 'Entity not
found: ' . $id-getSerialization() );
+ }
+
$data = $this-entitySerializer-getSerialized(
$entity );
$json = $this-encode( $data );
+
$this-writeToDump( $json );
} catch ( StorageException $ex ) {
- $this-handleStorageException( $ex );
+ $this-exceptionHandler-handleException( $ex,
'failed-to-dump', 'Failed to dump '. $id );
}
- //TODO: use callback for reporting progress
+ if ( $this-progressInterval 0 ( $i %
$this-progressInterval ) === 0 ) {
+ $this-progressReporter-reportMessage(
'Processed ' . $i . '
[MediaWiki-commits] [Gerrit] Add info and discussion links for BetaFeatures - change (mediawiki...BetaFeatures)
jenkins-bot has submitted this change and it was merged.
Change subject: Add info and discussion links for BetaFeatures
..
Add info and discussion links for BetaFeatures
Bug: 56333
Change-Id: I2a7ea6c050db856371c1656691c068692feb37a9
---
M BetaFeatures.i18n.php
M BetaFeaturesHooks.php
M includes/HTMLTextBlockField.php
3 files changed, 46 insertions(+), 1 deletion(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/BetaFeatures.i18n.php b/BetaFeatures.i18n.php
index 521ea39..357161c 100644
--- a/BetaFeatures.i18n.php
+++ b/BetaFeatures.i18n.php
@@ -48,6 +48,9 @@
'betafeatures-test-feature-field' = 'This is a test feature - it
should not show up.', # do not translate or duplicate this message to other
languages
'betafeatures-tooltip' = 'Introducing Beta Features! This new
preferences section lets you test and give feedback about new features before
we launch them as default behavior. Try out something new now!',
+
+ 'betafeatures-about-betafeatures' = 'About Beta Features',
+ 'betafeatures-discuss-betafeatures' = 'Leave feedback',
);
/** Message documentation (Message documentation)
@@ -103,6 +106,9 @@
The label for the checkbox is {{msg-mw|Betafeatures-test-check-field}}.',
'betafeatures-tooltip' = 'A tooltip meant to advertise the existence
of the BetaFeatures preferences page the first time a user sees it. Only shown
once, meant to be a call to action.',
+
+ 'betafeatures-about-betafeatures' = 'Text for a link to a page
describing what Beta Features is, what the project is for, etc.',
+ 'betafeatures-discuss-betafeatures' = 'Text for a link to a page where
users can leave feedback about Beta Features.',
);
/** Arabic (العربية)
diff --git a/BetaFeaturesHooks.php b/BetaFeaturesHooks.php
index 8406b27..b5020e5 100644
--- a/BetaFeaturesHooks.php
+++ b/BetaFeaturesHooks.php
@@ -158,7 +158,31 @@
$prefs['betafeatures-section-desc'] = array(
'class' = 'HTMLTextBlockField',
- 'label' = wfMessage( 'betafeatures-section-desc',
count( $betaPrefs ), $wgSitename )-text(),
+ 'label' = implode( '', array(
+ Html::rawElement(
+ 'p',
+ array(),
+ wfMessage( 'betafeatures-section-desc',
count( $betaPrefs ), $wgSitename )-text()
+ ),
+
+ Html::rawElement( 'p', array(), implode( ' | ',
array(
+ Html::rawElement(
+ 'a',
+ array(
+ 'href' =
'//mediawiki.org/wiki/About_Beta_Features'
+ ),
+ wfMessage(
'betafeatures-about-betafeatures' )
+ ),
+
+ Html::rawElement(
+ 'a',
+ array(
+ 'href' =
'//mediawiki.org/wiki/Talk:About_Beta_Features'
+ ),
+ wfMessage(
'betafeatures-discuss-betafeatures' )
+ ),
+ ) ) ),
+ ) ),
'section' = 'betafeatures',
);
diff --git a/includes/HTMLTextBlockField.php b/includes/HTMLTextBlockField.php
index 765aa5f..a2ddd9f 100644
--- a/includes/HTMLTextBlockField.php
+++ b/includes/HTMLTextBlockField.php
@@ -24,6 +24,21 @@
class HTMLTextBlockField extends HTMLFormField {
/**
+* Override __construct so we can allow HTML in labels
+*/
+ function __construct( $params ) {
+ if ( isset( $params['label'] ) ) {
+ $label = $params['label'];
+ }
+
+ parent::__construct( $params );
+
+ if ( isset( $label ) ) {
+ $this-mLabel = $label;
+ }
+ }
+
+ /**
* This field type is meant to be used for a block of text, so
* the right-aligned label style doesn't really apply.
* @return string
--
To view, visit https://gerrit.wikimedia.org/r/92568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a7ea6c050db856371c1656691c068692feb37a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Esanders
[MediaWiki-commits] [Gerrit] Release v1.4 - change (mediawiki...erudite)
Njw has uploaded a new change for review. https://gerrit.wikimedia.org/r/92645 Change subject: Release v1.4 .. Release v1.4 Change-Id: Id703ea3de95accaa249c76b3583a288305228be7 --- M erudite.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite refs/changes/45/92645/1 diff --git a/erudite.php b/erudite.php index db63d6b..366800c 100644 --- a/erudite.php +++ b/erudite.php @@ -17,7 +17,7 @@ 'name' = 'Erudite', 'url' = 'https://www.mediawiki.org/wiki/Skin:Erudite', 'author' = array( 'Nick White', 'Matt Wiebe', 'Colin Andrew Ferm' ), - 'version' = '1.3', + 'version' = '1.4', 'descriptionmsg' = 'erudite-desc', ); -- To view, visit https://gerrit.wikimedia.org/r/92645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id703ea3de95accaa249c76b3583a288305228be7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/erudite Gerrit-Branch: master Gerrit-Owner: Njw nick.wh...@durham.ac.uk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release v1.4 - change (mediawiki...erudite)
Njw has submitted this change and it was merged. Change subject: Release v1.4 .. Release v1.4 Change-Id: Id703ea3de95accaa249c76b3583a288305228be7 --- M erudite.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Njw: Verified; Looks good to me, approved diff --git a/erudite.php b/erudite.php index db63d6b..366800c 100644 --- a/erudite.php +++ b/erudite.php @@ -17,7 +17,7 @@ 'name' = 'Erudite', 'url' = 'https://www.mediawiki.org/wiki/Skin:Erudite', 'author' = array( 'Nick White', 'Matt Wiebe', 'Colin Andrew Ferm' ), - 'version' = '1.3', + 'version' = '1.4', 'descriptionmsg' = 'erudite-desc', ); -- To view, visit https://gerrit.wikimedia.org/r/92645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id703ea3de95accaa249c76b3583a288305228be7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/erudite Gerrit-Branch: master Gerrit-Owner: Njw nick.wh...@durham.ac.uk Gerrit-Reviewer: Njw nick.wh...@durham.ac.uk Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup lib/includes/serializers - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/92646 Change subject: Cleanup lib/includes/serializers .. Cleanup lib/includes/serializers Cleanup all files before starting to look at them. This commit also splits the Options files into 3 seperate files (one per class) Change-Id: I776358b0b9dbfcc0b525c8d6aef0a135d2d119b2 --- M lib/WikibaseLib.classes.php M lib/includes/serializers/AliasSerializer.php M lib/includes/serializers/ByPropertyListSerializer.php M lib/includes/serializers/ByPropertyListUnserializer.php M lib/includes/serializers/ClaimSerializer.php M lib/includes/serializers/ClaimsSerializer.php M lib/includes/serializers/DescriptionSerializer.php A lib/includes/serializers/EntitySerializationOptions.php M lib/includes/serializers/EntitySerializer.php M lib/includes/serializers/ItemSerializer.php M lib/includes/serializers/LabelSerializer.php A lib/includes/serializers/MultiLangSerializationOptions.php M lib/includes/serializers/MultilingualSerializer.php M lib/includes/serializers/PropertySerializer.php M lib/includes/serializers/ReferenceSerializer.php M lib/includes/serializers/SerializationOptions.php M lib/includes/serializers/Serializer.php M lib/includes/serializers/SerializerFactory.php M lib/includes/serializers/SerializerObject.php M lib/includes/serializers/SiteLinkSerializer.php M lib/includes/serializers/SnakSerializer.php M lib/includes/serializers/Unserializer.php 22 files changed, 284 insertions(+), 426 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/46/92646/1 diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php index 6fb2bea..cfc1e68 100644 --- a/lib/WikibaseLib.classes.php +++ b/lib/WikibaseLib.classes.php @@ -139,9 +139,9 @@ 'Wikibase\Lib\Serializers\PropertySerializer' = 'includes/serializers/PropertySerializer.php', 'Wikibase\Lib\Serializers\ReferenceSerializer' = 'includes/serializers/ReferenceSerializer.php', 'Wikibase\Lib\Serializers\SerializationOptions' = 'includes/serializers/SerializationOptions.php', - 'Wikibase\Lib\Serializers\MultiLangSerializationOptions' = 'includes/serializers/SerializationOptions.php', + 'Wikibase\Lib\Serializers\MultiLangSerializationOptions' = 'includes/serializers/MultiLangSerializationOptions.php', + 'Wikibase\Lib\Serializers\EntitySerializationOptions' = 'includes/serializers/EntitySerializationOptions.php', 'Wikibase\Lib\Serializers\MultilingualSerializer' = 'includes/serializers/MultilingualSerializer.php', - 'Wikibase\Lib\Serializers\EntitySerializationOptions' = 'includes/serializers/SerializationOptions.php', 'Wikibase\Lib\Serializers\Serializer' = 'includes/serializers/Serializer.php', 'Wikibase\Lib\Serializers\SerializerFactory' = 'includes/serializers/SerializerFactory.php', 'Wikibase\Lib\Serializers\SerializerObject' = 'includes/serializers/SerializerObject.php', diff --git a/lib/includes/serializers/AliasSerializer.php b/lib/includes/serializers/AliasSerializer.php index 8d7058e..5e4b519 100644 --- a/lib/includes/serializers/AliasSerializer.php +++ b/lib/includes/serializers/AliasSerializer.php @@ -11,8 +11,6 @@ * * @since 0.4 * - * @ingroup WikibaseLib - * * @licence GNU GPL v2+ * @author Tobias Gritschacher tobias.gritschac...@wikimedia.de * @author Katie Filbert aude.w...@gmail.com diff --git a/lib/includes/serializers/ByPropertyListSerializer.php b/lib/includes/serializers/ByPropertyListSerializer.php index d14629a..9de1176 100644 --- a/lib/includes/serializers/ByPropertyListSerializer.php +++ b/lib/includes/serializers/ByPropertyListSerializer.php @@ -5,7 +5,6 @@ use Traversable; use InvalidArgumentException; use Wikibase\ByPropertyIdArray; -use Wikibase\DataModel\Entity\PropertyId; /** * Serializer for Traversable objects that need to be grouped @@ -27,9 +26,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @since 0.2 - * - * @file - * @ingroup WikibaseLib * * @licence GNU GPL v2+ * @author Jeroen De Dauw jeroended...@gmail.com diff --git a/lib/includes/serializers/ByPropertyListUnserializer.php b/lib/includes/serializers/ByPropertyListUnserializer.php index ca99b9e..8e91fa2 100644 --- a/lib/includes/serializers/ByPropertyListUnserializer.php +++ b/lib/includes/serializers/ByPropertyListUnserializer.php @@ -26,9 +26,6 @@ * * @since 0.4 * - * @file - * @ingroup WikibaseLib - * * @licence GNU GPL v2+ * @author Jeroen De Dauw jeroended...@gmail.com */ diff --git a/lib/includes/serializers/ClaimSerializer.php b/lib/includes/serializers/ClaimSerializer.php index be5019f..e7bf013 100644 --- a/lib/includes/serializers/ClaimSerializer.php +++ b/lib/includes/serializers/ClaimSerializer.php @@ -14,8 +14,6 @@ * * @since 0.2
[MediaWiki-commits] [Gerrit] git-mwcore macro used wrong reference - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: git-mwcore macro used wrong reference .. git-mwcore macro used wrong reference The git-mwcore macro 203c8f2c https://gerrit.wikimedia.org/r/#/c/84949/ was not using the proper reference repository, having /srv/ssd/zuul/git/mediawiki/core instead of the Gerrit replicated bare repository. Jobs updated: mediawiki-core-doxygen-publish mediawiki-core-install-sqlite mediawiki-core-jsduck mediawiki-core-jsduck-publish mediawiki-core-lint mediawiki-core-phpunit-api mediawiki-core-phpunit-databaseless mediawiki-core-phpunit-misc mediawiki-core-phpunit-parser mediawiki-core-qunit mediawiki-core-regression-REL1_19 mediawiki-core-regression-REL1_20 mediawiki-core-regression-REL1_21 mediawiki-core-regression-REL1_22 mediawiki-core-regression-master mediawiki-core-whitespaces Change-Id: I59223a2d13978b23317109fda0e3b0d23e977acd --- M macro-scm.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/macro-scm.yaml b/macro-scm.yaml index 15e47e2..7dbd2cb 100644 --- a/macro-scm.yaml +++ b/macro-scm.yaml @@ -28,7 +28,7 @@ scm: - git: url: 'git://integration.wikimedia.org/mediawiki/core' -reference-repo: '/srv/ssd/zuul/git/mediawiki/core' +reference-repo: '/srv/ssd/gerrit/mediawiki/core.git' branches: - '$ZUUL_COMMIT' refspec: '$ZUUL_REF' -- To view, visit https://gerrit.wikimedia.org/r/92640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59223a2d13978b23317109fda0e3b0d23e977acd Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace php_sapi_name() with PHP_SAPI - change (mediawiki...luasandbox)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace php_sapi_name() with PHP_SAPI
..
Replace php_sapi_name() with PHP_SAPI
Change-Id: I61b35e34e8ccfa8e7f679e3792daee66ebc52209
---
M luasandbox.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/luasandbox.php b/luasandbox.php
index 40034e1..e49852c 100644
--- a/luasandbox.php
+++ b/luasandbox.php
@@ -1,5 +1,5 @@
?php
-$br = (php_sapi_name() == cli)? :br;
+$br = (PHP_SAPI == cli)? :br;
if(!extension_loaded('luasandbox')) {
dl('luasandbox.' . PHP_SHLIB_SUFFIX);
--
To view, visit https://gerrit.wikimedia.org/r/91857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61b35e34e8ccfa8e7f679e3792daee66ebc52209
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@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] /var/lib/git - /srv/ssd/gerrit - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92647
Change subject: /var/lib/git - /srv/ssd/gerrit
..
/var/lib/git - /srv/ssd/gerrit
That is for the git-mwcore macro which run git archive to snapshot
mediawiki in the workspace. I fixed that path manually on lanthanum by
adding a symbolic link, this change updates the jobs.
Change-Id: Icd13ebf5b9094bb04ee0fe6f7cbd935ecbedde24
---
M macro.yaml
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/47/92647/1
diff --git a/macro.yaml b/macro.yaml
index 1cbe975..0d73884 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -52,7 +52,7 @@
- shell: |
#!/bin/bash -xe
# Snapshot `remotes/origin/{branch}` in the job workspace
-git archive --remote=/var/lib/git/mediawiki/core.git {branch} \
+git archive --remote=/srv/ssd/gerrit/mediawiki/core.git {branch} \
| (cd $WORKSPACE tar xf -)
- builder:
--
To view, visit https://gerrit.wikimedia.org/r/92647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd13ebf5b9094bb04ee0fe6f7cbd935ecbedde24
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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] Remove linkprefix message, add $linkPrefixCharset - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove linkprefix message, add $linkPrefixCharset
..
Remove linkprefix message, add $linkPrefixCharset
The existing linkprefix message is unlikely to be accurately
customized by message translators (as shown by the fact that, of the 10
distinct customizations prior to Iaa7eaa44 (which made them even more
complicated), 3 were broken or entirely ineffective, 1 was half
ineffective, and 2 more seem to have included the Latin-1 Supplement by
accident) or by local wiki admins. So, like linktrail before it, let's
move it out of the system messages and into a separate language
variable.
At the same time, let's make it a simple character set (like
$wgLegalTitleChars) rather than a complicated regular expression. The
complicated regex now lives in the parser.
This also adjusts the output of the API's action=querymeta=siteinfo and
adds an accessor parallel to the linkTrail accessor to Language.
Note the following changes that are not simply extracting the existing
charset from the linkprefix message for $linkPrefixCharset:
* The En message matched all non-ASCII UTF-8 characters by matching the
component bytes (\\x80-\\xff). The new character set is equivalent.
* Various languages were identical to En and so have no $linkPrefixCharset
set. These are: Ary Az Ce Ga Id Ka Kiu Km Ltg Mk Ms Ne Nn Ro Roa_tara Sc Si
Sr_ec Sr_el Tl Tt_cyrl Tt_latn Ug_arab War
* Cu, Uk, and Udm are changed to match any number of „ or « in the prefix.
* Cv tried to include « that was redundant to the range \\x80-\\xff
(see En comment). This was removed.
* Diq was entirely bogus, and so was removed.
* Gu included many additional UTF-8 characters that are redundant to the
range \\x80-\\xff (see En comment). These were removed, and the
resulting character set is equivalent to En.
* Mt has been broken since it was introduced in r37242. The charset used is
equivalent to the broken regex.
Bug: 56031
Change-Id: I3369851b33113fc118a1bace38f3ac310cdd9725
---
M includes/api/ApiQuerySiteinfo.php
M includes/cache/LocalisationCache.php
M includes/parser/Parser.php
M languages/Language.php
M languages/messages/MessagesAry.php
M languages/messages/MessagesAz.php
M languages/messages/MessagesCe.php
M languages/messages/MessagesCrh_cyrl.php
M languages/messages/MessagesCrh_latn.php
M languages/messages/MessagesCu.php
M languages/messages/MessagesCv.php
M languages/messages/MessagesDiq.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesGa.php
M languages/messages/MessagesGu.php
M languages/messages/MessagesId.php
M languages/messages/MessagesIs.php
M languages/messages/MessagesKa.php
M languages/messages/MessagesKaa.php
M languages/messages/MessagesKiu.php
M languages/messages/MessagesKm.php
M languages/messages/MessagesLtg.php
M languages/messages/MessagesMk.php
M languages/messages/MessagesMs.php
M languages/messages/MessagesMt.php
M languages/messages/MessagesNe.php
M languages/messages/MessagesNn.php
M languages/messages/MessagesQqq.php
M languages/messages/MessagesRo.php
M languages/messages/MessagesRoa_tara.php
M languages/messages/MessagesSc.php
M languages/messages/MessagesSi.php
M languages/messages/MessagesSr_ec.php
M languages/messages/MessagesSr_el.php
M languages/messages/MessagesTl.php
M languages/messages/MessagesTt_cyrl.php
M languages/messages/MessagesTt_latn.php
M languages/messages/MessagesUdm.php
M languages/messages/MessagesUg_arab.php
M languages/messages/MessagesUk.php
M languages/messages/MessagesUz.php
M languages/messages/MessagesWar.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
44 files changed, 36 insertions(+), 83 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiQuerySiteinfo.php
b/includes/api/ApiQuerySiteinfo.php
index a776706..ac9e85a 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -153,8 +153,12 @@
}
if ( $wgContLang-linkPrefixExtension() ) {
- $data['linkprefix'] = wfMessage( 'linkprefix'
)-inContentLanguage()-text();
+ $linkPrefixCharset = $wgContLang-linkPrefixCharset();
+ $data['linkprefixcharset'] = $linkPrefixCharset;
+ // For backwards compatability
+ $data['linkprefix'] =
/^((?.*[^$linkPrefixCharset]|))(.+)$/sDu;
} else {
+ $data['linkprefixcharset'] = '';
$data['linkprefix'] = '';
}
diff --git a/includes/cache/LocalisationCache.php
b/includes/cache/LocalisationCache.php
index 1bfd17b..c5a153a 100644
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -106,7 +106,7 @@
'fallback', 'namespaceNames', 'bookstoreList',
[MediaWiki-commits] [Gerrit] (bug 49434) Support diff=0 in Wikibase - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92648
Change subject: (bug 49434) Support diff=0 in Wikibase
..
(bug 49434) Support diff=0 in Wikibase
This adds support for requests with diff=0.
Also, moves the revision calculating code and getContent()
out of ViewEntityAction and adds/improves tests.
Ultimately, much of this code should be in core,
with stuff factored out of Article and DifferenceEngine
and merged together with this code, in a new core class.
But best not to block fixing this bug on that for now.
Change-Id: I6d160aa13f12feb98f2e95128e7e7a07ee6831d6
---
M repo/Wikibase.classes.php
A repo/includes/ContentRetriever.php
M repo/includes/actions/ViewEntityAction.php
A repo/tests/phpunit/includes/ContentRetrieverTest.php
4 files changed, 200 insertions(+), 65 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/48/92648/1
diff --git a/repo/Wikibase.classes.php b/repo/Wikibase.classes.php
index 9d7058b..be46931 100644
--- a/repo/Wikibase.classes.php
+++ b/repo/Wikibase.classes.php
@@ -34,6 +34,7 @@
// includes
'Wikibase\ClaimSaver' = 'includes/ClaimSaver.php',
'Wikibase\ClaimSummaryBuilder' =
'includes/ClaimSummaryBuilder.php',
+ 'Wikibase\ContentRetriever' = 'includes/ContentRetriever.php',
'Wikibase\DataTypeSelector' = 'includes/DataTypeSelector.php',
'Wikibase\EditEntity' = 'includes/EditEntity.php',
'Wikibase\EntityContentDiffView' =
'includes/EntityContentDiffView.php',
diff --git a/repo/includes/ContentRetriever.php
b/repo/includes/ContentRetriever.php
new file mode 100644
index 000..1299fe4
--- /dev/null
+++ b/repo/includes/ContentRetriever.php
@@ -0,0 +1,74 @@
+?php
+
+namespace Wikibase;
+
+use Article;
+use Revision;
+use Title;
+use WikiPage;
+
+/**
+ * Fetches content for a given Title / Article and request (diff or not diff)
+ *
+ * @since 0.5
+ *
+ * @todo put/merge this into core, with revision id / content fetching stuff
+ * factored out of DifferenceEngine and Article classes. :)
+ *
+ * @licence GNU GPL v2+
+ * @author Katie Filbert aude.w...@gmail.com
+ */
+class ContentRetriever {
+
+ /**
+* Returns the content of the page in the revision being viewed.
+*
+* @todo split out the get revision id stuff, add tests and see if
+* any core code can be shared here
+*
+* @return Content|null
+*/
+ public function getContent( $article, $title, $request ) {
+ $queryValues = $request-getQueryValues();
+ $oldId = $article-getOldID();
+
+ if ( array_key_exists( 'diff', $queryValues ) ) {
+ $revision = $this-getDiffRevision( $oldId,
$queryValues['diff'] );
+ } else {
+ $revision = Revision::newFromTitle( $title, $oldId );
+ }
+
+ return $revision !== null ? $revision-getContent() : null;
+ }
+
+ /**
+* Get the revision specified in the diff parameter or prev/next
revision of oldid
+*
+* @since 0.4
+*
+* @param int $oldId
+* @param string|int $diffValue
+*
+* @return Revision|null
+*/
+ public function getDiffRevision( $oldId, $diffValue ) {
+ if ( in_array( $diffValue, array( 'prev', 'next', 'cur', 0 ) )
) {
+ $oldIdRev = Revision::newFromId( $oldId );
+
+ if ( $diffValue === 0 || $diffValue === 'cur' ) {
+ $curId =
$oldIdRev-getTitle()-getLatestRevID();
+ return Revision::newFromId( $curId );
+ } elseif ( $diffValue === 'next' ) {
+ return $oldIdRev-getNext();
+ }
+
+ return $oldIdRev;
+ } else {
+ $revId = (int)$diffValue;
+ return Revision::newFromId( $revId );
+ }
+
+ return null;
+ }
+
+}
diff --git a/repo/includes/actions/ViewEntityAction.php
b/repo/includes/actions/ViewEntityAction.php
index fb6fa1a..30568af 100644
--- a/repo/includes/actions/ViewEntityAction.php
+++ b/repo/includes/actions/ViewEntityAction.php
@@ -50,6 +50,23 @@
$this-languageFallbackChain = $chain;
}
+/**
+ * Get the revision specified in the diff parameter or prev/next revision
of oldid
+ *
+ * @since 0.4
+* @deprecated since 0.5
+* use ContentRetriever::getDiffRevision
+ *
+ * @param int $oldId
+ * @param string|int $diffValue
+ *
+ * @return Revision|null
+ */
+ public function getDiffRevision( $oldId, $diffValue ) {
+ $contentRetriever = new
[MediaWiki-commits] [Gerrit] Fix Cite restoration for current Cite extension - change (mediawiki...DynamicPageList)
Theaitetos has submitted this change and it was merged.
Change subject: Fix Cite restoration for current Cite extension
..
Fix Cite restoration for current Cite extension
The field `mInCnt` was removed in Iee94917f3f. Instead restore the call
counter `mCallCnt` which was added in March 2011.
Change-Id: Id9dca85fda059195ba628f5c11ed6fd2d06ab1fa
---
M DPL.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Theaitetos: Verified; Looks good to me, approved
diff --git a/DPL.php b/DPL.php
index 5768690..a0c58cd 100644
--- a/DPL.php
+++ b/DPL.php
@@ -75,7 +75,7 @@
$citeObject =
$parser-mTagHooks['references'][0];
$tmpCiteGroupCnt=
$citeObject-mGroupCnt;
$tmpCiteOutCnt =
$citeObject-mOutCnt;
- $tmpCiteInCnt =
$citeObject-mInCnt;
+ $tmpCiteCallCnt =
$citeObject-mCallCnt;
$tmpCiteRefs=
$citeObject-mRefs;
$tmpCiteReferencesErrors=
$citeObject-mReferencesErrors;
$tmpCiteRefCallStack=
$citeObject-mRefCallStack;
@@ -86,7 +86,7 @@
if ($citeObject != null) {
$citeObject-mGroupCnt =
$tmpCiteGroupCnt;
$citeObject-mOutCnt=
$tmpCiteOutCnt;
- $citeObject-mInCnt =
$tmpCiteInCnt;
+ $citeObject-mCallCnt =
$tmpCiteCallCnt;
$citeObject-mRefs =
$tmpCiteRefs;
$citeObject-mReferencesErrors =
$tmpCiteReferencesErrors;
$citeObject-mRefCallStack =
$tmpCiteRefCallStack;
--
To view, visit https://gerrit.wikimedia.org/r/61269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9dca85fda059195ba628f5c11ed6fd2d06ab1fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DynamicPageList
Gerrit-Branch: master
Gerrit-Owner: Poke patrickwesterh...@gmail.com
Gerrit-Reviewer: Eranroz eranro...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Theaitetos blakha...@gmx.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [browser test] disabled indent/outdent are now spans not links - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/92649 Change subject: [browser test] disabled indent/outdent are now spans not links .. [browser test] disabled indent/outdent are now spans not links Change-Id: I8b8788f4c92219480936360efe7153ab093c274e --- M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/49/92649/1 diff --git a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb index c70d660..0daacc1 100644 --- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb @@ -6,12 +6,12 @@ div(:container_disabled, class: 'oo-ui-widget oo-ui-widget-disabled oo-ui-flaggableElement-constructive oo-ui-pushButtonWidget') div(:content, class: 've-ce-documentNode ve-ce-branchNode') - a(:decrease_indentation, class: 'oo-ui-widget oo-ui-tool oo-ui-tool-name-outdent oo-ui-widget-disabled') + span(:decrease_indentation, class: 'oo-ui-widget oo-ui-tool oo-ui-tool-name-outdent oo-ui-widget-disabled') a(:decrease_indentation_on, title: /Decrease indentation/) span(:downarrow, class: 'oo-ui-iconedElement-icon oo-ui-icon-down') a(:edit_ve, title: /Edit this page with VisualEditor/) span(:heading, text: 'Heading') - a(:increase_indentation, class: 'oo-ui-widget oo-ui-tool oo-ui-tool-name-indent oo-ui-widget-disabled') + span(:increase_indentation, class: 'oo-ui-widget oo-ui-tool oo-ui-tool-name-indent oo-ui-widget-disabled') a(:increase_indentation_on, title: /Increase indentation/) div(:insert_references, class: 'oo-ui-window-title') span(:internal_linksuggestion, text: 'Main Page') -- To view, visit https://gerrit.wikimedia.org/r/92649 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b8788f4c92219480936360efe7153ab093c274e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add tests for DifferenceEngine for revision loading - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add tests for DifferenceEngine for revision loading
..
Add tests for DifferenceEngine for revision loading
Change-Id: Ia206b396e96b52ba9ac4895aae0f2839dca6f958
---
A tests/phpunit/includes/diff/DifferenceEngineTest.php
1 file changed, 120 insertions(+), 0 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/diff/DifferenceEngineTest.php
b/tests/phpunit/includes/diff/DifferenceEngineTest.php
new file mode 100644
index 000..a10c024
--- /dev/null
+++ b/tests/phpunit/includes/diff/DifferenceEngineTest.php
@@ -0,0 +1,120 @@
+?php
+
+/**
+ * @covers DifferenceEngine
+ *
+ * @todo tests for the rest of DifferenceEngine!
+ *
+ * @group Database
+ *
+ * @licence GNU GPL v2+
+ * @author Katie Filbert aude.w...@gmail.com
+ */
+class DifferenceEngineTest extends MediaWikiTestCase {
+
+ protected $context;
+
+ private static $revisions;
+
+ public function setUp() {
+ parent::setUp();
+
+ $title = $this-getTitle();
+
+ $this-context = new RequestContext();
+ $this-context-setTitle( $title );
+
+ if ( !self::$revisions ) {
+ self::$revisions = $this-doEdits();
+ }
+ }
+
+ /**
+* @return Title
+*/
+ protected function getTitle() {
+ $namespace = $this-getDefaultWikitextNS();
+ return Title::newFromText( 'Kitten', $namespace );
+ }
+
+ /**
+* @return int[] revision ids
+*/
+ protected function doEdits() {
+ $title = $this-getTitle();
+ $page = WikiPage::factory( $title );
+
+ $strings = array( it is a kitten, two kittens, three
kittens, four kittens );
+ $revisions = array();
+
+ foreach( $strings as $string ) {
+ $content = ContentHandler::makeContent( $string, $title
);
+ $page-doEditContent( $content, 'edit page' );
+ $revisions[] = $page-getLatest();
+ }
+
+ return $revisions;
+ }
+
+ public function testMapDiffPrevNext() {
+ $cases = $this-getMapDiffPrevNextCases();
+
+ foreach( $cases as $case ) {
+ list( $expected, $old, $new, $message ) = $case;
+
+ $diffEngine = new DifferenceEngine( $this-context,
$old, $new, 2, true, false );
+ $diffMap = $diffEngine-mapDiffPrevNext( $old, $new );
+ $this-assertEquals( $expected, $diffMap, $message );
+ }
+ }
+
+ private function getMapDiffPrevNextCases() {
+ $revs = self::$revisions;
+
+ return array(
+ array( array( $revs[1], $revs[2] ), $revs[2], 'prev',
'diff=prev' ),
+ array( array( $revs[2], $revs[3] ), $revs[2], 'next',
'diff=next' ),
+ array( array( $revs[1], $revs[3] ), $revs[1], $revs[3],
'diff=' . $revs[3] )
+ );
+ }
+
+ public function testLoadRevisionData() {
+ $cases = $this-getLoadRevisionDataCases();
+
+ foreach( $cases as $case ) {
+ list( $expectedOld, $expectedNew, $old, $new, $message
) = $case;
+
+ $diffEngine = new DifferenceEngine( $this-context,
$old, $new, 2, true, false );
+ $diffEngine-loadRevisionData();
+
+ $this-assertEquals( $diffEngine-mOldid, $expectedOld,
$message );
+ $this-assertEquals( $diffEngine-mNewid, $expectedNew,
$message );
+ }
+ }
+
+ private function getLoadRevisionDataCases() {
+ $revs = self::$revisions;
+
+ return array(
+ array( $revs[2], $revs[3], $revs[3], 'prev',
'diff=prev' ),
+ array( $revs[2], $revs[3], $revs[2], 'next',
'diff=next' ),
+ array( $revs[1], $revs[3], $revs[1], $revs[3], 'diff='
. $revs[3] ),
+ array( $revs[1], $revs[3], $revs[1], 0, 'diff=0' )
+ );
+ }
+
+ public function testGetOldid() {
+ $revs = self::$revisions;
+
+ $diffEngine = new DifferenceEngine( $this-context, $revs[1],
$revs[2], 2, true, false );
+ $this-assertEquals( $revs[1], $diffEngine-getOldid(), 'diff
get old id' );
+ }
+
+ public function testGetNewid() {
+ $revs = self::$revisions;
+
+ $diffEngine = new DifferenceEngine( $this-context, $revs[1],
$revs[2], 2, true, false );
+ $this-assertEquals( $revs[2], $diffEngine-getNewid(), 'diff
get new id' );
+ }
+
+}
[MediaWiki-commits] [Gerrit] Install optipng and jepgoptim - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Install optipng and jepgoptim
..
Install optipng and jepgoptim
Change-Id: I0e7cc7ff46ee0f0774264b17a9aeb5fa8c868ce4
---
M puppet/modules/base/manifests/init.pp
M puppet/modules/wiki/templates/wikimaintenance.erb
2 files changed, 3 insertions(+), 0 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/base/manifests/init.pp
b/puppet/modules/base/manifests/init.pp
index 6fe87b6..571f26b 100644
--- a/puppet/modules/base/manifests/init.pp
+++ b/puppet/modules/base/manifests/init.pp
@@ -26,6 +26,8 @@
# Development extras
'git-review',
+'optipng',
+'jpegoptim',
# Other
'mysqltuner',
diff --git a/puppet/modules/wiki/templates/wikimaintenance.erb
b/puppet/modules/wiki/templates/wikimaintenance.erb
index 47d2211..91c48c0 100644
--- a/puppet/modules/wiki/templates/wikimaintenance.erb
+++ b/puppet/modules/wiki/templates/wikimaintenance.erb
@@ -1,3 +1,4 @@
# file managed by puppet
* * * * * %= @user % nice php
/www/translatewiki.net/w/maintenance/runJobs.php --exclusive --maxtime=50
--procs=1 --memory-limit=250M /www/translatewiki.net/w/logs/jobqueue 2
/dev/null
*/5 * * * * %= @user % nice php
/www/sandbox.translatewiki.net/w/maintenance/runJobs.php --exclusive
--maxtime=50 --procs=1 --memory-limit=250M
/www/sandbox.translatewiki.net/w/logs/jobqueue 2 /dev/null
+@weekly www-data find /www/translatewiki.net/w/images/thumb/ -name *.png
-type f -print0 | nice xargs -0 -P4 -I{} optipng -o7 {} 1 /dev/null
--
To view, visit https://gerrit.wikimedia.org/r/92635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e7cc7ff46ee0f0774264b17a9aeb5fa8c868ce4
Gerrit-PatchSet: 3
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@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] I could not figure out another way of having passwords in en... - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92650
Change subject: I could not figure out another way of having passwords in
environment variables but not displayed in Jenkins console log
..
I could not figure out another way of having passwords in environment variables
but not displayed in Jenkins console log
Change-Id: I92a3c4908acc859228559df9fc5d87cfb0c94cf1
---
M docs/jenkins.md
M lib/mediawiki/selenium/hooks.rb
2 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/50/92650/1
diff --git a/docs/jenkins.md b/docs/jenkins.md
index 382956a..f39505e 100644
--- a/docs/jenkins.md
+++ b/docs/jenkins.md
@@ -24,3 +24,7 @@
- name
- SAUCE_ONDEMAND_ACCESS_KEY
- SAUCE_ONDEMAND_USERNAME
+- MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
+- MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
+- MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
+- MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG
diff --git a/lib/mediawiki/selenium/hooks.rb b/lib/mediawiki/selenium/hooks.rb
index c4a27fa..bfc3b4b 100644
--- a/lib/mediawiki/selenium/hooks.rb
+++ b/lib/mediawiki/selenium/hooks.rb
@@ -12,6 +12,11 @@
config = YAML.load_file('config/config.yml')
Before('@login') do
+ ENV['MEDIAWIKI_PASSWORD'] =
ENV['MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET'] if
ENV['MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET']
+ ENV['MEDIAWIKI_PASSWORD'] =
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG'] if
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG']
+ ENV['MEDIAWIKI_PASSWORD'] =
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG'] if
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG']
+ ENV['MEDIAWIKI_PASSWORD'] = ENV['MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG'] if
ENV['MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG']
+
puts MEDIAWIKI_USER environment variable is not defined! Please export a
value for that variable before proceeding. unless ENV['MEDIAWIKI_USER']
puts MEDIAWIKI_PASSWORD environment variable is not defined! Please export
a value for that variable before proceeding. unless ENV['MEDIAWIKI_PASSWORD']
end
--
To view, visit https://gerrit.wikimedia.org/r/92650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92a3c4908acc859228559df9fc5d87cfb0c94cf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed unnecessary nodes from wb-statement template - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92651
Change subject: Removed unnecessary nodes from wb-statement template
..
Removed unnecessary nodes from wb-statement template
Simplifying the statement node structure by removing nodes that have no actual
use.
This allows dropping the toolbarParentSelector option for statementview edit
toolbar
as wells as for the references add toolbar.
Change-Id: I0376ed6c2f885d4b2915a6db7a297d270d6c98ce
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/templates.php
M lib/resources/wikibase.css
M selenium/lib/modules/reference_module.rb
M selenium_cuc/features/support/modules/reference_module.rb
6 files changed, 29 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/51/92651/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 2b59489..abbc5cd 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -305,7 +305,7 @@
$.wikibase.toolbarcontroller.definition( 'edittoolbar', {
widgetName: 'wikibase.statementview',
events: {
- statementviewchange: function( event ) {
+ 'claimviewchange statementviewchange': function( event ) {
var $target = $( event.target ),
statementview = $target.data( 'statementview' ),
$btnSave = $target.data( 'edittoolbar'
).toolbar.editGroup.$btnSave,
@@ -342,8 +342,7 @@
},
options: {
interactionWidgetName:
$.wikibase.statementview.prototype.widgetName,
- parentWidgetFullName: 'wikibase.claimlistview',
- toolbarParentSelector: '.wb-statement-claim'
+ parentWidgetFullName: 'wikibase.claimlistview'
}
} );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index 1c513c7..a94ef3b 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -65,7 +65,7 @@
if( this.value() ) {
var $listview = $( 'div/' )
- .prependTo( this.$references )
+ .appendTo( this.$references )
.listview( {
listItemAdapter: new
$.wikibase.listview.ListItemAdapter( {
listItemWidget:
$.wikibase.referenceview,
@@ -114,15 +114,9 @@
}
} );
- // Forward query for listview reference.
- this.$references.data(
- 'listview',
- this.$references.children( '.wb-listview'
).data( 'listview' )
- );
-
// Collapse references if there is at least one.
- if ( this.$references.data( 'listview' ).items().length
0 ) {
- this.$references.css( 'display', 'none' );
+ if ( $listview.data( 'listview' ).items().length 0 ) {
+ $listview.css( 'display', 'none' );
}
// toggle for references section:
@@ -131,7 +125,7 @@
'wikibase-statementview-referencesheading-pendingcountersubject',
refs.length
)
- ).toggler( { $subject: this.$references } );
+ ).toggler( { $subject: $listview } );
this.$refsHeading.append( $toggler );
@@ -178,7 +172,7 @@
* @param {wb.Reference} reference
*/
_addReference: function( reference ) {
- var lv = this.$references.children( '.wb-listview' ).data(
'listview' );
+ var lv = this.$references.children( ':wikibase-listview'
).data( 'listview' );
lv.addItem( reference );
},
@@ -189,15 +183,16 @@
*/
getReferences: function() {
var self = this,
+ listview = this.$references.children(
':wikibase-listview' ).data( 'listview' ),
references = [];
// If the statement is pending (not yet stored), the listview
widget for the references is
// not defined.
- if ( !this.$references.data( 'listview' ) ) {
+ if
[MediaWiki-commits] [Gerrit] Removed toolbarParentSelector option from toolbarbase widget - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92652
Change subject: Removed toolbarParentSelector option from toolbarbase widget
..
Removed toolbarParentSelector option from toolbarbase widget
Since the toolbarParentSelecor option is not used anymore and generates
unnecessary
complexity, it is dropped from the toolbarbase widget.
Change-Id: I9950925636817ef24e68e7cdb8127607e0723bee
---
M lib/resources/jquery.wikibase/toolbar/addtoolbar.js
M lib/resources/jquery.wikibase/toolbar/edittoolbar.js
M lib/resources/jquery.wikibase/toolbar/toolbarbase.js
M lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
4 files changed, 2 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/52/92652/1
diff --git a/lib/resources/jquery.wikibase/toolbar/addtoolbar.js
b/lib/resources/jquery.wikibase/toolbar/addtoolbar.js
index ee8873e..047fb2e 100644
--- a/lib/resources/jquery.wikibase/toolbar/addtoolbar.js
+++ b/lib/resources/jquery.wikibase/toolbar/addtoolbar.js
@@ -1,7 +1,4 @@
/**
- * @file
- * @ingroup WikibaseLib
- *
* @licence GNU GPL v2+
* @author H. Snater mediaw...@snater.com
*/
@@ -51,7 +48,6 @@
* @type {Object}
*/
options: {
- toolbarParentSelector: null,
interactionWidgetName: null,
customAction: null,
eventPrefix: '',
diff --git a/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
b/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
index 7bec417..69d355f 100644
--- a/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
+++ b/lib/resources/jquery.wikibase/toolbar/edittoolbar.js
@@ -1,7 +1,4 @@
/**
- * @file
- * @ingroup WikibaseLib
- *
* @licence GNU GPL v2+
* @author H. Snater mediaw...@snater.com
*/
@@ -53,7 +50,6 @@
options: {
interactionWidgetName: null,
parentWidgetFullName: null,
- toolbarParentSelector: null,
enableRemove: true
},
diff --git a/lib/resources/jquery.wikibase/toolbar/toolbarbase.js
b/lib/resources/jquery.wikibase/toolbar/toolbarbase.js
index aa96a35..782a199 100644
--- a/lib/resources/jquery.wikibase/toolbar/toolbarbase.js
+++ b/lib/resources/jquery.wikibase/toolbar/toolbarbase.js
@@ -1,7 +1,4 @@
/**
- * @file
- * @ingroup WikibaseLib
- *
* @licence GNU GPL v2+
* @author H. Snater mediaw...@snater.com
*/
@@ -13,21 +10,8 @@
* @since 0.4
*
* This widget offers basic functionality shared by all toolbar widgets.
-*
-* @option toolbarParentSelector {string} jQuery selector to find the
node the toolbar DOM
-* structure with its buttons shall be appended to. If omitted,
the DOM structure
-* required for the toolbar will be appended to the node the
toolbar is initialized on.
-* Default: null (this.element will be used)
*/
$.widget( 'wikibase.toolbarbase', {
- /**
-* Options
-* @type {Object}
-*/
- options: {
- toolbarParentSelector: null
- },
-
/**
* The toolbar widget.
* @type {jQuery.wikibase.toolbar}
@@ -45,11 +29,7 @@
*/
_create: function() {
var $toolbarDom = mw.template( 'wikibase-toolbar',
this.widgetBaseClass, '' );
- this.$toolbarParent = $toolbarDom.appendTo(
- ( this.options.toolbarParentSelector )
- ? this.element.find(
this.options.toolbarParentSelector )
- : this.element
- );
+ this.$toolbarParent = $toolbarDom.appendTo(
this.element );
},
/**
diff --git
a/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
b/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
index 72f8cbe..1a52f55 100644
--- a/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
+++ b/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
@@ -1,7 +1,4 @@
/**
- * @file
- * @ingroup WikibaseLib
- *
* @licence GNU GPL v2+
* @author H. Snater mediaw...@snater.com
*/
@@ -26,9 +23,7 @@
* {
* widgetName: 'wikibase.claimlistview',// namespace.name of
the referenced widget that
* // needs to be able to
interface to the toolbar type
-* options: { // options passed to the toolbar
-* toolbarParentSelector:
[MediaWiki-commits] [Gerrit] tie operations-mw-config-tests to gallium for now - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/92653 Change subject: tie operations-mw-config-tests to gallium for now .. tie operations-mw-config-tests to gallium for now operations-mw-config-tests git repo requires an internet access due to some submodule referencing a git://github.com URL. Until we find out a proper solution, bind the job on gallium which has internet access. Change-Id: I5948ccfae53db465bb4b7793c7877ec9073b5962 --- M operations-mw-config.yaml 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/53/92653/1 diff --git a/operations-mw-config.yaml b/operations-mw-config.yaml index 50f4354..cdfdf5d 100644 --- a/operations-mw-config.yaml +++ b/operations-mw-config.yaml @@ -1,6 +1,10 @@ - job-template: name: 'operations-mw-config-tests' -node: (hasContintPackages hasPhpUnit) +# Repo has a reference to a git://github.com url which does not +# work on 10.0.0.0/8 slaves :( +# +#node: (hasContintPackages hasPhpUnit) +node: gallium defaults: use-remote-zuul triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/92653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5948ccfae53db465bb4b7793c7877ec9073b5962 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-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] /var/lib/git - /srv/ssd/gerrit - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: /var/lib/git - /srv/ssd/gerrit
..
/var/lib/git - /srv/ssd/gerrit
That is for the git-mwcore macro which run git archive to snapshot
mediawiki in the workspace. I fixed that path manually on lanthanum by
adding a symbolic link, this change updates the jobs.
Change-Id: Icd13ebf5b9094bb04ee0fe6f7cbd935ecbedde24
---
M macro.yaml
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index 1cbe975..0d73884 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -52,7 +52,7 @@
- shell: |
#!/bin/bash -xe
# Snapshot `remotes/origin/{branch}` in the job workspace
-git archive --remote=/var/lib/git/mediawiki/core.git {branch} \
+git archive --remote=/srv/ssd/gerrit/mediawiki/core.git {branch} \
| (cd $WORKSPACE tar xf -)
- builder:
--
To view, visit https://gerrit.wikimedia.org/r/92647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd13ebf5b9094bb04ee0fe6f7cbd935ecbedde24
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [browser test] disabled indent/outdent are now spans not links - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [browser test] disabled indent/outdent are now spans not links .. [browser test] disabled indent/outdent are now spans not links Change-Id: I8b8788f4c92219480936360efe7153ab093c274e --- M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Cmcmahon: Looks good to me, approved Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb index c70d660..0daacc1 100644 --- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb @@ -6,12 +6,12 @@ div(:container_disabled, class: 'oo-ui-widget oo-ui-widget-disabled oo-ui-flaggableElement-constructive oo-ui-pushButtonWidget') div(:content, class: 've-ce-documentNode ve-ce-branchNode') - a(:decrease_indentation, class: 'oo-ui-widget oo-ui-tool oo-ui-tool-name-outdent oo-ui-widget-disabled') + span(:decrease_indentation, class: 'oo-ui-widget oo-ui-tool oo-ui-tool-name-outdent oo-ui-widget-disabled') a(:decrease_indentation_on, title: /Decrease indentation/) span(:downarrow, class: 'oo-ui-iconedElement-icon oo-ui-icon-down') a(:edit_ve, title: /Edit this page with VisualEditor/) span(:heading, text: 'Heading') - a(:increase_indentation, class: 'oo-ui-widget oo-ui-tool oo-ui-tool-name-indent oo-ui-widget-disabled') + span(:increase_indentation, class: 'oo-ui-widget oo-ui-tool oo-ui-tool-name-indent oo-ui-widget-disabled') a(:increase_indentation_on, title: /Increase indentation/) div(:insert_references, class: 'oo-ui-window-title') span(:internal_linksuggestion, text: 'Main Page') -- To view, visit https://gerrit.wikimedia.org/r/92649 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b8788f4c92219480936360efe7153ab093c274e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Zfilipin zfili...@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] [WIP] recentchanges: Implement support for pagesets - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92654
Change subject: [WIP] recentchanges: Implement support for pagesets
..
[WIP] recentchanges: Implement support for pagesets
See bug 55377 for information, implementation is not ready!
Issues:
* Should probably not reuse the ApiQuery's page set, that one
is for property modules, not list modules. Since these params
are not prefixed as-is, it might cause a regression if someone
is combining a prop query with a list query, like:
action=query titles=Foo prop=categories list=recentchanges
Where the recentchanges is not supposed to be filtered.
This works, but this change would make that recentchanges query
filtered.
Could be prefixed with 'rc', but having
titles/pageids/converttitles/generator is nice, so perhaps find
a way to use 2 page sets, and prefix one of them.
* Figure out whehter to query by page id, or by page title.
Doing by page id would require an extra sql index. The old
implementation (reverted in r46823) did a page title query.
However that is slightly counterintuitive when working with pages
that have been renamed, watchlist presumably suffers from this
as well (though we currently update watchlist manually when
someone moves a page).
Follows-up r31348, r46823.
Bug: 55377
Change-Id: I1e69966c0f944ca644d977cb18822a8536dafd5a
---
M includes/api/ApiQueryRecentChanges.php
1 file changed, 24 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/92654/1
diff --git a/includes/api/ApiQueryRecentChanges.php
b/includes/api/ApiQueryRecentChanges.php
index 6b10bdc..0561bc4 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -139,8 +139,11 @@
*/
public function run( $resultPageSet = null ) {
$user = $this-getUser();
- /* Get the parameters of the request. */
+ $result = $this-getResult();
$params = $this-extractRequestParams();
+
+ $pageSet = $this-getPageSet();
+ $pageSet-execute();
/* Build our basic query. Namely, something along the lines of:
* SELECT * FROM recentchanges WHERE rc_timestamp $start
@@ -177,6 +180,26 @@
$this-addWhereFld( 'rc_namespace', $params['namespace'] );
$this-addWhereFld( 'rc_deleted', 0 );
+
+
+ // Recent changes stores titles separetely from pageids (they
are a snapshot from the
+ // time the edit was made), therefor we need to adjust the
query depending on the
+ // data source. E.g. if Foo was renamed to Bar, quering for
Foo would return
+ // edits from before the rename, and edits made to the redirect
page after the rename.
+ // FIXME: Though using rc_title/rc_namespace performs better
than rc_cur_id queries,
+ // in most cases this is probably confusing since quering for
Bar should return
+ // all edits made to that page, regardless of whether it was
named differently in the past.
+ // Maybe turn this into a separate flag that can be enabled by
the user.
+ // FIXME: rc_cur_id queries like these are not indexed.
+ if ( $pageSet-getDataSource() === 'titles' ) {
+ $titles = $pageSet-getTitles(); // 0 = Title object
+ $lb = new LinkBatch( $titles );
+ // rc_namespace, rc_title
+ $this-addWhere( $lb-constructSet( 'rc',
$this-getDB() ) );
+ } else {
+ $titles = $pageSet-getGoodTitles(); // page_id =
Title object
+ $this-addWhereFld( 'rc_cur_id', array_keys( $titles )
);
+ }
if ( !is_null( $params['type'] ) ) {
$this-addWhereFld( 'rc_type', $this-parseRCType(
$params['type'] ) );
@@ -307,7 +330,6 @@
$titles = array();
- $result = $this-getResult();
/* Iterate through the rows, adding data extracted from them to
our query result. */
foreach ( $res as $row ) {
--
To view, visit https://gerrit.wikimedia.org/r/92654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e69966c0f944ca644d977cb18822a8536dafd5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Load thumbnails, use loading image in core - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Load thumbnails, use loading image in core
..
Load thumbnails, use loading image in core
This makes the loading experience _way_ nicer, and hopefully faster.
Bug: 56266
Change-Id: Ided64b0e15af84d9fe65517db2adb291c174c4bf
---
M js/ext.multimediaViewer.js
M js/multilightbox/hooks.txt
M js/multilightbox/lightboxinterface.js
3 files changed, 263 insertions(+), 190 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/ext.multimediaViewer.js b/js/ext.multimediaViewer.js
index 2c39791..8b38d7e 100755
--- a/js/ext.multimediaViewer.js
+++ b/js/ext.multimediaViewer.js
@@ -91,201 +91,19 @@
viewer.lightbox.currentIndex = index;
// Open with a basic thumbnail and no
information - fill in async
- viewer.lightbox.images[index].src = this.src;
+ viewer.lightbox.images[index].src =
mw.config.get( 'wgScriptPath', '' ) +
'/resources/jquery/images/spinner-large.gif';
viewer.lightbox.open();
viewer.fetchImageInfo( fileTitle, function (
imageInfo ) {
- function whitelistHtml( $ele ) {
- function test( $ele ) {
- return $ele.jquery (
- $ele.is( 'a' )
||
- false
- );
- }
+ var imageEle = new Image();
- var $children,
- whitelisted = '';
+ imageEle.onload = function () {
+
viewer.lightbox.iface.replaceImageWith( imageEle );
- if ( $ele $ele.jquery
$ele.contents ) {
- $children =
$ele.contents();
- } else if ( $ele
$ele.textContent ) {
- return $ele.textContent;
- } else if ( $ele ) {
- return $ele;
- }
+ viewer.setImageInfo( fileTitle,
imageInfo );
+ };
- if ( !$children ||
$children.length === 0 ) {
- return $ele.text();
- }
-
- $children.each( function ( i,
ele ) {
- var $ele = $( ele );
-
- if ( test( $ele ) ===
true ) {
- whitelisted +=
$ele.html( whitelistHtml( $ele ) ).get( 0 ).outerHTML;
- } else {
- whitelisted +=
'span' + whitelistHtml( $ele ) + '/span';
- }
- } );
-
- return whitelisted;
- }
-
- function setUserpageLink( username,
gender ) {
- var userpage = 'User:' +
username,
- userTitle =
mw.Title.newFromText( userpage );
-
- ui.$username
- .text(
- mw.message(
'multimediaviewer-userpage-link', username, gender ).text()
- )
- .prop( 'href',
userTitle.getUrl() );
-
- if ( articlePath ) {
- ui.$username
- .prop( 'href',
articlePath.replace( '$1', userTitle.getPrefixedText() ) );
- }
-
-
[MediaWiki-commits] [Gerrit] Fix javascript types so that they get compressed by nginx - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Fix javascript types so that they get compressed by nginx .. Fix javascript types so that they get compressed by nginx MediaWiki uses text/javascript, static files probably application/javascript and nothing application/x-javascript. Change-Id: Ie06f0d65b6bed6dce7066490287505e014150df0 --- M puppet/modules/nginx/files/nginx.conf 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ori.livneh: Looks good to me, but someone else must approve Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/nginx/files/nginx.conf b/puppet/modules/nginx/files/nginx.conf index dca6ef1..353a988 100644 --- a/puppet/modules/nginx/files/nginx.conf +++ b/puppet/modules/nginx/files/nginx.conf @@ -28,7 +28,7 @@ gzip on; gzip_comp_level 8; gzip_disable msie6; - gzip_types text/plain text/css application/json application/x-javascript text/xml application/atom+xml; + gzip_types text/plain text/css application/json application/javascript text/javascript text/xml application/atom+xml; gzip_buffers 16 8k; include /etc/nginx/sites-enabled/*; -- To view, visit https://gerrit.wikimedia.org/r/92616 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie06f0d65b6bed6dce7066490287505e014150df0 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@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] [browser test] changes make it more convenient to click Tran... - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/92656 Change subject: [browser test] changes make it more convenient to click Transclusion icon .. [browser test] changes make it more convenient to click Transclusion icon Change-Id: I21e5a0f11f58c7f199d9c36c2ac65705c295b397 --- M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/56/92656/1 diff --git a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb index c70d660..825a39c 100644 --- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb @@ -37,7 +37,7 @@ span(:ve_references, text: 'Reference') span(:ve_numbering, class: 'oo-ui-iconedElement-icon oo-ui-icon-number-list') div(:visual_editor_toolbar, class: 'oo-ui-toolbar-tools') - span(:transclusion, text: 'Transclusion') + span(:transclusion, class: 'oo-ui-iconedElement-icon oo-ui-icon-template') in_frame(:index = 0) do |frame| text_area(:describe_change, index: 0, frame: frame) -- To view, visit https://gerrit.wikimedia.org/r/92656 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21e5a0f11f58c7f199d9c36c2ac65705c295b397 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] position: fixed for multilightbox - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: position: fixed for multilightbox
..
position: fixed for multilightbox
Also moved something out of the ml.css file that shouldn't have been
there.
Bug: 55476
Change-Id: I94020b138a71683e2407a78ef480057692967eaf
---
M css/ext.multimediaViewer.css
M css/multilightbox.css
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/css/ext.multimediaViewer.css b/css/ext.multimediaViewer.css
index f1b3ac4..77e8bb2 100644
--- a/css/ext.multimediaViewer.css
+++ b/css/ext.multimediaViewer.css
@@ -152,3 +152,7 @@
.mw-mlb-image-links li.mw-mlb-datetime-li.empty:before {
background-image: none;
}
+
+.mw-mlb-credit.empty {
+ display: none;
+}
diff --git a/css/multilightbox.css b/css/multilightbox.css
index 94e3d42..8b3f073 100644
--- a/css/multilightbox.css
+++ b/css/multilightbox.css
@@ -9,7 +9,7 @@
}
.mlb-wrapper {
- position: absolute;
+ position: fixed;
top: 0px;
left: 0px;
right: 0px;
@@ -85,8 +85,4 @@
.mlb-fullscreen-div .mlb-fullscreen {
background-image: url(../img/defullscreen.svg);
-}
-
-.mw-mlb-credit.empty {
- display: none;
}
--
To view, visit https://gerrit.wikimedia.org/r/92353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94020b138a71683e2407a78ef480057692967eaf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Gergő Tisza gti...@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] Rename 'formulæ' to 'formulae'. - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/92657 Change subject: Rename 'formulæ' to 'formulae'. .. Rename 'formulæ' to 'formulae'. Everyone loves a ligature, but within our codebase we should be consistent, and sadly that means usin en-US, not en-GB-archaic. Also having non-basic latin characters in filenames is a bit of a pain for developers. Similarly for the i18n message, the ligature should go in MessagesEn_gb if anywhere. Also in this commit, re-saved the BF thumbnails as plain SVG. Change-Id: I21a2bf040bed132d3f1c73c916c731d36e0ad852 --- M VisualEditor.hooks.php M VisualEditor.i18n.php A betafeatures-icon-VisualEditor-formulae.svg D betafeatures-icon-VisualEditor-formulæ.svg M betafeatures-icon-VisualEditor.svg 5 files changed, 414 insertions(+), 401 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/57/92657/1 diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index 6503d05..6bf3838 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -298,7 +298,7 @@ // TODO: use message 'visualeditor-preference-mwmath-discussion-link' 'discussion-link' = false, 'screenshot' = $wgExtensionAssetsPath . - '/VisualEditor/betafeatures-icon-VisualEditor-formulæ.svg', + '/VisualEditor/betafeatures-icon-VisualEditor-formulae.svg', 'requirements' = array( 'betafeatures' = array( 'visualeditor-enable', diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php index 899e235..a70526c 100644 --- a/VisualEditor.i18n.php +++ b/VisualEditor.i18n.php @@ -177,8 +177,8 @@ 'visualeditor-preference-mwalienextension-label' = 'VisualEditor extension tag editing', 'visualeditor-preference-mwhiero-description' = 'Add experimental support to VisualEditor for creating and editing hieroglyphics for testing, ahead of general release. Please remember to always review your changes before saving when using experimental features.', 'visualeditor-preference-mwhiero-label' = 'VisualEditor hieroglyphics editing', - 'visualeditor-preference-mwmath-description' = 'Add experimental support to VisualEditor for creating and editing of mathematical formulæ for testing, ahead of general release. Please remember to always review your changes before saving when using experimental features.', - 'visualeditor-preference-mwmath-label' = 'VisualEditor formulæ editing', + 'visualeditor-preference-mwmath-description' = 'Add experimental support to VisualEditor for creating and editing of mathematical formulae for testing, ahead of general release. Please remember to always review your changes before saving when using experimental features.', + 'visualeditor-preference-mwmath-label' = 'VisualEditor formulae editing', 'visualeditor-reference-input-placeholder' = 'What do you want to reference?', 'visualeditor-referencelist-isempty' = 'There are no references with the group $1 on this page to include in this list.', 'visualeditor-referencelist-isempty-default' = 'There are no references on this page to include in this list.', diff --git a/betafeatures-icon-VisualEditor-formulae.svg b/betafeatures-icon-VisualEditor-formulae.svg new file mode 100644 index 000..72d66ae --- /dev/null +++ b/betafeatures-icon-VisualEditor-formulae.svg @@ -0,0 +1,184 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + version=1.1 + width=264 + height=162 + viewBox=0 0 264 162 + id=Layer_1 + xml:space=preservemetadata + id=metadata3213rdf:RDFcc:Work + rdf:about=dc:formatimage/svg+xml/dc:formatdc:type + rdf:resource=http://purl.org/dc/dcmitype/StillImage; /dc:title/dc:title/cc:Work/rdf:RDF/metadatadefs + id=defs3211 /g + id=g3120-2polygon + points=0.5,151.749 0.5,0.5 263.5,0.5 263.5,152.249 254.5,158.954 254.5,42.5 215.5,42.5 215.5,155.1 211.107,151.369 203.5,156.699 203.5,42.5 48.5,42.5 48.5,153.35 38.749,161.38 24.833,151.361 13.366,161.357 + id=polygon3122-9 + style=fill:#ff /g + id=g3124-5path + d=m 263,1 v 150.998 l -8,5.96 V 43 42 h -1 -38 -1 v 1 111.02 l -3.274,-2.781 -0.589,-0.498 -0.633,0.441 -6.504,4.556 V 43 42 H 203 49 48 v 1 110.1 l -9.257,7.66 -13.295,-9.57 -0.645,-0.463 -0.598,0.521 -10.864,9.47 L 1,151.499 V 1 h 262 m 1,-1 H 0 V 152 L 13.391,162 24.865,152 38.756,162 49,153.6 V 43 H 203 V
[MediaWiki-commits] [Gerrit] New commit - change (analytics/wikimetrics)
Stefan.petrea has uploaded a new change for review. https://gerrit.wikimedia.org/r/92655 Change subject: New commit .. New commit This changeset should be deleted (only for testing purposes) Change-Id: Ief6d042e9a01fac576679b747f50696f5547d246 --- M README.md 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics refs/changes/55/92655/1 diff --git a/README.md b/README.md index b9542ce..e8f946d 100644 --- a/README.md +++ b/README.md @@ -187,3 +187,6 @@ # no doc string comment on this function because it's obvious +new changes + + -- To view, visit https://gerrit.wikimedia.org/r/92655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief6d042e9a01fac576679b747f50696f5547d246 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wikimetrics Gerrit-Branch: master Gerrit-Owner: Stefan.petrea ste...@garage-coding.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] I could not figure out another way of having passwords in en... - change (mediawiki/selenium)
Cmcmahon has submitted this change and it was merged.
Change subject: I could not figure out another way of having passwords in
environment variables but not displayed in Jenkins console log
..
I could not figure out another way of having passwords in environment variables
but not displayed in Jenkins console log
Change-Id: I92a3c4908acc859228559df9fc5d87cfb0c94cf1
---
M docs/jenkins.md
M lib/mediawiki/selenium/hooks.rb
2 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/jenkins.md b/docs/jenkins.md
index 382956a..f39505e 100644
--- a/docs/jenkins.md
+++ b/docs/jenkins.md
@@ -24,3 +24,7 @@
- name
- SAUCE_ONDEMAND_ACCESS_KEY
- SAUCE_ONDEMAND_USERNAME
+- MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
+- MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
+- MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
+- MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG
diff --git a/lib/mediawiki/selenium/hooks.rb b/lib/mediawiki/selenium/hooks.rb
index c4a27fa..bfc3b4b 100644
--- a/lib/mediawiki/selenium/hooks.rb
+++ b/lib/mediawiki/selenium/hooks.rb
@@ -12,6 +12,11 @@
config = YAML.load_file('config/config.yml')
Before('@login') do
+ ENV['MEDIAWIKI_PASSWORD'] =
ENV['MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET'] if
ENV['MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET']
+ ENV['MEDIAWIKI_PASSWORD'] =
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG'] if
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG']
+ ENV['MEDIAWIKI_PASSWORD'] =
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG'] if
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG']
+ ENV['MEDIAWIKI_PASSWORD'] = ENV['MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG'] if
ENV['MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG']
+
puts MEDIAWIKI_USER environment variable is not defined! Please export a
value for that variable before proceeding. unless ENV['MEDIAWIKI_USER']
puts MEDIAWIKI_PASSWORD environment variable is not defined! Please export
a value for that variable before proceeding. unless ENV['MEDIAWIKI_PASSWORD']
end
--
To view, visit https://gerrit.wikimedia.org/r/92650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92a3c4908acc859228559df9fc5d87cfb0c94cf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@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] Add missing media screen - change (mediawiki/core)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/92658 Change subject: Add missing media screen .. Add missing media screen This prevents styles overriding the print stylesheet Bug: 56366 Change-Id: I9b5aad17a4fbd0ea2b38504f2de730d1df2cc8d7 --- M resources/Resources.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/58/92658/1 diff --git a/resources/Resources.php b/resources/Resources.php index 8809227..e3bd4ed 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -92,7 +92,7 @@ 'common/commonElements.css' = array( 'media' = 'screen' ), 'common/commonContent.css' = array( 'media' = 'screen' ), 'common/commonInterface.css' = array( 'media' = 'screen' ), - 'vector/styles.less', + 'vector/styles.less' = array( 'media' = 'screen' ), ), 'remoteBasePath' = $GLOBALS['wgStylePath'], 'localBasePath' = $GLOBALS['wgStyleDirectory'], -- To view, visit https://gerrit.wikimedia.org/r/92658 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b5aad17a4fbd0ea2b38504f2de730d1df2cc8d7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: Fix double space - change (mediawiki...VectorBeta)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/92659 Change subject: i18n: Fix double space .. i18n: Fix double space Change-Id: I4fcadad6b8819dc69eb17dbef66a15e9a597a999 --- M VectorBeta.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VectorBeta refs/changes/59/92659/1 diff --git a/VectorBeta.i18n.php b/VectorBeta.i18n.php index 61bdbb3..37c7969 100644 --- a/VectorBeta.i18n.php +++ b/VectorBeta.i18n.php @@ -34,5 +34,5 @@ */ $messages['qqq'] = array( 'vector-beta-feature-typography-message' = 'Name shown in user preferences for Vector typography beta feature experiment.', - 'vector-beta-feature-typography-description' = 'Brief explanation of typography beta feature experiment.', + 'vector-beta-feature-typography-description' = 'Brief explanation of typography beta feature experiment.', ); -- To view, visit https://gerrit.wikimedia.org/r/92659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4fcadad6b8819dc69eb17dbef66a15e9a597a999 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VectorBeta Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dsh cleanup. these servers are decom in racktables RT #6123 - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/92660 Change subject: dsh cleanup. these servers are decom in racktables RT #6123 .. dsh cleanup. these servers are decom in racktables RT #6123 Change-Id: I2544a2d23c4e7302c2e2a5195976fc128b691b8f --- M files/dsh/group/ALL M files/dsh/group/pmtpa 2 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/60/92660/1 diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL index 03dcada..2f2d2bf 100644 --- a/files/dsh/group/ALL +++ b/files/dsh/group/ALL @@ -1,4 +1,3 @@ -bayes dataset2 dataset1001 eiximenis diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa index f6fd82d..73bc056 100644 --- a/files/dsh/group/pmtpa +++ b/files/dsh/group/pmtpa @@ -1,8 +1,6 @@ adler -alsted amane ariel -bayes brewster browne dobson -- To view, visit https://gerrit.wikimedia.org/r/92660 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2544a2d23c4e7302c2e2a5195976fc128b691b8f 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] [browser test] changes make it convenient to click Refs icon - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/92661 Change subject: [browser test] changes make it convenient to click Refs icon .. [browser test] changes make it convenient to click Refs icon Change-Id: I9a9ca50357601e9d254a8c86e172a497ca839387 --- M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/61/92661/1 diff --git a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb index 0daacc1..a981813 100644 --- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb @@ -34,7 +34,7 @@ span(:ve_bullets, class: 'oo-ui-iconedElement-icon oo-ui-icon-bullet-list') div(:ve_heading_menu, class: 'oo-ui-iconedElement-icon oo-ui-icon-down') span(:ve_link_icon, class: 'oo-ui-iconedElement-icon oo-ui-icon-link') - span(:ve_references, text: 'Reference') + span(:ve_references, class: 'oo-ui-iconedElement-icon oo-ui-icon-reference') span(:ve_numbering, class: 'oo-ui-iconedElement-icon oo-ui-icon-number-list') div(:visual_editor_toolbar, class: 'oo-ui-toolbar-tools') span(:transclusion, text: 'Transclusion') -- To view, visit https://gerrit.wikimedia.org/r/92661 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a9ca50357601e9d254a8c86e172a497ca839387 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add arsenic to dsh groups, treat like terbium - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/92662 Change subject: add arsenic to dsh groups, treat like terbium .. add arsenic to dsh groups, treat like terbium for ^demon's temp. scripting host for cirrus Change-Id: I7520c234000aded07db78c52fde2c5068c1cfaee --- M files/dsh/group/ALL M files/dsh/group/mediawiki-installation M files/dsh/group/mw-eqiad 3 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/62/92662/1 diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL index 03dcada..76ba246 100644 --- a/files/dsh/group/ALL +++ b/files/dsh/group/ALL @@ -1,3 +1,4 @@ +arsenic bayes dataset2 dataset1001 diff --git a/files/dsh/group/mediawiki-installation b/files/dsh/group/mediawiki-installation index 55ca2fc..7f72989 100644 --- a/files/dsh/group/mediawiki-installation +++ b/files/dsh/group/mediawiki-installation @@ -1,3 +1,4 @@ +arsenic searchidx2 searchidx1001 fenari diff --git a/files/dsh/group/mw-eqiad b/files/dsh/group/mw-eqiad index 2f9d320..fecc65a 100644 --- a/files/dsh/group/mw-eqiad +++ b/files/dsh/group/mw-eqiad @@ -1,3 +1,4 @@ +arsenic bast1001 mw1001 mw1002 -- To view, visit https://gerrit.wikimedia.org/r/92662 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7520c234000aded07db78c52fde2c5068c1cfaee 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] Avoid infinite loop if oldid and a cookie. - change (mediawiki...Parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92663
Change subject: Avoid infinite loop if oldid and a cookie.
..
Avoid infinite loop if oldid and a cookie.
Introduced in 5cc3dfb83f6d2741be88a7f38e63f70dc6c63730.
Change-Id: I3ea96df904f210890d453e2ed0a74c8cfed16f74
---
M js/api/ParserService.js
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/63/92663/1
diff --git a/js/api/ParserService.js b/js/api/ParserService.js
index 43c392a..e6c7496 100644
--- a/js/api/ParserService.js
+++ b/js/api/ParserService.js
@@ -646,9 +646,13 @@
}
};
} else {
- if ( req.query.oldid !req.headers.cookie ) {
+ if ( req.query.oldid ) {
oldid = req.query.oldid;
- res.setHeader( 'Cache-Control', 's-maxage=2592000' );
+ if ( !req.headers.cookie ) {
+ res.setHeader( 'Cache-Control',
's-maxage=2592000' );
+ } else {
+ res.setHeader( 'Cache-Control',
'private,no-cache,s-maxage=0' );
+ }
tmpCb = parse.bind( null, env, req, res, function (
req, res, src, doc ) {
sendRes( doc.documentElement );
});
--
To view, visit https://gerrit.wikimedia.org/r/92663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ea96df904f210890d453e2ed0a74c8cfed16f74
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch to using uwsgi for the proxy api - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92664
Change subject: Switch to using uwsgi for the proxy api
..
Switch to using uwsgi for the proxy api
Change-Id: I797d8f5e96e0dcc504668b1cd8832aa2e5de6e41
---
M files/upstart/dynamicproxy-api.conf
M modules/dynamicproxy/manifests/api.pp
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/92664/1
diff --git a/files/upstart/dynamicproxy-api.conf
b/files/upstart/dynamicproxy-api.conf
index 3d2ac49..7e3502b 100644
--- a/files/upstart/dynamicproxy-api.conf
+++ b/files/upstart/dynamicproxy-api.conf
@@ -6,5 +6,5 @@
respawn limit 10 5
script
-/usr/bin/dynamicproxy-api
+/usr/bin/uwsgi --plugin python --socket=127.0.0.1:3031 --module
invisible_unicorn.api --callable app --processes 4 --threads 2 --master true
end script
diff --git a/modules/dynamicproxy/manifests/api.pp
b/modules/dynamicproxy/manifests/api.pp
index d0bc8c4..e0f9543 100644
--- a/modules/dynamicproxy/manifests/api.pp
+++ b/modules/dynamicproxy/manifests/api.pp
@@ -4,13 +4,13 @@
require = Class['misc::labsdebrepo'],
}
-package { ['python-invisible-unicorn', 'python-flask-sqlalchemy']:
+package { ['python-invisible-unicorn', 'python-flask-sqlalchemy', 'uwsgi',
'uwsgi-plugin-python']:
ensure = 'present',
require = Package['python-flask'],
}
upstart_job{ 'dynamicproxy-api':
-require = Package['python-invisible-unicorn',
'python-flask-sqlalchemy', 'redis', 'python-flask'],
+require = Package['python-invisible-unicorn',
'python-flask-sqlalchemy', 'redis', 'python-flask', 'uwsgi',
'uwsgi-plugin-python'],
install = 'true',
start = 'true'
}
--
To view, visit https://gerrit.wikimedia.org/r/92664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I797d8f5e96e0dcc504668b1cd8832aa2e5de6e41
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] Better handle PoolErrors. - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92665
Change subject: Better handle PoolErrors.
..
Better handle PoolErrors.
This should stop those sometimes crashes during rebuilds.
Bug: 56060
Change-Id: I6f293c6cf3470e8c85339f30b99776cbe5d31021
---
M includes/CirrusSearchSearcher.php
M includes/CirrusSearchUpdater.php
2 files changed, 25 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/65/92665/1
diff --git a/includes/CirrusSearchSearcher.php
b/includes/CirrusSearchSearcher.php
index 3fceed2..dfe7111 100644
--- a/includes/CirrusSearchSearcher.php
+++ b/includes/CirrusSearchSearcher.php
@@ -283,10 +283,13 @@
return Status::newGood( null );
} catch (
\Elastica\Exception\ExceptionInterface $e ) {
wfLogWarning( Search backend error
during get for $id. Error message is: . $e-getMessage() );
- $status = new Status();
- $status-warning(
'cirrussearch-backend-error' );
- return $status;
+ return Status::newFatal(
'cirrussearch-backend-error' );
}
+ },
+ 'error' = function( $status ) {
+ $status = $status-getErrorsArray();
+ wfLogWarning( 'Pool error performing a get
against Elasticsearch: ' . $status[ 0 ][ 0 ] );
+ return $status;
}
) );
$result = $getWork-execute();
@@ -362,6 +365,11 @@
wfLogWarning( Search backend error
during $description. Error message is: . $e-getMessage() );
return false;
}
+ },
+ 'error' = function( $status ) {
+ $status = $status-getErrorsArray();
+ wfLogWarning( 'Pool error searching
Elasticsearch: ' . $status[ 0 ][ 0 ] );
+ return false;
}
) );
$result = $work-execute();
diff --git a/includes/CirrusSearchUpdater.php b/includes/CirrusSearchUpdater.php
index cca0db8..c78fcd5 100644
--- a/includes/CirrusSearchUpdater.php
+++ b/includes/CirrusSearchUpdater.php
@@ -180,14 +180,19 @@
return;
}
wfDebugLog( 'CirrusSearch', Sending $documentCount documents
to the $indexType index. );
- $work = new PoolCounterWorkViaCallback( 'CirrusSearch-Update',
_elasticsearch,
- array( 'doWork' = function() use ( $indexType,
$documents ) {
+ $work = new PoolCounterWorkViaCallback( 'CirrusSearch-Update',
_elasticsearch, array(
+ 'doWork' = function() use ( $indexType, $documents ) {
try {
$result =
CirrusSearchConnection::getPageType( $indexType )-addDocuments( $documents );
wfDebugLog( 'CirrusSearch', 'Update
completed in ' . $result-getEngineTime() . ' (engine) millis' );
} catch (
\Elastica\Exception\ExceptionInterface $e ) {
error_log( CirrusSearch update failed
caused by: . $e-getMessage() );
}
+ },
+ 'error' = function( $status ) {
+ $status = $status-getErrorsArray();
+ wfLogWarning( 'Pool error sending documents to
Elasticsearch: ' . $status[ 0 ][ 0 ] );
+ return false;
}
) );
$work-execute();
@@ -403,14 +408,19 @@
return;
}
wfDebugLog( 'CirrusSearch', Sending $idCount deletes to the
$indexType index. );
- $work = new PoolCounterWorkViaCallback( 'CirrusSearch-Update',
_elasticsearch,
- array( 'doWork' = function() use ( $indexType, $ids ) {
+ $work = new PoolCounterWorkViaCallback( 'CirrusSearch-Update',
_elasticsearch, array(
+ 'doWork' = function() use ( $indexType, $ids ) {
try {
$result =
CirrusSearchConnection::getPageType( $indexType )-deleteIds( $ids );
wfDebugLog( 'CirrusSearch', 'Delete
completed in ' . $result-getEngineTime() . ' (engine)
[MediaWiki-commits] [Gerrit] dsh cleanup. these servers are decom in racktables RT #6123 - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: dsh cleanup. these servers are decom in racktables RT #6123 .. dsh cleanup. these servers are decom in racktables RT #6123 Change-Id: I2544a2d23c4e7302c2e2a5195976fc128b691b8f --- M files/dsh/group/ALL M files/dsh/group/pmtpa 2 files changed, 0 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL index 03dcada..2f2d2bf 100644 --- a/files/dsh/group/ALL +++ b/files/dsh/group/ALL @@ -1,4 +1,3 @@ -bayes dataset2 dataset1001 eiximenis diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa index f6fd82d..73bc056 100644 --- a/files/dsh/group/pmtpa +++ b/files/dsh/group/pmtpa @@ -1,8 +1,6 @@ adler -alsted amane ariel -bayes brewster browne dobson -- To view, visit https://gerrit.wikimedia.org/r/92660 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2544a2d23c4e7302c2e2a5195976fc128b691b8f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@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] Wrap jQuery in an anonymous function to avoid conflicts - change (mediawiki...WikiEditor)
Cillian.deRoiste has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92666
Change subject: Wrap jQuery in an anonymous function to avoid conflicts
..
Wrap jQuery in an anonymous function to avoid conflicts
Change-Id: Ifdd4b10063221a4967d812eafd43858623ec5d28
---
M modules/ext.wikiEditor.dialogs.js
M modules/ext.wikiEditor.js
M modules/ext.wikiEditor.toolbar.hideSig.js
M modules/ext.wikiEditor.toolbar.js
4 files changed, 47 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/66/92666/1
diff --git a/modules/ext.wikiEditor.dialogs.js
b/modules/ext.wikiEditor.dialogs.js
index 0e0dd09..4994037 100644
--- a/modules/ext.wikiEditor.dialogs.js
+++ b/modules/ext.wikiEditor.dialogs.js
@@ -1,15 +1,16 @@
/*
* JavaScript for WikiEditor Dialogs
*/
-
-$( document ).ready( function() {
- if ( !$.wikiEditor.isSupported( $.wikiEditor.modules.dialogs ) ) {
- return;
- }
-
- // Replace icons
- $.wikiEditor.modules.dialogs.config.replaceIcons( $( '#wpTextbox1' ) );
-
- // Add dialogs module
- $( '#wpTextbox1' ).wikiEditor( 'addModule',
$.wikiEditor.modules.dialogs.config.getDefaultConfig() );
-} );
+(function($){
+$( document ).ready( function() {
+ if ( !$.wikiEditor.isSupported( $.wikiEditor.modules.dialogs ) ) {
+ return;
+ }
+
+ // Replace icons
+ $.wikiEditor.modules.dialogs.config.replaceIcons( $( '#wpTextbox1'
) );
+
+ // Add dialogs module
+ $( '#wpTextbox1' ).wikiEditor( 'addModule',
$.wikiEditor.modules.dialogs.config.getDefaultConfig() );
+} );
+})(jQuery);
diff --git a/modules/ext.wikiEditor.js b/modules/ext.wikiEditor.js
index 6056e63..3b1a049 100644
--- a/modules/ext.wikiEditor.js
+++ b/modules/ext.wikiEditor.js
@@ -1,8 +1,9 @@
/*
* JavaScript for WikiEditor
*/
-
-$( document ).ready( function() {
- // Initialize wikiEditor
- $( '#wpTextbox1' ).wikiEditor();
-} );
+(function($){
+$( document ).ready( function() {
+ // Initialize wikiEditor
+ $( '#wpTextbox1' ).wikiEditor();
+} );
+})(jQuery);
diff --git a/modules/ext.wikiEditor.toolbar.hideSig.js
b/modules/ext.wikiEditor.toolbar.hideSig.js
index 3bc0f0b..29ba22e 100644
--- a/modules/ext.wikiEditor.toolbar.hideSig.js
+++ b/modules/ext.wikiEditor.toolbar.hideSig.js
@@ -1,14 +1,16 @@
/*
* Remove the signature button if the main namespace is edited.
*/
-$( document ).ready( function() {
- // This module is designed not to depend on ext.wikiEditor or
jquery.wikiEditor.
- // Removing this dependency fixed various bugs, but it does mean that
we have to
- // account for the situation where $.wikiEditor is not present
- if ( !$.wikiEditor || !$.wikiEditor.isSupported(
$.wikiEditor.modules.toolbar ) ) {
- return;
- }
- if ( $( 'body' ).hasClass( 'ns-0' ) ) {
- $( '#wpTextbox1' ).wikiEditor( 'removeFromToolbar', {
'section': 'main', 'group': 'insert', 'tool': 'signature' } );
- }
-});
+(function($){
+$( document ).ready( function() {
+ // This module is designed not to depend on ext.wikiEditor or
jquery.wikiEditor.
+ // Removing this dependency fixed various bugs, but it does mean
that we have to
+ // account for the situation where $.wikiEditor is not present
+ if ( !$.wikiEditor || !$.wikiEditor.isSupported(
$.wikiEditor.modules.toolbar ) ) {
+ return;
+ }
+ if ( $( 'body' ).hasClass( 'ns-0' ) ) {
+ $( '#wpTextbox1' ).wikiEditor( 'removeFromToolbar', {
'section': 'main', 'group': 'insert', 'tool': 'signature' } );
+ }
+});
+})(jQuery);
diff --git a/modules/ext.wikiEditor.toolbar.js
b/modules/ext.wikiEditor.toolbar.js
index 5cdeae5..b81299c 100644
--- a/modules/ext.wikiEditor.toolbar.js
+++ b/modules/ext.wikiEditor.toolbar.js
@@ -1,17 +1,18 @@
/*
* JavaScript for WikiEditor Toolbar
*/
-
-$( document ).ready( function() {
- if ( !$.wikiEditor.isSupported( $.wikiEditor.modules.toolbar ) ) {
- $( '.wikiEditor-oldToolbar' ).show();
- return;
- }
- // The old toolbar is still in place and needs to be removed so there
aren't two toolbars
- $( '#toolbar' ).remove();
- // Add toolbar module
- // TODO: Implement .wikiEditor( 'remove' )
- $( '#wpTextbox1' ).wikiEditor(
- 'addModule',
$.wikiEditor.modules.toolbar.config.getDefaultConfig()
- );
-} );
+(function($){
+$( document ).ready( function() {
+ if ( !$.wikiEditor.isSupported( $.wikiEditor.modules.toolbar ) ) {
+ $( '.wikiEditor-oldToolbar' ).show();
+ return;
+ }
+ // The old toolbar is
[MediaWiki-commits] [Gerrit] tie operations-mw-config-tests to gallium for now - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: tie operations-mw-config-tests to gallium for now .. tie operations-mw-config-tests to gallium for now operations-mw-config-tests git repo requires an internet access due to some submodule referencing a git://github.com URL. Until we find out a proper solution, bind the job on gallium which has internet access. Change-Id: I5948ccfae53db465bb4b7793c7877ec9073b5962 --- M operations-mw-config.yaml 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/operations-mw-config.yaml b/operations-mw-config.yaml index 50f4354..cdfdf5d 100644 --- a/operations-mw-config.yaml +++ b/operations-mw-config.yaml @@ -1,6 +1,10 @@ - job-template: name: 'operations-mw-config-tests' -node: (hasContintPackages hasPhpUnit) +# Repo has a reference to a git://github.com url which does not +# work on 10.0.0.0/8 slaves :( +# +#node: (hasContintPackages hasPhpUnit) +node: gallium defaults: use-remote-zuul triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/92653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5948ccfae53db465bb4b7793c7877ec9073b5962 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reimplement toogleLayout feature - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Reimplement toogleLayout feature
..
Reimplement toogleLayout feature
Change-Id: I43139216217fc791b71878fb34a1a45e66fd3955
---
M modules/jquery/jquery.prpZoom.js
M modules/page/ext.proofreadpage.page.css
M modules/page/ext.proofreadpage.page.edit.js
3 files changed, 102 insertions(+), 21 deletions(-)
Approvals:
Tpt: Looks good to me, approved
Rtdwivedi: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/jquery/jquery.prpZoom.js b/modules/jquery/jquery.prpZoom.js
index a596734..c01b71a 100644
--- a/modules/jquery/jquery.prpZoom.js
+++ b/modules/jquery/jquery.prpZoom.js
@@ -24,8 +24,8 @@
$.widget( 'mw.prpZoom', {
options: {
- zoomStep: 3,
- moveStep: 3,
+ zoomStep: 4,
+ moveStep: 4,
animationDuration: 200
},
@@ -144,8 +144,22 @@
},
destroy: function() {
- this.reset();
- this.draggable( 'destroy' );
+ this.element
+ .draggable( 'destroy' )
+ .css( {
+ position: 'static',
+ top: '',
+ left: '',
+ width: '',
+ height: ''
+ } )
+ .parent().css( {
+ position: 'static',
+ overflow: '',
+ height: '',
+ cursor: ''
+ } );
+
$.Widget.prototype.destroy.call( this );
}
} );
diff --git a/modules/page/ext.proofreadpage.page.css
b/modules/page/ext.proofreadpage.page.css
index a3795da..8512e62 100644
--- a/modules/page/ext.proofreadpage.page.css
+++ b/modules/page/ext.proofreadpage.page.css
@@ -1,6 +1,7 @@
.prp-page-container {
width: 100%;
}
+
.prp-page-content {
float: left;
width: 50%;
diff --git a/modules/page/ext.proofreadpage.page.edit.js
b/modules/page/ext.proofreadpage.page.edit.js
index 1bfeea1..8465f9a 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -2,14 +2,71 @@
'use strict';
/**
+* Is the layout horizontal (ie is the scan image on top of the edit
area)
+* @type {boolean}
+*/
+ var isLayoutHorizontal = false;
+
+ /**
+* The scan image
+* @type {jQuery}
+*/
+ var $zoomImage;
+
+ /**
* Show or hide header and footer areas
*
-* @param string speed of the toogle. May be 'fast', 'slow' or undefined
+* @param speed string speed of the toogle. May be 'fast', 'slow' or
undefined
*/
function toggleHeaders( speed ) {
$( '.prp-page-edit-header' ).toggle( speed );
$( '.prp-page-edit-body label' ).toggle( speed );
$( '.prp-page-edit-footer' ).toggle( speed );
+ }
+
+ /**
+* Put the scan image on top or on the left of the edit area
+*/
+ function toogleLayout() {
+ if( $zoomImage.data( 'prpZoom' ) ) {
+ $zoomImage.prpZoom( 'destroy' );
+ }
+
+ var $container = $zoomImage.parent();
+
+ if( isLayoutHorizontal ) {
+ $container.appendTo( '#editform .prp-page-container' );
+
+ $container.css( {
+ width: ''
+ } );
+ $( '#editform' ).find( '.prp-page-content' ).css( {
+ width: ''
+ } );
+
+ $zoomImage.prpZoom();
+
+ isLayoutHorizontal = false;
+
+ } else {
+ $container.insertBefore( '#editform' );
+
+ $container.css( {
+ width: '100%',
+ overflow: 'auto',
+ height: $( window ).height() / 3 + 'px'
+ } );
+ $( '#editform' ).find( '.prp-page-content' ).css( {
+ width: '100%'
+ } );
+
+ $zoomImage.prpZoom();
+ $container.css( {
+ height: $( window ).height() / 3 + 'px'
+ } );
+
+ isLayoutHorizontal = true;
+
[MediaWiki-commits] [Gerrit] add arsenic to dsh groups, treat like terbium - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: add arsenic to dsh groups, treat like terbium .. add arsenic to dsh groups, treat like terbium for ^demon's temp. scripting host for cirrus RT #6120 Change-Id: I7520c234000aded07db78c52fde2c5068c1cfaee --- M files/dsh/group/ALL M files/dsh/group/mediawiki-installation M files/dsh/group/mw-eqiad 3 files changed, 3 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL index 2f2d2bf..77fe029 100644 --- a/files/dsh/group/ALL +++ b/files/dsh/group/ALL @@ -1,3 +1,4 @@ +arsenic dataset2 dataset1001 eiximenis diff --git a/files/dsh/group/mediawiki-installation b/files/dsh/group/mediawiki-installation index 55ca2fc..7f72989 100644 --- a/files/dsh/group/mediawiki-installation +++ b/files/dsh/group/mediawiki-installation @@ -1,3 +1,4 @@ +arsenic searchidx2 searchidx1001 fenari diff --git a/files/dsh/group/mw-eqiad b/files/dsh/group/mw-eqiad index 2f9d320..fecc65a 100644 --- a/files/dsh/group/mw-eqiad +++ b/files/dsh/group/mw-eqiad @@ -1,3 +1,4 @@ +arsenic bast1001 mw1001 mw1002 -- To view, visit https://gerrit.wikimedia.org/r/92662 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7520c234000aded07db78c52fde2c5068c1cfaee Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Chad ch...@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
