[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Allow ssh access from per-project prometheus hosts
Yuvipanda has submitted this change and it was merged.
Change subject: labs: Allow ssh access from per-project prometheus hosts
..
labs: Allow ssh access from per-project prometheus hosts
This allows labs projects to set a special hiera variable
containing list of prometheus host IPs and allows ssh checks
from that for all the instances in that project
Change-Id: I59382877917fd485d029c2499fd780669a2ffdb0
---
M modules/network/manifests/constants.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/network/manifests/constants.pp
b/modules/network/manifests/constants.pp
index badfa70..4a1404c 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -90,9 +90,9 @@
'10.68.18.66', # bastion-restricted-01.eqiad.wmflabs
'10.68.18.68', # bastion-restricted-02.eqiad.wmflabs
],
-'monitoring_hosts' => [
+'monitoring_hosts' => concat([
'10.68.16.210', # shinken-01.eqiad.wmflabs
-],
+], hiera('prometheus_host_ips', [])), # Support per-project
prometheus hosts!
'deployment_hosts' => [
'10.68.17.240', #
deployment-tin.deployment-prep.eqiad.wmflabs
'10.68.17.215', # mira.deployment-prep.eqiad.wmflabs
--
To view, visit https://gerrit.wikimedia.org/r/304169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I59382877917fd485d029c2499fd780669a2ffdb0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix link to Help:Contents in UPGRADE file
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/304170 Change subject: Fix link to Help:Contents in UPGRADE file .. Fix link to Help:Contents in UPGRADE file Change-Id: I4c8c44f8c75200f33985f2e769e88f171162cc83 --- M UPGRADE 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/70/304170/2 diff --git a/UPGRADE b/UPGRADE index 0fff289..3ec1a22 100644 --- a/UPGRADE +++ b/UPGRADE @@ -1,7 +1,7 @@ This file provides an overview of the MediaWiki upgrade process. For help with specific problems, check -* the documentation at https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents/ +* the documentation at https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents * the mediawiki-l mailing list archive at http://lists.wikimedia.org/pipermail/mediawiki-l/ * the bug tracker at https://phabricator.wikimedia.org/ -- To view, visit https://gerrit.wikimedia.org/r/304170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c8c44f8c75200f33985f2e769e88f171162cc83 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Glaisher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: wmnet: host names on each line, fix indentation, misc cleanup
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/304171 Change subject: wmnet: host names on each line, fix indentation, misc cleanup .. wmnet: host names on each line, fix indentation, misc cleanup Change-Id: I6db35bac330e05b18ba3a7dc73456aa967b8c12f --- M templates/wmnet 1 file changed, 560 insertions(+), 503 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/71/304171/1 diff --git a/templates/wmnet b/templates/wmnet index d4c6fcd..770c4a4 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -99,21 +99,21 @@ kafka1001 1H IN A 10.64.0.11 kafka1002 1H IN A 10.64.16.41 kafka1012 1H IN A 10.64.5.12 -1H IN 2620:0:861:104:10:64:5:12 +kafka1012 1H IN 2620:0:861:104:10:64:5:12 kafka1013 1H IN A 10.64.5.13 -1H IN 2620:0:861:104:10:64:5:13 +kafka1013 1H IN 2620:0:861:104:10:64:5:13 kafka1014 1H IN A 10.64.36.114 -1H IN 2620:0:861:106:10:64:36:114 +kafka1014 1H IN 2620:0:861:106:10:64:36:114 kafka1018 1H IN A 10.64.53.10 -1H IN 2620:0:861:108:10:64:53:10 +kafka1018 1H IN 2620:0:861:108:10:64:53:10 kafka1020 1H IN A 10.64.53.12 -1H IN 2620:0:861:108:10:64:53:12 +kafka1020 1H IN 2620:0:861:108:10:64:53:12 kafka1022 1H IN A 10.64.36.122 -1H IN 2620:0:861:106:10:64:36:122 +kafka1022 1H IN 2620:0:861:106:10:64:36:122 analytics1015 1H IN A 10.64.36.115 notebook10011H IN A 10.64.36.117 notebook10021H IN A 10.64.5.14 -1H IN 2620:0:861:104:10:64:5:14 +notebook10021H IN 2620:0:861:104:10:64:5:14 analytics10261H IN A 10.64.36.126 analytics10271H IN A 10.64.36.127 @@ -169,59 +169,59 @@ conf1003 1H IN A 10.64.48.111 contint1001 1H IN A 10.64.0.237 cp1045 1H IN A 10.64.32.97 - 1H IN 2620:0:861:103:10:64:32:97 +cp1045 1H IN 2620:0:861:103:10:64:32:97 cp1046 1H IN A 10.64.32.98 - 1H IN 2620:0:861:103:10:64:32:98 +cp1046 1H IN 2620:0:861:103:10:64:32:98 cp1047 1H IN A 10.64.32.99 - 1H IN 2620:0:861:103:10:64:32:99 +cp1047 1H IN 2620:0:861:103:10:64:32:99 cp1048 1H IN A 10.64.32.100 - 1H IN 2620:0:861:103:10:64:32:100 +cp1048 1H IN 2620:0:861:103:10:64:32:100 cp1049 1H IN A 10.64.32.101 - 1H IN 2620:0:861:103:10:64:32:101 +cp1049 1H IN 2620:0:861:103:10:64:32:101 cp1050 1H IN A 10.64.32.102 - 1H IN 2620:0:861:103:10:64:32:102 +cp1050 1H IN 2620:0:861:103:10:64:32:102 cp1051 1H IN A 10.64.32.103 - 1H IN 2620:0:861:103:10:64:32:103 +cp1051 1H IN 2620:0:861:103:10:64:32:103 cp1052 1H IN A 10.64.32.104 - 1H IN 2620:0:861:103:10:64:32:104 +cp1052 1H IN 2620:0:861:103:10:64:32:104 cp1053 1H IN A 10.64.32.105 - 1H IN 2620:0:861:103:10:64:32:105 +cp1053 1H IN 2620:0:861:103:10:64:32:105 cp1054 1H IN A 10.64.32.106 - 1H IN 2620:0:861:103:10:64:32:106 +cp1054 1H IN 2620:0:861:103:10:64:32:106 cp1055 1H IN A 10.64.32.107 - 1H IN 2620:0:861:103:10:64:32:107 +cp1055 1H IN 2620:0:861:103:10:64:32:107 cp1058 1H IN A 10.64.0.95 - 1H IN 2620:0:861:101:10:64:0:95 +cp1058 1H IN 2620:0:861:101:10:64:0:95 cp1059 1H IN A 10.64.0.96 - 1H IN 2620:0:861:101:10:64:0:96 +cp1059 1H IN 2620:0:861:101:10:64:0:96 cp1060 1H IN A 10.64.0.97 - 1H IN 2620:0:861:101:10:64:0:97 +cp1060 1H IN 2620:0:861:101:10:64:0:97 cp1061 1H IN A 10.64.0.98 - 1H IN 2620:0:861:101:10:64:0:98 +cp1061 1H IN 2620:0:861:101:10:64:0:98 cp1062 1H IN A 10.64.0.99 - 1H IN 2620:0:861:101:10:64:0:99 +cp1062 1H I
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Stop icinga git remote update
Dzahn has submitted this change and it was merged.
Change subject: Stop icinga git remote update
..
Stop icinga git remote update
This check has been causing some ownership issues on
/srv/mediawiki-staging for a few months. Ideally, icinga wouldn't change
the state of a git repository.
Use git ls-remote to check the current sha1 of the remote.
Bug: T127093
Change-Id: I921d3f9e75a5ac2a19e1b82e246827ab4e1b7a9a
---
M modules/monitoring/manifests/icinga/git_merge.pp
M modules/monitoring/templates/check_git-needs-merge.erb
M modules/role/manifests/deployment/server.pp
3 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/monitoring/manifests/icinga/git_merge.pp
b/modules/monitoring/manifests/icinga/git_merge.pp
index f5fe73b..56d6288 100644
--- a/modules/monitoring/manifests/icinga/git_merge.pp
+++ b/modules/monitoring/manifests/icinga/git_merge.pp
@@ -4,15 +4,14 @@
define monitoring::icinga::git_merge (
$dir = "/var/lib/git/operations/${title}",
$user = 'gitpuppet',
-$remote_branch = 'origin/production',
+$remote= 'origin',
+$remote_branch = 'production',
$interval = 10
) {
$sane_title = regsubst($title, '\W', '_', 'G')
$filename = "/usr/local/lib/nagios/plugins/check_${sane_title}-needs-merge"
$file_resource = "check_${sane_title}_needs_merge"
-
-$remote = regsubst($remote_branch,'/\w+$','')
file { $file_resource:
ensure => present,
diff --git a/modules/monitoring/templates/check_git-needs-merge.erb
b/modules/monitoring/templates/check_git-needs-merge.erb
index 463916a..d716e59 100755
--- a/modules/monitoring/templates/check_git-needs-merge.erb
+++ b/modules/monitoring/templates/check_git-needs-merge.erb
@@ -5,12 +5,15 @@
#Config variables
basedir="<%= @dir %>"
git_user=<%= @user %>
-refname=<%= @remote_branch %>
+repository=<%= @remote %>
+refs=<%= @remote_branch %>
+refname="${repository}/${refs}"
# First of all, check if there is something to merge.
cd "${basedir}"
-su - $git_user -c "cd ${basedir} && git remote update <%= @remote %> >
/dev/null 2>&1"
-remote_sha1=$(git rev-parse ${refname})
+remote_sha1=$(su - $git_user -c "cd \"${basedir}\" \
+&& git ls-remote --heads \"${repository}\" \"${refs}\" 2>&1" \
+| cut -f1)
local_sha1=$(git rev-parse HEAD)
# Exit if there are no changes to merge.
if [ "x${remote_sha1}" == "x${local_sha1}" ]; then
diff --git a/modules/role/manifests/deployment/server.pp
b/modules/role/manifests/deployment/server.pp
index 6774592..fb5c86a 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -67,7 +67,8 @@
::monitoring::icinga::git_merge { 'mediawiki_config':
dir => '/srv/mediawiki-staging/',
user => 'root',
-remote_branch => 'readonly/master'
+remote=> 'readonly',
+remote_branch => 'master',
}
# Also make sure that no files have been stolen by root ;-)
--
To view, visit https://gerrit.wikimedia.org/r/303955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I921d3f9e75a5ac2a19e1b82e246827ab4e1b7a9a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: more maintenance, http->https, rm broken urls etc
Dzahn has submitted this change and it was merged. Change subject: planet: more maintenance, http->https, rm broken urls etc .. planet: more maintenance, http->https, rm broken urls etc Changes URLs from http to https where possible, removes broken feeds, fixes redirects to become 200 and similar things. All the details are on https://phabricator.wikimedia.org/P3817 Bug: T141480 Change-Id: I14a4b82e8feb6d68b451835a4692f0bf2caa1193 --- M modules/planet/templates/feeds/cs_config.erb M modules/planet/templates/feeds/de_config.erb M modules/planet/templates/feeds/en_config.erb M modules/planet/templates/feeds/es_config.erb M modules/planet/templates/feeds/pt_config.erb M modules/planet/templates/feeds/ro_config.erb M modules/planet/templates/feeds/ru_config.erb M modules/planet/templates/feeds/zh_config.erb 8 files changed, 16 insertions(+), 36 deletions(-) Approvals: Dereckson: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/planet/templates/feeds/cs_config.erb b/modules/planet/templates/feeds/cs_config.erb index 33d2c31..f40d8fd 100644 --- a/modules/planet/templates/feeds/cs_config.erb +++ b/modules/planet/templates/feeds/cs_config.erb @@ -23,7 +23,7 @@ # Subscription configuration -[http://blog.wikimedia.cz/feed/atom/] +[https://blog.wikimedia.cz/feed/atom/] name = * Wikimedia Česká republika * face = http://upload.wikimedia.org/wikipedia/commons/thumb/f/f2/Wikimedia_Czech_Republic-logo.svg/64px-Wikimedia_Czech_Republic-logo.svg.png @@ -32,11 +32,6 @@ [https://okinokynko.blogspot.com/feeds/posts/default/-/wiki] name = Okino - -[http://vrba.bloguje.cz/tema-1-wikipedia.xml] -name = Vrba -face = http://upload.wikimedia.org/wikipedia/commons/thumb/1/14/Smiley_green_alien_sick.svg/64px-Smiley_green_alien_sick.svg.png -faceheight = 87 [https://okinokynko.blogspot.com/feeds/posts/default/-/Wikipedie] name=Okinovo Okýnko diff --git a/modules/planet/templates/feeds/de_config.erb b/modules/planet/templates/feeds/de_config.erb index d561bdb..59e6b89 100644 --- a/modules/planet/templates/feeds/de_config.erb +++ b/modules/planet/templates/feeds/de_config.erb @@ -26,7 +26,7 @@ [https://arnomane.wordpress.com/category/wiki-de/feed/atom/] name=Daniel Arnold -#[http://wikimedia.ch/archives/category/de/feed] +#[https://www.wikimedia.ch/archives/category/de/feed] #name=Wikimedia CH [http://intelligentdesigns.net/blog/?cat=16&feed=rss2] @@ -50,7 +50,7 @@ [https://feeds.feedburner.com/dewikizine?format=xml] name=Wikizine -[http://blog.dapete.net/kategorie/wiki/feed] +[https://blog.dapete.net/kategorie/wiki/feed/] name=Peter Schloemer (Dapete) [http://www.finanzer.org/blog/category/wikimedia/feed/] @@ -68,7 +68,7 @@ [https://piratenblog.wordpress.com/category/wiki/feed/atom/] name=Elvis untot -[http://blog.wikimedia.de/feed/] +[https://blog.wikimedia.de/feed/] name=Wikimedia Deutschland Blog [http://erinnerungshort.de/blog/feed/] @@ -89,7 +89,7 @@ [https://achimraschka.blogspot.com/feeds/posts/default/-/Freies%20Wissen] name=Achim Raschka -[http://schmalenstroer.net/blog/tag/wikipedia/feed/] +[https://schmalenstroer.net/blog/tag/wikipedia/feed/] name=Michael Schmalenstroer [https://steproe.wordpress.com/category/wikimedia/feed/atom/] @@ -100,9 +100,6 @@ [https://unglaublich-was-auch-immer.blogspot.com/feeds/posts/default] name=Frank Schubert - -[http://grenzenderbezahlung.tumblr.com/rss] -name=Grenzen der Bezahlung. [https://festivalsommer.blogspot.com/feeds/posts/default/-/Planet] name=Festivalsommer diff --git a/modules/planet/templates/feeds/en_config.erb b/modules/planet/templates/feeds/en_config.erb index 75d6cac..4c1cc90 100644 --- a/modules/planet/templates/feeds/en_config.erb +++ b/modules/planet/templates/feeds/en_config.erb @@ -83,7 +83,7 @@ [http://moononastick.com/blog/feed/?cat=4] name=User:The wub -[http://mako.cc/copyrighteous/tags/planetwikimedia/feed/atom] +[https://mako.cc/copyrighteous/tags/planetwikimedia/feed/atom] name=Benjamin Mako Hill [https://dialogicality.blogspot.com/feeds/posts/default/-/wiki] @@ -329,7 +329,7 @@ [http://pigsonthewing.org.uk/category/wikipedia-2/feed/atom/] name=Andy Mabbett (User:Pigsonthewing) -[http://wikistrategies.net/category/wiki/feed/atom/] +[https://wikistrategies.net/category/wiki/feed/atom/] name=Pete Forsyth, Wiki Strategies [http://www.harryburt.co.uk/blog/category/interests/mediawiki-and-wikimedia/feed/atom/] @@ -359,10 +359,7 @@ [http://englishwikisource.tumblr.com/rss] name=English Wikisource -[http://samwilson.id.au/tag/wikimedia/feed/] -name=User:Samwilson - -[http://blog.wikimedia.de/tag/Wikidata+English/feed/] +[https://blog.wikimedia.de/tag/Wikidata+English/feed/] name=Wikidata (WMDE - English) [https://blogs.gnome.org/aklapper/category/computer/wikimedia/feed/] @@ -383,7 +380,7 @@ [http://lu.is/feed/] name=Luis Villa
[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Allow ssh access from per-project prometheus hosts
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304169
Change subject: labs: Allow ssh access from per-project prometheus hosts
..
labs: Allow ssh access from per-project prometheus hosts
This allows labs projects to set a special hiera variable
containing list of prometheus host IPs and allows ssh checks
from that for all the instances in that project
Change-Id: I59382877917fd485d029c2499fd780669a2ffdb0
---
M modules/network/manifests/constants.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/69/304169/1
diff --git a/modules/network/manifests/constants.pp
b/modules/network/manifests/constants.pp
index badfa70..4a1404c 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -90,9 +90,9 @@
'10.68.18.66', # bastion-restricted-01.eqiad.wmflabs
'10.68.18.68', # bastion-restricted-02.eqiad.wmflabs
],
-'monitoring_hosts' => [
+'monitoring_hosts' => concat([
'10.68.16.210', # shinken-01.eqiad.wmflabs
-],
+], hiera('prometheus_host_ips', [])), # Support per-project
prometheus hosts!
'deployment_hosts' => [
'10.68.17.240', #
deployment-tin.deployment-prep.eqiad.wmflabs
'10.68.17.215', # mira.deployment-prep.eqiad.wmflabs
--
To view, visit https://gerrit.wikimedia.org/r/304169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I59382877917fd485d029c2499fd780669a2ffdb0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace extract() with explicit variable definitions in DjVu...
jenkins-bot has submitted this change and it was merged.
Change subject: Replace extract() with explicit variable definitions in
DjVuImage
..
Replace extract() with explicit variable definitions in DjVuImage
Bug: T28496
Change-Id: I09e012674e4d6c141912db6ef53dc51b2fcf0a66
---
M includes/media/DjVuImage.php
1 file changed, 20 insertions(+), 42 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/media/DjVuImage.php b/includes/media/DjVuImage.php
index 16740d8..ed361eb 100644
--- a/includes/media/DjVuImage.php
+++ b/includes/media/DjVuImage.php
@@ -84,11 +84,9 @@
function dump() {
$file = fopen( $this->mFilename, 'rb' );
$header = fread( $file, 12 );
- // @todo FIXME: Would be good to replace this extract() call
with
- // something that explicitly initializes local variables.
- extract( unpack( 'a4magic/a4chunk/NchunkLength', $header ) );
- /** @var string $chunk
-* @var string $chunkLength */
+ $arr = unpack( 'a4magic/a4chunk/NchunkLength', $header );
+ $chunk = $arr['chunk'];
+ $chunkLength = $arr['chunkLength'];
echo "$chunk $chunkLength\n";
$this->dumpForm( $file, $chunkLength, 1 );
fclose( $file );
@@ -103,11 +101,9 @@
if ( $chunkHeader == '' ) {
break;
}
- // @todo FIXME: Would be good to replace this extract()
call with
- // something that explicitly initializes local
variables.
- extract( unpack( 'a4chunk/NchunkLength', $chunkHeader )
);
- /** @var string $chunk
-* @var string $chunkLength */
+ $arr = unpack( 'a4chunk/NchunkLength', $chunkHeader );
+ $chunk = $arr['chunk'];
+ $chunkLength = $arr['chunkLength'];
echo str_repeat( ' ', $indent * 4 ) . "$chunk
$chunkLength\n";
if ( $chunk == 'FORM' ) {
@@ -138,24 +134,19 @@
if ( strlen( $header ) < 16 ) {
wfDebug( __METHOD__ . ": too short file header\n" );
} else {
- // @todo FIXME: Would be good to replace this extract()
call with
- // something that explicitly initializes local
variables.
- extract( unpack(
'a4magic/a4form/NformLength/a4subtype', $header ) );
+ $arr = unpack( 'a4magic/a4form/NformLength/a4subtype',
$header );
- /** @var string $magic
-* @var string $subtype
-* @var string $formLength
-* @var string $formType */
- if ( $magic != 'AT&T' ) {
+ $subtype = $arr['subtype'];
+ if ( $arr['magic'] != 'AT&T' ) {
wfDebug( __METHOD__ . ": not a DjVu file\n" );
} elseif ( $subtype == 'DJVU' ) {
// Single-page document
$info = $this->getPageInfo( $file );
} elseif ( $subtype == 'DJVM' ) {
// Multi-page document
- $info = $this->getMultiPageInfo( $file,
$formLength );
+ $info = $this->getMultiPageInfo( $file,
$arr['formLength'] );
} else {
- wfDebug( __METHOD__ . ": unrecognized DJVU file
type '$formType'\n" );
+ wfDebug( __METHOD__ . ": unrecognized DJVU file
type '{$arr['subtype']}'\n" );
}
}
fclose( $file );
@@ -168,13 +159,9 @@
if ( strlen( $header ) < 8 ) {
return [ false, 0 ];
} else {
- // @todo FIXME: Would be good to replace this extract()
call with
- // something that explicitly initializes local
variables.
- extract( unpack( 'a4chunk/Nlength', $header ) );
+ $arr = unpack( 'a4chunk/Nlength', $header );
- /** @var string $chunk
-* @var string $length */
- return [ $chunk, $length ];
+ return [ $arr['chunk'], $arr['length'] ];
}
}
@@ -236,31 +223,22 @@
return false;
}
- // @todo FIXME: Would be good to replace this extract() call
with
- // something that explicitly initializes local variables.
-
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove checks formerly for MySQL server version
jenkins-bot has submitted this change and it was merged.
Change subject: Remove checks formerly for MySQL server version
..
Remove checks formerly for MySQL server version
Removed these checks instead of fixing them, for the stated reasons:
* initEditCount.php: "instanceof DatabaseMysql" is not a correct way to
check if the database server is MySQL/MariaDB, because DatabaseMysql is
now a subclass of DatabaseMysqlBase, only used as a wrapper around the
deprecated mysql PHP extension (not the newer mysqli extension). The
check was intended for pre-4.1 versions of MySQL, which do not support
subqueries.
The effect of this change is to use single-query mode whenever there is
only one configured database server, even when using the mysqli PHP
extension, which would have been the original intent.
* fixBug20757.php: If the database server is not MySQL/MariaDB, the
$lowerLeft variable would remain undefined. The script was only intended
for use with MySQL, so the check was only necessary in order to support
pre-4.1 versions of MySQL, which require different SQL.
Follows-up b74f88967bf090af.
Change-Id: I7f32aed4473e5ea39dc40449ddc0af5f9a10df16
---
M maintenance/initEditCount.php
M maintenance/storage/fixBug20757.php
2 files changed, 5 insertions(+), 10 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/initEditCount.php b/maintenance/initEditCount.php
index c219b9b..50a4018 100644
--- a/maintenance/initEditCount.php
+++ b/maintenance/initEditCount.php
@@ -32,8 +32,7 @@
avoids locking tables or lagging slaves with large updates;
calculates counts on a slave if possible.
-Background mode will be automatically used if the server is MySQL 4.0
-(which does not support subqueries) or if multiple servers are listed
+Background mode will be automatically used if multiple servers are listed
in the load balancer, usually indicating a replication environment.' );
$this->addDescription( 'Batch-recalculate user_editcount fields
from the revision table' );
}
@@ -46,13 +45,12 @@
$dbver = $dbw->getServerVersion();
// Autodetect mode...
- $backgroundMode = wfGetLB()->getServerCount() > 1 ||
- ( $dbw instanceof DatabaseMysql );
-
if ( $this->hasOption( 'background' ) ) {
$backgroundMode = true;
} elseif ( $this->hasOption( 'quick' ) ) {
$backgroundMode = false;
+ } else {
+ $backgroundMode = wfGetLB()->getServerCount() > 1;
}
if ( $backgroundMode ) {
@@ -96,7 +94,6 @@
wfWaitForSlaves();
}
} else {
- // Subselect should work on modern MySQLs etc
$this->output( "Using single-query mode...\n" );
$sql = "UPDATE $user SET user_editcount=(SELECT
COUNT(*) FROM $revision WHERE rev_user=user_id)";
$dbw->query( $sql );
diff --git a/maintenance/storage/fixBug20757.php
b/maintenance/storage/fixBug20757.php
index 0ea52ca..94335cf 100644
--- a/maintenance/storage/fixBug20757.php
+++ b/maintenance/storage/fixBug20757.php
@@ -57,10 +57,8 @@
$totalRevs = $dbr->selectField( 'text', 'MAX(old_id)', false,
__METHOD__ );
- if ( $dbr->getType() == 'mysql' ) {
- // In MySQL 4.1+, the binary field old_text has a
non-working LOWER() function
- $lowerLeft = 'LOWER(CONVERT(LEFT(old_text,22) USING
latin1))';
- }
+ // In MySQL 4.1+, the binary field old_text has a non-working
LOWER() function
+ $lowerLeft = 'LOWER(CONVERT(LEFT(old_text,22) USING latin1))';
while ( true ) {
print "ID: $startId / $totalRevs\r";
--
To view, visit https://gerrit.wikimedia.org/r/290204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f32aed4473e5ea39dc40449ddc0af5f9a10df16
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Parent5446
Gerrit-Reviewer: PleaseStand
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...AbuseFilter[master]: Only run filters once for direct uploads (without stash)
jenkins-bot has submitted this change and it was merged.
Change subject: Only run filters once for direct uploads (without stash)
..
Only run filters once for direct uploads (without stash)
Uses the new UploadStashFile hook.
Bug: T140522
Depends-On: I2f574b355cd33b2e9fa7ff8e1793503b257cce65
Change-Id: Ic7c2dbc54c6ad300d26172796ee21027a8c372ee
---
M AbuseFilter.hooks.php
M extension.json
2 files changed, 27 insertions(+), 7 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/AbuseFilter.hooks.php b/AbuseFilter.hooks.php
index ce30f16..1e60a21 100644
--- a/AbuseFilter.hooks.php
+++ b/AbuseFilter.hooks.php
@@ -699,6 +699,8 @@
}
/**
+* Filter an upload.
+*
* @param UploadBase $upload
* @param User $user
* @param array $props
@@ -714,6 +716,23 @@
}
/**
+* Filter an upload to stash. If a filter doesn't need to check the
page contents or
+* upload comment, it can use `action='stashupload'` to provide better
experience to e.g.
+* UploadWizard (rejecting files immediately, rather than after the
user adds the details).
+*
+* @param UploadBase $upload
+* @param User $user
+* @param array $props
+* @param array|ApiMessage &$error
+* @return bool
+*/
+ public static function onUploadStashFile( UploadBase $upload, User
$user,
+ array $props, &$error
+ ) {
+ return self::filterUpload( 'stashupload', $upload, $user,
$props, null, null, $error );
+ }
+
+ /**
* @param UploadBase $upload
* @param string $mime
* @param array|ApiMessage &$error
@@ -722,17 +741,17 @@
public static function onUploadVerifyFile( $upload, $mime, &$error ) {
global $wgUser, $wgVersion;
- // On MW 1.27 and older, this is the only hook we can use, even
though it's deficient.
- // On MW 1.28 and newer, we use UploadVerifyUpload to check
file uploads, and this one only
- // to check file uploads to stash. If a filter doesn't need to
check the page contents or
- // upload comment, it can use `action='stashupload'` to provide
better experience to e.g.
- // UploadWizard (rejecting files immediately, rather than after
the user adds the details).
- $action = version_compare( $wgVersion, '1.28', '<' ) ? 'upload'
: 'stashupload';
+ // We only use this hook on MW 1.27 and older, as it's is the
only hook we have.
+ // On MW 1.28 and newer, we use UploadVerifyUpload to check
file uploads, and
+ // UploadStashFile to check file uploads to stash.
+ if ( version_compare( $wgVersion, '1.28', '>=' ) ) {
+ return;
+ }
// UploadBase makes it absolutely impossible to get these out
of it, even though it knows them.
$props = FSFile::getPropsFromPath( $upload->getTempPath() );
- return self::filterUpload( $action, $upload, $wgUser, $props,
null, null, $error );
+ return self::filterUpload( 'upload', $upload, $wgUser, $props,
null, null, $error );
}
/**
diff --git a/extension.json b/extension.json
index 032ccf1..b87967d 100644
--- a/extension.json
+++ b/extension.json
@@ -180,6 +180,7 @@
"ContributionsToolLinks":
"AbuseFilterHooks::onContributionsToolLinks",
"UploadVerifyFile": "AbuseFilterHooks::onUploadVerifyFile",
"UploadVerifyUpload": "AbuseFilterHooks::onUploadVerifyUpload",
+ "UploadStashFile": "AbuseFilterHooks::onUploadStashFile",
"MakeGlobalVariablesScript":
"AbuseFilterHooks::onMakeGlobalVariablesScript",
"ArticleSaveComplete":
"AbuseFilterHooks::onArticleSaveComplete",
"UserMergeAccountFields":
"AbuseFilterHooks::onUserMergeAccountFields",
--
To view, visit https://gerrit.wikimedia.org/r/300843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7c2dbc54c6ad300d26172796ee21027a8c372ee
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Introduce UploadStashFile hook, improve API handling of stas...
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce UploadStashFile hook, improve API handling of stash
errors
..
Introduce UploadStashFile hook, improve API handling of stash errors
UploadBase:
* Introduce a new method, tryStashFile(), as a replacement for the
now-soft-deprecated stashFile(). The method runs the new hook and
returns a Status object, with an error (if the hook returned an
error) or a value (if it didn't).
* Introduce a new hook, UploadStashFile, allowing extensions to
prevent a file from being stashed. Note that code in extensions
which has not been updated for MediaWiki 1.28 may still call
stashFile() directly, and therefore not call this hook. For
important checks (not just for UI), extension authors should use
UploadVerifyFile or UploadVerifyUpload hooks.
* Extract common code of tryStashFile() and stashFile() to
a new protected method doStashFile().
SpecialUpload:
* Use tryStashFile() when stashing a file after a warning or
"recoverable error" was encountered.
ApiUpload:
* Refactor stashing code so that error handling only happens in one
place, not four different ones. Use Status objects rather than
exception throwing/catching for control flow.
* Simplify the error messages slightly (error codes are unchanged).
Produce better ones by always using handleStashException().
'stashfailed' is now always at root (not nested inside 'warnings'),
behaving the same as 'filekey' does on success.
* Use tryStashFile() when stashing. Handle errors so as to allow
custom API results passed via ApiMessage to be preserved.
Some API result changes for different requests are shown below.
api.php?action=upload&format=json&filename=good.png&file=...&stash=1
Before:
{
"error": {
"code": "stashfilestorage",
"info": "Could not store upload in the stash: Stashing temporary file
failed: UploadStashFileException Error storing file in '/tmp/phpB32SRT': Could
not create directory \"mwstore://local-backend/local-temp/3/3a\".",
"*": "See http://localhost:3080/w/api.php for API usage"
}
}
After:
{
"error": {
"code": "stashfilestorage",
"info": "Could not store upload in the stash: Error storing file in
'/tmp/phpB32SRT': Could not create directory
\"mwstore://local-backend/local-temp/3/3a\".",
"*": "See http://localhost:3080/w/api.php for API usage"
}
}
api.php?action=upload&format=json&filename=[bad].png&file=...
Before:
{
"upload": {
"result": "Warning",
"warnings": {
"badfilename": "-bad-.png",
"stashfailed": "Stashing temporary file failed:
UploadStashFileException Error storing file in '/tmp/phpB32SRT': Could not
create directory \"mwstore://local-backend/local-temp/3/3a\"."
}
}
}
After:
{
"upload": {
"result": "Warning",
"stashfailed": "Could not store upload in the stash: Error storing
file in '/tmp/phpB32SRT': Could not create directory
\"mwstore://local-backend/local-temp/3/3a\"."
"warnings": {
"badfilename": "-bad-.png",
}
}
}
Bug: T140521
Change-Id: I2f574b355cd33b2e9fa7ff8e1793503b257cce65
---
M docs/hooks.txt
M includes/api/ApiUpload.php
M includes/specials/SpecialUpload.php
M includes/upload/UploadBase.php
M includes/upload/UploadFromChunks.php
M includes/upload/UploadFromStash.php
M languages/i18n/en.json
M languages/i18n/qqq.json
8 files changed, 150 insertions(+), 86 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 8fa3793..5cf8ffe 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3373,6 +3373,18 @@
&$radio: Boolean, if source type should be shown as radio button
$selectedSourceType: The selected source type
+'UploadStashFile': Before a file is stashed (uploaded to stash).
+Note that code which has not been updated for MediaWiki 1.28 may not call this
+hook. If your extension absolutely, positively must prevent some files from
+being uploaded, use UploadVerifyFile or UploadVerifyUpload.
+$upload: (object) An instance of UploadBase, with all info about the upload
+$user: (object) An instance of User, the user uploading this file
+$props: (array) File properties, as returned by FSFile::getPropsFromPath()
+&$error: output: If the file stashing should be prevented, set this to the
reason
+ in the form of array( messagename, param1, param2, ... ) or a
MessageSpecifier
+ instance (you might want to use ApiMessage to provide machine-readable
details
+ for the API).
+
'UploadVerification': DEPRECATED! Use UploadVerifyFile instead.
Additional chances to reject an uploaded file.
$saveName: (string) destination file name
diff --git a/includes/api/ApiUpload.php
[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: Three changes
Felipe Schenone has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304168
Change subject: Three changes
..
Three changes
- Change logo image for styled HTML
- Minimize to a corner rather than a bar
- Mark required parameters with underline
Change-Id: I56d961e6ef527d7714a0a66c80482dd59de49c31
---
M proveit.css
M proveit.js
2 files changed, 57 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikipedia/gadgets/ProveIt
refs/changes/68/304168/1
diff --git a/proveit.css b/proveit.css
index 80fafc5..f07cf2d 100755
--- a/proveit.css
+++ b/proveit.css
@@ -4,30 +4,44 @@
position: fixed;
right: 10px;
bottom: 0;
- width: 700px;
z-index: ;
}
-#proveit-logo {
- cursor: pointer;
- float: right;
- margin: 3px 3px 0 0;
-}
-
-#proveit-tabs {
+#proveit-header {
border: 1px solid #ddd;
- padding: 0;
+ overflow: hidden;
}
-#proveit-tabs span {
+#proveit-logo {
+ background: black;
+ cursor: pointer;
+ color: white;
+ font-weight: bold;
+ float: right;
+ padding: 15px;
+}
+
+#proveit-left-bracket {
+ color: yellow;
+ margin-right: 5px;
+}
+#proveit-right-bracket {
+ color: yellow;
+ margin-left: 5px;
+}
+
+#proveit-edit-tab,
+#proveit-add-tab {
cursor: pointer;
color: black;
- display: inline-block;
+ display: none;
+ float: left;
outline: none;
- padding: 12px 20px 12px 20px;
+ padding: 15px;
}
-#proveit-tabs span.active {
+#proveit-edit-tab.active,
+#proveit-add-tab.active {
background: #a7dcff;
}
@@ -35,11 +49,12 @@
background: #f4f4f4;
border-left: 1px solid #ddd;
border-right: 1px solid #ddd;
- height: 280px;
display: none;
+ height: 280px;
overflow: scroll;
overflow-y: scroll;
overflow-x: hidden;
+ width: 700px;
}
#proveit-reference-list {
@@ -107,6 +122,14 @@
width: 100%;
}
+#proveit-reference-form label.proveit-required {
+ text-decoration: underline;
+}
+
+#proveit-reference-form label.proveit-hidden {
+ display: none;
+}
+
#proveit-reference-form input,
#proveit-reference-form select {
-webkit-appearance: none;
@@ -169,8 +192,4 @@
#proveit-insert-button,
#proveit-update-button {
background: #a7dcff;
-}
-
-#proveit .hidden {
- display: none;
}
\ No newline at end of file
diff --git a/proveit.js b/proveit.js
index 3a7d5ac..a64fcc3 100755
--- a/proveit.js
+++ b/proveit.js
@@ -57,11 +57,6 @@
},
/**
-* URL of the ProveIt logo hosted at Commons
-*/
- LOGO:
'//upload.wikimedia.org/wikipedia/commons/0/0d/ProveIt_user_interface_logo.png',
-
- /**
* URL of the ProveIt icon hosted at Commons
*/
ICON:
'//upload.wikimedia.org/wikipedia/commons/thumb/1/19/ProveIt_logo_for_user_boxes.svg/22px-ProveIt_logo_for_user_boxes.svg.png',
@@ -204,11 +199,13 @@
// First define the elements
var gui = $( '' ).attr( 'id', 'proveit' );
- // Tabs
- var tabs = $( '').attr( 'id', 'proveit-tabs' ),
+ // Header
+ var header = $( '' ).attr( 'id', 'proveit-header' ),
+ logo = $( '' ).attr( 'id', 'proveit-logo' ).text(
'ProveIt' ),
+ leftBracket = $( '' ).attr( 'id',
'proveit-left-bracket' ).text( '[' ),
+ rightBracket = $( '' ).attr( 'id',
'proveit-right-bracket' ).text( ']' ),
editTab = $( '' ).attr( 'id', 'proveit-edit-tab'
).addClass( 'active' ).text( proveit.getMessage( 'edit-tab' ) ),
- addTab = $( '' ).attr( 'id', 'proveit-add-tab'
).text( proveit.getMessage( 'add-tab' ) ),
- logo = $( '' ).attr({ 'id': 'proveit-logo', 'src':
proveit.LOGO, 'alt': 'ProveIt' });
+ addTab = $( '' ).attr( 'id', 'proveit-add-tab'
).text( proveit.getMessage( 'add-tab' ) );
// Content
var content = $( '' ).attr( 'id', 'proveit-content' ),
@@ -222,20 +219,22 @@
insertButton = $( '' ).attr( 'id',
'proveit-insert-button' ).text( proveit.getMessage( 'insert-button' ) );
// Then put everything together and add it to the DOM
- tabs.append( logo ).append( editTab ).append( addTab );
- buttons.append( showAllParamsButton ).append( updateButton
).append( insertButton );
- content.append( referenceList ).append( referenceFormContainer
).append( buttons );
- gui.append( tabs ).append( content );
+ logo.prepend( leftBracket ).append( rightBracket );
+ header.append( logo, editTab, addTab );
+ buttons.append( showAllParamsButton,
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Search for scripts in maintenance folder too
jenkins-bot has submitted this change and it was merged.
Change subject: Search for scripts in maintenance folder too
..
Search for scripts in maintenance folder too
- with 38ac04438664 scripts can be found in an archive folder but mainenance
scripts must be started with preleading "maintenance/"
- join paths in the right way; otherwise we could have mixed separators
on windows os.
- simplify test for existing script
Change-Id: I02ed7a5e533eaa33c32cbd77a2c2bdcba567413c
---
M pwb.py
1 file changed, 9 insertions(+), 11 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pwb.py b/pwb.py
index 395019e..060fea0 100755
--- a/pwb.py
+++ b/pwb.py
@@ -208,17 +208,15 @@
if not filename.endswith('.py'):
filename += '.py'
if not os.path.exists(filename):
-testpath = os.path.join(os.path.split(__file__)[0],
-'scripts',
-filename)
-file_package = 'scripts'
-if not os.path.exists(testpath):
-testpath = os.path.join(
-os.path.split(__file__)[0], 'scripts/archive', filename)
-file_package = 'scripts.archive'
-
-if os.path.exists(testpath):
-filename = testpath
+script_paths = ['scripts',
+'scripts.maintenance',
+'scripts.archive']
+for file_package in script_paths:
+paths = file_package.split('.') + [filename]
+testpath = os.path.join(_pwb_dir, *paths)
+if os.path.exists(testpath):
+filename = testpath
+break
else:
raise OSError("%s not found!" % filename)
--
To view, visit https://gerrit.wikimedia.org/r/270279
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I02ed7a5e533eaa33c32cbd77a2c2bdcba567413c
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: Don't require jessie for node exporter
Yuvipanda has submitted this change and it was merged.
Change subject: prometheus: Don't require jessie for node exporter
..
prometheus: Don't require jessie for node exporter
I built packages for precise and trusty too, only available in
tools just now.
See https://wikitech.wikimedia.org/wiki/Prometheus/Exporters
on how the packages were built
Change-Id: I511e3d28e1eea11e41b29bcb33578f98a41395dd
---
M modules/prometheus/manifests/node_exporter.pp
M modules/role/manifests/prometheus/node_exporter.pp
2 files changed, 1 insertion(+), 6 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/prometheus/manifests/node_exporter.pp
b/modules/prometheus/manifests/node_exporter.pp
index d50f249..31ad0a2 100644
--- a/modules/prometheus/manifests/node_exporter.pp
+++ b/modules/prometheus/manifests/node_exporter.pp
@@ -24,8 +24,6 @@
$ignored_devices = '^(ram|loop|fd)\\d+$',
$collectors_extra = [],
) {
-requires_os('debian >= jessie')
-
require_package('prometheus-node-exporter')
$collectors_default = ['diskstats', 'filefd', 'filesystem', 'loadavg',
diff --git a/modules/role/manifests/prometheus/node_exporter.pp
b/modules/role/manifests/prometheus/node_exporter.pp
index 865fdb7..7addc78 100644
--- a/modules/role/manifests/prometheus/node_exporter.pp
+++ b/modules/role/manifests/prometheus/node_exporter.pp
@@ -4,10 +4,7 @@
# https://github.com/prometheus/node_exporter and the module's documentation.
class role::prometheus::node_exporter {
-if os_version('debian >= jessie') {
-# Doesn't work for trusty or jessie yet
-include ::prometheus::node_exporter
-}
+include ::prometheus::node_exporter
ferm::service { 'prometheus-node-exporter':
proto => 'tcp',
--
To view, visit https://gerrit.wikimedia.org/r/304167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I511e3d28e1eea11e41b29bcb33578f98a41395dd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: Don't require jessie for node exporter
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304167
Change subject: prometheus: Don't require jessie for node exporter
..
prometheus: Don't require jessie for node exporter
I built packages for precise and trusty too, only available in
tools just now.
See https://wikitech.wikimedia.org/wiki/Prometheus/Exporters
on how the packages were built
Change-Id: I511e3d28e1eea11e41b29bcb33578f98a41395dd
---
M modules/prometheus/manifests/node_exporter.pp
M modules/role/manifests/prometheus/node_exporter.pp
2 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/304167/1
diff --git a/modules/prometheus/manifests/node_exporter.pp
b/modules/prometheus/manifests/node_exporter.pp
index d50f249..31ad0a2 100644
--- a/modules/prometheus/manifests/node_exporter.pp
+++ b/modules/prometheus/manifests/node_exporter.pp
@@ -24,8 +24,6 @@
$ignored_devices = '^(ram|loop|fd)\\d+$',
$collectors_extra = [],
) {
-requires_os('debian >= jessie')
-
require_package('prometheus-node-exporter')
$collectors_default = ['diskstats', 'filefd', 'filesystem', 'loadavg',
diff --git a/modules/role/manifests/prometheus/node_exporter.pp
b/modules/role/manifests/prometheus/node_exporter.pp
index 865fdb7..7addc78 100644
--- a/modules/role/manifests/prometheus/node_exporter.pp
+++ b/modules/role/manifests/prometheus/node_exporter.pp
@@ -4,10 +4,7 @@
# https://github.com/prometheus/node_exporter and the module's documentation.
class role::prometheus::node_exporter {
-if os_version('debian >= jessie') {
-# Doesn't work for trusty or jessie yet
-include ::prometheus::node_exporter
-}
+include ::prometheus::node_exporter
ferm::service { 'prometheus-node-exporter':
proto => 'tcp',
--
To view, visit https://gerrit.wikimedia.org/r/304167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I511e3d28e1eea11e41b29bcb33578f98a41395dd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Fix DedupeFind cache set call
jenkins-bot has submitted this change and it was merged.
Change subject: Fix DedupeFind cache set call
..
Fix DedupeFind cache set call
set, not get.
Change-Id: Ic3406fd4ed893445c72ffe1f7a6572330c0a5523
---
M CRM/Contact/Page/DedupeFind.php
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Eileen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CRM/Contact/Page/DedupeFind.php b/CRM/Contact/Page/DedupeFind.php
index 2555693..ab917c8 100644
--- a/CRM/Contact/Page/DedupeFind.php
+++ b/CRM/Contact/Page/DedupeFind.php
@@ -35,8 +35,9 @@
protected $_rgid;
protected $_mainContacts;
protected $_gid;
+ protected $action;
- /**
+ /**
* Get BAO Name.
*
* @return string
@@ -158,7 +159,7 @@
if (!$foundDupes) {
$foundDupes = CRM_Dedupe_Finder::dupes($rgid, $contactIds);
}
- $this->get("search_dedupe_dupes_$gid", $foundDupes);
+ $this->set("search_dedupe_dupes_$gid", $foundDupes);
}
else {
$foundDupes = $this->get('dedupe_dupes');
--
To view, visit https://gerrit.wikimedia.org/r/304110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3406fd4ed893445c72ffe1f7a6572330c0a5523
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: Eileen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Upgrade unmatched explicit commit() of DBO_TRX to an exception
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304166
Change subject: Upgrade unmatched explicit commit() of DBO_TRX to an exception
..
Upgrade unmatched explicit commit() of DBO_TRX to an exception
This mostly for sanity, as normally the exception would
happen on begin().
Change-Id: I2c2fb20ed5184d3c00d3050e929a11e3e37f50f4
---
M includes/db/Database.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/66/304166/1
diff --git a/includes/db/Database.php b/includes/db/Database.php
index ba25183..c591f3c 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2718,7 +2718,10 @@
wfWarn( "$fname: No transaction to commit,
something got out of sync!" );
return; // nothing to do
} elseif ( $this->mTrxAutomatic ) {
- wfWarn( "$fname: Explicit commit of implicit
transaction. Something may be out of sync!" );
+ throw new DBUnexpectedError(
+ $this,
+ "$fname: Explicit commit of implicit
transaction."
+ );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/304166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c2fb20ed5184d3c00d3050e929a11e3e37f50f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: Restore node exporter prefix requirements
Yuvipanda has submitted this change and it was merged.
Change subject: prometheus: Restore node exporter prefix requirements
..
prometheus: Restore node exporter prefix requirements
I removed this earlier, and now see why it is required -
so that we can have other target files described as other
jobs! I've restored it and added explicit lines for the
jobs I needed
Change-Id: Iee2c49c5e4ad668f2e7cc3f1ac679dc0c8e973e1
---
M modules/prometheus/manifests/server.pp
M modules/role/manifests/prometheus/tools.pp
2 files changed, 11 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/prometheus/manifests/server.pp
b/modules/prometheus/manifests/server.pp
index 2421278..05e0616 100644
--- a/modules/prometheus/manifests/server.pp
+++ b/modules/prometheus/manifests/server.pp
@@ -81,8 +81,8 @@
{
'job_name' => 'node',
'file_sd_configs' => [
-{ 'names' => [ "${targets_path}/*.yml",
-"${targets_path}/*.yaml" ] },
+{ 'names' => [ "${targets_path}/node_*.yml",
+"${targets_path}/node_*.yaml" ] },
]
},
]
diff --git a/modules/role/manifests/prometheus/tools.pp
b/modules/role/manifests/prometheus/tools.pp
index 7e0a00d..2347b3e 100644
--- a/modules/role/manifests/prometheus/tools.pp
+++ b/modules/role/manifests/prometheus/tools.pp
@@ -74,7 +74,15 @@
}
# lint:endignore
]
-}
+},
+{
+'job_name'=> 'etcd',
+'file_sd_configs' => [
+{
+'names' => [ "${targets_path}/etcd_*.yml" ]
+}
+]
+},
]
}
--
To view, visit https://gerrit.wikimedia.org/r/304164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee2c49c5e4ad668f2e7cc3f1ac679dc0c8e973e1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Add ssh checks to prometheus
Yuvipanda has submitted this change and it was merged.
Change subject: tools: Add ssh checks to prometheus
..
tools: Add ssh checks to prometheus
Change-Id: Ifcb8f93e3f6bcfdc2d6d05d31d31a4b1f6174ca3
---
M modules/role/manifests/prometheus/tools.pp
1 file changed, 63 insertions(+), 20 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/prometheus/tools.pp
b/modules/role/manifests/prometheus/tools.pp
index a0ab1c9..7e0a00d 100644
--- a/modules/role/manifests/prometheus/tools.pp
+++ b/modules/role/manifests/prometheus/tools.pp
@@ -7,6 +7,7 @@
class role::prometheus::tools {
$bearer_token_file = '/srv/prometheus/tools/k8s.token'
$master_host = hiera('k8s::master_host')
+$targets_path = '/srv/prometheus/tools/targets'
prometheus::server { 'tools':
listen_address => '127.0.0.1:9902',
@@ -19,25 +20,60 @@
'api_servers' => [ "https://${master_host}:6443";
],
'bearer_token_file' => $bearer_token_file,
},
-],
-# keep metrics coming from apiserver or node kubernetes
roles
-# and map kubernetes node labels to prometheus metric
labels
-'relabel_configs' => [
-{
-'source_labels' => ['__meta_kubernetes_role'],
-'action'=> 'keep',
-'regex' => '(?:apiserver|node)',
-},
-{
-'action' => 'labelmap',
-'regex' => '__meta_kubernetes_node_label_(.+)',
-},
-{
-'source_labels' => ['__meta_kubernetes_role'],
-'action'=> 'replace',
-'target_label' => 'kubernetes_role',
-},
-]
+],
+# keep metrics coming from apiserver or node kubernetes roles
+# and map kubernetes node labels to prometheus metric labels
+'relabel_configs' => [
+{
+'source_labels' => ['__meta_kubernetes_role'],
+'action'=> 'keep',
+'regex' => '(?:apiserver|node)',
+},
+{
+'action' => 'labelmap',
+'regex' => '__meta_kubernetes_node_label_(.+)',
+},
+{
+'source_labels' => ['__meta_kubernetes_role'],
+'action'=> 'replace',
+'target_label' => 'kubernetes_role',
+},
+]
+},
+{
+'job_name'=> 'ssh_banner',
+'metrics_path'=> '/probe',
+'params' => {
+'module' => ['ssh_banner'],
+},
+'file_sd_configs' => [
+{
+'names' => ["${targets_path}/ssh_banner.yml"]
+}
+],
+'relabel_configs' => [
+# The replacement syntax is for prometheus to consume
+# lint:ignore:single_quote_string_with_variables
+{
+'source_labels' => ['__address__'],
+'regex' => '(.*)',
+'target_label' => '__param_target',
+'replacement' => '${1}',
+},
+{
+'source_labels' => ['__param_target'],
+'regex' => '(.*)',
+'target_label' => 'instance',
+'replacement' => '${1}',
+},
+{
+'source_labels' => [],
+'regex' => '.*',
+'target_label' => '__address__',
+'replacement' => '127.0.0.1:9115',
+}
+# lint:endignore
+]
}
]
}
@@ -62,7 +98,6 @@
include ::role::prometheus::blackbox_exporter
include ::prometheus::scripts
-$targets_path = '/srv/prometheus/tools/targets'
cron { 'prometheus_tools_project_targets':
ensure => present,
command => "/usr/local/bin/prometheus-labs-targets >
${targets_path}/node_project.$$ && mv ${targets_path}/node_project.$$
${targets_path}/node_project.yml",
@@ -71,6 +106,14 @@
user=> 'prometheus',
}
+cr
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add primary key to change_tag and tag_summary tables
TTO has uploaded a new change for review. https://gerrit.wikimedia.org/r/304165 Change subject: Add primary key to change_tag and tag_summary tables .. Add primary key to change_tag and tag_summary tables Based heavily on 43e386ca16411096bbbd7f14f9f4e15c5e268fe7. Bug: T123225 Change-Id: I33480f4016812259700979f1145099744bb451d4 --- M includes/installer/MssqlUpdater.php M includes/installer/MysqlUpdater.php M includes/installer/OracleUpdater.php M includes/installer/PostgresUpdater.php M includes/installer/SqliteUpdater.php A maintenance/archives/patch-change_tag-ct_id.sql A maintenance/archives/patch-tag_summary-ts_id.sql A maintenance/mssql/archives/patch-change_tag-ct_id.sql A maintenance/mssql/archives/patch-tag_summary-ts_id.sql M maintenance/mssql/tables.sql A maintenance/oracle/archives/patch-change_tag-ct_id.sql A maintenance/oracle/archives/patch-tag_summary-ts_id.sql M maintenance/oracle/tables.sql M maintenance/postgres/tables.sql A maintenance/sqlite/archives/patch-change_tag-ct_id.sql A maintenance/sqlite/archives/patch-tag_summary-ts_id.sql M maintenance/tables.sql 17 files changed, 106 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/65/304165/1 diff --git a/includes/installer/MssqlUpdater.php b/includes/installer/MssqlUpdater.php index 770d3bf..1175e9e 100644 --- a/includes/installer/MssqlUpdater.php +++ b/includes/installer/MssqlUpdater.php @@ -92,6 +92,8 @@ // 1.28 [ 'addIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp', 'patch-add-rc_name_type_patrolled_timestamp_index.sql' ], + [ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ], + [ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ], ]; } diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index 719b66a..8ea40da 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -287,6 +287,8 @@ // 1.28 [ 'addIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp', 'patch-add-rc_name_type_patrolled_timestamp_index.sql' ], + [ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ], + [ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ], ]; } diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php index 8075aac..e1e0d0f 100644 --- a/includes/installer/OracleUpdater.php +++ b/includes/installer/OracleUpdater.php @@ -116,6 +116,8 @@ // 1.28 [ 'addIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp', 'patch-add-rc_name_type_patrolled_timestamp_index.sql' ], + [ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ], + [ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ], // KEEP THIS AT THE BOTTOM!! [ 'doRebuildDuplicateFunction' ], diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php index be94d91..aba520b 100644 --- a/includes/installer/PostgresUpdater.php +++ b/includes/installer/PostgresUpdater.php @@ -68,6 +68,8 @@ [ 'addSequence', 'archive', false, 'archive_ar_id_seq' ], [ 'addSequence', 'externallinks', false, 'externallinks_el_id_seq' ], [ 'addSequence', 'watchlist', false, 'watchlist_wl_id_seq' ], + [ 'addSequence', 'change_tag', false, 'change_tag_ct_id_seq' ], + [ 'addSequence', 'tag_summary', false, 'tag_summary_ts_id_seq' ], # new tables [ 'addTable', 'category', 'patch-category.sql' ], diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index 1c6e6eb..388c034 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -156,6 +156,8 @@ // 1.28 [ 'addIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp', 'patch-add-rc_name_type_patrolled_timestamp_index.sql' ], + [ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ], + [ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ], ]; } diff --git a/maintenance/archives/patch-change_tag-ct_id.sql b/maintenance/archives/patch-change_tag-ct_id.sql new file mode 100644 index 000..7b986d6 --- /dev/null +++ b/mai
[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: Restore node exporter prefix requirements
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304164
Change subject: prometheus: Restore node exporter prefix requirements
..
prometheus: Restore node exporter prefix requirements
I removed this earlier, and now see why it is required -
so that we can have other target files described as other
jobs! I've restored it and added explicit lines for the
jobs I needed
Change-Id: Iee2c49c5e4ad668f2e7cc3f1ac679dc0c8e973e1
---
M modules/prometheus/manifests/server.pp
M modules/role/manifests/prometheus/tools.pp
2 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/304164/1
diff --git a/modules/prometheus/manifests/server.pp
b/modules/prometheus/manifests/server.pp
index 2421278..05e0616 100644
--- a/modules/prometheus/manifests/server.pp
+++ b/modules/prometheus/manifests/server.pp
@@ -81,8 +81,8 @@
{
'job_name' => 'node',
'file_sd_configs' => [
-{ 'names' => [ "${targets_path}/*.yml",
-"${targets_path}/*.yaml" ] },
+{ 'names' => [ "${targets_path}/node_*.yml",
+"${targets_path}/node_*.yaml" ] },
]
},
]
diff --git a/modules/role/manifests/prometheus/tools.pp
b/modules/role/manifests/prometheus/tools.pp
index d59ebab..ace93da 100644
--- a/modules/role/manifests/prometheus/tools.pp
+++ b/modules/role/manifests/prometheus/tools.pp
@@ -74,7 +74,15 @@
}
# lint:endignore
]
-}
+},
+{
+'job_name'=> 'etcd',
+'file_sd_configs' => [
+{
+'names' => [ "${targets_path}/etcd_*.yml" ]
+}
+]
+},
]
}
--
To view, visit https://gerrit.wikimedia.org/r/304164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee2c49c5e4ad668f2e7cc3f1ac679dc0c8e973e1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: Use 4sp indent rather than 2sp
Yuvipanda has submitted this change and it was merged.
Change subject: prometheus: Use 4sp indent rather than 2sp
..
prometheus: Use 4sp indent rather than 2sp
Change-Id: I48da9a257f6d5866d0bd7ce1bf4d103c860042eb
---
M modules/role/manifests/prometheus/tools.pp
1 file changed, 28 insertions(+), 28 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/prometheus/tools.pp
b/modules/role/manifests/prometheus/tools.pp
index f254ba3..a0ab1c9 100644
--- a/modules/role/manifests/prometheus/tools.pp
+++ b/modules/role/manifests/prometheus/tools.pp
@@ -11,34 +11,34 @@
prometheus::server { 'tools':
listen_address => '127.0.0.1:9902',
scrape_configs_extra => [
- {
-'job_name' => 'k8s',
-'bearer_token_file' => $bearer_token_file,
-'kubernetes_sd_configs' => [
- {
-'api_servers' => [ "https://${master_host}:6443"; ],
-'bearer_token_file' => $bearer_token_file,
- },
-],
-# keep metrics coming from apiserver or node kubernetes roles
-# and map kubernetes node labels to prometheus metric labels
-'relabel_configs' => [
- {
-'source_labels' => ['__meta_kubernetes_role'],
-'action'=> 'keep',
-'regex' => '(?:apiserver|node)',
- },
- {
-'action' => 'labelmap',
-'regex' => '__meta_kubernetes_node_label_(.+)',
- },
- {
-'source_labels' => ['__meta_kubernetes_role'],
-'action'=> 'replace',
-'target_label' => 'kubernetes_role',
- },
-]
- }
+{
+'job_name' => 'k8s',
+'bearer_token_file' => $bearer_token_file,
+'kubernetes_sd_configs' => [
+{
+'api_servers' => [ "https://${master_host}:6443";
],
+'bearer_token_file' => $bearer_token_file,
+},
+],
+# keep metrics coming from apiserver or node kubernetes
roles
+# and map kubernetes node labels to prometheus metric
labels
+'relabel_configs' => [
+{
+'source_labels' => ['__meta_kubernetes_role'],
+'action'=> 'keep',
+'regex' => '(?:apiserver|node)',
+},
+{
+'action' => 'labelmap',
+'regex' => '__meta_kubernetes_node_label_(.+)',
+},
+{
+'source_labels' => ['__meta_kubernetes_role'],
+'action'=> 'replace',
+'target_label' => 'kubernetes_role',
+},
+]
+}
]
}
--
To view, visit https://gerrit.wikimedia.org/r/304160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48da9a257f6d5866d0bd7ce1bf4d103c860042eb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: Add Wikibase item links into the toolbox on article placehol...
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304162
Change subject: Add Wikibase item links into the toolbox on article placeholders
..
Add Wikibase item links into the toolbox on article placeholders
Bug: T126873
Change-Id: I3ac0c78e6fd05cc042757a874e93cb6b8b614b17
---
M extension.json
A includes/BaseTemplateToolboxHookHandler.php
A tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
3 files changed, 356 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder
refs/changes/62/304162/1
diff --git a/extension.json b/extension.json
index d9dd0ba..75ebe1f 100644
--- a/extension.json
+++ b/extension.json
@@ -62,6 +62,9 @@
"remoteExtPath": "ArticlePlaceholder/modules"
},
"Hooks": {
+ "BaseTemplateToolbox": [
+
"ArticlePlaceholder\\BaseTemplateToolboxHookHandler::onBaseTemplateToolbox"
+ ],
"ScribuntoExternalLibraries": [
"ArticlePlaceholder\\Hooks::onScribuntoExternalLibraries"
],
diff --git a/includes/BaseTemplateToolboxHookHandler.php
b/includes/BaseTemplateToolboxHookHandler.php
new file mode 100644
index 000..42a962b
--- /dev/null
+++ b/includes/BaseTemplateToolboxHookHandler.php
@@ -0,0 +1,142 @@
+
+ */
+class BaseTemplateToolboxHookHandler {
+
+ /**
+* @var EntityIdParser
+*/
+ private $entityIdParser;
+
+ /**
+* @var RepoLinker
+*/
+ private $repoLinker;
+
+ /**
+* @var EntityLookup
+*/
+ private $entityLookup;
+
+ /**
+* @param SpecialPage $specialPage
+*
+* @return self
+*/
+ private static function newFromGlobalState() {
+ $wikibaseClient = WikibaseClient::getDefaultInstance();
+
+ return new self(
+ $wikibaseClient->getEntityIdParser(),
+ $wikibaseClient->newRepoLinker(),
+ $wikibaseClient->getStore()->getEntityLookup()
+ );
+ }
+
+ /**
+* @param EntityIdParser $entityIdParser
+* @param RepoLinker $repoLinker
+* @param EntityLookup $entityLookup
+*/
+ public function __construct(
+ EntityIdParser $entityIdParser,
+ RepoLinker $repoLinker,
+ EntityLookup $entityLookup
+ ) {
+ $this->entityIdParser = $entityIdParser;
+ $this->repoLinker = $repoLinker;
+ $this->entityLookup = $entityLookup;
+ }
+
+ /**
+* @param BaseTemplate $baseTemplate
+* @param array &$toolbox
+*/
+ public static function onBaseTemplateToolbox( BaseTemplate
$baseTemplate, array &$toolbox ) {
+ // Return early (for performance reasons) in case we're not on
+ // Special:AboutTopic (even before calling newFromGlobalState)
+ $title = $baseTemplate->getSkin()->getTitle();
+
+ if ( $title->getNamespace() !== NS_SPECIAL ) {
+ return;
+ }
+
+ $canonicalSpecialPageName = SpecialPageFactory::resolveAlias(
$title->getText() )[0];
+ if ( $canonicalSpecialPageName !== 'AboutTopic' ) {
+ return;
+ }
+
+ $self = self::newFromGlobalState();
+ $self->doBaseTemplateToolbox( $baseTemplate, $toolbox );
+ }
+
+ /**
+* @param BaseTemplate $baseTemplate
+* @param array &$toolbox
+*/
+ public function doBaseTemplateToolbox( BaseTemplate $baseTemplate,
array &$toolbox ) {
+ $itemId = $this->getItemId(
+ $baseTemplate->getSkin()->getTitle(),
+ $baseTemplate->getSkin()->getRequest()
+ );
+
+ if ( $itemId && $this->entityLookup->hasEntity( $itemId ) ) {
+ // Duplicated from
Wikibase\ClientHooks::onBaseTemplateToolbox
+ $toolbox['wikibase'] = array(
+ 'text' => $baseTemplate->getMsg(
'wikibase-dataitem' )->text(),
+ 'href' => $this->repoLinker->getEntityUrl(
$itemId ),
+ 'id' => 't-wikibase'
+ );
+ }
+ }
+
+ /**
+* @param Title $title
+* @param WebRequest $webRequest
+*
+* @return ItemId
+*/
+ private function getItemId( Title $title, WebRequest $webRequest ) {
+ $idSerialization = $webRequest->getText(
+ 'entityid',
+ SpecialPageFactory::resolveAlias( $title->getText() )[1]
+ );
+
+ if ( !$idSerialization ) {
+
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Update mw version number
jenkins-bot has submitted this change and it was merged.
Change subject: Update mw version number
..
Update mw version number
Change-Id: I4ffce441cdbd2db56a4b7dc37b655f71c23fe0b5
---
M pywikibot/family.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, approved
Dalba: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 2ad6c73..0bb5c09 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1240,7 +1240,7 @@
Use L{pywikibot.tools.MediaWikiVersion} to compare version strings.
"""
# Here we return the latest mw release for downloading
-return '1.26.3'
+return '1.27.0'
def force_version(self, code):
"""
--
To view, visit https://gerrit.wikimedia.org/r/303993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ffce441cdbd2db56a4b7dc37b655f71c23fe0b5
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
Gerrit-Reviewer: Dalba
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: Use 4sp indent rather than 2sp
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304160
Change subject: prometheus: Use 4sp indent rather than 2sp
..
prometheus: Use 4sp indent rather than 2sp
Change-Id: I48da9a257f6d5866d0bd7ce1bf4d103c860042eb
---
M modules/role/manifests/prometheus/tools.pp
1 file changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/304160/1
diff --git a/modules/role/manifests/prometheus/tools.pp
b/modules/role/manifests/prometheus/tools.pp
index f254ba3..a0ab1c9 100644
--- a/modules/role/manifests/prometheus/tools.pp
+++ b/modules/role/manifests/prometheus/tools.pp
@@ -11,34 +11,34 @@
prometheus::server { 'tools':
listen_address => '127.0.0.1:9902',
scrape_configs_extra => [
- {
-'job_name' => 'k8s',
-'bearer_token_file' => $bearer_token_file,
-'kubernetes_sd_configs' => [
- {
-'api_servers' => [ "https://${master_host}:6443"; ],
-'bearer_token_file' => $bearer_token_file,
- },
-],
-# keep metrics coming from apiserver or node kubernetes roles
-# and map kubernetes node labels to prometheus metric labels
-'relabel_configs' => [
- {
-'source_labels' => ['__meta_kubernetes_role'],
-'action'=> 'keep',
-'regex' => '(?:apiserver|node)',
- },
- {
-'action' => 'labelmap',
-'regex' => '__meta_kubernetes_node_label_(.+)',
- },
- {
-'source_labels' => ['__meta_kubernetes_role'],
-'action'=> 'replace',
-'target_label' => 'kubernetes_role',
- },
-]
- }
+{
+'job_name' => 'k8s',
+'bearer_token_file' => $bearer_token_file,
+'kubernetes_sd_configs' => [
+{
+'api_servers' => [ "https://${master_host}:6443";
],
+'bearer_token_file' => $bearer_token_file,
+},
+],
+# keep metrics coming from apiserver or node kubernetes
roles
+# and map kubernetes node labels to prometheus metric
labels
+'relabel_configs' => [
+{
+'source_labels' => ['__meta_kubernetes_role'],
+'action'=> 'keep',
+'regex' => '(?:apiserver|node)',
+},
+{
+'action' => 'labelmap',
+'regex' => '__meta_kubernetes_node_label_(.+)',
+},
+{
+'source_labels' => ['__meta_kubernetes_role'],
+'action'=> 'replace',
+'target_label' => 'kubernetes_role',
+},
+]
+}
]
}
--
To view, visit https://gerrit.wikimedia.org/r/304160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48da9a257f6d5866d0bd7ce1bf4d103c860042eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Add ssh checks to prometheus
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304161
Change subject: tools: Add ssh checks to prometheus
..
tools: Add ssh checks to prometheus
Change-Id: Ifcb8f93e3f6bcfdc2d6d05d31d31a4b1f6174ca3
---
M modules/role/manifests/prometheus/tools.pp
1 file changed, 56 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/304161/1
diff --git a/modules/role/manifests/prometheus/tools.pp
b/modules/role/manifests/prometheus/tools.pp
index a0ab1c9..fa65745 100644
--- a/modules/role/manifests/prometheus/tools.pp
+++ b/modules/role/manifests/prometheus/tools.pp
@@ -7,6 +7,7 @@
class role::prometheus::tools {
$bearer_token_file = '/srv/prometheus/tools/k8s.token'
$master_host = hiera('k8s::master_host')
+$targets_path = '/srv/prometheus/tools/targets'
prometheus::server { 'tools':
listen_address => '127.0.0.1:9902',
@@ -19,25 +20,53 @@
'api_servers' => [ "https://${master_host}:6443";
],
'bearer_token_file' => $bearer_token_file,
},
-],
-# keep metrics coming from apiserver or node kubernetes
roles
-# and map kubernetes node labels to prometheus metric
labels
-'relabel_configs' => [
-{
-'source_labels' => ['__meta_kubernetes_role'],
-'action'=> 'keep',
-'regex' => '(?:apiserver|node)',
-},
-{
-'action' => 'labelmap',
-'regex' => '__meta_kubernetes_node_label_(.+)',
-},
-{
-'source_labels' => ['__meta_kubernetes_role'],
-'action'=> 'replace',
-'target_label' => 'kubernetes_role',
-},
-]
+],
+# keep metrics coming from apiserver or node kubernetes roles
+# and map kubernetes node labels to prometheus metric labels
+'relabel_configs' => [
+{
+'source_labels' => ['__meta_kubernetes_role'],
+'action'=> 'keep',
+'regex' => '(?:apiserver|node)',
+},
+{
+'action' => 'labelmap',
+'regex' => '__meta_kubernetes_node_label_(.+)',
+},
+{
+'source_labels' => ['__meta_kubernetes_role'],
+'action'=> 'replace',
+'target_label' => 'kubernetes_role',
+},
+]
+},
+{
+'job_name'=> 'ssh_checks',
+'module' => ['ssh_banner'],
+'file_sd_configs' => [ { 'names' =>
["${targets_path}/ssh_checks.yml"] } ],
+'relabel_configs' => [
+# The replacement syntax is for prometheus to consume
+# lint:ignore:single_quote_string_with_variables
+{
+'source_labels' => ['__address__'],
+'regex' => '(.*)',
+'target_label' => '__param_target',
+'replacement' => '${1}',
+},
+{
+'source_labels' => ['__param_target'],
+'regex' => '(.*)',
+'target_label' => 'instance',
+'replacement' => '${1}',
+},
+{
+'source_labels' => [],
+'regex' => '.*',
+'target_label' => '__address__',
+'replacement' => '127.0.0.1:9115',
+}
+# lint:endignore
+]
}
]
}
@@ -62,7 +91,6 @@
include ::role::prometheus::blackbox_exporter
include ::prometheus::scripts
-$targets_path = '/srv/prometheus/tools/targets'
cron { 'prometheus_tools_project_targets':
ensure => present,
command => "/usr/local/bin/prometheus-labs-targets >
${targets_path}/node_project.$$ && mv ${targets_path}/node_project.$$
${targets_path}/node_project.yml",
@@ -71,6 +99,14 @@
user=> 'prometheus',
}
+cron { 'prometheus_tools_project_ssh_targets':
+ensure => present,
+command => "/usr/local/bin/prometheus-labs-targets --port 2
[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: more maintenance, http->https, rm broken urls etc
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/304159 Change subject: planet: more maintenance, http->https, rm broken urls etc .. planet: more maintenance, http->https, rm broken urls etc Change-Id: I14a4b82e8feb6d68b451835a4692f0bf2caa1193 --- M modules/planet/templates/feeds/cs_config.erb M modules/planet/templates/feeds/de_config.erb M modules/planet/templates/feeds/en_config.erb M modules/planet/templates/feeds/es_config.erb M modules/planet/templates/feeds/pt_config.erb M modules/planet/templates/feeds/ro_config.erb M modules/planet/templates/feeds/ru_config.erb M modules/planet/templates/feeds/zh_config.erb 8 files changed, 16 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/59/304159/1 diff --git a/modules/planet/templates/feeds/cs_config.erb b/modules/planet/templates/feeds/cs_config.erb index 33d2c31..f40d8fd 100644 --- a/modules/planet/templates/feeds/cs_config.erb +++ b/modules/planet/templates/feeds/cs_config.erb @@ -23,7 +23,7 @@ # Subscription configuration -[http://blog.wikimedia.cz/feed/atom/] +[https://blog.wikimedia.cz/feed/atom/] name = * Wikimedia Česká republika * face = http://upload.wikimedia.org/wikipedia/commons/thumb/f/f2/Wikimedia_Czech_Republic-logo.svg/64px-Wikimedia_Czech_Republic-logo.svg.png @@ -32,11 +32,6 @@ [https://okinokynko.blogspot.com/feeds/posts/default/-/wiki] name = Okino - -[http://vrba.bloguje.cz/tema-1-wikipedia.xml] -name = Vrba -face = http://upload.wikimedia.org/wikipedia/commons/thumb/1/14/Smiley_green_alien_sick.svg/64px-Smiley_green_alien_sick.svg.png -faceheight = 87 [https://okinokynko.blogspot.com/feeds/posts/default/-/Wikipedie] name=Okinovo Okýnko diff --git a/modules/planet/templates/feeds/de_config.erb b/modules/planet/templates/feeds/de_config.erb index d561bdb..59e6b89 100644 --- a/modules/planet/templates/feeds/de_config.erb +++ b/modules/planet/templates/feeds/de_config.erb @@ -26,7 +26,7 @@ [https://arnomane.wordpress.com/category/wiki-de/feed/atom/] name=Daniel Arnold -#[http://wikimedia.ch/archives/category/de/feed] +#[https://www.wikimedia.ch/archives/category/de/feed] #name=Wikimedia CH [http://intelligentdesigns.net/blog/?cat=16&feed=rss2] @@ -50,7 +50,7 @@ [https://feeds.feedburner.com/dewikizine?format=xml] name=Wikizine -[http://blog.dapete.net/kategorie/wiki/feed] +[https://blog.dapete.net/kategorie/wiki/feed/] name=Peter Schloemer (Dapete) [http://www.finanzer.org/blog/category/wikimedia/feed/] @@ -68,7 +68,7 @@ [https://piratenblog.wordpress.com/category/wiki/feed/atom/] name=Elvis untot -[http://blog.wikimedia.de/feed/] +[https://blog.wikimedia.de/feed/] name=Wikimedia Deutschland Blog [http://erinnerungshort.de/blog/feed/] @@ -89,7 +89,7 @@ [https://achimraschka.blogspot.com/feeds/posts/default/-/Freies%20Wissen] name=Achim Raschka -[http://schmalenstroer.net/blog/tag/wikipedia/feed/] +[https://schmalenstroer.net/blog/tag/wikipedia/feed/] name=Michael Schmalenstroer [https://steproe.wordpress.com/category/wikimedia/feed/atom/] @@ -100,9 +100,6 @@ [https://unglaublich-was-auch-immer.blogspot.com/feeds/posts/default] name=Frank Schubert - -[http://grenzenderbezahlung.tumblr.com/rss] -name=Grenzen der Bezahlung. [https://festivalsommer.blogspot.com/feeds/posts/default/-/Planet] name=Festivalsommer diff --git a/modules/planet/templates/feeds/en_config.erb b/modules/planet/templates/feeds/en_config.erb index 75d6cac..4c1cc90 100644 --- a/modules/planet/templates/feeds/en_config.erb +++ b/modules/planet/templates/feeds/en_config.erb @@ -83,7 +83,7 @@ [http://moononastick.com/blog/feed/?cat=4] name=User:The wub -[http://mako.cc/copyrighteous/tags/planetwikimedia/feed/atom] +[https://mako.cc/copyrighteous/tags/planetwikimedia/feed/atom] name=Benjamin Mako Hill [https://dialogicality.blogspot.com/feeds/posts/default/-/wiki] @@ -329,7 +329,7 @@ [http://pigsonthewing.org.uk/category/wikipedia-2/feed/atom/] name=Andy Mabbett (User:Pigsonthewing) -[http://wikistrategies.net/category/wiki/feed/atom/] +[https://wikistrategies.net/category/wiki/feed/atom/] name=Pete Forsyth, Wiki Strategies [http://www.harryburt.co.uk/blog/category/interests/mediawiki-and-wikimedia/feed/atom/] @@ -359,10 +359,7 @@ [http://englishwikisource.tumblr.com/rss] name=English Wikisource -[http://samwilson.id.au/tag/wikimedia/feed/] -name=User:Samwilson - -[http://blog.wikimedia.de/tag/Wikidata+English/feed/] +[https://blog.wikimedia.de/tag/Wikidata+English/feed/] name=Wikidata (WMDE - English) [https://blogs.gnome.org/aklapper/category/computer/wikimedia/feed/] @@ -383,7 +380,7 @@ [http://lu.is/feed/] name=Luis Villa -[https://nethahussain.wordpress.com/category/wikipedia/] +[https://nethahussain.wordpress.com/category/wikipedia/feed/] name=Netha Hussain [http://pblog.ebaker.me.uk/feeds/posts/default/-/wikipedia] @@
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add rc_name_type_patrolled_timestamp index
jenkins-bot has submitted this change and it was merged.
Change subject: Add rc_name_type_patrolled_timestamp index
..
Add rc_name_type_patrolled_timestamp index
Bug: T140108
Change-Id: I382a5f0daef703a3d16fe008a5e1d1402f2c7b33
---
M includes/installer/MssqlUpdater.php
M includes/installer/MysqlUpdater.php
M includes/installer/OracleUpdater.php
M includes/installer/PostgresUpdater.php
M includes/installer/SqliteUpdater.php
A maintenance/archives/patch-add-rc_name_type_patrolled_timestamp_index.sql
M maintenance/mssql/tables.sql
A
maintenance/oracle/archives/patch-add-rc_name_type_patrolled_timestamp_index.sql
M maintenance/oracle/tables.sql
M maintenance/postgres/tables.sql
M maintenance/tables.sql
11 files changed, 31 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/installer/MssqlUpdater.php
b/includes/installer/MssqlUpdater.php
index accc42f..770d3bf 100644
--- a/includes/installer/MssqlUpdater.php
+++ b/includes/installer/MssqlUpdater.php
@@ -87,7 +87,11 @@
[ 'updateSchema', 'recentchanges',
'recentchanges-drop-fks',
'patch-recentchanges-drop-fks.sql' ],
[ 'updateSchema', 'logging', 'logging-drop-fks',
'patch-logging-drop-fks.sql' ],
- [ 'updateSchema', 'archive', 'archive-drop-fks',
'patch-archive-drop-fks.sql' ]
+ [ 'updateSchema', 'archive', 'archive-drop-fks',
'patch-archive-drop-fks.sql' ],
+
+ // 1.28
+ [ 'addIndex', 'recentchanges',
'rc_name_type_patrolled_timestamp',
+
'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
];
}
diff --git a/includes/installer/MysqlUpdater.php
b/includes/installer/MysqlUpdater.php
index d414d907..719b66a 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -283,6 +283,10 @@
[ 'addIndex', 'categorylinks', 'cl_collation_ext',
'patch-add-cl_collation_ext_index.sql' ],
[ 'doCollationUpdate' ],
+
+ // 1.28
+ [ 'addIndex', 'recentchanges',
'rc_name_type_patrolled_timestamp',
+
'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
];
}
diff --git a/includes/installer/OracleUpdater.php
b/includes/installer/OracleUpdater.php
index 334256b..8075aac 100644
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -113,6 +113,10 @@
[ 'dropTable', 'msg_resource' ],
[ 'addField', 'watchlist', 'wl_id',
'patch-watchlist-wl_id.sql' ],
+ // 1.28
+ [ 'addIndex', 'recentchanges',
'rc_name_type_patrolled_timestamp',
+
'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
+
// KEEP THIS AT THE BOTTOM!!
[ 'doRebuildDuplicateFunction' ],
diff --git a/includes/installer/PostgresUpdater.php
b/includes/installer/PostgresUpdater.php
index a3b50ac..be94d91 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -433,6 +433,10 @@
'addPgField', 'watchlist', 'wl_id',
"INTEGER NOT NULL PRIMARY KEY DEFAULT
nextval('watchlist_wl_id_seq')"
],
+
+ // 1.28
+ [ 'addPgIndex', 'recentchanges',
'rc_name_type_patrolled_timestamp',
+ '( rc_namespace, rc_type, rc_patrolled,
rc_timestamp )' ],
];
}
diff --git a/includes/installer/SqliteUpdater.php
b/includes/installer/SqliteUpdater.php
index 86dccd7..1c6e6eb 100644
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -152,6 +152,10 @@
[ 'addIndex', 'categorylinks', 'cl_collation_ext',
'patch-add-cl_collation_ext_index.sql' ],
[ 'doCollationUpdate' ],
+
+ // 1.28
+ [ 'addIndex', 'recentchanges',
'rc_name_type_patrolled_timestamp',
+
'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
];
}
diff --git
a/maintenance/archives/patch-add-rc_name_type_patrolled_timestamp_index.sql
b/maintenance/archives/patch-add-rc_name_type_patrolled_timestamp_index.sql
new file mode 100644
index 000..aa54e75
--- /dev/null
+++ b/maintenance/archives/patch-add-rc_name_type_patrolled_timestamp_index.sql
@@ -0,0 +1,2 @@
+-- @since 1.28
+CREATE INDEX /*i*/rc_name_type_patrolled_timestamp ON /*_*/recentchanges
(rc_
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Require POST for action=purge in PurgeAction
jenkins-bot has submitted this change and it was merged.
Change subject: Require POST for action=purge in PurgeAction
..
Require POST for action=purge in PurgeAction
For the index.php end point, POSTs do not need a token.
This avoids cross-DC writes in active/active DC setups and
avoids DB writes that can be caused by just accidentally
following a link.
There are no links to action=purge by default in MediaWiki.
User scripts that create purge links will continue to work.
However these links will now point to a confirmation form.
To preserve the immediate-purge-redirect effect, these
scripts should be updated to use the API instead.
Bug: T135170
Change-Id: I5749ff470d99c5e3f22e05ff6856394cc05a0f48
---
M includes/DefaultSettings.php
M includes/FeedUtils.php
M includes/actions/PurgeAction.php
3 files changed, 4 insertions(+), 14 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8363b32..2ac31bf 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5051,7 +5051,7 @@
$wgGroupPermissions['user']['reupload'] = true;
$wgGroupPermissions['user']['reupload-shared'] = true;
$wgGroupPermissions['user']['minoredit'] = true;
-$wgGroupPermissions['user']['purge'] = true; // can use ?action=purge without
clicking "ok"
+$wgGroupPermissions['user']['purge'] = true;
$wgGroupPermissions['user']['sendemail'] = true;
$wgGroupPermissions['user']['applychangetags'] = true;
$wgGroupPermissions['user']['changetags'] = true;
diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php
index d7dbd22..071a3db 100644
--- a/includes/FeedUtils.php
+++ b/includes/FeedUtils.php
@@ -39,6 +39,7 @@
global $wgRequest, $wgUser;
$purge = $wgRequest->getVal( 'action' ) === 'purge';
+ // Allow users with 'purge' right to clear feed caches
if ( $purge && $wgUser->isAllowed( 'purge' ) ) {
$cache = ObjectCache::getMainWANInstance();
$cache->delete( $timekey, 1 );
diff --git a/includes/actions/PurgeAction.php b/includes/actions/PurgeAction.php
index 576533d..b2002ff 100644
--- a/includes/actions/PurgeAction.php
+++ b/includes/actions/PurgeAction.php
@@ -21,10 +21,7 @@
*/
/**
- * User-requested page cache purging.
- *
- * For users with 'purge', this will directly trigger the cache purging and
- * for users without that right, it will show a confirmation form.
+ * User-requested page cache purging
*
* @ingroup Actions
*/
@@ -48,10 +45,6 @@
return $this->page->doPurge();
}
- /**
-* purge is slightly weird because it can be either formed or formless
depending
-* on user permissions
-*/
public function show() {
$this->setHeaders();
@@ -65,11 +58,7 @@
return;
}
- if ( $user->isAllowed( 'purge' ) ) {
- // This will update the database immediately, even on
HTTP GET.
- // Lots of uses may exist for this feature, so just
ignore warnings.
-
Profiler::instance()->getTransactionProfiler()->resetExpectations();
-
+ if ( $this->getRequest()->wasPosted() ) {
$this->redirectParams = wfArrayToCgi( array_diff_key(
$this->getRequest()->getQueryValues(),
[ 'title' => null, 'action' => null ]
--
To view, visit https://gerrit.wikimedia.org/r/304157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5749ff470d99c5e3f22e05ff6856394cc05a0f48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Allow users with 'abusefilter-view-private' to view history/...
jenkins-bot has submitted this change and it was merged.
Change subject: Allow users with 'abusefilter-view-private' to view
history/diff of private filters
..
Allow users with 'abusefilter-view-private' to view history/diff of private
filters
These pages are read only pages so it's better to let users with
'abusefilter-view-private' to view history and diff of private filters
as 'abusefilter-modify' is a read+write right.
Bug: T126129
Change-Id: I9e15326c8d681000ab13ef8a50fa0eed4c24dbe6
---
M Views/AbuseFilterViewDiff.php
M Views/AbuseFilterViewHistory.php
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Views/AbuseFilterViewDiff.php b/Views/AbuseFilterViewDiff.php
index 328d5a0..1c9e61a 100644
--- a/Views/AbuseFilterViewDiff.php
+++ b/Views/AbuseFilterViewDiff.php
@@ -99,9 +99,9 @@
$newSpec = $this->mParams[4];
$this->mFilter = $this->mParams[1];
- if ( AbuseFilter::filterHidden( $this->mFilter ) &&
- !$this->getUser()->isAllowed(
'abusefilter-modify' ) &&
- !$this->getUser()->isAllowed(
'abusefilter-view-private' ) ) {
+ if ( AbuseFilter::filterHidden( $this->mFilter )
+ && !$this->getUser()->isAllowed(
'abusefilter-view-private' )
+ ) {
$this->getOutput()->addWikiMsg(
'abusefilter-history-error-hidden' );
return false;
}
diff --git a/Views/AbuseFilterViewHistory.php b/Views/AbuseFilterViewHistory.php
index bedbafc..82e18bf 100644
--- a/Views/AbuseFilterViewHistory.php
+++ b/Views/AbuseFilterViewHistory.php
@@ -17,9 +17,9 @@
}
# Check perms
- if ( $filter &&
- !$this->getUser()->isAllowed(
'abusefilter-modify' ) &&
- AbuseFilter::filterHidden( $filter ) ) {
+ if ( $filter && AbuseFilter::filterHidden( $filter )
+ && !$this->getUser()->isAllowed(
'abusefilter-view-private' )
+ ) {
$out->addWikiMsg( 'abusefilter-history-error-hidden' );
return;
}
@@ -234,7 +234,7 @@
$info['conds']['afh_filter'] = $this->mFilter;
}
- if ( !$this->getUser()->isAllowed( 'abusefilter-modify' ) ) {
+ if ( !$this->getUser()->isAllowed( 'abusefilter-view-private' )
) {
// Hide data the user can't see.
$info['conds']['af_hidden'] = 0;
}
--
To view, visit https://gerrit.wikimedia.org/r/285422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9e15326c8d681000ab13ef8a50fa0eed4c24dbe6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Glaisher
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Jackmcbarn
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: MarcoAurelio
Gerrit-Reviewer: Samtar
Gerrit-Reviewer: Se4598
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] resourceloader: Make cache-eval in mw.loader.work asyn...
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304158
Change subject: [WIP] resourceloader: Make cache-eval in mw.loader.work
asynchronous
..
[WIP] resourceloader: Make cache-eval in mw.loader.work asynchronous
Bug: T142129
Change-Id: Icd39423aec35f25162d2443b1f0507f6f0c748a3
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/58/304158/1
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 2c58a63..e3d1cdb 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1661,6 +1661,17 @@
}
}
+
+ /**
+* Execute a batch of load.php responses retreived from
mw.loader.store.
+*
+* @private
+* @param {string[]} concatSource Array of JavaScript
source code in the form of
+* calls to mw.loader#implement().
+*/
+ function runSourceBatch( concatSource ) {
+ }
+
/* Public Members */
return {
/**
--
To view, visit https://gerrit.wikimedia.org/r/304158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd39423aec35f25162d2443b1f0507f6f0c748a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Require POST for action=purge in PurgeAction
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304157
Change subject: Require POST for action=purge in PurgeAction
..
Require POST for action=purge in PurgeAction
For the index.php end point, POSTs do not need a token.
This avoids cross-DC writes in active/active DC setups and
avoids DB writes that can be caused by just accidentally
following a link.
There are no links to action=purge by default in MediaWiki.
User scripts that create purge links will continue to work.
However these links will now point to a confirmation form.
To preserve the immediate-purge-redirect effect, these
scripts should be updated to use the API instead.
Bug: T135170
Change-Id: I5749ff470d99c5e3f22e05ff6856394cc05a0f48
---
M includes/DefaultSettings.php
M includes/FeedUtils.php
M includes/actions/PurgeAction.php
3 files changed, 4 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/57/304157/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8363b32..2ac31bf 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5051,7 +5051,7 @@
$wgGroupPermissions['user']['reupload'] = true;
$wgGroupPermissions['user']['reupload-shared'] = true;
$wgGroupPermissions['user']['minoredit'] = true;
-$wgGroupPermissions['user']['purge'] = true; // can use ?action=purge without
clicking "ok"
+$wgGroupPermissions['user']['purge'] = true;
$wgGroupPermissions['user']['sendemail'] = true;
$wgGroupPermissions['user']['applychangetags'] = true;
$wgGroupPermissions['user']['changetags'] = true;
diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php
index d7dbd22..071a3db 100644
--- a/includes/FeedUtils.php
+++ b/includes/FeedUtils.php
@@ -39,6 +39,7 @@
global $wgRequest, $wgUser;
$purge = $wgRequest->getVal( 'action' ) === 'purge';
+ // Allow users with 'purge' right to clear feed caches
if ( $purge && $wgUser->isAllowed( 'purge' ) ) {
$cache = ObjectCache::getMainWANInstance();
$cache->delete( $timekey, 1 );
diff --git a/includes/actions/PurgeAction.php b/includes/actions/PurgeAction.php
index 576533d..b2002ff 100644
--- a/includes/actions/PurgeAction.php
+++ b/includes/actions/PurgeAction.php
@@ -21,10 +21,7 @@
*/
/**
- * User-requested page cache purging.
- *
- * For users with 'purge', this will directly trigger the cache purging and
- * for users without that right, it will show a confirmation form.
+ * User-requested page cache purging
*
* @ingroup Actions
*/
@@ -48,10 +45,6 @@
return $this->page->doPurge();
}
- /**
-* purge is slightly weird because it can be either formed or formless
depending
-* on user permissions
-*/
public function show() {
$this->setHeaders();
@@ -65,11 +58,7 @@
return;
}
- if ( $user->isAllowed( 'purge' ) ) {
- // This will update the database immediately, even on
HTTP GET.
- // Lots of uses may exist for this feature, so just
ignore warnings.
-
Profiler::instance()->getTransactionProfiler()->resetExpectations();
-
+ if ( $this->getRequest()->wasPosted() ) {
$this->redirectParams = wfArrayToCgi( array_diff_key(
$this->getRequest()->getQueryValues(),
[ 'title' => null, 'action' => null ]
--
To view, visit https://gerrit.wikimedia.org/r/304157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5749ff470d99c5e3f22e05ff6856394cc05a0f48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mw.htmlform.ooui.styles: Remove vertical margin from OOjs UI...
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304156
Change subject: mw.htmlform.ooui.styles: Remove vertical margin from OOjs UI
HTMLForms
..
mw.htmlform.ooui.styles: Remove vertical margin from OOjs UI HTMLForms
Originally added in b524a4333f9c1b42bf6ac0f6caa3055bd8acf84a,
this is no longer needed for framed forms (with setWrapperLegend())
after e5bb1f68cf4154c1bc4389a4404808ebddb5cef9 in OOjs UI and was
never needed for non-framed forms at all.
Change-Id: If4b4b8776080a00685bbcb9026a3d5eb89e4167d
---
M resources/src/mediawiki.special/mediawiki.special.movePage.css
M resources/src/mediawiki/htmlform/ooui.styles.css
2 files changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/56/304156/1
diff --git a/resources/src/mediawiki.special/mediawiki.special.movePage.css
b/resources/src/mediawiki.special/mediawiki.special.movePage.css
index dd1c2aa..9428fed 100644
--- a/resources/src/mediawiki.special/mediawiki.special.movePage.css
+++ b/resources/src/mediawiki.special/mediawiki.special.movePage.css
@@ -4,5 +4,4 @@
.movepage-wrapper {
width: 50em;
- margin: 1em 0;
}
diff --git a/resources/src/mediawiki/htmlform/ooui.styles.css
b/resources/src/mediawiki/htmlform/ooui.styles.css
index a9e75d7..fc0fd6e 100644
--- a/resources/src/mediawiki/htmlform/ooui.styles.css
+++ b/resources/src/mediawiki/htmlform/ooui.styles.css
@@ -1,9 +1,5 @@
/* OOUIHTMLForm styles */
-.mw-htmlform-ooui-wrapper {
- margin: 1em 0;
-}
-
.mw-htmlform-ooui .mw-htmlform-submit-buttons {
margin-top: 1em;
}
--
To view, visit https://gerrit.wikimedia.org/r/304156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4b4b8776080a00685bbcb9026a3d5eb89e4167d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: StashEdit: Refactor and simplify edit.stash.js
jenkins-bot has submitted this change and it was merged.
Change subject: StashEdit: Refactor and simplify edit.stash.js
..
StashEdit: Refactor and simplify edit.stash.js
* Reduce call sites for stashEdit() to only inside checkStash().
* Update onFormLoaded() to not call stashEdit() directly but instead
call checkStash(). This avoids hardcoding the priority and
simplifies code by ensuring isTextChanged() and isSummaryChanged()
are always checked before stashEdit() is called.
* Move texthash and priority handling to stashEdit().
* Don't clear lastTextHash if text hasn't changed.
* Remove check for 'origSummary' in onTextFocus. Have stash rate
always be 3s for the textarea, and always 1s for the summary.
Change-Id: I3f049df6ee2e1c218e8b3c1c397ff0bc50e58c8e
---
M resources/src/mediawiki.action/mediawiki.action.edit.stash.js
1 file changed, 46 insertions(+), 50 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
index 704287a..6c63957 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
@@ -9,7 +9,11 @@
$( function () {
var idleTimeout = 3000,
api = new mw.Api(),
- pending = null,
+ timer,
+ pending,
+ lastText,
+ lastSummary,
+ lastTextHash,
$form = $( '#editform' ),
$text = $form.find( '#wpTextbox1' ),
$summary = $form.find( '#wpSummary' ),
@@ -17,33 +21,36 @@
model = $form.find( '[name=model]' ).val(),
format = $form.find( '[name=format]' ).val(),
revId = $form.find( '[name=parentRevId]' ).val(),
- lastText = $text.textSelection( 'getContents' ),
- lastSummary = $summary.textSelection( 'getContents' ),
- lastTextHash = null,
lastPriority = 0,
- origSummary = lastSummary,
- timer = null,
PRIORITY_LOW = 1,
PRIORITY_HIGH = 2;
// Send a request to stash the edit to the API.
// If a request is in progress, abort it since its payload is
stale and the API
// may limit concurrent stash parses.
- function stashEdit( priority, hashForReuse ) {
- if ( pending ) {
- pending.abort();
- pending = null;
- }
-
+ function stashEdit() {
api.getToken( 'csrf' ).then( function ( token ) {
- // If applicable, just send the hash key to
reuse the last text server-side
- var req, params;
+ var req, params,
+ textChanged = isTextChanged(),
+ priority = textChanged ? PRIORITY_HIGH
: PRIORITY_LOW;
- // Update tracking of the last text/summary
sent out
- lastText = $text.textSelection( 'getContents' );
+ if ( pending ) {
+ if ( lastPriority > priority ) {
+ // Stash request for summary
change should wait on pending text change stash
+ pending.then( checkStash );
+ return;
+ }
+ pending.abort();
+ }
+
+ // Update the "last" tracking variables
lastSummary = $summary.textSelection(
'getContents' );
lastPriority = priority;
- lastTextHash = null; // "failed" until proven
successful
+ if ( textChanged ) {
+ lastText = $text.textSelection(
'getContents' );
+ // Reset hash
+ lastTextHash = null;
+ }
params = {
action: 'stashedit',
@@ -56,8 +63,8 @@
contentformat: format,
baserevid: revId
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: LoadBalancer object injection cleanups
jenkins-bot has submitted this change and it was merged.
Change subject: LoadBalancer object injection cleanups
..
LoadBalancer object injection cleanups
Follows-up 5f921702d2.
* Move cache object creation up to LBFactory.
* Refactored some code duplication in LBFactorySimple.
Change-Id: I0a5820f5155fc545a8bf0cc4e7c27f878388682b
---
M includes/db/loadbalancer/LBFactory.php
M includes/db/loadbalancer/LBFactoryMulti.php
M includes/db/loadbalancer/LBFactorySimple.php
M includes/db/loadbalancer/LBFactorySingle.php
M includes/db/loadbalancer/LoadBalancer.php
5 files changed, 49 insertions(+), 31 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
Smalyshev: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/db/loadbalancer/LBFactory.php
b/includes/db/loadbalancer/LBFactory.php
index 053f9f8..4078a39 100644
--- a/includes/db/loadbalancer/LBFactory.php
+++ b/includes/db/loadbalancer/LBFactory.php
@@ -31,15 +31,16 @@
* @ingroup Database
*/
abstract class LBFactory implements DestructibleService {
-
/** @var ChronologyProtector */
protected $chronProt;
-
/** @var TransactionProfiler */
protected $trxProfiler;
-
/** @var LoggerInterface */
- protected $logger;
+ protected $trxLogger;
+ /** @var BagOStuff */
+ protected $srvCache;
+ /** @var WANObjectCache */
+ protected $wanCache;
/** @var string|bool Reason all LBs are read-only or false if not */
protected $readOnlyReason = false;
@@ -49,15 +50,28 @@
/**
* Construct a factory based on a configuration array (typically from
$wgLBFactoryConf)
* @param array $conf
+* @TODO: inject objects via dependency framework
*/
public function __construct( array $conf ) {
if ( isset( $conf['readOnlyReason'] ) && is_string(
$conf['readOnlyReason'] ) ) {
$this->readOnlyReason = $conf['readOnlyReason'];
}
-
$this->chronProt = $this->newChronologyProtector();
$this->trxProfiler =
Profiler::instance()->getTransactionProfiler();
- $this->logger = LoggerFactory::getInstance( 'DBTransaction' );
+ // Use APC/memcached style caching, but avoids loops with
CACHE_DB (T141804)
+ $cache = ObjectCache::getLocalServerInstance();
+ if ( $cache->getQoS( $cache::ATTR_EMULATION ) >
$cache::QOS_EMULATION_SQL ) {
+ $this->srvCache = $cache;
+ } else {
+ $this->srvCache = new EmptyBagOStuff();
+ }
+ $wCache = ObjectCache::getMainWANInstance();
+ if ( $wCache->getQoS( $wCache::ATTR_EMULATION ) >
$wCache::QOS_EMULATION_SQL ) {
+ $this->wanCache = $wCache;
+ } else {
+ $this->wanCache = WANObjectCache::newEmpty();
+ }
+ $this->trxLogger = LoggerFactory::getInstance( 'DBTransaction'
);
}
/**
@@ -261,7 +275,7 @@
foreach ( $callersByDB as $db => $callers ) {
$msg .= "$db: " . implode( '; ', $callers ) .
"\n";
}
- $this->logger->info( $msg );
+ $this->trxLogger->info( $msg );
}
}
diff --git a/includes/db/loadbalancer/LBFactoryMulti.php
b/includes/db/loadbalancer/LBFactoryMulti.php
index 3a543ac..10a65f8 100644
--- a/includes/db/loadbalancer/LBFactoryMulti.php
+++ b/includes/db/loadbalancer/LBFactoryMulti.php
@@ -317,7 +317,9 @@
'servers' => $this->makeServerArray( $template, $loads,
$groupLoads ),
'loadMonitor' => $this->loadMonitorClass,
'readOnlyReason' => $readOnlyReason,
- 'trxProfiler' => $this->trxProfiler
+ 'trxProfiler' => $this->trxProfiler,
+ 'srvCache' => $this->srvCache,
+ 'wanCache' => $this->wanCache
] );
}
diff --git a/includes/db/loadbalancer/LBFactorySimple.php
b/includes/db/loadbalancer/LBFactorySimple.php
index 1b0a1f3..14baf2e 100644
--- a/includes/db/loadbalancer/LBFactorySimple.php
+++ b/includes/db/loadbalancer/LBFactorySimple.php
@@ -84,12 +84,7 @@
] ];
}
- return new LoadBalancer( [
- 'servers' => $servers,
- 'loadMonitor' => $this->loadMonitorClass,
- 'readOnlyReason' => $this->readOnlyReason,
- 'trxProfiler' => $this->trxProfiler
- ] );
+ return $this->newLoadBalancer( $servers );
}
/**
@@ -118,12 +113,7 @@
throw
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQuality[master]: Update PHP requirement to 5.5
jenkins-bot has submitted this change and it was merged.
Change subject: Update PHP requirement to 5.5
..
Update PHP requirement to 5.5
Change-Id: I49e6ed2f2698d6c43e082fc266d2ec4a7575412d
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 10db465..346e5e3 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
"issues":
"https://phabricator.wikimedia.org/project/profile/989/";
},
"require": {
- "php": ">=5.3.0",
+ "php": ">=5.5.0",
"wikibase/data-model": "~4.0|~5.0|~6.0",
"wikibase/data-model-services": "~2.0|~3.0",
"serialization/serialization": "^3.2.1"
--
To view, visit https://gerrit.wikimedia.org/r/302252
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49e6ed2f2698d6c43e082fc266d2ec4a7575412d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuality
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeEditor[master]: Supply model/format directly to hook
jenkins-bot has submitted this change and it was merged.
Change subject: Supply model/format directly to hook
..
Supply model/format directly to hook
Most of the time people want to trigger on content model, or content
format. This allows triggering correctly even if you are viewing an
old revision with a different content model, or are using a content
format that is different than the default for the current model.
Also remove back compat code for pre 1.23
Change-Id: I9706eaae0983e2b7b99f83c9564ea04c5ec252ac
---
M CodeEditor.hooks.php
M extension.json
2 files changed, 14 insertions(+), 26 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CodeEditor.hooks.php b/CodeEditor.hooks.php
index 0c59d34..7ae7396 100644
--- a/CodeEditor.hooks.php
+++ b/CodeEditor.hooks.php
@@ -1,30 +1,23 @@
hasContentModel( CONTENT_MODEL_JAVASCRIPT
) ) {
+ if ( $wgCodeEditorEnableCore ) {
+ if ( $model === CONTENT_MODEL_JAVASCRIPT ) {
return 'javascript';
- } elseif ( $title->hasContentModel( CONTENT_MODEL_CSS )
) {
+ } elseif ( $model === CONTENT_MODEL_CSS ) {
return 'css';
- } elseif ( $title->hasContentModel( CONTENT_MODEL_JSON
) ) {
+ } elseif ( $model === CONTENT_MODEL_JSON ) {
return 'json';
- }
- } elseif ( $wgCodeEditorEnableCore && ( $title->isCssOrJsPage()
|| $title->isCssJsSubpage() ) ) {
- // This block is deprecated. Remove after 1.23 release
- if ( preg_match( '/\.js$/', $title->getText() ) ) {
- return 'javascript';
- }
- if ( preg_match( '/\.css$/', $title->getText() ) ) {
- return 'css';
}
}
// Give extensions a chance
+ // Note: $model and $format were added around the time of
MediaWiki 1.28.
$lang = null;
- Hooks::run( 'CodeEditorGetPageLanguage', [ $title, &$lang ] );
+ Hooks::run( 'CodeEditorGetPageLanguage', [ $title, &$lang,
$model, $format ] );
return $lang;
}
@@ -39,17 +32,15 @@
public static function editPageShowEditFormInitial( $editpage, $output
) {
$output->addModuleStyles( 'ext.wikiEditor.toolbar.styles' );
- $lang = self::getPageLanguage( $editpage->getContextTitle() );
+
+ $title = $editpage->getContextTitle();
+ $model = $editpage->contentModel;
+ $format = $editpage->contentFormat;
+
+ $lang = self::getPageLanguage( $title, $model, $format );
if ( $lang && $output->getUser()->getOption( 'usebetatoolbar' )
) {
$output->addModules( 'ext.codeEditor' );
- }
- return true;
- }
-
- public static function onMakeGlobalVariablesScript( &$vars, $output ) {
- $lang = self::getPageLanguage( $output->getTitle() );
- if ( $lang ) {
- $vars['wgCodeEditorCurrentLanguage'] = $lang;
+ $output->addJsConfigVars(
'wgCodeEditorCurrentLanguage', $lang );
}
return true;
}
diff --git a/extension.json b/extension.json
index d87ea30..915d292 100644
--- a/extension.json
+++ b/extension.json
@@ -22,9 +22,6 @@
"BeforePageDisplay": [
"CodeEditorHooks::onBeforePageDisplay"
],
- "MakeGlobalVariablesScript": [
- "CodeEditorHooks::onMakeGlobalVariablesScript"
- ],
"GetPreferences": [
"CodeEditorHooks::getPreferences"
]
--
To view, visit https://gerrit.wikimedia.org/r/299441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9706eaae0983e2b7b99f83c9564ea04c5ec252ac
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: TheDJ
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Optimize summary-based extension edit stash caches
jenkins-bot has submitted this change and it was merged.
Change subject: Optimize summary-based extension edit stash caches
..
Optimize summary-based extension edit stash caches
* Send stash requests when the summary changes, so that things like
AbuseFilter caching have a higher hit rate.
* Make the backend API skip parsing if a fresh cache is already present.
This makes requests for summary-only changes much faster and more likely
to finish in time.
* Avoid sending the full text if only the summary changed since the
last successful stash. This works via an optional stashedtexthash
parameter to the API.
* Also always apply the lock in parseAndStash(), even for VE.
Change-Id: I9bfd74cf05411853b675c6f54ff5d8934bcfc54c
---
M includes/api/ApiStashEdit.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
M resources/src/mediawiki.action/mediawiki.action.edit.stash.js
4 files changed, 174 insertions(+), 48 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiStashEdit.php b/includes/api/ApiStashEdit.php
index 446a98c..297c0fb 100644
--- a/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@ -39,6 +39,7 @@
const ERROR_PARSE = 'error_parse';
const ERROR_CACHE = 'error_cache';
const ERROR_UNCACHEABLE = 'uncacheable';
+ const ERROR_BUSY = 'busy';
const PRESUME_FRESH_TTL_SEC = 30;
const MAX_CACHE_TTL = 300; // 5 minutes
@@ -51,6 +52,7 @@
$this->dieUsage( 'This interface is not supported for
bots', 'botsnotsupported' );
}
+ $cache = ObjectCache::getLocalClusterInstance();
$page = $this->getTitleOrPageId( $params );
$title = $page->getTitle();
@@ -60,8 +62,23 @@
$this->dieUsage( 'Unsupported content model/format',
'badmodelformat' );
}
- // Trim and fix newlines so the key SHA1's match (see
RequestContext::getText())
- $text = rtrim( str_replace( "\r\n", "\n", $params['text'] ) );
+ if ( strlen( $params['stashedtexthash'] ) ) {
+ // Load from cache since the client indicates the text
is the same as last stash
+ $textHash = $params['stashedtexthash'];
+ $textKey = $cache->makeKey( 'stashedit', 'text',
$textHash );
+ $text = $cache->get( $textKey );
+ if ( !is_string( $text ) ) {
+ $this->dieUsage( 'No stashed text found with
the given hash', 'missingtext' );
+ }
+ } elseif ( $params['text'] !== null ) {
+ // Trim and fix newlines so the key SHA1's match (see
WebRequest::getText())
+ $text = rtrim( str_replace( "\r\n", "\n",
$params['text'] ) );
+ $textHash = sha1( $text );
+ } else {
+ $this->dieUsage(
+ 'The text or stashedtexthash parameter must be
given', 'missingtextparam' );
+ }
+
$textContent = ContentHandler::makeContent(
$text, $title, $params['contentmodel'],
$params['contentformat'] );
@@ -113,24 +130,24 @@
// The user will abort the AJAX request by pressing "save", so
ignore that
ignore_user_abort( true );
- // Use the master DB for fast blocking locks
- $dbw = wfGetDB( DB_MASTER );
-
- // Get a key based on the source text, format, and user
preferences
- $key = self::getStashKey( $title, $content, $user );
- // De-duplicate requests on the same key
if ( $user->pingLimiter( 'stashedit' ) ) {
$status = 'ratelimited';
- } elseif ( $dbw->lock( $key, __METHOD__, 1 ) ) {
- $status = self::parseAndStash( $page, $content, $user,
$params['summary'] );
- $dbw->unlock( $key, __METHOD__ );
} else {
- $status = 'busy';
+ $status = self::parseAndStash( $page, $content, $user,
$params['summary'] );
+ $textKey = $cache->makeKey( 'stashedit', 'text',
$textHash );
+ $cache->set( $textKey, $text, self::MAX_CACHE_TTL );
}
$this->getStats()->increment( "editstash.cache_stores.$status"
);
- $this->getResult()->addValue( null, $this->getModuleName(), [
'status' => $status ] );
+ $this->getResult()->addValue(
+ null,
+ $this->getModuleName(),
+ [
+ 'status' => $status,
+ 'texthash' =>
[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: -releng: remove #browser-tests, fix -infra
jenkins-bot has submitted this change and it was merged. Change subject: -releng: remove #browser-tests, fix -infra .. -releng: remove #browser-tests, fix -infra * Removed #browser-tests as that is a tag for anyone to use about their browser tests. It is not a project "owned" by Release Engineering. * Fixed the capitalization of #browser-tests-infrastructure, because. Change-Id: I278ee43bf6465cc27b28081456dd49296461c105 --- M channels.yaml 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/channels.yaml b/channels.yaml index 7de5037..f18027d 100644 --- a/channels.yaml +++ b/channels.yaml @@ -114,12 +114,11 @@ - Deployment-Systems(.*) - Scap3(.*) - scap(.*) -- Browser-Tests(.*) - Gitblit-Deprecate - Gerrit-Migration - MediaWiki-Releasing - MediaWiki-Codesniffer -- Browser-Tests-infrastructure +- Browser-Tests-Infrastructure - Testing-Initiative-2015 - commit-message-validator -- To view, visit https://gerrit.wikimedia.org/r/304041 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I278ee43bf6465cc27b28081456dd49296461c105 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Greg Grossmeier Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: wikimedia.org: repeat hostname on each line for multi records
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/304155 Change subject: wikimedia.org: repeat hostname on each line for multi records .. wikimedia.org: repeat hostname on each line for multi records Change-Id: I7867aca7bfaa2ef7625edf892497055110ced474 --- M templates/wikimedia.org 1 file changed, 61 insertions(+), 62 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/55/304155/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 03e163f..0657dcc 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -60,9 +60,9 @@ dumps 1H IN CNAME dataset1001 lists 1H IN A208.80.154.75 -1H IN 2620:0:861:3::2 -1H IN MX 10 lists -1H IN TXT "v=spf1 mx ?all" +lists 1H IN 2620:0:861:3::2 +lists 1H IN MX 10 lists +lists 1H IN TXT "v=spf1 mx ?all" wiki-mail 1H IN CNAMEmx1001; used by Jenkins and possibly others @@ -88,62 +88,61 @@ ; Servers (alphabetic order) << WHAT PART ABOUT THIS IS SO HARD TO UNDERSTAND? acamar 1H IN A208.80.153.12 -1H IN 2620:0:860:1:208:80:153:12 +acamar 1H IN 2620:0:860:1:208:80:153:12 achernar1H IN A208.80.153.42 -1H IN 2620:0:860:2:208:80:153:42 +achernar1H IN 2620:0:860:2:208:80:153:42 alsafi 1H IN A208.80.153.50 -1H IN 2620:0:860:2:208:80:153:50 +alsafi 1H IN 2620:0:860:2:208:80:153:50 astatine1H IN A208.80.155.110 baham 1H IN A208.80.153.13 -1H IN 2620:0:860:1:208:80:153:13 +baham 1H IN 2620:0:860:1:208:80:153:13 barium 1H IN A208.80.155.11 bast10011H IN A208.80.154.149 -1H IN 2620:0:861:2:208:80:154:149 +bast10011H IN 2620:0:861:2:208:80:154:149 bast20011H IN A208.80.153.5 -1H IN 2620:0:860:1:208:80:153:5 +bast20011H IN 2620:0:860:1:208:80:153:5 bast30011H IN A91.198.174.112 -1H IN 2620:0:862:1:91:198:174:112 +bast30011H IN 2620:0:862:1:91:198:174:112 bast40011H IN A198.35.26.5 -1H IN 2620:0:863:1:198:35:26:5 +bast40011H IN 2620:0:863:1:198:35:26:5 californium 1H IN A208.80.154.147 carbon 1H IN A208.80.154.10 -1H IN 2620:0:861:1:208:80:154:10 +carbon 1H IN 2620:0:861:1:208:80:154:10 chromium1H IN A208.80.154.157 -1H IN 2620:0:861:2:208:80:154:157 +chromium1H IN 2620:0:861:2:208:80:154:157 dubnium 1H IN A208.80.154.77 cp1008 1H IN A208.80.154.42 dataset1001 1H IN A208.80.154.11 -1H IN 2620:0:861:1:208:80:154:11 +dataset1001 1H IN 2620:0:861:1:208:80:154:11 eeden 1H IN A91.198.174.121 -1H IN 2620:0:862:1:91:198:174:121 +eeden 1H IN 2620:0:862:1:91:198:174:121 einsteinium 1H IN A208.80.155.119 fermium 1H IN A208.80.154.74 ; VM on the ganeti01.svc.eqiad.wmnet cluster -1H IN 2620:0:861:3:208:80:154:74 +fermium 1H IN 2620:0:861:3:208:80:154:74 frdata-eqiad 1H IN A208.80.155.10 frdev-eqiad 1H IN A208.80.155.13 fundraising-eqiad 1H IN A208.80.155.14 - gallium 1H IN A208.80.154.135 labservices1002 1H IN A208.80.154.12 hydrogen1H IN A208.80.154.50 -1H IN 2620:0:861:1:208:80:154:50 +hydrogen1H IN 2620:0:861:1:208:80:154:50 install1001 1H IN A208.80.154.83 -1H IN 2620:0:861:3:208:80:154:83 +install1001 1H IN 2620:0:861:3:208:80:154:83 install2001 1H IN A208.80.153.4 -1H IN 2620:0:860:1:208:80:153:4 +install2001 1H IN 2620:0:860:1:208:80:153:4 iron1H IN A208.80.154.151 -1H IN 2620:0:861:2:208:80:154:151 +iron1H IN 2620:0:861:2:208:80:154:151 kraz1H IN A208.80.153.44 -1H IN 2620:0:860:2:208:80:153:44 +kraz1H IN 2620:0:860:2:208:80:153:44 labcontrol1001 1H IN A208.80.154.92 labcontrol1002 1H IN A208.80.154.95 labtestweb2001 1H IN A208.80.153.14 -1H IN 2620:0:860:1:208:80:153:14 +labtestweb2001 1H IN 2620:0:860:1:208:80:153:14 labservices1001 1H IN A208.80.155.117 labtestcontrol2001 1H IN A208.80.153.47 labtestservices2001 1H IN A208.80.153.48 lead1H IN A208.80.154.82 -
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix comment of get/setLinkRenderer in doxygen
jenkins-bot has submitted this change and it was merged.
Change subject: Fix comment of get/setLinkRenderer in doxygen
..
Fix comment of get/setLinkRenderer in doxygen
Doxygen requires the full qualified name of the class in a comment
or in the @aram/@return annotation, otherwise the class isn't linked
in the resulting output[1]. This commit changes the LinkRenderer
annotations in SpecialPage and Parser to \MediaWiki\Linker\LinkRenderer.
[1]
https://doc.wikimedia.org/mediawiki-core/master/php/classSpecialPage.html#a3560214f63fc2f20c63b4025db5cd81d
Change-Id: I74cedcd764a6053cc5a0c6d2eedbedb72651f57c
---
M includes/parser/Parser.php
M includes/specialpage/SpecialPage.php
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index f9eea48..206ad00 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -251,7 +251,7 @@
protected $mProfiler;
/**
-* @var LinkRenderer
+* @var \MediaWiki\Linker\LinkRenderer
*/
protected $mLinkRenderer;
@@ -882,10 +882,10 @@
}
/**
-* Get a LinkRenderer instance to make links with
+* Get a \MediaWiki\Linker\LinkRenderer instance to make links with
*
* @since 1.28
-* @return LinkRenderer
+* @return \MediaWiki\Linker\LinkRenderer
*/
public function getLinkRenderer() {
if ( !$this->mLinkRenderer ) {
diff --git a/includes/specialpage/SpecialPage.php
b/includes/specialpage/SpecialPage.php
index 35ecc6e..99b9f33 100644
--- a/includes/specialpage/SpecialPage.php
+++ b/includes/specialpage/SpecialPage.php
@@ -61,7 +61,7 @@
protected $mContext;
/**
-* @var LinkRenderer|null
+* @var \MediaWiki\Linker\LinkRenderer|null
*/
private $linkRenderer;
@@ -834,7 +834,7 @@
/**
* @since 1.28
-* @return LinkRenderer
+* @return \MediaWiki\Linker\LinkRenderer
*/
protected function getLinkRenderer() {
if ( $this->linkRenderer ) {
@@ -846,7 +846,7 @@
/**
* @since 1.28
-* @param LinkRenderer $linkRenderer
+* @param \MediaWiki\Linker\LinkRenderer $linkRenderer
*/
public function setLinkRenderer( LinkRenderer $linkRenderer ) {
$this->linkRenderer = $linkRenderer;
--
To view, visit https://gerrit.wikimedia.org/r/303810
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74cedcd764a6053cc5a0c6d2eedbedb72651f57c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
Gerrit-Reviewer: Cscott
Gerrit-Reviewer: Jackmcbarn
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_26]: Remove support for $wgWellFormedXml=false
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304154
Change subject: Remove support for $wgWellFormedXml=false
..
Remove support for $wgWellFormedXml=false
tl;dr: Having unnessary complexity in security critical code is bad.
* When PHP is built with certain versions of libpcre, can lead to XSS
* Extra options add extra complexity and maintenance burden
** Thus we should only have one html output mode. well formed = false
was already vetoed in T52040, so lets go with WellFormed=true.
* Options which are used by very few people tend to get tested less
* Escaping is an area of code where we should be very conservative
* Having escaping rules depend on making assumptions about which
characters various browsers consider "whitespace" is scary
* $wgWellFormedXml=false has had a negative security impact in the
past (Usually not directly its fault, but has made other bugs
more exploitable)
* Saving a couple bytes (even less bytes after gzip taken into
account) is really not worth it in this context (imho).
Incidentally, this backports the removal of the space before the
closing '/>' of a self-closed tag from dd2d7d0ffc.
Bug: T57548
Change-Id: I5c922e0980d3f9eb39adb5bb5833e158afda42ed
---
M includes/DefaultSettings.php
M includes/Html.php
M tests/parser/parserTest.inc
M tests/parser/parserTests.txt
M tests/phpunit/includes/HtmlTest.php
M tests/phpunit/includes/LinkerTest.php
M tests/phpunit/includes/OutputPageTest.php
M tests/phpunit/includes/XmlSelectTest.php
M tests/phpunit/includes/XmlTest.php
M tests/phpunit/includes/content/JsonContentTest.php
M tests/phpunit/includes/parser/NewParserTest.php
11 files changed, 147 insertions(+), 249 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/304154/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7498a02..1a97dac 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3091,24 +3091,6 @@
$wgAllowMicrodataAttributes = false;
/**
- * Should we try to make our HTML output well-formed XML? If set to false,
- * output will be a few bytes shorter, and the HTML will arguably be more
- * readable. If set to true, life will be much easier for the authors of
- * screen-scraping bots, and the HTML will arguably be more readable.
- *
- * Setting this to false may omit quotation marks on some attributes, omit
- * slashes from some self-closing tags, omit some ending tags, etc., where
- * permitted by HTML5. Setting it to true will not guarantee that all pages
- * will be well-formed, although non-well-formed pages should be rare and it's
- * a bug if you find one. Conversely, setting it to false doesn't mean that
- * all XML-y constructs will be omitted, just that they might be.
- *
- * Because of compatibility with screen-scraping bots, and because it's
- * controversial, this is currently left to true by default.
- */
-$wgWellFormedXml = true;
-
-/**
* Permit other namespaces in addition to the w3.org default.
*
* Use the prefix for the key and the namespace for the value.
diff --git a/includes/Html.php b/includes/Html.php
index 62ae0b8..c49cca4 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -38,8 +38,6 @@
*
* $wgMimeType: If this is set to an xml MIME type then output should be
* valid XHTML5.
- * $wgWellFormedXml: If this is set to true, then all output should be
- * well-formed XML (quotes on attributes, self-closing tags, etc.).
*
* This class is meant to be confined to utility functions that are called from
* trusted code paths. It does not do enforcement of policy like not allowing
@@ -199,8 +197,7 @@
* This is quite similar to Xml::tags(), but it implements some useful
* HTML-specific logic. For instance, there is no $allowShortTag
* parameter: the closing tag is magically omitted if $element has an
empty
-* content model. If $wgWellFormedXml is false, then a few bytes will
be
-* shaved off the HTML output as well.
+* content model.
*
* @param string $element The element's name, e.g., 'a'
* @param array $attribs Associative array of attributes, e.g., array(
@@ -211,14 +208,10 @@
* @return string Raw HTML
*/
public static function rawElement( $element, $attribs = array(),
$contents = '' ) {
- global $wgWellFormedXml;
$start = self::openElement( $element, $attribs );
if ( in_array( $element, self::$voidElements ) ) {
- if ( $wgWellFormedXml ) {
- // Silly XML.
- return substr( $start, 0, -1 ) . ' />';
- }
- return $start;
+ // Silly XML.
+ return substr( $start, 0, -1 ) . '/>';
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Localisation to the links, add the link to Localisation ...
Zppix has uploaded a new change for review. https://gerrit.wikimedia.org/r/304153 Change subject: Add Localisation to the links, add the link to Localisation in Languages/Language.php .. Add Localisation to the links, add the link to Localisation in Languages/Language.php Change-Id: I996d09f38a007195ba9734e13f10611c4ca1242c --- M index.php M languages/Language.php 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/53/304153/1 diff --git a/index.php b/index.php index 2423092..743f77b 100644 --- a/index.php +++ b/index.php @@ -8,7 +8,7 @@ * See the README, INSTALL, and UPGRADE files for basic setup instructions * and pointers to the online documentation. * - * https://www.mediawiki.org/ + * https://www.mediawiki.org/wiki/Special:MyLanguage/MediaWiki * * -- * diff --git a/languages/Language.php b/languages/Language.php index d96710a..efe5dc9 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -1,6 +1,6 @@ https://www.mediawiki.org/wiki/Special:MyLanguage/Localisation for more information. * * 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 -- To view, visit https://gerrit.wikimedia.org/r/304153 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I996d09f38a007195ba9734e13f10611c4ca1242c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Zppix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Fix scripts/gen-autoload.php
jenkins-bot has submitted this change and it was merged.
Change subject: Fix scripts/gen-autoload.php
..
Fix scripts/gen-autoload.php
Change-Id: Iebc6ec5cfe1308cddc828165c8b45e032de7ac57
---
M scripts/gen-autoload.php
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/scripts/gen-autoload.php b/scripts/gen-autoload.php
index fde52a0..4adc7d0 100644
--- a/scripts/gen-autoload.php
+++ b/scripts/gen-autoload.php
@@ -5,7 +5,7 @@
function main() {
$base = dirname( __DIR__ );
$generator = new AutoloadGenerator( $base );
- foreach ( array( 'includes', 'maintenance' ) as $dir ) {
+ foreach ( array( 'includes', 'maintenance', 'profiles' ) as $dir ) {
$generator->readDir( $base . '/' . $dir );
}
foreach ( glob( $base . '/*.php' ) as $file ) {
@@ -13,7 +13,8 @@
}
$generator->readFile( dirname( __DIR__ ) . '/tests/unit/TestUtils.php'
);
- $generator->generateAutoload( basename( __DIR__ ) . '/' . basename(
__FILE__ ) );
+ $data = $generator->getAutoload( basename( __DIR__ ) . '/' . basename(
__FILE__ ) );
+ file_put_contents( $generator->getTargetFileinfo()['filename'], $data );
echo "Done.\n\n";
}
--
To view, visit https://gerrit.wikimedia.org/r/303534
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iebc6ec5cfe1308cddc828165c8b45e032de7ac57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse
Gerrit-Reviewer: Cindy-the-browser-test-bot
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Gehel
Gerrit-Reviewer: Manybubbles
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix comment about how to use AutoloadGenerator
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304152
Change subject: Fix comment about how to use AutoloadGenerator
..
Fix comment about how to use AutoloadGenerator
Change-Id: If15e9396b640536896406009233e91c0b5e2bb0f
---
M includes/utils/AutoloadGenerator.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/52/304152/1
diff --git a/includes/utils/AutoloadGenerator.php
b/includes/utils/AutoloadGenerator.php
index 2ebc9ed..395ce37 100644
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -11,7 +11,7 @@
* $gen = new AutoloadGenerator( __DIR__ );
* $gen->readDir( __DIR__ . '/includes' );
* $gen->readFile( __DIR__ . '/foo.php' )
- * $gen->generateAutoload();
+ * $gen->getAutoload();
*/
class AutoloadGenerator {
const FILETYPE_JSON = 'json';
--
To view, visit https://gerrit.wikimedia.org/r/304152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If15e9396b640536896406009233e91c0b5e2bb0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make PurgeChangedFiles actually purge old versions too
jenkins-bot has submitted this change and it was merged.
Change subject: Make PurgeChangedFiles actually purge old versions too
..
Make PurgeChangedFiles actually purge old versions too
Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
---
M maintenance/purgeChangedFiles.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
Zppix: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/maintenance/purgeChangedFiles.php
b/maintenance/purgeChangedFiles.php
index 5b035e1..70a26cb 100644
--- a/maintenance/purgeChangedFiles.php
+++ b/maintenance/purgeChangedFiles.php
@@ -164,8 +164,12 @@
continue;
}
- // Purge current version and any versions in
oldimage table
+ // Purge current version and its thumbnails
$file->purgeCache();
+ // Purge the old versions and their thumbnails
+ foreach ( $file->getHistory() as $oldFile ) {
+ $oldFile->purgeCache();
+ }
if ( $logType === 'delete' ) {
// If there is an orphaned storage
file... delete it
--
To view, visit https://gerrit.wikimedia.org/r/304137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Zppix
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...Kartographer[master]: Introduce width=full
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce width=full
..
Introduce width=full
Bug: T142114
Change-Id: Ief9d40c5872a578e9f5e470f689465e931392fd6
---
M includes/Tag/MapFrame.php
M tests/parserTests.txt
2 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Tag/MapFrame.php b/includes/Tag/MapFrame.php
index eef1c08..c65bfbe 100644
--- a/includes/Tag/MapFrame.php
+++ b/includes/Tag/MapFrame.php
@@ -20,7 +20,7 @@
protected function parseArgs() {
parent::parseArgs();
// @todo: should these have defaults?
- $this->width = $this->getText( 'width', false,
'/^(\d+|([1-9]\d?|100)%)$/' );
+ $this->width = $this->getText( 'width', false,
'/^(\d+|([1-9]\d?|100)%|full)$/' );
$this->height = $this->getInt( 'height' );
$defaultAlign = $this->getLanguage()->isRTL() ? 'left' :
'right';
$this->align = $this->getText( 'align', $defaultAlign,
'/^(left|center|right)$/' );
@@ -83,6 +83,9 @@
if ( preg_match( '/^\d+%$/', $width ) && $width
!= '100%' ) {
$width = '300px'; // @todo: deprecate
old syntax completely
}
+ if ( $width == 'full' ) {
+ $width = '100%';
+ }
$attrs = [
'class' =>
'mw-kartographer-interactive',
'mw-data' => 'interface',
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 3d50cb7..0225f3e 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -115,11 +115,15 @@
+
+
!! result
+
+
!! end
--
To view, visit https://gerrit.wikimedia.org/r/304151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief9d40c5872a578e9f5e470f689465e931392fd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: Yurik
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fixups to sitelinkgroupview.js
jenkins-bot has submitted this change and it was merged.
Change subject: Fixups to sitelinkgroupview.js
..
Fixups to sitelinkgroupview.js
Change-Id: Ib6c2a4a8d9dd4212ce7b5a60c19eb173218d3055
---
M view/resources/jquery/wikibase/jquery.wikibase.sitelinkgroupview.js
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkgroupview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkgroupview.js
index 491cc32..e9c63d9 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkgroupview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -25,7 +25,7 @@
* @extends jQuery.ui.EditableTemplatedWidget
*
* @option {string} groupName
- * @option {wikibase.datamodel.SiteLink[]} value A list of SiteLinks
+ * @option {wikibase.datamodel.SiteLinkSet} value
* @option {Function} getSiteLinkListView
*
* @option {string} [helpMessage]
@@ -187,14 +187,15 @@
},
/**
-* @param {*} value
-* @return {Object}
+* @param {wb.datamodel.SiteLinkSet|null} value
+* @throws {Error}
+* @return {wb.datamodel.SiteLinkSet}
*/
_checkValue: function( value ) {
if ( !value ) {
value = new wb.datamodel.SiteLinkSet( [] );
} else if ( !( value instanceof wb.datamodel.SiteLinkSet ) ) {
- throw new Error();
+ throw new Error( 'value must be a SiteLinkSet or null'
);
}
return value;
@@ -260,6 +261,7 @@
_getSiteLinksArray: function() {
var res = [];
+ // FIXME: Replace with Set.toArray (requires DataModel
JavaScript 3.0).
this.options.value.each( function( siteId, siteLink ) {
res.push( siteLink );
} );
--
To view, visit https://gerrit.wikimedia.org/r/302443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6c2a4a8d9dd4212ce7b5a60c19eb173218d3055
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Introduce grunt deploy
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce grunt deploy
..
Introduce grunt deploy
Bug: T137623
Change-Id: Icd62f69f06ea4cff9ecbc769905373fac2017a4e
---
M Gruntfile.js
M README.md
M package.json
3 files changed, 102 insertions(+), 43 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index 4ab7489..d9fc11c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,21 +1,9 @@
/* jshint node:true */
module.exports = function( grunt ) {
'use strict';
- grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-contrib-qunit' );
- grunt.loadNpmTasks( 'grunt-jsonlint' );
- grunt.loadNpmTasks( 'grunt-jscs' );
- grunt.loadNpmTasks( 'grunt-usemin' );
- grunt.loadNpmTasks( 'grunt-filerev' );
- grunt.loadNpmTasks( 'grunt-contrib-clean' );
- grunt.loadNpmTasks( 'grunt-contrib-concat' );
- grunt.loadNpmTasks( 'grunt-contrib-uglify' );
- grunt.loadNpmTasks( 'grunt-contrib-copy' );
- grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
- grunt.loadNpmTasks( 'grunt-contrib-htmlmin' );
-
+ require( 'load-grunt-tasks' )( grunt );
var pkg = grunt.file.readJSON( 'package.json' );
+ var dist = 'dist';
grunt.initConfig( {
pkg: pkg,
@@ -45,13 +33,18 @@
},
clean: {
release: [
- 'dist'
+ dist
+ ],
+ deploy: [
+ dist + '/*', dist + '!.git/**'
]
},
useminPrepare: {
- html: ['index.html', 'embed.html'],
+ html: [
+ 'index.html', 'embed.html'
+ ],
options: {
- dest: 'dist'
+ dest: dist
}
},
concat: {},
@@ -59,13 +52,13 @@
copy: {
release: {
files: [
- {//bootstrap icons
+ {// bootstrap icons
expand: true,
flatten: true,
src: [
'**/*.{eot,ttf,woff,woff2}'
],
- dest: 'dist/fonts/',
+ dest: dist + '/fonts/',
filter: 'isFile'
},
{// uls images
@@ -74,7 +67,7 @@
src: [
'**/jquery.uls/images/*.{png,jpg,svg}'
],
- dest: 'dist/images/',
+ dest: dist + '/images/',
filter: 'isFile'
},
{// leaflet fullscreen images
@@ -83,17 +76,17 @@
src: [
'**/leaflet-fullscreen/**/*.png'
],
- dest: 'dist/css/',
+ dest: dist + '/css/',
filter: 'isFile'
},
{
expand: true,
cwd: './',
src: [
-
'i18n/**', 'vendor/jquery.uls/**', '*.html', 'logo.svg',
-
'robots.txt'
+
'i18n/**', 'vendor/jquery.uls/**', '*.html',
+
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.14]: Make PurgeChangedFiles actually purge old versions too
jenkins-bot has submitted this change and it was merged.
Change subject: Make PurgeChangedFiles actually purge old versions too
..
Make PurgeChangedFiles actually purge old versions too
Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
---
M maintenance/purgeChangedFiles.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/purgeChangedFiles.php
b/maintenance/purgeChangedFiles.php
index 5b035e1..70a26cb 100644
--- a/maintenance/purgeChangedFiles.php
+++ b/maintenance/purgeChangedFiles.php
@@ -164,8 +164,12 @@
continue;
}
- // Purge current version and any versions in
oldimage table
+ // Purge current version and its thumbnails
$file->purgeCache();
+ // Purge the old versions and their thumbnails
+ foreach ( $file->getHistory() as $oldFile ) {
+ $oldFile->purgeCache();
+ }
if ( $logType === 'delete' ) {
// If there is an orphaned storage
file... delete it
--
To view, visit https://gerrit.wikimedia.org/r/304147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.14
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: WmfFramework-ize some HTTP request functions
jenkins-bot has submitted this change and it was merged.
Change subject: WmfFramework-ize some HTTP request functions
..
WmfFramework-ize some HTTP request functions
The gateway shouldn't be responsible for handling request data. Move it into
statics for now, but eventually we should have a helper to manage the request.
Bug: T131798
Bug: T131275
Change-Id: Ic539dee91fa0f09985cbedf9655e5ed8099d150b
---
M amazon_gateway/amazon.adapter.php
M extras/banner_history/BannerHistoryLogIdProcessor.php
M extras/custom_filters/custom_filters.body.php
M extras/custom_filters/filters/minfraud/minfraud.body.php
M gateway_common/DonationData.php
M gateway_common/DonorLanguage.php
M gateway_common/WmfFramework.drupal.php
M gateway_common/WmfFramework.mediawiki.php
M gateway_common/gateway.adapter.php
M gateway_forms/Mustache.php
M globalcollect_gateway/globalcollect.adapter.php
11 files changed, 97 insertions(+), 47 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/amazon_gateway/amazon.adapter.php
b/amazon_gateway/amazon.adapter.php
index 70046c3..25eb149 100644
--- a/amazon_gateway/amazon.adapter.php
+++ b/amazon_gateway/amazon.adapter.php
@@ -301,9 +301,9 @@
'seller_note' => WmfFramework::formatMessage(
'donate_interface-donation-description' ),
'seller_order_reference_id' => $this->getData_Staged(
'order_id' ),
) );
- $orderRefs = $this->request->getSessionData( 'order_refs' );
+ $orderRefs = WmfFramework::getSessionValue( 'order_refs' );
$orderRefs[$orderReferenceId] = true;
- $this->request->setSessionData( 'order_refs', $orderRefs );
+ WmfFramework::setSessionValue( 'order_refs', $orderRefs );
}
protected function authorizeOnOrderReference() {
@@ -355,9 +355,9 @@
'seller_note' => WmfFramework::formatMessage(
'donate_interface-monthly-donation-description' ),
'seller_billing_agreement_id' => $this->getData_Staged(
'order_id' ),
) );
- $billingAgreements = $this->request->getSessionData(
'billing_agreements' );
+ $billingAgreements = WmfFramework::getSessionValue(
'billing_agreements' );
$billingAgreements[$billingAgreementId] = true;
- $this->request->setSessionData( 'billing_agreements',
$billingAgreements );
+ WmfFramework::setSessionValue( 'billing_agreements',
$billingAgreements );
}
protected function authorizeOnBillingAgreement() {
diff --git a/extras/banner_history/BannerHistoryLogIdProcessor.php
b/extras/banner_history/BannerHistoryLogIdProcessor.php
index 20fa9a5..592639f 100644
--- a/extras/banner_history/BannerHistoryLogIdProcessor.php
+++ b/extras/banner_history/BannerHistoryLogIdProcessor.php
@@ -48,8 +48,8 @@
'BannerHistoryLogIdProcessor::queueAssociationOfIds():
will ' .
'push to banner-history queue if required info is
available.' );
- $bannerHistoryId = $this->gatewayAdapter->getRequest()
- ->getText( self::BANNER_HISTORY_LOG_ID_PARAM );
+ $bannerHistoryId = WmfFramework::getRequestValue(
+ self::BANNER_HISTORY_LOG_ID_PARAM, null );
// Campaigns may not have banner history enabled. For now, at
least,
// bow out silently if no banner history ID was sent.
diff --git a/extras/custom_filters/custom_filters.body.php
b/extras/custom_filters/custom_filters.body.php
index a4d5526..9e08424 100644
--- a/extras/custom_filters/custom_filters.body.php
+++ b/extras/custom_filters/custom_filters.body.php
@@ -38,7 +38,7 @@
// load user action ranges and risk score
$this->action_ranges = $this->gateway_adapter->getGlobal(
'CustomFiltersActionRanges' );
- $this->risk_score =
$this->gateway_adapter->getRequest()->getSessionData( 'risk_scores' );
+ $this->risk_score = WmfFramework::getSessionValue(
'risk_scores' );
if ( !$this->risk_score ) {
$this->risk_score = array();
} else {
@@ -150,7 +150,7 @@
}
// Always keep the stored scores up to date
- $this->gateway_adapter->getRequest()->setSessionData(
'risk_scores', $this->risk_score );
+ WmfFramework::setSessionValue( 'risk_scores', $this->risk_score
);
return TRUE;
}
@@ -188,7 +188,7 @@
*/
public static function determineStoredAction( GatewayType
$gateway_adapter ) {
if (
- !$gateway_adapter->getRequest()->getSessionData(
'risk_scores' )
+ !WmfFramework::getSessionValue( 'risk_sc
[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Introduce width=full
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304151
Change subject: Introduce width=full
..
Introduce width=full
Bug: T142114
Change-Id: Ief9d40c5872a578e9f5e470f689465e931392fd6
---
M includes/Tag/MapFrame.php
M tests/parserTests.txt
2 files changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/51/304151/1
diff --git a/includes/Tag/MapFrame.php b/includes/Tag/MapFrame.php
index eef1c08..c65bfbe 100644
--- a/includes/Tag/MapFrame.php
+++ b/includes/Tag/MapFrame.php
@@ -20,7 +20,7 @@
protected function parseArgs() {
parent::parseArgs();
// @todo: should these have defaults?
- $this->width = $this->getText( 'width', false,
'/^(\d+|([1-9]\d?|100)%)$/' );
+ $this->width = $this->getText( 'width', false,
'/^(\d+|([1-9]\d?|100)%|full)$/' );
$this->height = $this->getInt( 'height' );
$defaultAlign = $this->getLanguage()->isRTL() ? 'left' :
'right';
$this->align = $this->getText( 'align', $defaultAlign,
'/^(left|center|right)$/' );
@@ -83,6 +83,9 @@
if ( preg_match( '/^\d+%$/', $width ) && $width
!= '100%' ) {
$width = '300px'; // @todo: deprecate
old syntax completely
}
+ if ( $width == 'full' ) {
+ $width = '100%';
+ }
$attrs = [
'class' =>
'mw-kartographer-interactive',
'mw-data' => 'interface',
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 3d50cb7..0225f3e 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -115,11 +115,15 @@
+
+
!! result
+
+
!! end
--
To view, visit https://gerrit.wikimedia.org/r/304151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief9d40c5872a578e9f5e470f689465e931392fd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: remove a couple stub methods
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: remove a couple stub methods
..
Hygiene: remove a couple stub methods
Change-Id: I40dba95188d3fde799fe1d2836dfbc8937a68af1
---
M app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
2 files changed, 2 insertions(+), 13 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
index ac84953..01eef87 100644
--- a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
+++ b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
@@ -278,11 +278,8 @@
unregisterReceiver(downloadReceiver);
}
-private class GalleryPageChangeListener implements
ViewPager.OnPageChangeListener {
+private class GalleryPageChangeListener extends
ViewPager.SimpleOnPageChangeListener {
private int currentPosition = -1;
-@Override
-public void onPageScrolled(int position, float positionOffset, int
positionOffsetPixels) {
-}
@Override
public void onPageSelected(int position) {
// the pager has settled on a new position
diff --git
a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
index d98afab..5a1972c 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
@@ -89,18 +89,10 @@
pager = (ViewPager) rootView.findViewById(R.id.pager);
pager.setAdapter(pagerAdapter);
-pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-@Override
-public void onPageScrolled(int position, float positionOffset, int
positionOffsetPixels) {
-}
-
+pager.addOnPageChangeListener(new
ViewPager.SimpleOnPageChangeListener() {
@Override
public void onPageSelected(int position) {
getActivity().supportInvalidateOptionsMenu();
-}
-
-@Override
-public void onPageScrollStateChanged(int state) {
}
});
--
To view, visit https://gerrit.wikimedia.org/r/304039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40dba95188d3fde799fe1d2836dfbc8937a68af1
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Dbrant
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[wmf/1.28.0-wmf.13]: Make PurgeChangedFiles actually purge old versions too
jenkins-bot has submitted this change and it was merged.
Change subject: Make PurgeChangedFiles actually purge old versions too
..
Make PurgeChangedFiles actually purge old versions too
Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
---
M maintenance/purgeChangedFiles.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/purgeChangedFiles.php
b/maintenance/purgeChangedFiles.php
index 5b035e1..70a26cb 100644
--- a/maintenance/purgeChangedFiles.php
+++ b/maintenance/purgeChangedFiles.php
@@ -164,8 +164,12 @@
continue;
}
- // Purge current version and any versions in
oldimage table
+ // Purge current version and its thumbnails
$file->purgeCache();
+ // Purge the old versions and their thumbnails
+ foreach ( $file->getHistory() as $oldFile ) {
+ $oldFile->purgeCache();
+ }
if ( $logType === 'delete' ) {
// If there is an orphaned storage
file... delete it
--
To view, visit https://gerrit.wikimedia.org/r/304138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.13
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VipsScaler[master]: Remove default VipsOptions, they're at best, broken
jenkins-bot has submitted this change and it was merged.
Change subject: Remove default VipsOptions, they're at best, broken
..
Remove default VipsOptions, they're at best, broken
Change-Id: I6cbacf8946cc7e436ac2ce581904a7ac51a46fec
---
M extension.json
1 file changed, 1 insertion(+), 27 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index f4f224d..f40904a 100644
--- a/extension.json
+++ b/extension.json
@@ -77,33 +77,7 @@
},
"config": {
"VipsCommand": "vips",
- "VipsOptions": [
- {
- "conditions": {
- "mimeType": "image/jpeg",
- "minShrinkFactor": 1.2
- },
- "sharpen": {
- "radius": 0,
- "sigma": 0.8
- },
- "_merge_strategy": "array_plus_2d"
- },
- {
- "conditions": {
- "mimeType": "image/jpeg"
- },
- "sharpen": false,
- "bilinear": true,
- "_merge_strategy": "array_plus_2d"
- },
- {
- "conditions": {
- "mimeType": "image/png"
- },
- "_merge_strategy": "array_plus_2d"
- }
- ],
+ "VipsOptions": [],
"VipsThumbnailerHost": null,
"VipsTestExpiry": 3600
},
--
To view, visit https://gerrit.wikimedia.org/r/304140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6cbacf8946cc7e436ac2ce581904a7ac51a46fec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VipsScaler
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Fix TextState#getChangeTransaction bug
jenkins-bot has submitted this change and it was merged.
Change subject: Fix TextState#getChangeTransaction bug
..
Fix TextState#getChangeTransaction bug
Also document the algorithm more clearly
Bug: T141573
Change-Id: I3cfca36c289a6936810665233547d37ef504905f
---
M src/ce/ve.ce.TextState.js
M tests/ce/ve.ce.TextState.test.js
2 files changed, 52 insertions(+), 11 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/ve.ce.TextState.js b/src/ce/ve.ce.TextState.js
index 1663f74..5aa464b 100644
--- a/src/ce/ve.ce.TextState.js
+++ b/src/ce/ve.ce.TextState.js
@@ -213,7 +213,11 @@
// During typical typing, there is a single changed chunk with matching
start/end chars.
textStart = 0;
textEnd = 0;
- if ( change.start < Math.min( oldChunks.length, newChunks.length ) ) {
+ if ( change.start + change.end < Math.min( oldChunks.length,
newChunks.length ) ) {
+ // Both oldChunks and newChunks include a changed chunk.
Therefore the first changed
+ // chunk of oldChunks and newChunks is respectively oldChunks[
change.start ] and
+ // newChunks[ change.start ] . If they have matching
annotations, then matching
+ // characters at their start are also part of the unchanged
start region.
if ( oldChunks[ change.start ].hasEqualElements( newChunks[
change.start ] ) ) {
oldChunk = oldChunks[ change.start ];
newChunk = newChunks[ change.start ];
@@ -226,19 +230,22 @@
textStart = i;
}
- if (
- change.end < Math.min( oldChunks.length,
newChunks.length ) &&
- oldChunks[ oldChunks.length - 1 - change.end
].hasEqualElements(
+ // Likewise, the last changed chunk of oldChunks and newChunks
is respectively
+ // oldChunks[ oldChunks.length - 1 - change.end ] and
+ // newChunks[ newChunks.length - 1 - change.end ] , and if they
have matching
+ // annotations, then matching characters at their end
potentially form part of
+ // the unchanged end region.
+ if ( oldChunks[ oldChunks.length - 1 - change.end
].hasEqualElements(
newChunks[ newChunks.length - 1 - change.end ]
- )
- ) {
+ ) ) {
oldChunk = oldChunks[ oldChunks.length - 1 - change.end
];
newChunk = newChunks[ newChunks.length - 1 - change.end
];
- // For oldChunks/newChunks/both, it's possible that
only one chunk
- // changed, in which case textStart has already eaten
into that chunk;
- // so take care not to overlap it. (For example, for
'ana'->'anna',
- // textStart will be 2 so we want to limit textEnd to
1, else the 'n'
- // of 'ana' will be counted twice).
+ // However, if only one chunk has changed in
oldChunks/newChunks, then
+ // oldChunk/newChunk is also the *first* changed chunk,
in which case
+ // textStart has already eaten into that chunk; so take
care not to
+ // overlap it. (For example, for 'ana'->'anna',
textStart will be 2 so
+ // we want to limit textEnd to 1, else the 'n' of 'ana'
will be counted
+ // twice).
iLen = Math.min(
oldChunk.text.length -
( change.start + change.end ===
oldChunks.length - 1 ? textStart : 0 ),
diff --git a/tests/ce/ve.ce.TextState.test.js b/tests/ce/ve.ce.TextState.test.js
index 593c987..57e3342 100644
--- a/tests/ce/ve.ce.TextState.test.js
+++ b/tests/ce/ve.ce.TextState.test.js
@@ -317,6 +317,40 @@
},
{ type: 'retain', length: 3 }
]
+ },
+ {
+ msg: 'Insert new chunk whose annotations match end
chunk\'s',
+ oldRawHtml: 'xyz',
+ oldInnerHtml: 'xyz',
+ newInnerHtml: 'xywyz',
+ operations: [
+ { type: 'retain', length: 2 },
+ {
+ type: 'replace',
+ remove: [],
+ insert: [ 'y', [ 'w', [ 0 ] ] ],
+ insertedDataOffset: 0,
+ insertedDataLength: 2
+ },
+ { type: 'retain', length: 5
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Invalidate global abuse filter rules from cache when a previ...
jenkins-bot has submitted this change and it was merged.
Change subject: Invalidate global abuse filter rules from cache when a
previously global filter is edited
..
Invalidate global abuse filter rules from cache when a previously global filter
is edited
Bug: T142566
Change-Id: I3604b7eae21d5c50da4cbafe4abb15f4427eef15
---
M Views/AbuseFilterViewEdit.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php
index 7cee9c7..6f6116a 100644
--- a/Views/AbuseFilterViewEdit.php
+++ b/Views/AbuseFilterViewEdit.php
@@ -74,6 +74,8 @@
}
$origActions = $newRow->mOriginalActions;
+ $wasGlobal = (bool)$newRow->mOriginalRow->af_global;
+
unset( $newRow->mOriginalRow );
unset( $newRow->mOriginalActions );
@@ -234,8 +236,8 @@
$dbw->endAtomic( __METHOD__ );
- // Reset Memcache if this was a global rule
- if ( $newRow['af_global'] ) {
+ // Invalidate cache if this was a global rule
+ if ( $wasGlobal || $newRow['af_global'] ) {
$group = 'default';
if ( isset( $newRow['af_group'] ) &&
$newRow['af_group'] != '' ) {
$group = $newRow['af_group'];
--
To view, visit https://gerrit.wikimedia.org/r/304040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3604b7eae21d5c50da4cbafe4abb15f4427eef15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Glaisher
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[wmf_deploy]: Merge branch 'master' into wmf_deploy
jenkins-bot has submitted this change and it was merged. Change subject: Merge branch 'master' into wmf_deploy .. Merge branch 'master' into wmf_deploy Change-Id: Id469d2ac159f9cbac9e970bd154c5e578b081297 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: AndyRussG: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/304130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id469d2ac159f9cbac9e970bd154c5e578b081297 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: AndyRussG Gerrit-Reviewer: AndyRussG Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Revert "Move mediawiki-core-phpcs off of nodepool"
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/304150 Change subject: Revert "Move mediawiki-core-phpcs off of nodepool" .. Revert "Move mediawiki-core-phpcs off of nodepool" This reverts commit d353f95ec906ddd637ce9328e9a42efe9743482c. Change-Id: Icb44706eece7f3b7ac8f48df53ad07529a49b81c --- M jjb/mediawiki.yaml M zuul/layout.yaml M zuul/parameter_functions.py 3 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/50/304150/1 diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 05021ca..5481ced 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -498,14 +498,15 @@ # Special job to run MW-CS against MediaWiki core. # Can't run it through composer because it'll timeout. - job: -name: 'mediawiki-core-phpcs' -node: contintLabsSlave && phpflavor-hhvm +name: 'mediawiki-core-phpcs-trusty' +node: ci-trusty-wikimedia concurrent: true logrotate: daysToKeep: 15 triggers: - zuul builders: + - castor-load - zuul-cloner: projects: > mediawiki/core @@ -514,3 +515,5 @@ - shell: | cd $WORKSPACE/src vendor/bin/phpcs -p -s +publishers: + - castor-save diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 30cfb7a..4ac3d0a 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -740,7 +740,7 @@ branch: (?!REL1_23|REL1_24|REL1_25|REL1_26|fundraising/REL.*) queue-name: mediawiki - - name: mediawiki-core-phpcs + - name: mediawiki-core-phpcs-trusty branch: (?!^REL1_23|^REL1_24|^REL1_25|^REL1_26|^fundraising/REL) files: - '^.*\.(json|php|php5|phtml|inc|xml)$' @@ -1301,7 +1301,7 @@ - mediawiki-core-php55lint - composer-package-validate test: - - mediawiki-core-phpcs + - mediawiki-core-phpcs-trusty - mediawiki-core-jsduck - mediawiki-core-npm-node-4.3 - mediawiki-core-php53lint @@ -1321,7 +1321,7 @@ - mediawiki-core-npm-node-4.3 - mediawiki-core-php53lint - mediawiki-core-php55lint - - mediawiki-core-phpcs + - mediawiki-core-phpcs-trusty - mediawiki-phpunit-hhvm-trusty - mediawiki-parsertests-hhvm-trusty - mediawiki-phpunit-hhvm-composer diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py index d9efae8..a597b98 100644 --- a/zuul/parameter_functions.py +++ b/zuul/parameter_functions.py @@ -18,7 +18,7 @@ params['DISPLAY'] = ':94' hhvm_jobs = ( -'mediawiki-core-phpcs', +'mediawiki-core-phpcs-trusty', 'mw-tools-codesniffer-mwcore-testrun', ) php5_jobs = ( -- To view, visit https://gerrit.wikimedia.org/r/304150 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb44706eece7f3b7ac8f48df53ad07529a49b81c Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Use main account for checking user existence
jenkins-bot has submitted this change and it was merged.
Change subject: Use main account for checking user existence
..
Use main account for checking user existence
When running a bot using a Special:BotPassword username but no provided
password, use the main account username to check that the user exists
before prompting for the password.
For BotPasswords see https://www.mediawiki.org/wiki/Manual:Bot_passwords
Bug: T142623
Change-Id: I2bf629b3f6b21f375cacdabc2518c7ac0cf3cd49
---
M pywikibot/login.py
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
Dalba: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pywikibot/login.py b/pywikibot/login.py
index df1152c..20f38f7 100644
--- a/pywikibot/login.py
+++ b/pywikibot/login.py
@@ -122,21 +122,24 @@
@raises NoUsername: Username doesnt exist in user list.
"""
+# convert any Special:BotPassword usernames to main account equivalent
+main_username = self.username.partition('@')[0]
+
try:
-data = self.site.allusers(start=self.username, total=1)
+data = self.site.allusers(start=main_username, total=1)
user = next(iter(data))
except pywikibot.data.api.APIError as e:
if e.code == 'readapidenied':
pywikibot.warning('Could not check user %s exists on %s'
- % (self.username, self.site))
+ % (main_username, self.site))
return
else:
raise
-if user['name'] != self.username:
+if user['name'] != main_username:
# Report the same error as server error code NotExists
raise NoUsername('Username \'%s\' does not exist on %s'
- % (self.username, self.site))
+ % (main_username, self.site))
def botAllowed(self):
"""
--
To view, visit https://gerrit.wikimedia.org/r/304060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2bf629b3f6b21f375cacdabc2518c7ac0cf3cd49
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil
Gerrit-Reviewer: Dalba
Gerrit-Reviewer: John Vandenberg
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[REL1_26]: Use ipb_id when updating expiry in Block::updateTimestamp()
jenkins-bot has submitted this change and it was merged. Change subject: Use ipb_id when updating expiry in Block::updateTimestamp() .. Use ipb_id when updating expiry in Block::updateTimestamp() If Block::purgeExpired() hasn't been called due to low traffic, already expired blocks might have their timestamps extended. Bug: T128695 Change-Id: I21e7dca57bda77a755b54d0e09f340c3f0e75bd6 --- M includes/Block.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Block.php b/includes/Block.php index c5a16fc..f91f4bd 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -843,7 +843,7 @@ 'ipb_expiry' => $dbw->timestamp( $this->mExpiry ), ), array( /* WHERE */ - 'ipb_address' => (string)$this->getTarget() + 'ipb_id' => $this->getId() ), __METHOD__ ); -- To view, visit https://gerrit.wikimedia.org/r/304114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I21e7dca57bda77a755b54d0e09f340c3f0e75bd6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_26 Gerrit-Owner: Chad Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_23]: Use ipb_id when updating expiry in Block::updateTimestamp()
jenkins-bot has submitted this change and it was merged. Change subject: Use ipb_id when updating expiry in Block::updateTimestamp() .. Use ipb_id when updating expiry in Block::updateTimestamp() If Block::purgeExpired() hasn't been called due to low traffic, already expired blocks might have their timestamps extended. Bug: T128695 Change-Id: I21e7dca57bda77a755b54d0e09f340c3f0e75bd6 --- M includes/Block.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Block.php b/includes/Block.php index a3d3691..c00d943 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -772,7 +772,7 @@ 'ipb_expiry' => $dbw->timestamp( $this->mExpiry ), ), array( /* WHERE */ - 'ipb_address' => (string)$this->getTarget() + 'ipb_id' => $this->getId() ), __METHOD__ ); -- To view, visit https://gerrit.wikimedia.org/r/304115 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I21e7dca57bda77a755b54d0e09f340c3f0e75bd6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_23 Gerrit-Owner: Chad Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Move mediawiki-core-phpcs off of nodepool
Legoktm has submitted this change and it was merged. Change subject: Move mediawiki-core-phpcs off of nodepool .. Move mediawiki-core-phpcs off of nodepool Change-Id: I8bfe038562466c623eb88712723b159c7829c457 --- M jjb/mediawiki.yaml M zuul/layout.yaml M zuul/parameter_functions.py 3 files changed, 6 insertions(+), 9 deletions(-) Approvals: Legoktm: Verified; Looks good to me, approved Zppix: Looks good to me, but someone else must approve diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 5481ced..05021ca 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -498,15 +498,14 @@ # Special job to run MW-CS against MediaWiki core. # Can't run it through composer because it'll timeout. - job: -name: 'mediawiki-core-phpcs-trusty' -node: ci-trusty-wikimedia +name: 'mediawiki-core-phpcs' +node: contintLabsSlave && phpflavor-hhvm concurrent: true logrotate: daysToKeep: 15 triggers: - zuul builders: - - castor-load - zuul-cloner: projects: > mediawiki/core @@ -515,5 +514,3 @@ - shell: | cd $WORKSPACE/src vendor/bin/phpcs -p -s -publishers: - - castor-save diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4ac3d0a..30cfb7a 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -740,7 +740,7 @@ branch: (?!REL1_23|REL1_24|REL1_25|REL1_26|fundraising/REL.*) queue-name: mediawiki - - name: mediawiki-core-phpcs-trusty + - name: mediawiki-core-phpcs branch: (?!^REL1_23|^REL1_24|^REL1_25|^REL1_26|^fundraising/REL) files: - '^.*\.(json|php|php5|phtml|inc|xml)$' @@ -1301,7 +1301,7 @@ - mediawiki-core-php55lint - composer-package-validate test: - - mediawiki-core-phpcs-trusty + - mediawiki-core-phpcs - mediawiki-core-jsduck - mediawiki-core-npm-node-4.3 - mediawiki-core-php53lint @@ -1321,7 +1321,7 @@ - mediawiki-core-npm-node-4.3 - mediawiki-core-php53lint - mediawiki-core-php55lint - - mediawiki-core-phpcs-trusty + - mediawiki-core-phpcs - mediawiki-phpunit-hhvm-trusty - mediawiki-parsertests-hhvm-trusty - mediawiki-phpunit-hhvm-composer diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py index a597b98..d9efae8 100644 --- a/zuul/parameter_functions.py +++ b/zuul/parameter_functions.py @@ -18,7 +18,7 @@ params['DISPLAY'] = ':94' hhvm_jobs = ( -'mediawiki-core-phpcs-trusty', +'mediawiki-core-phpcs', 'mw-tools-codesniffer-mwcore-testrun', ) php5_jobs = ( -- To view, visit https://gerrit.wikimedia.org/r/304149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8bfe038562466c623eb88712723b159c7829c457 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Zppix Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Move mediawiki-core-phpcs off of nodepool
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/304149 Change subject: Move mediawiki-core-phpcs off of nodepool .. Move mediawiki-core-phpcs off of nodepool Change-Id: I8bfe038562466c623eb88712723b159c7829c457 --- M jjb/mediawiki.yaml M zuul/layout.yaml M zuul/parameter_functions.py 3 files changed, 6 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/49/304149/1 diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 5481ced..05021ca 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -498,15 +498,14 @@ # Special job to run MW-CS against MediaWiki core. # Can't run it through composer because it'll timeout. - job: -name: 'mediawiki-core-phpcs-trusty' -node: ci-trusty-wikimedia +name: 'mediawiki-core-phpcs' +node: contintLabsSlave && phpflavor-hhvm concurrent: true logrotate: daysToKeep: 15 triggers: - zuul builders: - - castor-load - zuul-cloner: projects: > mediawiki/core @@ -515,5 +514,3 @@ - shell: | cd $WORKSPACE/src vendor/bin/phpcs -p -s -publishers: - - castor-save diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4ac3d0a..30cfb7a 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -740,7 +740,7 @@ branch: (?!REL1_23|REL1_24|REL1_25|REL1_26|fundraising/REL.*) queue-name: mediawiki - - name: mediawiki-core-phpcs-trusty + - name: mediawiki-core-phpcs branch: (?!^REL1_23|^REL1_24|^REL1_25|^REL1_26|^fundraising/REL) files: - '^.*\.(json|php|php5|phtml|inc|xml)$' @@ -1301,7 +1301,7 @@ - mediawiki-core-php55lint - composer-package-validate test: - - mediawiki-core-phpcs-trusty + - mediawiki-core-phpcs - mediawiki-core-jsduck - mediawiki-core-npm-node-4.3 - mediawiki-core-php53lint @@ -1321,7 +1321,7 @@ - mediawiki-core-npm-node-4.3 - mediawiki-core-php53lint - mediawiki-core-php55lint - - mediawiki-core-phpcs-trusty + - mediawiki-core-phpcs - mediawiki-phpunit-hhvm-trusty - mediawiki-parsertests-hhvm-trusty - mediawiki-phpunit-hhvm-composer diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py index a597b98..d9efae8 100644 --- a/zuul/parameter_functions.py +++ b/zuul/parameter_functions.py @@ -18,7 +18,7 @@ params['DISPLAY'] = ':94' hhvm_jobs = ( -'mediawiki-core-phpcs-trusty', +'mediawiki-core-phpcs', 'mw-tools-codesniffer-mwcore-testrun', ) php5_jobs = ( -- To view, visit https://gerrit.wikimedia.org/r/304149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bfe038562466c623eb88712723b159c7829c457 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: FieldLayout: Use saner line-height for errors/notices
jenkins-bot has submitted this change and it was merged.
Change subject: FieldLayout: Use saner line-height for errors/notices
..
FieldLayout: Use saner line-height for errors/notices
The large line-height was meant to ensure some spacing at the top and
bottom of the text, but resulted in very spread out lines for
multiline messages. Make it smaller (we use 1.5em widely for various
labels and other text) and instead add some padding.
Bug: T142639
Change-Id: I50ca03aa473aba32fef02e070c0c9dd372082498
---
M src/themes/apex/layouts.less
M src/themes/mediawiki/layouts.less
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, but someone else must approve
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less
index 5a3af47..0dbd8b5 100644
--- a/src/themes/apex/layouts.less
+++ b/src/themes/apex/layouts.less
@@ -90,8 +90,8 @@
}
.oo-ui-labelWidget {
- padding: 0;
- line-height: 1.875em;
+ padding: 0.1em 0;
+ line-height: 1.5em;
vertical-align: middle;
}
}
diff --git a/src/themes/mediawiki/layouts.less
b/src/themes/mediawiki/layouts.less
index dc2f331..15ffe06 100644
--- a/src/themes/mediawiki/layouts.less
+++ b/src/themes/mediawiki/layouts.less
@@ -95,8 +95,8 @@
.oo-ui-labelWidget {
display: table-cell;
- padding: 0;
- line-height: 1.875;
+ padding: 0.1em 0;
+ line-height: 1.5;
vertical-align: middle;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/304124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I50ca03aa473aba32fef02e070c0c9dd372082498
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Isarra
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: VolkerE
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport[master]: Change order of events with Sanders DMCA
Odder has uploaded a new change for review. https://gerrit.wikimedia.org/r/304148 Change subject: Change order of events with Sanders DMCA .. Change order of events with Sanders DMCA This patch changes the text describing the order of events regarding the Bernie Sanders DMCA request. I filed my counter-notice first and only informed Ars Technica about it after a couple of hours; not the other way round. Change-Id: I71624eb6fb4b48f8c904cd504428822446acd0d5 --- M build/stories.html 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport refs/changes/48/304148/1 diff --git a/build/stories.html b/build/stories.html index a1e2296..bfe7def 100644 --- a/build/stories.html +++ b/build/stories.html @@ -103,7 +103,7 @@ Feel the BernJanuary 2016 -In January, we received a DMCA from the campaign of Bernie Sanders, a U.S. presidential primary candidate. They asked us to remove campaign logos from Wikimedia Commons. We cautioned them that the notice would be posted to Lumen, which could trigger a Streisand effect. They refused to withdraw the DMCA, so we removed the logos. The next day, Ars Technica wrote about the takedown, and we received a counter-notice from a Wikimedia user. We spoke with the Sanders campaign about the counter-notice, and were happy to hear they had decided to rescind their DMCA. The logos have been restored. +In January, we received a DMCA from the campaign of Bernie Sanders, a U.S. presidential primary candidate. They asked us to remove campaign logos from Wikimedia Commons. We cautioned them that the notice would be posted to Lumen, which could trigger a Streisand effect. They refused to withdraw the DMCA, so we removed the logos. The next day, we received a counter-notice from a Wikimedia user and Ars Technica wrote about the takedown. We spoke with the Sanders campaign about the counter-notice, and were happy to hear they had decided to rescind their DMCA. The logos have been restored. @@ -439,7 +439,7 @@ - + Text licensed under Creative Commons Attribution-ShareAlike 3.0 unported. -- To view, visit https://gerrit.wikimedia.org/r/304148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71624eb6fb4b48f8c904cd504428822446acd0d5 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport Gerrit-Branch: master Gerrit-Owner: Odder ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP] dnsrecursor: Rewrite code setting up lua hooks
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304146
Change subject: [WIP] dnsrecursor: Rewrite code setting up lua hooks
..
[WIP] dnsrecursor: Rewrite code setting up lua hooks
TODO: Basic idea has been tested, but this puppetisation needs testig
To:
* Not use separate files for our labs hooks, as PowerDNS only reads one file
- preventing a rather nasty gotcha where one lua hook file would define a
function and then get it overridden by the next.
* Handle NXDOMAINs/SOAs for metal names properly.
* Have all these files in the role module for labs dnsrecursors, rather than
the dnsrecursor module itself.
Bug: T139438
Change-Id: I1e4fae6ab33da9b229bc27868136783b8aedc010
---
R hieradata/common/role/labs/dnsrecursor/lua_hooks.yaml
D modules/dnsrecursor/files/labs-ip-alias-dump.py
M modules/dnsrecursor/manifests/init.pp
D modules/dnsrecursor/manifests/labsaliaser.pp
D modules/dnsrecursor/manifests/metalresolver.pp
D modules/dnsrecursor/templates/metaldns.lua.erb
D modules/dnsrecursor/templates/recursorhooks.lua.erb
A modules/role/files/labs/dnsrecursor-hooks-builder.py
M modules/role/manifests/labs/dnsrecursor.pp
9 files changed, 200 insertions(+), 278 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/304146/1
diff --git a/hieradata/common/dnsrecursor/labsaliaser.yaml
b/hieradata/common/role/labs/dnsrecursor/lua_hooks.yaml
similarity index 100%
rename from hieradata/common/dnsrecursor/labsaliaser.yaml
rename to hieradata/common/role/labs/dnsrecursor/lua_hooks.yaml
diff --git a/modules/dnsrecursor/files/labs-ip-alias-dump.py
b/modules/dnsrecursor/files/labs-ip-alias-dump.py
deleted file mode 100644
index 3f5a8f2..000
--- a/modules/dnsrecursor/files/labs-ip-alias-dump.py
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/python
-import os
-import sys
-import yaml
-import argparse
-import itertools
-
-from keystoneclient.session import Session as KeystoneSession
-from keystoneclient.auth.identity.v2 import Password as KeystonePassword
-from keystoneclient.client import Client as KeystoneClient
-
-from novaclient import client as novaclient
-
-argparser = argparse.ArgumentParser()
-argparser.add_argument(
-'--config-file',
-help='Path to config file',
-default='/etc/labs-dns-alias.yaml',
-type=argparse.FileType('r')
-)
-argparser.add_argument(
-'--check-changes-only',
-help='Exit with 0 if there are no changes and 1 if there are changes. Do
not write to file',
-action='store_true'
-)
-
-LUA_LINE_TEMPLATE = '{table}["{key}"] = "{value}" -- {comment}\n'
-
-args = argparser.parse_args()
-config = yaml.safe_load(args.config_file)
-
-auth = KeystonePassword(
-auth_url=config['nova_api_url'],
-username=config['username'],
-password=config['password'],
-tenant_name=config['admin_project_name']
-)
-keystoneClient = KeystoneClient(
-session=KeystoneSession(auth=auth), endpoint=config['nova_api_url'])
-
-projects = []
-for tenant in keystoneClient.tenants.list():
-projects.append(tenant.name)
-
-aliases = {}
-for project in projects:
-client = novaclient.Client(
-"1.1",
-config['username'],
-config['password'],
-project,
-config['nova_api_url']
-)
-
-for server in client.servers.list():
-serverAddresses = {}
-try:
-private = [
-str(ip['addr']) for ip in server.addresses['public']
-if ip['OS-EXT-IPS:type'] == 'fixed'
-]
-public = [
-str(ip['addr']) for ip in server.addresses['public']
-if ip['OS-EXT-IPS:type'] == 'floating'
-]
-if public:
-# Match all possible public IPs to all possible private ones
-# Technically there can be more than one floating IP and more
than one private IP
-# Although this is never practically the case...
-aliases[server.name] = list(itertools.product(public, private))
-except KeyError:
-# This can happen if a server doesn't (yet) have any addresses,
while it's being
-# constructed. In which case we simply harmlessly ignore it.
-pass
-
-output = 'aliasmapping = {}\n'
-# Sort to prevent flapping around due to random ordering
-for name in sorted(aliases.keys()):
-ips = aliases[name]
-for public, private in ips:
-output += LUA_LINE_TEMPLATE.format(
-table='aliasmapping',
-key=public,
-value=private,
-comment=name
-)
-
-output += """
-function postresolve (remoteip, domain, qtype, records, origrcode)
-for key,val in ipairs(records)
-do
-if (aliasmapping[val.content] and val.qtype == pdns.A) then
-val.content = aliasmapping[val.content]
-setvariable()
-end
-end
-return origrco
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.14]: Make PurgeChangedFiles actually purge old versions too
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304147
Change subject: Make PurgeChangedFiles actually purge old versions too
..
Make PurgeChangedFiles actually purge old versions too
Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
---
M maintenance/purgeChangedFiles.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/47/304147/1
diff --git a/maintenance/purgeChangedFiles.php
b/maintenance/purgeChangedFiles.php
index 5b035e1..70a26cb 100644
--- a/maintenance/purgeChangedFiles.php
+++ b/maintenance/purgeChangedFiles.php
@@ -164,8 +164,12 @@
continue;
}
- // Purge current version and any versions in
oldimage table
+ // Purge current version and its thumbnails
$file->purgeCache();
+ // Purge the old versions and their thumbnails
+ foreach ( $file->getHistory() as $oldFile ) {
+ $oldFile->purgeCache();
+ }
if ( $logType === 'delete' ) {
// If there is an orphaned storage
file... delete it
--
To view, visit https://gerrit.wikimedia.org/r/304147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.14
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Re-instate group1 wikis to 1.28.0-wmf.14
Reedy has submitted this change and it was merged.
Change subject: Re-instate group1 wikis to 1.28.0-wmf.14
..
Re-instate group1 wikis to 1.28.0-wmf.14
This reverts commit 6fb569d3375693120e4ba8ac3af3abd465cbad4d.
Change-Id: I539148c563f21c7c79cba84f3d81c52a733e7caf
---
M wikiversions.json
1 file changed, 594 insertions(+), 594 deletions(-)
Approvals:
Reedy: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikiversions.json b/wikiversions.json
index a99adac..89c5e85 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,749 +1,749 @@
{
"aawiki": "php-1.28.0-wmf.13",
-"aawikibooks": "php-1.28.0-wmf.13",
-"aawiktionary": "php-1.28.0-wmf.13",
+"aawikibooks": "php-1.28.0-wmf.14",
+"aawiktionary": "php-1.28.0-wmf.14",
"abwiki": "php-1.28.0-wmf.13",
-"abwiktionary": "php-1.28.0-wmf.13",
+"abwiktionary": "php-1.28.0-wmf.14",
"acewiki": "php-1.28.0-wmf.13",
-"advisorywiki": "php-1.28.0-wmf.13",
+"advisorywiki": "php-1.28.0-wmf.14",
"adywiki": "php-1.28.0-wmf.13",
"afwiki": "php-1.28.0-wmf.13",
-"afwikibooks": "php-1.28.0-wmf.13",
-"afwikiquote": "php-1.28.0-wmf.13",
-"afwiktionary": "php-1.28.0-wmf.13",
+"afwikibooks": "php-1.28.0-wmf.14",
+"afwikiquote": "php-1.28.0-wmf.14",
+"afwiktionary": "php-1.28.0-wmf.14",
"akwiki": "php-1.28.0-wmf.13",
-"akwikibooks": "php-1.28.0-wmf.13",
-"akwiktionary": "php-1.28.0-wmf.13",
+"akwikibooks": "php-1.28.0-wmf.14",
+"akwiktionary": "php-1.28.0-wmf.14",
"alswiki": "php-1.28.0-wmf.13",
-"alswikibooks": "php-1.28.0-wmf.13",
-"alswikiquote": "php-1.28.0-wmf.13",
-"alswiktionary": "php-1.28.0-wmf.13",
+"alswikibooks": "php-1.28.0-wmf.14",
+"alswikiquote": "php-1.28.0-wmf.14",
+"alswiktionary": "php-1.28.0-wmf.14",
"amwiki": "php-1.28.0-wmf.13",
-"amwikiquote": "php-1.28.0-wmf.13",
-"amwiktionary": "php-1.28.0-wmf.13",
+"amwikiquote": "php-1.28.0-wmf.14",
+"amwiktionary": "php-1.28.0-wmf.14",
"angwiki": "php-1.28.0-wmf.13",
-"angwikibooks": "php-1.28.0-wmf.13",
-"angwikiquote": "php-1.28.0-wmf.13",
-"angwikisource": "php-1.28.0-wmf.13",
-"angwiktionary": "php-1.28.0-wmf.13",
+"angwikibooks": "php-1.28.0-wmf.14",
+"angwikiquote": "php-1.28.0-wmf.14",
+"angwikisource": "php-1.28.0-wmf.14",
+"angwiktionary": "php-1.28.0-wmf.14",
"anwiki": "php-1.28.0-wmf.13",
-"anwiktionary": "php-1.28.0-wmf.13",
+"anwiktionary": "php-1.28.0-wmf.14",
"arbcom_dewiki": "php-1.28.0-wmf.13",
"arbcom_enwiki": "php-1.28.0-wmf.13",
"arbcom_fiwiki": "php-1.28.0-wmf.13",
"arbcom_nlwiki": "php-1.28.0-wmf.13",
"arcwiki": "php-1.28.0-wmf.13",
"arwiki": "php-1.28.0-wmf.13",
-"arwikibooks": "php-1.28.0-wmf.13",
-"arwikimedia": "php-1.28.0-wmf.13",
-"arwikinews": "php-1.28.0-wmf.13",
-"arwikiquote": "php-1.28.0-wmf.13",
-"arwikisource": "php-1.28.0-wmf.13",
-"arwikiversity": "php-1.28.0-wmf.13",
-"arwiktionary": "php-1.28.0-wmf.13",
+"arwikibooks": "php-1.28.0-wmf.14",
+"arwikimedia": "php-1.28.0-wmf.14",
+"arwikinews": "php-1.28.0-wmf.14",
+"arwikiquote": "php-1.28.0-wmf.14",
+"arwikisource": "php-1.28.0-wmf.14",
+"arwikiversity": "php-1.28.0-wmf.14",
+"arwiktionary": "php-1.28.0-wmf.14",
"arzwiki": "php-1.28.0-wmf.13",
"astwiki": "php-1.28.0-wmf.13",
-"astwikibooks": "php-1.28.0-wmf.13",
-"astwikiquote": "php-1.28.0-wmf.13",
-"astwiktionary": "php-1.28.0-wmf.13",
+"astwikibooks": "php-1.28.0-wmf.14",
+"astwikiquote": "php-1.28.0-wmf.14",
+"astwiktionary": "php-1.28.0-wmf.14",
"aswiki": "php-1.28.0-wmf.13",
-"aswikibooks": "php-1.28.0-wmf.13",
-"aswikisource": "php-1.28.0-wmf.13",
-"aswiktionary": "php-1.28.0-wmf.13",
-"auditcomwiki": "php-1.28.0-wmf.13",
+"aswikibooks": "php-1.28.0-wmf.14",
+"aswikisource": "php-1.28.0-wmf.14",
+"aswiktionary": "php-1.28.0-wmf.14",
+"auditcomwiki": "php-1.28.0-wmf.14",
"avwiki": "php-1.28.0-wmf.13",
-"avwiktionary": "php-1.28.0-wmf.13",
+"avwiktionary": "php-1.28.0-wmf.14",
"aywiki": "php-1.28.0-wmf.13",
-"aywikibooks": "php-1.28.0-wmf.13",
-"aywiktionary": "php-1.28.0-wmf.13",
+"aywikibooks": "php-1.28.0-wmf.14",
+"aywiktionary": "php-1.28.0-wmf.14",
"azbwiki": "php-1.28.0-wmf.13",
"azwiki": "php-1.28.0-wmf.13",
-"azwikibooks": "php-1.28.0-wmf.13",
-"azwikiquote": "php-1.28.0-wmf.13",
-"azwikisource": "php-1.28.0-wmf.13",
-"azwiktionary": "php-1.28.0-wmf.13",
+"azwikibooks": "php-1.28.0-wmf.14",
+"azwikiquote": "php-1.28.0-wmf.14",
+"azwikisource": "php-1.28.0-wmf.14",
+"azwiktionary": "php-1.28.0-wmf.14",
"barwiki": "php-1.28.0-wmf.13",
"bat_smgwiki": "php-1.28.0-wmf.13",
"bawiki": "php-1.28.0-wmf.13",
-"bawikibooks": "php-1
[MediaWiki-commits] [Gerrit] integration/config[master]: Revert "Temporarily move composer-hhvm/php5 jobs off of node...
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304145
Change subject: Revert "Temporarily move composer-hhvm/php5 jobs off of
nodepool"
..
Revert "Temporarily move composer-hhvm/php5 jobs off of nodepool"
This reverts commit 66856c5347f21791186056eb22dd8825de7bc8e3.
Change-Id: I85c101fe39dc98f65a6d069a4c621ecfb22bd1e6
---
M jjb/php.yaml
M zuul/layout.yaml
2 files changed, 42 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/45/304145/1
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 18e4fad..f9545ff 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -104,10 +104,11 @@
- 'composer-php53'
- 'composer-package-php53'
-# Runs "composer update" and "composer test"
+# Same as 'composer-{phpflavor}'. Runs "composer update" and "composer test"
+# but on disposable instances maintained by Nodepool.
- job-template:
-name: 'composer-{phpflavor}'
-node: contintLabsSlave && phpflavor-{phpflavor}
+name: 'composer-{phpflavor}-{image}'
+node: ci-{image}-wikimedia
defaults: use-remote-zuul-shallow-clone
concurrent: true
logrotate:
@@ -117,11 +118,14 @@
builders:
- assert-phpflavor:
phpflavor: '{phpflavor}'
+ - castor-load
- composer-validate:
dir: '.'
- composer-update:
dir: '.'
- composer-test
+publishers:
+ - castor-save
# Same as 'composer-package-{phpflavor}'. Runs "composer update" and "composer
# test" for libraries that are published as composer packages but on disposable
@@ -159,11 +163,4 @@
image: jessie
jobs:
- 'composer-package-{phpflavor}-{image}'
-
-- project:
-name: 'composer-flavored'
-phpflavor:
-- php55
-- hhvm
-jobs:
- - 'composer-{phpflavor}'
+ - 'composer-{phpflavor}-{image}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4ac3d0a..65e0e2e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -711,7 +711,7 @@
# Don't run tests on deployment branches where the tests have been removed.
# Covered by test_smashpig_deployment_branch_filters
- - name: ^composer-hhvm$
+ - name: ^composer-hhvm-trusty$
skip-if:
- project: ^wikimedia/fundraising/SmashPig$
branch: ^deployment$
@@ -913,8 +913,8 @@
- mwext-qunit-composer-jessie
- npm-node-4.3
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
- name: extension-unittests-composer-non-voting
check:
@@ -936,8 +936,8 @@
experimental:
- mwext-qunit-composer-jessie
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
- name: extension-unittests-generic
check:
@@ -967,8 +967,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
- name: extension-unittests-non-voting
check:
@@ -995,8 +995,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
# Template to run per-patch selenium browser test
# Intentionally not in gate because it's super slow
@@ -1067,8 +1067,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
# Similar to above, but uses a check/test pipeline
- name: mw-checks-test
@@ -1094,8 +1094,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
- name: composer-test
check:
@@ -1104,23 +1104,27 @@
- composer-validate
test:
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
gate-and-submit:
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
+experimental:
+ - composer-hhvm-jessie
- name: composer-test55
check:
- php55lint
- composer-validate
test:
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
gate-and-submit:
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
+experimental:
+ - composer-hhvm-jessie
- name: jshint
check:
@@ -1584,9 +1588,9 @@
- php55lint
- composer-validate
test:
- - composer-php55
+ - composer-php55-trus
[MediaWiki-commits] [Gerrit] operations/puppet[production]: remove mw2086 from conftool, dsh group
Dzahn has submitted this change and it was merged. Change subject: remove mw2086 from conftool, dsh group .. remove mw2086 from conftool, dsh group mw2086 was down and then came back up by itself, more details on the ticket. Due to this weird behavior we were asked to depool it and wait for investigation. Bug:T142661 Change-Id: I18fa7c89848f715fd22ad71188d49afe86feb437 --- M conftool-data/nodes/codfw.yaml M modules/scap/files/dsh/group/mediawiki-installation 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Dzahn: Verified; Looks good to me, approved diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml index f4ef6e7..e7f163e 100644 --- a/conftool-data/nodes/codfw.yaml +++ b/conftool-data/nodes/codfw.yaml @@ -156,7 +156,6 @@ mw2219.codfw.wmnet: [apache2] mw2220.codfw.wmnet: [apache2] imagescaler: - mw2086.codfw.wmnet: [apache2] mw2087.codfw.wmnet: [apache2] mw2089.codfw.wmnet: [apache2] mw2149.codfw.wmnet: [apache2] diff --git a/modules/scap/files/dsh/group/mediawiki-installation b/modules/scap/files/dsh/group/mediawiki-installation index 10d0198..3a8b386 100644 --- a/modules/scap/files/dsh/group/mediawiki-installation +++ b/modules/scap/files/dsh/group/mediawiki-installation @@ -191,7 +191,6 @@ mw2083.codfw.wmnet mw2084.codfw.wmnet mw2085.codfw.wmnet -mw2086.codfw.wmnet mw2087.codfw.wmnet mw2088.codfw.wmnet mw2089.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/304139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I18fa7c89848f715fd22ad71188d49afe86feb437 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Papaul Gerrit-Reviewer: Reedy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Use `a` tag for clear icon
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304144
Change subject: Use `a` tag for clear icon
..
Use `a` tag for clear icon
It seems mw-ui-icon and the button tag do not cooperate (reason
unknown)
There is no reason this needs to be a button tag. Unless someone
can identify which browser style is interfering with vertical alignment
this seems a safe fix.
Bug: T142391
Change-Id: I0c32eaa3c4015d178c0caae82741aa4996f368f2
---
M resources/mobile.search/SearchOverlay.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/44/304144/1
diff --git a/resources/mobile.search/SearchOverlay.js
b/resources/mobile.search/SearchOverlay.js
index d997cda..894fff2 100644
--- a/resources/mobile.search/SearchOverlay.js
+++ b/resources/mobile.search/SearchOverlay.js
@@ -61,7 +61,7 @@
*/
defaults: $.extend( {}, Overlay.prototype.defaults, {
clearIcon: new Icon( {
- tagName: 'button',
+ tagName: 'a',
name: 'clear',
label: mw.msg( 'mobile-frontend-clear-search' ),
additionalClassNames: 'clear'
--
To view, visit https://gerrit.wikimedia.org/r/304144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c32eaa3c4015d178c0caae82741aa4996f368f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Re-instate group1 wikis to 1.28.0-wmf.14
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304143
Change subject: Re-instate group1 wikis to 1.28.0-wmf.14
..
Re-instate group1 wikis to 1.28.0-wmf.14
This reverts commit 6fb569d3375693120e4ba8ac3af3abd465cbad4d.
Change-Id: I539148c563f21c7c79cba84f3d81c52a733e7caf
---
M wikiversions.json
1 file changed, 594 insertions(+), 594 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/43/304143/1
diff --git a/wikiversions.json b/wikiversions.json
index a99adac..89c5e85 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,749 +1,749 @@
{
"aawiki": "php-1.28.0-wmf.13",
-"aawikibooks": "php-1.28.0-wmf.13",
-"aawiktionary": "php-1.28.0-wmf.13",
+"aawikibooks": "php-1.28.0-wmf.14",
+"aawiktionary": "php-1.28.0-wmf.14",
"abwiki": "php-1.28.0-wmf.13",
-"abwiktionary": "php-1.28.0-wmf.13",
+"abwiktionary": "php-1.28.0-wmf.14",
"acewiki": "php-1.28.0-wmf.13",
-"advisorywiki": "php-1.28.0-wmf.13",
+"advisorywiki": "php-1.28.0-wmf.14",
"adywiki": "php-1.28.0-wmf.13",
"afwiki": "php-1.28.0-wmf.13",
-"afwikibooks": "php-1.28.0-wmf.13",
-"afwikiquote": "php-1.28.0-wmf.13",
-"afwiktionary": "php-1.28.0-wmf.13",
+"afwikibooks": "php-1.28.0-wmf.14",
+"afwikiquote": "php-1.28.0-wmf.14",
+"afwiktionary": "php-1.28.0-wmf.14",
"akwiki": "php-1.28.0-wmf.13",
-"akwikibooks": "php-1.28.0-wmf.13",
-"akwiktionary": "php-1.28.0-wmf.13",
+"akwikibooks": "php-1.28.0-wmf.14",
+"akwiktionary": "php-1.28.0-wmf.14",
"alswiki": "php-1.28.0-wmf.13",
-"alswikibooks": "php-1.28.0-wmf.13",
-"alswikiquote": "php-1.28.0-wmf.13",
-"alswiktionary": "php-1.28.0-wmf.13",
+"alswikibooks": "php-1.28.0-wmf.14",
+"alswikiquote": "php-1.28.0-wmf.14",
+"alswiktionary": "php-1.28.0-wmf.14",
"amwiki": "php-1.28.0-wmf.13",
-"amwikiquote": "php-1.28.0-wmf.13",
-"amwiktionary": "php-1.28.0-wmf.13",
+"amwikiquote": "php-1.28.0-wmf.14",
+"amwiktionary": "php-1.28.0-wmf.14",
"angwiki": "php-1.28.0-wmf.13",
-"angwikibooks": "php-1.28.0-wmf.13",
-"angwikiquote": "php-1.28.0-wmf.13",
-"angwikisource": "php-1.28.0-wmf.13",
-"angwiktionary": "php-1.28.0-wmf.13",
+"angwikibooks": "php-1.28.0-wmf.14",
+"angwikiquote": "php-1.28.0-wmf.14",
+"angwikisource": "php-1.28.0-wmf.14",
+"angwiktionary": "php-1.28.0-wmf.14",
"anwiki": "php-1.28.0-wmf.13",
-"anwiktionary": "php-1.28.0-wmf.13",
+"anwiktionary": "php-1.28.0-wmf.14",
"arbcom_dewiki": "php-1.28.0-wmf.13",
"arbcom_enwiki": "php-1.28.0-wmf.13",
"arbcom_fiwiki": "php-1.28.0-wmf.13",
"arbcom_nlwiki": "php-1.28.0-wmf.13",
"arcwiki": "php-1.28.0-wmf.13",
"arwiki": "php-1.28.0-wmf.13",
-"arwikibooks": "php-1.28.0-wmf.13",
-"arwikimedia": "php-1.28.0-wmf.13",
-"arwikinews": "php-1.28.0-wmf.13",
-"arwikiquote": "php-1.28.0-wmf.13",
-"arwikisource": "php-1.28.0-wmf.13",
-"arwikiversity": "php-1.28.0-wmf.13",
-"arwiktionary": "php-1.28.0-wmf.13",
+"arwikibooks": "php-1.28.0-wmf.14",
+"arwikimedia": "php-1.28.0-wmf.14",
+"arwikinews": "php-1.28.0-wmf.14",
+"arwikiquote": "php-1.28.0-wmf.14",
+"arwikisource": "php-1.28.0-wmf.14",
+"arwikiversity": "php-1.28.0-wmf.14",
+"arwiktionary": "php-1.28.0-wmf.14",
"arzwiki": "php-1.28.0-wmf.13",
"astwiki": "php-1.28.0-wmf.13",
-"astwikibooks": "php-1.28.0-wmf.13",
-"astwikiquote": "php-1.28.0-wmf.13",
-"astwiktionary": "php-1.28.0-wmf.13",
+"astwikibooks": "php-1.28.0-wmf.14",
+"astwikiquote": "php-1.28.0-wmf.14",
+"astwiktionary": "php-1.28.0-wmf.14",
"aswiki": "php-1.28.0-wmf.13",
-"aswikibooks": "php-1.28.0-wmf.13",
-"aswikisource": "php-1.28.0-wmf.13",
-"aswiktionary": "php-1.28.0-wmf.13",
-"auditcomwiki": "php-1.28.0-wmf.13",
+"aswikibooks": "php-1.28.0-wmf.14",
+"aswikisource": "php-1.28.0-wmf.14",
+"aswiktionary": "php-1.28.0-wmf.14",
+"auditcomwiki": "php-1.28.0-wmf.14",
"avwiki": "php-1.28.0-wmf.13",
-"avwiktionary": "php-1.28.0-wmf.13",
+"avwiktionary": "php-1.28.0-wmf.14",
"aywiki": "php-1.28.0-wmf.13",
-"aywikibooks": "php-1.28.0-wmf.13",
-"aywiktionary": "php-1.28.0-wmf.13",
+"aywikibooks": "php-1.28.0-wmf.14",
+"aywiktionary": "php-1.28.0-wmf.14",
"azbwiki": "php-1.28.0-wmf.13",
"azwiki": "php-1.28.0-wmf.13",
-"azwikibooks": "php-1.28.0-wmf.13",
-"azwikiquote": "php-1.28.0-wmf.13",
-"azwikisource": "php-1.28.0-wmf.13",
-"azwiktionary": "php-1.28.0-wmf.13",
+"azwikibooks": "php-1.28.0-wmf.14",
+"azwikiquote": "php-1.28.0-wmf.14",
+"azwikisource": "php-1.28.0-wmf.14",
+"azwiktionary": "php-1.28.0-wmf.14",
"barwiki": "php-1.28.0-wmf.13",
"bat_smgwiki": "php-1.28.0-wmf.13",
"bawiki"
[MediaWiki-commits] [Gerrit] integration/config[master]: Temporarily move composer-hhvm/php5 jobs off of nodepool
Legoktm has submitted this change and it was merged.
Change subject: Temporarily move composer-hhvm/php5 jobs off of nodepool
..
Temporarily move composer-hhvm/php5 jobs off of nodepool
We're running low on capacity so moving these quick jobs off of nodepool
should help a lot.
Change-Id: I7b5ddf2d9a6ba2d00819bd9eff6d77a9754dda72
---
M jjb/php.yaml
M zuul/layout.yaml
2 files changed, 40 insertions(+), 42 deletions(-)
Approvals:
Legoktm: Verified; Looks good to me, approved
Zppix: Looks good to me, but someone else must approve
diff --git a/jjb/php.yaml b/jjb/php.yaml
index f9545ff..18e4fad 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -104,11 +104,10 @@
- 'composer-php53'
- 'composer-package-php53'
-# Same as 'composer-{phpflavor}'. Runs "composer update" and "composer test"
-# but on disposable instances maintained by Nodepool.
+# Runs "composer update" and "composer test"
- job-template:
-name: 'composer-{phpflavor}-{image}'
-node: ci-{image}-wikimedia
+name: 'composer-{phpflavor}'
+node: contintLabsSlave && phpflavor-{phpflavor}
defaults: use-remote-zuul-shallow-clone
concurrent: true
logrotate:
@@ -118,14 +117,11 @@
builders:
- assert-phpflavor:
phpflavor: '{phpflavor}'
- - castor-load
- composer-validate:
dir: '.'
- composer-update:
dir: '.'
- composer-test
-publishers:
- - castor-save
# Same as 'composer-package-{phpflavor}'. Runs "composer update" and "composer
# test" for libraries that are published as composer packages but on disposable
@@ -163,4 +159,11 @@
image: jessie
jobs:
- 'composer-package-{phpflavor}-{image}'
- - 'composer-{phpflavor}-{image}'
+
+- project:
+name: 'composer-flavored'
+phpflavor:
+- php55
+- hhvm
+jobs:
+ - 'composer-{phpflavor}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 65e0e2e..4ac3d0a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -711,7 +711,7 @@
# Don't run tests on deployment branches where the tests have been removed.
# Covered by test_smashpig_deployment_branch_filters
- - name: ^composer-hhvm-trusty$
+ - name: ^composer-hhvm$
skip-if:
- project: ^wikimedia/fundraising/SmashPig$
branch: ^deployment$
@@ -913,8 +913,8 @@
- mwext-qunit-composer-jessie
- npm-node-4.3
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
- name: extension-unittests-composer-non-voting
check:
@@ -936,8 +936,8 @@
experimental:
- mwext-qunit-composer-jessie
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
- name: extension-unittests-generic
check:
@@ -967,8 +967,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
- name: extension-unittests-non-voting
check:
@@ -995,8 +995,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
# Template to run per-patch selenium browser test
# Intentionally not in gate because it's super slow
@@ -1067,8 +1067,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
# Similar to above, but uses a check/test pipeline
- name: mw-checks-test
@@ -1094,8 +1094,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
- name: composer-test
check:
@@ -1104,27 +1104,23 @@
- composer-validate
test:
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
gate-and-submit:
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
-experimental:
- - composer-hhvm-jessie
+ - composer-php55
+ - composer-hhvm
- name: composer-test55
check:
- php55lint
- composer-validate
test:
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
gate-and-submit:
- - composer-php55-trusty
- - composer-hhvm-trusty
-experimental:
- - composer-hhvm-jessie
+ - composer-php55
+ - composer-hhvm
- name: jshint
check:
@@ -1588,9 +1584,9 @@
- php55lint
- composer-validate
test:
- - composer-php55-trusty
+ - compos
[MediaWiki-commits] [Gerrit] mediawiki...VipsScaler[wmf/1.28.0-wmf.14]: Remove default VipsOptions, they're at best, broken
Reedy has submitted this change and it was merged.
Change subject: Remove default VipsOptions, they're at best, broken
..
Remove default VipsOptions, they're at best, broken
Change-Id: I6cbacf8946cc7e436ac2ce581904a7ac51a46fec
---
M extension.json
1 file changed, 1 insertion(+), 27 deletions(-)
Approvals:
Reedy: Verified; Looks good to me, approved
Gilles: Looks good to me, but someone else must approve
diff --git a/extension.json b/extension.json
index f4f224d..f40904a 100644
--- a/extension.json
+++ b/extension.json
@@ -77,33 +77,7 @@
},
"config": {
"VipsCommand": "vips",
- "VipsOptions": [
- {
- "conditions": {
- "mimeType": "image/jpeg",
- "minShrinkFactor": 1.2
- },
- "sharpen": {
- "radius": 0,
- "sigma": 0.8
- },
- "_merge_strategy": "array_plus_2d"
- },
- {
- "conditions": {
- "mimeType": "image/jpeg"
- },
- "sharpen": false,
- "bilinear": true,
- "_merge_strategy": "array_plus_2d"
- },
- {
- "conditions": {
- "mimeType": "image/png"
- },
- "_merge_strategy": "array_plus_2d"
- }
- ],
+ "VipsOptions": [],
"VipsThumbnailerHost": null,
"VipsTestExpiry": 3600
},
--
To view, visit https://gerrit.wikimedia.org/r/304141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6cbacf8946cc7e436ac2ce581904a7ac51a46fec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VipsScaler
Gerrit-Branch: wmf/1.28.0-wmf.14
Gerrit-Owner: Paladox
Gerrit-Reviewer: Gilles
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Reedy
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...VipsScaler[master]: Remove 'UnitTestList' hook
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/304142 Change subject: Remove 'UnitTestList' hook .. Remove 'UnitTestList' hook No longer needed now that extension unittests are autodiscovered. Bug: T142120 Bug: T142121 Change-Id: I27625cd0fdbfcc29b0d1a9c7dd13d985f56871fc --- D VipsScalerHooks.php M extension.json R tests/phpunit/VipsScalerTest.php 3 files changed, 0 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VipsScaler refs/changes/42/304142/1 diff --git a/VipsScalerHooks.php b/VipsScalerHooks.php deleted file mode 100644 index a0ac13b..000 --- a/VipsScalerHooks.php +++ /dev/null @@ -1,12 +0,0 @@ -https://gerrit.wikimedia.org/r/304142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27625cd0fdbfcc29b0d1a9c7dd13d985f56871fc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VipsScaler Gerrit-Branch: master Gerrit-Owner: Reedy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Clear border on selected framed buttons
jenkins-bot has submitted this change and it was merged.
Change subject: MediaWiki theme: Clear border on selected framed buttons
..
MediaWiki theme: Clear border on selected framed buttons
Making `border-color` of selected buttons in ButtonSelect-, ButtonGroup- and
ToggleButtonWidget equal to `background-color` in order to appear clearer.
Also adapting `z-index` to circumvent visual inaccuracies in `:hover` and
`:active` state.
Bug: T142550
Change-Id: I1616a6fef72d40ab7af97e0829ffb286bd290b38
---
M src/styles/widgets/ButtonOptionWidget.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
4 files changed, 29 insertions(+), 13 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/styles/widgets/ButtonOptionWidget.less
b/src/styles/widgets/ButtonOptionWidget.less
index fe21409..7509330 100644
--- a/src/styles/widgets/ButtonOptionWidget.less
+++ b/src/styles/widgets/ButtonOptionWidget.less
@@ -3,10 +3,6 @@
.oo-ui-buttonOptionWidget {
display: inline-block;
- .oo-ui-buttonElement-button {
- position: relative;
- }
-
&.oo-ui-iconElement .oo-ui-iconElement-icon,
&.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator {
position: static;
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 90e3a3b..36d4196 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -52,12 +52,14 @@
@border-color-default: #ccc;
@border-color-default-hover: #aaa;
+@border-color-default-focus: @color-progressive-focus;
@border-color-disabled: #ddd;
@border-color-disabled-framed: @color-disabled-framed;
@border-color-progressive-active: #859dcc; // equivalents `fade(
@color-progressive-active, 50% )`
@border-color-destructive-active: #b77c79; // equivalents `fade(
@color-destructive-active, 50% )`
@border-color-focus-inset: @color-default-light;
@border-color-dialog: #aaa;
+@border-color-buttonelement-active: @background-color-active;
@border-radius-default: 2px;
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index 89a50cb..7bba06c 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -179,12 +179,17 @@
&.oo-ui-buttonElement-pressed >
.oo-ui-buttonElement-button {
background-color: darken(
@background-color-default, 15% );
border-color: darken(
@background-color-default, 15% );
- box-shadow: none;
}
&.oo-ui-buttonElement-active >
.oo-ui-buttonElement-button {
background-color: @background-color-active;
color: @color-default-light;
+ border-color:
@border-color-buttonelement-active;
+ z-index: 3;
+
+ &:focus {
+ border-color: @color-progressive-focus;
+ }
}
&.oo-ui-flaggedElement {
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index c76807f..d2b1fe1 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -50,6 +50,15 @@
border-top-right-radius: @border-radius-default;
}
}
+
+ &.oo-ui-widget-enabled {
+ .oo-ui-buttonElement {
+ .oo-ui-buttonElement-button:focus {
+ border-color: @border-color-default-focus;
+ z-index: 3;
+ }
+ }
+ }
}
.theme-oo-ui-buttonWidget () {
@@ -1180,14 +1189,6 @@
&:focus {
outline: 0;
-
- .oo-ui-buttonOptionWidget.oo-ui-optionWidget-selected {
- .oo-ui-buttonElement-button {
- border-color: @color-progressive-focus;
- box-shadow: @box-shadow-focus-default;
- z-index: 2;
- }
- }
}
.oo-ui-buttonOptionWidget {
@@ -1206,6 +1207,18 @@
border-bottom-right-radius: @border-radius-default;
border-top-right-radius: @border-radius-default;
}
+
+ }
+
+ &.oo-ui-widget-enabled {
+ &:focus {
+ .oo-ui-buttonOptionWidget.oo-ui-optionWidget-selected {
+ .oo-ui-buttonElement-button {
+ border-color:
@border-color-default-focus;
+
[MediaWiki-commits] [Gerrit] mediawiki...VipsScaler[wmf/1.28.0-wmf.14]: Remove default VipsOptions, they're at best, broken
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304141
Change subject: Remove default VipsOptions, they're at best, broken
..
Remove default VipsOptions, they're at best, broken
Change-Id: I6cbacf8946cc7e436ac2ce581904a7ac51a46fec
---
M extension.json
1 file changed, 1 insertion(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VipsScaler
refs/changes/41/304141/1
diff --git a/extension.json b/extension.json
index f4f224d..f40904a 100644
--- a/extension.json
+++ b/extension.json
@@ -77,33 +77,7 @@
},
"config": {
"VipsCommand": "vips",
- "VipsOptions": [
- {
- "conditions": {
- "mimeType": "image/jpeg",
- "minShrinkFactor": 1.2
- },
- "sharpen": {
- "radius": 0,
- "sigma": 0.8
- },
- "_merge_strategy": "array_plus_2d"
- },
- {
- "conditions": {
- "mimeType": "image/jpeg"
- },
- "sharpen": false,
- "bilinear": true,
- "_merge_strategy": "array_plus_2d"
- },
- {
- "conditions": {
- "mimeType": "image/png"
- },
- "_merge_strategy": "array_plus_2d"
- }
- ],
+ "VipsOptions": [],
"VipsThumbnailerHost": null,
"VipsTestExpiry": 3600
},
--
To view, visit https://gerrit.wikimedia.org/r/304141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cbacf8946cc7e436ac2ce581904a7ac51a46fec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VipsScaler
Gerrit-Branch: wmf/1.28.0-wmf.14
Gerrit-Owner: Paladox
Gerrit-Reviewer: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VipsScaler[master]: Remove default VipsOptions, they're at best, broken
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304140
Change subject: Remove default VipsOptions, they're at best, broken
..
Remove default VipsOptions, they're at best, broken
Change-Id: I6cbacf8946cc7e436ac2ce581904a7ac51a46fec
---
M extension.json
1 file changed, 1 insertion(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VipsScaler
refs/changes/40/304140/1
diff --git a/extension.json b/extension.json
index f4f224d..f40904a 100644
--- a/extension.json
+++ b/extension.json
@@ -77,33 +77,7 @@
},
"config": {
"VipsCommand": "vips",
- "VipsOptions": [
- {
- "conditions": {
- "mimeType": "image/jpeg",
- "minShrinkFactor": 1.2
- },
- "sharpen": {
- "radius": 0,
- "sigma": 0.8
- },
- "_merge_strategy": "array_plus_2d"
- },
- {
- "conditions": {
- "mimeType": "image/jpeg"
- },
- "sharpen": false,
- "bilinear": true,
- "_merge_strategy": "array_plus_2d"
- },
- {
- "conditions": {
- "mimeType": "image/png"
- },
- "_merge_strategy": "array_plus_2d"
- }
- ],
+ "VipsOptions": [],
"VipsThumbnailerHost": null,
"VipsTestExpiry": 3600
},
--
To view, visit https://gerrit.wikimedia.org/r/304140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cbacf8946cc7e436ac2ce581904a7ac51a46fec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VipsScaler
Gerrit-Branch: master
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: remove mw2086 from dsh group mw-installation
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/304139 Change subject: remove mw2086 from dsh group mw-installation .. remove mw2086 from dsh group mw-installation Bug:T142661 Change-Id: I18fa7c89848f715fd22ad71188d49afe86feb437 --- M modules/scap/files/dsh/group/mediawiki-installation 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/39/304139/1 diff --git a/modules/scap/files/dsh/group/mediawiki-installation b/modules/scap/files/dsh/group/mediawiki-installation index 10d0198..3a8b386 100644 --- a/modules/scap/files/dsh/group/mediawiki-installation +++ b/modules/scap/files/dsh/group/mediawiki-installation @@ -191,7 +191,6 @@ mw2083.codfw.wmnet mw2084.codfw.wmnet mw2085.codfw.wmnet -mw2086.codfw.wmnet mw2087.codfw.wmnet mw2088.codfw.wmnet mw2089.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/304139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I18fa7c89848f715fd22ad71188d49afe86feb437 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.13]: Make PurgeChangedFiles actually purge old versions too
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304138
Change subject: Make PurgeChangedFiles actually purge old versions too
..
Make PurgeChangedFiles actually purge old versions too
Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
---
M maintenance/purgeChangedFiles.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/38/304138/1
diff --git a/maintenance/purgeChangedFiles.php
b/maintenance/purgeChangedFiles.php
index 5b035e1..70a26cb 100644
--- a/maintenance/purgeChangedFiles.php
+++ b/maintenance/purgeChangedFiles.php
@@ -164,8 +164,12 @@
continue;
}
- // Purge current version and any versions in
oldimage table
+ // Purge current version and its thumbnails
$file->purgeCache();
+ // Purge the old versions and their thumbnails
+ foreach ( $file->getHistory() as $oldFile ) {
+ $oldFile->purgeCache();
+ }
if ( $logType === 'delete' ) {
// If there is an orphaned storage
file... delete it
--
To view, visit https://gerrit.wikimedia.org/r/304138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.13
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make PurgeChangedFiles actually purge old versions too
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304137
Change subject: Make PurgeChangedFiles actually purge old versions too
..
Make PurgeChangedFiles actually purge old versions too
Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
---
M maintenance/purgeChangedFiles.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/37/304137/1
diff --git a/maintenance/purgeChangedFiles.php
b/maintenance/purgeChangedFiles.php
index 5b035e1..70a26cb 100644
--- a/maintenance/purgeChangedFiles.php
+++ b/maintenance/purgeChangedFiles.php
@@ -164,8 +164,12 @@
continue;
}
- // Purge current version and any versions in
oldimage table
+ // Purge current version and its thumbnails
$file->purgeCache();
+ // Purge the old versions and their thumbnails
+ foreach ( $file->getHistory() as $oldFile ) {
+ $oldFile->purgeCache();
+ }
if ( $logType === 'delete' ) {
// If there is an orphaned storage
file... delete it
--
To view, visit https://gerrit.wikimedia.org/r/304137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7aa746535ceae7d19c492145c3254d55511a8576
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Drop wbc_entity_usage.eu_touched
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/304136 Change subject: Drop wbc_entity_usage.eu_touched .. Drop wbc_entity_usage.eu_touched No longer needed after T125838 has been implemented and usage tracking without eu_touched proved to work out. Manually tested with MySQL. Bug: T132628 Change-Id: I765924489838a36ffa869e0227e120e65def78b4 --- M client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdater.php D client/sql/entity_usage-add-touched.sql A client/sql/entity_usage-drop-touched.sql M client/sql/entity_usage.sql M docs/usagetracking.wiki 5 files changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/36/304136/1 diff --git a/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdater.php b/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdater.php index 02ab3e1..26cf796 100644 --- a/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdater.php +++ b/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdater.php @@ -65,11 +65,11 @@ $this->dbUpdater->modifyExtensionField( $table, 'eu_aspect', $script ); } - $script = $this->getUpdateScriptPath( 'entity_usage-add-touched', $db->getType() ); - $this->dbUpdater->addExtensionField( $table, 'eu_touched', $script ); - $script = $this->getUpdateScriptPath( 'entity_usage-drop-entity_type', $db->getType() ); $this->dbUpdater->dropExtensionField( $table, 'eu_entity_type', $script ); + + $script = $this->getUpdateScriptPath( 'entity_usage-drop-touched', $db->getType() ); + $this->dbUpdater->dropExtensionField( $table, 'eu_touched', $script ); } } diff --git a/client/sql/entity_usage-add-touched.sql b/client/sql/entity_usage-add-touched.sql deleted file mode 100644 index bb6106f..000 --- a/client/sql/entity_usage-add-touched.sql +++ /dev/null @@ -1,3 +0,0 @@ --- Add a column for tracking page.page_touched, to detect outdated entries in wbc_entity_usage. -ALTER TABLE /*_*/wbc_entity_usage - ADD COLUMN eu_touched BINARY(14) NOT NULL DEFAULT ''; diff --git a/client/sql/entity_usage-drop-touched.sql b/client/sql/entity_usage-drop-touched.sql new file mode 100644 index 000..58b485d --- /dev/null +++ b/client/sql/entity_usage-drop-touched.sql @@ -0,0 +1,4 @@ +-- get rid of the eu_touched column + +ALTER TABLE /*_*/wbc_entity_usage + DROP COLUMN eu_touched; diff --git a/client/sql/entity_usage.sql b/client/sql/entity_usage.sql index 4d93943..62140f5 100644 --- a/client/sql/entity_usage.sql +++ b/client/sql/entity_usage.sql @@ -2,8 +2,7 @@ eu_row_id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, eu_entity_id VARBINARY(255) NOT NULL, -- the ID of the entity being used eu_aspect VARBINARY(37) NOT NULL, -- the aspect of the entity. See EntityUsage::XXX_USAGE for possible values. - eu_page_idINT NOT NULL,-- the ID of the page that uses the entities. - eu_touchedBINARY(14) NOT NULL DEFAULT '' -- timestamp corresponding to page.page_touched + eu_page_idINT NOT NULL -- the ID of the page that uses the entities. ) /*$wgDBTableOptions*/; -- record one usage per page per aspect of an entity diff --git a/docs/usagetracking.wiki b/docs/usagetracking.wiki index c3d9e0e..d32b0d6 100644 --- a/docs/usagetracking.wiki +++ b/docs/usagetracking.wiki @@ -38,7 +38,6 @@ eu_entity_id VARBINARY(255) NOT NULL -- the ID of the entity being used eu_aspect VARBINARY(37) NOT NULL -- the aspect of the entity. See EntityUsage::XXX_USAGE for possible values. eu_page_idINT NOT NULL -- the ID of the page that uses the entities. - eu_touchedBINARY(14) NOT NULL DEFAULT '' -- timestamp corresponding to page.page_touched (currently unused) The following indexes are provided for efficient access: -- To view, visit https://gerrit.wikimedia.org/r/304136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I765924489838a36ffa869e0227e120e65def78b4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove unused parameter defaults from EntityTestHelper
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused parameter defaults from EntityTestHelper
..
Remove unused parameter defaults from EntityTestHelper
Change-Id: I7d1ce28e7618f326626931477cf6ba78f742ca4c
---
M repo/tests/phpunit/includes/Api/EntityTestHelper.php
1 file changed, 11 insertions(+), 5 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/Api/EntityTestHelper.php
b/repo/tests/phpunit/includes/Api/EntityTestHelper.php
index 0e0242b..d44a135 100644
--- a/repo/tests/phpunit/includes/Api/EntityTestHelper.php
+++ b/repo/tests/phpunit/includes/Api/EntityTestHelper.php
@@ -293,7 +293,7 @@
if ( !array_key_exists( $handle, self::$entityOutput ) ) {
throw new OutOfBoundsException( "No entity output
defined with handle {$handle}" );
}
- if ( !is_array( $props ) ) {
+ if ( $props === null ) {
return self::$entityOutput[ $handle ];
} else {
return self::stripUnwantedOutputValues(
self::$entityOutput[ $handle ], $props, $langs );
@@ -305,11 +305,15 @@
*
* @param array $entityOutput Array of entity output
* @param array $props Props to keep in the output
-* @param null|array $langs Languages to keep in the output
+* @param null|array $languageCodes Languages to keep in the output
*
* @return array Array of entity output with props and langs removed
*/
- protected static function stripUnwantedOutputValues( array
$entityOutput, array $props = array(), array $langs = null ) {
+ private static function stripUnwantedOutputValues(
+ array $entityOutput,
+ array $props,
+ array $languageCodes = null
+ ) {
$entityProps = array();
$props[] = 'type'; // always return the type so we can
demobilize
foreach ( $props as $prop ) {
@@ -318,9 +322,11 @@
}
}
foreach ( $entityProps as $prop => $value ) {
- if ( ( $prop == 'aliases' || $prop == 'labels' || $prop
== 'descriptions' ) && $langs != null && is_array( $langs ) ) {
+ if ( ( $prop === 'labels' || $prop === 'descriptions'
|| $prop === 'aliases' )
+ && $languageCodes !== null
+ ) {
$langValues = array();
- foreach ( $langs as $langCode ) {
+ foreach ( $languageCodes as $langCode ) {
if ( array_key_exists( $langCode,
$value ) ) {
$langValues[ $langCode ] =
$value[ $langCode ];
}
--
To view, visit https://gerrit.wikimedia.org/r/303524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d1ce28e7618f326626931477cf6ba78f742ca4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Jonas Kress (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Fix TextState#getChangeTransaction bug
Divec has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304135
Change subject: Fix TextState#getChangeTransaction bug
..
Fix TextState#getChangeTransaction bug
Also document the algorithm more clearly
Change-Id: I3cfca36c289a6936810665233547d37ef504905f
---
M src/ce/ve.ce.TextState.js
M tests/ce/ve.ce.TextState.test.js
2 files changed, 52 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/35/304135/1
diff --git a/src/ce/ve.ce.TextState.js b/src/ce/ve.ce.TextState.js
index 1663f74..5aa464b 100644
--- a/src/ce/ve.ce.TextState.js
+++ b/src/ce/ve.ce.TextState.js
@@ -213,7 +213,11 @@
// During typical typing, there is a single changed chunk with matching
start/end chars.
textStart = 0;
textEnd = 0;
- if ( change.start < Math.min( oldChunks.length, newChunks.length ) ) {
+ if ( change.start + change.end < Math.min( oldChunks.length,
newChunks.length ) ) {
+ // Both oldChunks and newChunks include a changed chunk.
Therefore the first changed
+ // chunk of oldChunks and newChunks is respectively oldChunks[
change.start ] and
+ // newChunks[ change.start ] . If they have matching
annotations, then matching
+ // characters at their start are also part of the unchanged
start region.
if ( oldChunks[ change.start ].hasEqualElements( newChunks[
change.start ] ) ) {
oldChunk = oldChunks[ change.start ];
newChunk = newChunks[ change.start ];
@@ -226,19 +230,22 @@
textStart = i;
}
- if (
- change.end < Math.min( oldChunks.length,
newChunks.length ) &&
- oldChunks[ oldChunks.length - 1 - change.end
].hasEqualElements(
+ // Likewise, the last changed chunk of oldChunks and newChunks
is respectively
+ // oldChunks[ oldChunks.length - 1 - change.end ] and
+ // newChunks[ newChunks.length - 1 - change.end ] , and if they
have matching
+ // annotations, then matching characters at their end
potentially form part of
+ // the unchanged end region.
+ if ( oldChunks[ oldChunks.length - 1 - change.end
].hasEqualElements(
newChunks[ newChunks.length - 1 - change.end ]
- )
- ) {
+ ) ) {
oldChunk = oldChunks[ oldChunks.length - 1 - change.end
];
newChunk = newChunks[ newChunks.length - 1 - change.end
];
- // For oldChunks/newChunks/both, it's possible that
only one chunk
- // changed, in which case textStart has already eaten
into that chunk;
- // so take care not to overlap it. (For example, for
'ana'->'anna',
- // textStart will be 2 so we want to limit textEnd to
1, else the 'n'
- // of 'ana' will be counted twice).
+ // However, if only one chunk has changed in
oldChunks/newChunks, then
+ // oldChunk/newChunk is also the *first* changed chunk,
in which case
+ // textStart has already eaten into that chunk; so take
care not to
+ // overlap it. (For example, for 'ana'->'anna',
textStart will be 2 so
+ // we want to limit textEnd to 1, else the 'n' of 'ana'
will be counted
+ // twice).
iLen = Math.min(
oldChunk.text.length -
( change.start + change.end ===
oldChunks.length - 1 ? textStart : 0 ),
diff --git a/tests/ce/ve.ce.TextState.test.js b/tests/ce/ve.ce.TextState.test.js
index 593c987..57e3342 100644
--- a/tests/ce/ve.ce.TextState.test.js
+++ b/tests/ce/ve.ce.TextState.test.js
@@ -317,6 +317,40 @@
},
{ type: 'retain', length: 3 }
]
+ },
+ {
+ msg: 'Insert new chunk whose annotations match end
chunk\'s',
+ oldRawHtml: 'xyz',
+ oldInnerHtml: 'xyz',
+ newInnerHtml: 'xywyz',
+ operations: [
+ { type: 'retain', length: 2 },
+ {
+ type: 'replace',
+ remove: [],
+ insert: [ 'y', [ 'w', [ 0 ] ] ],
+ insertedDataOffset: 0,
+ insertedDataLength: 2
+ },
+
[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Depool labvirt1011
Yuvipanda has submitted this change and it was merged. Change subject: labs: Depool labvirt1011 .. labs: Depool labvirt1011 Seems to be having issues spawning new instances Change-Id: I7336b1a3cb54fe076e27d925bb948b0054c29ffe --- M hieradata/eqiad.yaml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Andrew Bogott: Looks good to me, but someone else must approve Yuvipanda: Verified; Looks good to me, approved Zppix: Looks good to me, but someone else must approve diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml index 5081687..17b9f2d 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -135,7 +135,6 @@ - labvirt1008 - labvirt1009 - labvirt1010 -- labvirt1011 - labvirt1012 - labvirt1013 -- To view, visit https://gerrit.wikimedia.org/r/304134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7336b1a3cb54fe076e27d925bb948b0054c29ffe Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: Zppix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Increase centralized logging retention to 14d
Yuvipanda has submitted this change and it was merged.
Change subject: tools: Increase centralized logging retention to 14d
..
tools: Increase centralized logging retention to 14d
We have enough space
Change-Id: I9229b78e905ac9a6b19097ce6ce83746c2fbd4b1
---
M modules/role/manifests/toollabs/logging/centralserver.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/toollabs/logging/centralserver.pp
b/modules/role/manifests/toollabs/logging/centralserver.pp
index 83eb29e..eaed7dd 100644
--- a/modules/role/manifests/toollabs/logging/centralserver.pp
+++ b/modules/role/manifests/toollabs/logging/centralserver.pp
@@ -18,6 +18,6 @@
class { 'rsyslog::receiver':
require=> Labs_lvm::Volume['syslog'],
-log_retention_days => 3, # We don't have that much space! Increase
later when we know we can handle it
+log_retention_days => 14,
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/304133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9229b78e905ac9a6b19097ce6ce83746c2fbd4b1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Split some of the longest lines of code (exceeding 135 chara...
jenkins-bot has submitted this change and it was merged.
Change subject: Split some of the longest lines of code (exceeding 135
characters)
..
Split some of the longest lines of code (exceeding 135 characters)
Change-Id: I392c31d05a37b3f84464023ed84d5738c849cda1
---
M repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
M repo/tests/phpunit/includes/ParserOutput/FallbackHintHtmlTermRendererTest.php
M repo/tests/phpunit/includes/Rdf/Values/GlobeCoordinateRdfBuilderTest.php
3 files changed, 23 insertions(+), 9 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
b/repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
index 960abff..5adad98 100644
--- a/repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
+++ b/repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
@@ -99,7 +99,8 @@
)
),
new Statement( new PropertyValueSnak( new
PropertyId( 'P1' ), new StringValue( 'foo' ) ) ),
- 'property / P1property / P1'.
+ 'property / P1' .
+ 'property /
P1' .
'-'.
'bar (DETAILED)'.
'+'.
@@ -113,7 +114,8 @@
) )
),
new Statement( new PropertyValueSnak( new
PropertyId( 'P1' ), new StringValue( 'foo' ) ) ),
- 'property / P1: foo
/ qualifier'.
+ ''
.
+ 'property /
P1: foo / qualifier' .
' +'.
'P44: v (DETAILED)'
),
@@ -123,13 +125,17 @@
null,
null,
new Diff( array(
- new DiffOpRemove( new
Reference( new SnakList( array( new PropertyValueSnak( 50, new StringValue( 'v'
) ) ) ) ) ),
+ new DiffOpRemove( new
Reference( new SnakList( [
+ new PropertyValueSnak(
50, new StringValue( 'v' ) ),
+ ] ) ) ),
) )
),
new Statement( new PropertyValueSnak( new
PropertyId( 'P1' ), new StringValue( 'foo' ) ) ),
- 'property / P1: foo / reference'.
+ 'property / P1: foo / reference' .
+ '' .
'-'.
- 'P50: v (DETAILED) '
+ 'P50: v (DETAILED)' .
+ ' '
),
'ranks' => array(
new ClaimDifference(
diff --git
a/repo/tests/phpunit/includes/ParserOutput/FallbackHintHtmlTermRendererTest.php
b/repo/tests/phpunit/includes/ParserOutput/FallbackHintHtmlTermRendererTest.php
index a434e53..adca350 100644
---
a/repo/tests/phpunit/includes/ParserOutput/FallbackHintHtmlTermRendererTest.php
+++
b/repo/tests/phpunit/includes/ParserOutput/FallbackHintHtmlTermRendererTest.php
@@ -39,7 +39,8 @@
'de',
'de'
),
- 'lkt &
term'
+ 'lkt &
term'
],
[
new TermFallback(
@@ -48,7 +49,8 @@
'arc',
'arc'
),
- 'arc term'
+ 'arc term'
],
];
}
diff --git
a/repo/tests/phpunit/includes/Rdf/Values/GlobeCoordinateRdfBuilderTest.php
b/repo/tests/phpunit/includes/Rdf/Values/GlobeCoordinateRdfBuilderTest.php
index 4a4fff4..af319b7 100644
--- a/repo/tests/phpunit/includes/Rdf/Values/GlobeCoordinateRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/Rdf/Values/GlobeCoordinateRdfBuilderTest.php
@@ -22,6 +22,7 @@
*
* @license GPL-2.0+
* @author Daniel Kinzler
+ * @author Stas Malyshev
*/
class GlobeCoordinateRdfBuilderTest extends \PHPUnit_Framework_TestCase {
@@ -59,7 +60,9 @@
$snak,
false,
array(
-
[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Depool labvirt1011
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/304134 Change subject: labs: Depool labvirt1011 .. labs: Depool labvirt1011 Seems to be having issues spawning new instances Change-Id: I7336b1a3cb54fe076e27d925bb948b0054c29ffe --- M hieradata/eqiad.yaml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/34/304134/1 diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml index 5081687..17b9f2d 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -135,7 +135,6 @@ - labvirt1008 - labvirt1009 - labvirt1010 -- labvirt1011 - labvirt1012 - labvirt1013 -- To view, visit https://gerrit.wikimedia.org/r/304134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7336b1a3cb54fe076e27d925bb948b0054c29ffe Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Increase centralized logging retention to 14d
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304133
Change subject: tools: Increase centralized logging retention to 14d
..
tools: Increase centralized logging retention to 14d
We have enough space
Change-Id: I9229b78e905ac9a6b19097ce6ce83746c2fbd4b1
---
M modules/role/manifests/toollabs/logging/centralserver.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/304133/1
diff --git a/modules/role/manifests/toollabs/logging/centralserver.pp
b/modules/role/manifests/toollabs/logging/centralserver.pp
index 83eb29e..eaed7dd 100644
--- a/modules/role/manifests/toollabs/logging/centralserver.pp
+++ b/modules/role/manifests/toollabs/logging/centralserver.pp
@@ -18,6 +18,6 @@
class { 'rsyslog::receiver':
require=> Labs_lvm::Volume['syslog'],
-log_retention_days => 3, # We don't have that much space! Increase
later when we know we can handle it
+log_retention_days => 14,
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/304133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9229b78e905ac9a6b19097ce6ce83746c2fbd4b1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "group1 wikis to 1.28.0-wmf.14"
jenkins-bot has submitted this change and it was merged.
Change subject: Revert "group1 wikis to 1.28.0-wmf.14"
..
Revert "group1 wikis to 1.28.0-wmf.14"
This reverts commit eb69477a6d20242bb9e501845dba65267bb8b4b0.
Change-Id: Ib4a58a99338365179720e59c5102dadb0eee2cfe
---
M wikiversions.json
1 file changed, 594 insertions(+), 594 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikiversions.json b/wikiversions.json
index 89c5e85..a99adac 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,749 +1,749 @@
{
"aawiki": "php-1.28.0-wmf.13",
-"aawikibooks": "php-1.28.0-wmf.14",
-"aawiktionary": "php-1.28.0-wmf.14",
+"aawikibooks": "php-1.28.0-wmf.13",
+"aawiktionary": "php-1.28.0-wmf.13",
"abwiki": "php-1.28.0-wmf.13",
-"abwiktionary": "php-1.28.0-wmf.14",
+"abwiktionary": "php-1.28.0-wmf.13",
"acewiki": "php-1.28.0-wmf.13",
-"advisorywiki": "php-1.28.0-wmf.14",
+"advisorywiki": "php-1.28.0-wmf.13",
"adywiki": "php-1.28.0-wmf.13",
"afwiki": "php-1.28.0-wmf.13",
-"afwikibooks": "php-1.28.0-wmf.14",
-"afwikiquote": "php-1.28.0-wmf.14",
-"afwiktionary": "php-1.28.0-wmf.14",
+"afwikibooks": "php-1.28.0-wmf.13",
+"afwikiquote": "php-1.28.0-wmf.13",
+"afwiktionary": "php-1.28.0-wmf.13",
"akwiki": "php-1.28.0-wmf.13",
-"akwikibooks": "php-1.28.0-wmf.14",
-"akwiktionary": "php-1.28.0-wmf.14",
+"akwikibooks": "php-1.28.0-wmf.13",
+"akwiktionary": "php-1.28.0-wmf.13",
"alswiki": "php-1.28.0-wmf.13",
-"alswikibooks": "php-1.28.0-wmf.14",
-"alswikiquote": "php-1.28.0-wmf.14",
-"alswiktionary": "php-1.28.0-wmf.14",
+"alswikibooks": "php-1.28.0-wmf.13",
+"alswikiquote": "php-1.28.0-wmf.13",
+"alswiktionary": "php-1.28.0-wmf.13",
"amwiki": "php-1.28.0-wmf.13",
-"amwikiquote": "php-1.28.0-wmf.14",
-"amwiktionary": "php-1.28.0-wmf.14",
+"amwikiquote": "php-1.28.0-wmf.13",
+"amwiktionary": "php-1.28.0-wmf.13",
"angwiki": "php-1.28.0-wmf.13",
-"angwikibooks": "php-1.28.0-wmf.14",
-"angwikiquote": "php-1.28.0-wmf.14",
-"angwikisource": "php-1.28.0-wmf.14",
-"angwiktionary": "php-1.28.0-wmf.14",
+"angwikibooks": "php-1.28.0-wmf.13",
+"angwikiquote": "php-1.28.0-wmf.13",
+"angwikisource": "php-1.28.0-wmf.13",
+"angwiktionary": "php-1.28.0-wmf.13",
"anwiki": "php-1.28.0-wmf.13",
-"anwiktionary": "php-1.28.0-wmf.14",
+"anwiktionary": "php-1.28.0-wmf.13",
"arbcom_dewiki": "php-1.28.0-wmf.13",
"arbcom_enwiki": "php-1.28.0-wmf.13",
"arbcom_fiwiki": "php-1.28.0-wmf.13",
"arbcom_nlwiki": "php-1.28.0-wmf.13",
"arcwiki": "php-1.28.0-wmf.13",
"arwiki": "php-1.28.0-wmf.13",
-"arwikibooks": "php-1.28.0-wmf.14",
-"arwikimedia": "php-1.28.0-wmf.14",
-"arwikinews": "php-1.28.0-wmf.14",
-"arwikiquote": "php-1.28.0-wmf.14",
-"arwikisource": "php-1.28.0-wmf.14",
-"arwikiversity": "php-1.28.0-wmf.14",
-"arwiktionary": "php-1.28.0-wmf.14",
+"arwikibooks": "php-1.28.0-wmf.13",
+"arwikimedia": "php-1.28.0-wmf.13",
+"arwikinews": "php-1.28.0-wmf.13",
+"arwikiquote": "php-1.28.0-wmf.13",
+"arwikisource": "php-1.28.0-wmf.13",
+"arwikiversity": "php-1.28.0-wmf.13",
+"arwiktionary": "php-1.28.0-wmf.13",
"arzwiki": "php-1.28.0-wmf.13",
"astwiki": "php-1.28.0-wmf.13",
-"astwikibooks": "php-1.28.0-wmf.14",
-"astwikiquote": "php-1.28.0-wmf.14",
-"astwiktionary": "php-1.28.0-wmf.14",
+"astwikibooks": "php-1.28.0-wmf.13",
+"astwikiquote": "php-1.28.0-wmf.13",
+"astwiktionary": "php-1.28.0-wmf.13",
"aswiki": "php-1.28.0-wmf.13",
-"aswikibooks": "php-1.28.0-wmf.14",
-"aswikisource": "php-1.28.0-wmf.14",
-"aswiktionary": "php-1.28.0-wmf.14",
-"auditcomwiki": "php-1.28.0-wmf.14",
+"aswikibooks": "php-1.28.0-wmf.13",
+"aswikisource": "php-1.28.0-wmf.13",
+"aswiktionary": "php-1.28.0-wmf.13",
+"auditcomwiki": "php-1.28.0-wmf.13",
"avwiki": "php-1.28.0-wmf.13",
-"avwiktionary": "php-1.28.0-wmf.14",
+"avwiktionary": "php-1.28.0-wmf.13",
"aywiki": "php-1.28.0-wmf.13",
-"aywikibooks": "php-1.28.0-wmf.14",
-"aywiktionary": "php-1.28.0-wmf.14",
+"aywikibooks": "php-1.28.0-wmf.13",
+"aywiktionary": "php-1.28.0-wmf.13",
"azbwiki": "php-1.28.0-wmf.13",
"azwiki": "php-1.28.0-wmf.13",
-"azwikibooks": "php-1.28.0-wmf.14",
-"azwikiquote": "php-1.28.0-wmf.14",
-"azwikisource": "php-1.28.0-wmf.14",
-"azwiktionary": "php-1.28.0-wmf.14",
+"azwikibooks": "php-1.28.0-wmf.13",
+"azwikiquote": "php-1.28.0-wmf.13",
+"azwikisource": "php-1.28.0-wmf.13",
+"azwiktionary": "php-1.28.0-wmf.13",
"barwiki": "php-1.28.0-wmf.13",
"bat_smgwiki": "php-1.28.0-wmf.13",
"bawiki": "php-1.28.0-wmf.13",
-"bawikibooks": "php-1.28.0-wm
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "group1 wikis to 1.28.0-wmf.14"
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304132
Change subject: Revert "group1 wikis to 1.28.0-wmf.14"
..
Revert "group1 wikis to 1.28.0-wmf.14"
This reverts commit eb69477a6d20242bb9e501845dba65267bb8b4b0.
Change-Id: Ib4a58a99338365179720e59c5102dadb0eee2cfe
---
M wikiversions.json
1 file changed, 594 insertions(+), 594 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/32/304132/1
diff --git a/wikiversions.json b/wikiversions.json
index 89c5e85..a99adac 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,749 +1,749 @@
{
"aawiki": "php-1.28.0-wmf.13",
-"aawikibooks": "php-1.28.0-wmf.14",
-"aawiktionary": "php-1.28.0-wmf.14",
+"aawikibooks": "php-1.28.0-wmf.13",
+"aawiktionary": "php-1.28.0-wmf.13",
"abwiki": "php-1.28.0-wmf.13",
-"abwiktionary": "php-1.28.0-wmf.14",
+"abwiktionary": "php-1.28.0-wmf.13",
"acewiki": "php-1.28.0-wmf.13",
-"advisorywiki": "php-1.28.0-wmf.14",
+"advisorywiki": "php-1.28.0-wmf.13",
"adywiki": "php-1.28.0-wmf.13",
"afwiki": "php-1.28.0-wmf.13",
-"afwikibooks": "php-1.28.0-wmf.14",
-"afwikiquote": "php-1.28.0-wmf.14",
-"afwiktionary": "php-1.28.0-wmf.14",
+"afwikibooks": "php-1.28.0-wmf.13",
+"afwikiquote": "php-1.28.0-wmf.13",
+"afwiktionary": "php-1.28.0-wmf.13",
"akwiki": "php-1.28.0-wmf.13",
-"akwikibooks": "php-1.28.0-wmf.14",
-"akwiktionary": "php-1.28.0-wmf.14",
+"akwikibooks": "php-1.28.0-wmf.13",
+"akwiktionary": "php-1.28.0-wmf.13",
"alswiki": "php-1.28.0-wmf.13",
-"alswikibooks": "php-1.28.0-wmf.14",
-"alswikiquote": "php-1.28.0-wmf.14",
-"alswiktionary": "php-1.28.0-wmf.14",
+"alswikibooks": "php-1.28.0-wmf.13",
+"alswikiquote": "php-1.28.0-wmf.13",
+"alswiktionary": "php-1.28.0-wmf.13",
"amwiki": "php-1.28.0-wmf.13",
-"amwikiquote": "php-1.28.0-wmf.14",
-"amwiktionary": "php-1.28.0-wmf.14",
+"amwikiquote": "php-1.28.0-wmf.13",
+"amwiktionary": "php-1.28.0-wmf.13",
"angwiki": "php-1.28.0-wmf.13",
-"angwikibooks": "php-1.28.0-wmf.14",
-"angwikiquote": "php-1.28.0-wmf.14",
-"angwikisource": "php-1.28.0-wmf.14",
-"angwiktionary": "php-1.28.0-wmf.14",
+"angwikibooks": "php-1.28.0-wmf.13",
+"angwikiquote": "php-1.28.0-wmf.13",
+"angwikisource": "php-1.28.0-wmf.13",
+"angwiktionary": "php-1.28.0-wmf.13",
"anwiki": "php-1.28.0-wmf.13",
-"anwiktionary": "php-1.28.0-wmf.14",
+"anwiktionary": "php-1.28.0-wmf.13",
"arbcom_dewiki": "php-1.28.0-wmf.13",
"arbcom_enwiki": "php-1.28.0-wmf.13",
"arbcom_fiwiki": "php-1.28.0-wmf.13",
"arbcom_nlwiki": "php-1.28.0-wmf.13",
"arcwiki": "php-1.28.0-wmf.13",
"arwiki": "php-1.28.0-wmf.13",
-"arwikibooks": "php-1.28.0-wmf.14",
-"arwikimedia": "php-1.28.0-wmf.14",
-"arwikinews": "php-1.28.0-wmf.14",
-"arwikiquote": "php-1.28.0-wmf.14",
-"arwikisource": "php-1.28.0-wmf.14",
-"arwikiversity": "php-1.28.0-wmf.14",
-"arwiktionary": "php-1.28.0-wmf.14",
+"arwikibooks": "php-1.28.0-wmf.13",
+"arwikimedia": "php-1.28.0-wmf.13",
+"arwikinews": "php-1.28.0-wmf.13",
+"arwikiquote": "php-1.28.0-wmf.13",
+"arwikisource": "php-1.28.0-wmf.13",
+"arwikiversity": "php-1.28.0-wmf.13",
+"arwiktionary": "php-1.28.0-wmf.13",
"arzwiki": "php-1.28.0-wmf.13",
"astwiki": "php-1.28.0-wmf.13",
-"astwikibooks": "php-1.28.0-wmf.14",
-"astwikiquote": "php-1.28.0-wmf.14",
-"astwiktionary": "php-1.28.0-wmf.14",
+"astwikibooks": "php-1.28.0-wmf.13",
+"astwikiquote": "php-1.28.0-wmf.13",
+"astwiktionary": "php-1.28.0-wmf.13",
"aswiki": "php-1.28.0-wmf.13",
-"aswikibooks": "php-1.28.0-wmf.14",
-"aswikisource": "php-1.28.0-wmf.14",
-"aswiktionary": "php-1.28.0-wmf.14",
-"auditcomwiki": "php-1.28.0-wmf.14",
+"aswikibooks": "php-1.28.0-wmf.13",
+"aswikisource": "php-1.28.0-wmf.13",
+"aswiktionary": "php-1.28.0-wmf.13",
+"auditcomwiki": "php-1.28.0-wmf.13",
"avwiki": "php-1.28.0-wmf.13",
-"avwiktionary": "php-1.28.0-wmf.14",
+"avwiktionary": "php-1.28.0-wmf.13",
"aywiki": "php-1.28.0-wmf.13",
-"aywikibooks": "php-1.28.0-wmf.14",
-"aywiktionary": "php-1.28.0-wmf.14",
+"aywikibooks": "php-1.28.0-wmf.13",
+"aywiktionary": "php-1.28.0-wmf.13",
"azbwiki": "php-1.28.0-wmf.13",
"azwiki": "php-1.28.0-wmf.13",
-"azwikibooks": "php-1.28.0-wmf.14",
-"azwikiquote": "php-1.28.0-wmf.14",
-"azwikisource": "php-1.28.0-wmf.14",
-"azwiktionary": "php-1.28.0-wmf.14",
+"azwikibooks": "php-1.28.0-wmf.13",
+"azwikiquote": "php-1.28.0-wmf.13",
+"azwikisource": "php-1.28.0-wmf.13",
+"azwiktionary": "php-1.28.0-wmf.13",
"barwiki": "php-1.28.0-wmf.13",
"bat_smgwiki": "php-1.28.0-wmf.13",
"bawiki": "p
[MediaWiki-commits] [Gerrit] integration/config[master]: Temporarily move composer-hhvm/php5 jobs off of nodepool
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304131
Change subject: Temporarily move composer-hhvm/php5 jobs off of nodepool
..
Temporarily move composer-hhvm/php5 jobs off of nodepool
We're running low on capacity so moving these quick jobs off of nodepool
should help a lot.
Change-Id: I7b5ddf2d9a6ba2d00819bd9eff6d77a9754dda72
---
M jjb/php.yaml
M zuul/layout.yaml
2 files changed, 40 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/31/304131/1
diff --git a/jjb/php.yaml b/jjb/php.yaml
index f9545ff..18e4fad 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -104,11 +104,10 @@
- 'composer-php53'
- 'composer-package-php53'
-# Same as 'composer-{phpflavor}'. Runs "composer update" and "composer test"
-# but on disposable instances maintained by Nodepool.
+# Runs "composer update" and "composer test"
- job-template:
-name: 'composer-{phpflavor}-{image}'
-node: ci-{image}-wikimedia
+name: 'composer-{phpflavor}'
+node: contintLabsSlave && phpflavor-{phpflavor}
defaults: use-remote-zuul-shallow-clone
concurrent: true
logrotate:
@@ -118,14 +117,11 @@
builders:
- assert-phpflavor:
phpflavor: '{phpflavor}'
- - castor-load
- composer-validate:
dir: '.'
- composer-update:
dir: '.'
- composer-test
-publishers:
- - castor-save
# Same as 'composer-package-{phpflavor}'. Runs "composer update" and "composer
# test" for libraries that are published as composer packages but on disposable
@@ -163,4 +159,11 @@
image: jessie
jobs:
- 'composer-package-{phpflavor}-{image}'
- - 'composer-{phpflavor}-{image}'
+
+- project:
+name: 'composer-flavored'
+phpflavor:
+- php55
+- hhvm
+jobs:
+ - 'composer-{phpflavor}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 65e0e2e..4ac3d0a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -711,7 +711,7 @@
# Don't run tests on deployment branches where the tests have been removed.
# Covered by test_smashpig_deployment_branch_filters
- - name: ^composer-hhvm-trusty$
+ - name: ^composer-hhvm$
skip-if:
- project: ^wikimedia/fundraising/SmashPig$
branch: ^deployment$
@@ -913,8 +913,8 @@
- mwext-qunit-composer-jessie
- npm-node-4.3
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
- name: extension-unittests-composer-non-voting
check:
@@ -936,8 +936,8 @@
experimental:
- mwext-qunit-composer-jessie
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
- name: extension-unittests-generic
check:
@@ -967,8 +967,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
- name: extension-unittests-non-voting
check:
@@ -995,8 +995,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
# Template to run per-patch selenium browser test
# Intentionally not in gate because it's super slow
@@ -1067,8 +1067,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
# Similar to above, but uses a check/test pipeline
- name: mw-checks-test
@@ -1094,8 +1094,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
- name: composer-test
check:
@@ -1104,27 +1104,23 @@
- composer-validate
test:
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
gate-and-submit:
- composer-php53
- - composer-php55-trusty
- - composer-hhvm-trusty
-experimental:
- - composer-hhvm-jessie
+ - composer-php55
+ - composer-hhvm
- name: composer-test55
check:
- php55lint
- composer-validate
test:
- - composer-php55-trusty
- - composer-hhvm-trusty
+ - composer-php55
+ - composer-hhvm
gate-and-submit:
- - composer-php55-trusty
- - composer-hhvm-trusty
-experimental:
- - composer-hhvm-jessie
+ - composer-php55
+ - composer-hhvm
- name: jshint
check:
@@ -1588,9 +1584,9 @@
- php55lint
- composer-validate
test:
- - composer-php55-trusty
+ - c
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add missing assertions to PlaceholderEmittingEntityTermsView...
jenkins-bot has submitted this change and it was merged.
Change subject: Add missing assertions to PlaceholderEmittingEntityTermsViewTest
..
Add missing assertions to PlaceholderEmittingEntityTermsViewTest
This also fixes the order of the "expected" and "actual" parameters.
They are different in QUnit, this is why Adrian confused them.
Change-Id: I554f0d530897afba7df2faf80063fab14fe2f177
---
M
repo/tests/phpunit/includes/ParserOutput/PlaceholderEmittingEntityTermsViewTest.php
1 file changed, 14 insertions(+), 19 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/repo/tests/phpunit/includes/ParserOutput/PlaceholderEmittingEntityTermsViewTest.php
b/repo/tests/phpunit/includes/ParserOutput/PlaceholderEmittingEntityTermsViewTest.php
index f5f3e82..4bc9e9f 100644
---
a/repo/tests/phpunit/includes/ParserOutput/PlaceholderEmittingEntityTermsViewTest.php
+++
b/repo/tests/phpunit/includes/ParserOutput/PlaceholderEmittingEntityTermsViewTest.php
@@ -43,16 +43,19 @@
$entityTermsView = $this->newEntityTermsView( $textInjector );
- $result = $entityTermsView->getHtml(
- 'lkt',
- $property,
- $property,
- $property
- );
+ $html = $entityTermsView->getHtml( 'lkt', $property, $property
);
+ $markers = $textInjector->getMarkers();
- $this->assertEquals(
- array_values( $textInjector->getMarkers() ),
- [ [
'entityViewPlaceholder-entitytermsview-entitytermsforlanguagelistview-class' ],
[ 'termbox' ] ]
+ foreach ( $markers as $marker => $name ) {
+ $this->assertContains( $marker, $html );
+ }
+
+ $this->assertSame(
+ [
+ [
'entityViewPlaceholder-entitytermsview-entitytermsforlanguagelistview-class' ],
+ [ 'termbox' ],
+ ],
+ array_values( $markers )
);
}
@@ -62,17 +65,9 @@
$entityTermsView = $this->newEntityTermsView( $textInjector );
- $termsListItems = $entityTermsView->getTermsListItems(
- 'lkt',
- $property,
- $property,
- $property
- );
+ $termsListItems = $entityTermsView->getTermsListItems( 'lkt',
$property, $property );
- $this->assertEquals(
- $termsListItems,
- [ 'lkt' => null ]
- );
+ $this->assertSame( [ 'lkt' => null ], $termsListItems );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/303153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I554f0d530897afba7df2faf80063fab14fe2f177
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Adrian Heine
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Jonas Kress (WMDE)
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...CentralNotice[wmf_deploy]: Merge branch 'master' into wmf_deploy
AndyRussG has uploaded a new change for review. https://gerrit.wikimedia.org/r/304130 Change subject: Merge branch 'master' into wmf_deploy .. Merge branch 'master' into wmf_deploy Change-Id: Id469d2ac159f9cbac9e970bd154c5e578b081297 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/30/304130/1 -- To view, visit https://gerrit.wikimedia.org/r/304130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id469d2ac159f9cbac9e970bd154c5e578b081297 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: AndyRussG ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Only trigger Firefox data:uri image paste if there is no oth...
jenkins-bot has submitted this change and it was merged.
Change subject: Only trigger Firefox data:uri image paste if there is no other
HTML
..
Only trigger Firefox data:uri image paste if there is no other HTML
Bug: T142622
Change-Id: I440fb00841ae13c628d4b8d4e354d5f2883caab9
---
M src/ce/ve.ce.Surface.js
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
DLynch: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 41aec9b..48bb3d3 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1873,7 +1873,7 @@
// jshint unused:false
var clipboardKey, clipboardId, clipboardIndex, clipboardHash,
$elements, parts, pasteData, slice, internalListRange,
- data, pastedDocumentModel, htmlDoc, $images, i,
+ data, pastedDocumentModel, htmlDoc, $body, $images, i,
context, left, right, contextRange, pastedText, handled,
tableAction,
items = [],
@@ -2067,8 +2067,11 @@
}
// Some browsers don't provide pasted image data through the
clipboardData API and
// instead create img tags with data URLs, so detect those here
- $images = $( htmlDoc.body ).find( 'img[src^=data\\:]' );
- if ( $images.length ) {
+ $body = $( htmlDoc.body );
+ $images = $body.children( 'img[src^=data\\:]' );
+ // Check the body contained just children.
+ // TODO: In the future this may want to trigger image uploads
*and* paste the HTML.
+ if ( $images.length === $body.children().length ) {
for ( i = 0; i < $images.length; i++ ) {
items.push(
ve.ui.DataTransferItem.static.newFromDataUri(
$images.eq( i ).attr( 'src' ),
--
To view, visit https://gerrit.wikimedia.org/r/304058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I440fb00841ae13c628d4b8d4e354d5f2883caab9
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: DLynch
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Use natural language when referring to feature (but not exte...
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304129
Change subject: Use natural language when referring to feature (but not
extension/project)
..
Use natural language when referring to feature (but not extension/project)
Bug: T142651
Change-Id: I9fe75a04208049c4cc7c64bff182abec5fb52349
---
M i18n/en.json
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/29/304129/1
diff --git a/i18n/en.json b/i18n/en.json
index 1c92ef3..d418e13 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,7 +8,7 @@
"revisionslider-desc": "Shows a slider allowing selecting and comparing of
revisions on a diff page",
"revisionslider-beta-feature-message": "RevisionSlider",
"revisionslider-beta-feature-description": "Show a revision slider when
comparing two revisions of a page.",
-"revisionslider-toggle-label": "RevisionSlider",
+"revisionslider-toggle-label": "Revision slider",
"revisionslider-page-size": "$1 {{PLURAL:$2|byte|bytes}}",
"revisionslider-change-size": "$1 {{PLURAL:$3|byte|bytes}}",
"revisionslider-label-date": "Date",
@@ -17,18 +17,18 @@
"revisionslider-label-comment": "Comment",
"revisionslider-label-username": "{{GENDER:$1|Username}}",
"revisionslider-minoredit": "This is a minor edit",
-"revisionslider-loading-placeholder": "The RevisionSlider is loading...",
-"revisionslider-loading-failed": "The RevisionSlider failed to load.",
-"revisionslider-toggle-title-expand": "Open RevisionSlider",
-"revisionslider-toggle-title-collapse": "Collapse RevisionSlider",
+"revisionslider-loading-placeholder": "The revision slider is loading...",
+"revisionslider-loading-failed": "The revision slider failed to load.",
+"revisionslider-toggle-title-expand": "Open revision slider",
+"revisionslider-toggle-title-collapse": "Collapse revision slider",
"revisionslider-arrow-tooltip-newer": "See newer revisions",
"revisionslider-arrow-tooltip-older": "See older revisions",
"revisionslider-show-help-tooltip": "Show help text",
-"revisionslider-help-dialog-slide1": "The RevisionSlider helps you to
navigate and compare revisions on the diff page. It is based on a
[[m:WMDE_Technical_Wishes/RevisionSlider|community wish]] from the
German-speaking community technical wishlist. Feedback is very much appreciated
[[mw:Extension_talk:RevisionSlider|here]].",
+"revisionslider-help-dialog-slide1": "The revision slider helps you to
navigate and compare revisions on the diff page. It is based on a
[[m:WMDE_Technical_Wishes/RevisionSlider|community wish]] from the
German-speaking community technical wishlist. Feedback is very much appreciated
[[mw:Extension_talk:RevisionSlider|here]].",
"revisionslider-help-dialog-slide2": "Each bar represents a page revision.
Bars on the top show growth in size of the page, bars on the bottom show a
reduction. In the image, revision 1 represents added content, while revision 2
represents removal of content.",
"revisionslider-help-dialog-slide3": "To compare certain revisions,
select the revisions using the yellow and blue pointer.The blue pointer
controls the newer revision, the yellow pointer maps to the older
revision.Move the pointers by drag and drop or click on a bar.",
"revisionslider-help-dialog-slide4": "Use the backward and forward arrows
to move through revision history and show older and newer revisions.",
-"revisionslider-tutorial": "RevisionSlider Tutorial",
+"revisionslider-tutorial": "Revision slider tutorial",
"revisionslider-previous-dialog": "Previous",
"revisionslider-next-dialog": "Next",
"revisionslider-close-dialog": "Close"
--
To view, visit https://gerrit.wikimedia.org/r/304129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fe75a04208049c4cc7c64bff182abec5fb52349
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: Add blackbox exporter role/class
Yuvipanda has submitted this change and it was merged.
Change subject: prometheus: Add blackbox exporter role/class
..
prometheus: Add blackbox exporter role/class
https://wikitech.wikimedia.org/wiki/Prometheus/Black_box_exporter
explains how to build the deb. Deb is currently available only
in the tools project
Change-Id: I9050ff361ecf4dcc432bab2c0b5cb3627c6bfbff
---
A modules/prometheus/manifests/blackbox_exporter.pp
A modules/prometheus/templates/blackbox_exporter.yml.erb
A
modules/prometheus/templates/initscripts/prometheus-blackbox-exporter.systemd.erb
A modules/role/manifests/prometheus/blackbox_exporter.pp
M modules/role/manifests/prometheus/tools.pp
5 files changed, 62 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/prometheus/manifests/blackbox_exporter.pp
b/modules/prometheus/manifests/blackbox_exporter.pp
new file mode 100644
index 000..fa7446f
--- /dev/null
+++ b/modules/prometheus/manifests/blackbox_exporter.pp
@@ -0,0 +1,27 @@
+# Prometheus black box metrics exporter. See also
+# https://github.com/prometheus/blackbox_exporter
+#
+# This does 'active' checks over TCP / UDP / ICMP / HTTP / DNS
+# and reports status to the prometheus scraper
+
+class prometheus::blackbox_exporter{
+requires_os('debian >= jessie')
+
+require_package('prometheus-blackbox-exporter')
+
+file { '/etc/prometheus-blackbox_exporter.yml':
+ensure => present,
+mode=> '0444',
+owner => 'root',
+group => 'root',
+content => template('prometheus/blackbox_exporter.yml.erb'),
+notify => Service['prometheus-blackbox-exporter'],
+}
+
+base::service_unit { 'prometheus-blackbox-exporter':
+ensure => present,
+refresh => true,
+systemd => true,
+require => Package['prometheus-blackbox-exporter'],
+}
+}
diff --git a/modules/prometheus/templates/blackbox_exporter.yml.erb
b/modules/prometheus/templates/blackbox_exporter.yml.erb
new file mode 100644
index 000..55b6d5a
--- /dev/null
+++ b/modules/prometheus/templates/blackbox_exporter.yml.erb
@@ -0,0 +1,13 @@
+modules:
+ tcp_connect:
+prober: tcp
+timeout: 5s
+ ssh_banner:
+prober: tcp
+timeout: 5s
+tcp:
+ query_response:
+ - expect: "^SSH-2.0-"
+ icmp:
+prober: icmp
+timeout: 5s
diff --git
a/modules/prometheus/templates/initscripts/prometheus-blackbox-exporter.systemd.erb
b/modules/prometheus/templates/initscripts/prometheus-blackbox-exporter.systemd.erb
new file mode 100644
index 000..2f35925
--- /dev/null
+++
b/modules/prometheus/templates/initscripts/prometheus-blackbox-exporter.systemd.erb
@@ -0,0 +1,7 @@
+[Unit]
+Description=prometheus-blackbox-exporter
+
+[Service]
+User=prometheus
+ExecStart=/usr/bin/blackbox_exporter -config.file
/etc/prometheus-blackbox_exporter.yml
+Restart=on-failure
diff --git a/modules/role/manifests/prometheus/blackbox_exporter.pp
b/modules/role/manifests/prometheus/blackbox_exporter.pp
new file mode 100644
index 000..6d54120
--- /dev/null
+++ b/modules/role/manifests/prometheus/blackbox_exporter.pp
@@ -0,0 +1,14 @@
+# == Class: role::prometheus::blackbox_exporter
+#
+# Role to provision prometheus blackbox / active checks exporter. See
+# https://github.com/prometheus/blackbox_exporter and the module's
documentation.
+
+class role::prometheus::blackbox_exporter {
+include ::prometheus::blackbox_exporter
+
+ferm::service { 'prometheus-blackbox-exporter':
+proto => 'tcp',
+port => '9115',
+srange => '$DOMAIN_NETWORKS',
+}
+}
diff --git a/modules/role/manifests/prometheus/tools.pp
b/modules/role/manifests/prometheus/tools.pp
index fd6afd0..f254ba3 100644
--- a/modules/role/manifests/prometheus/tools.pp
+++ b/modules/role/manifests/prometheus/tools.pp
@@ -59,6 +59,7 @@
require => Prometheus::Server['tools'],
}
+include ::role::prometheus::blackbox_exporter
include ::prometheus::scripts
$targets_path = '/srv/prometheus/tools/targets'
--
To view, visit https://gerrit.wikimedia.org/r/303986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9050ff361ecf4dcc432bab2c0b5cb3627c6bfbff
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/portals[master]: New layout with language list dropdown.
jenkins-bot has submitted this change and it was merged. Change subject: New layout with language list dropdown. .. New layout with language list dropdown. As per the conversation on https://www.mediawiki.org/wiki/Talk:Wikipedia.org_updated_page_layout Bug: T140153 Change-Id: I7c44b270a53d3a7916950e91ab76995632f8a0a1 --- M data/site-stats.json M dev/wikipedia.org/assets/css/sprites.css M dev/wikipedia.org/assets/css/style.css M dev/wikipedia.org/assets/img/sprite-bookshelf_icons.png M dev/wikipedia.org/assets/img/sprite-bookshelf_ic...@1.5x.png M dev/wikipedia.org/assets/img/sprite-bookshelf_ic...@2x.png M dev/wikipedia.org/assets/img/sprite_assets/bookshelf_icons/arrow-down-blue.png D dev/wikipedia.org/assets/js/lang-dropdown-abtest.js A dev/wikipedia.org/assets/js/lang-dropdown.js M dev/wikipedia.org/assets/postcss/_lang-dropdown.css M dev/wikipedia.org/assets/postcss/_search-box.css M dev/wikipedia.org/assets/rev-manifest.json M dev/wikipedia.org/index.handlebars M dev/wikipedia.org/other-projects.json M dev/wikipedia.org/templates/language-list-button.handlebars M dev/wikipedia.org/templates/top-n-articles.handlebars M l10n/nl.json M prod/wikipedia.org/assets/img/sprite-bookshelf_icons.png M prod/wikipedia.org/assets/img/sprite-bookshelf_ic...@1.5x.png M prod/wikipedia.org/assets/img/sprite-bookshelf_ic...@2x.png D prod/wikipedia.org/assets/js/index-209a6a34e7.js A prod/wikipedia.org/assets/js/index-3b68787aa6.js D prod/wikipedia.org/assets/l10n/ab-8922c7e2.json A prod/wikipedia.org/assets/l10n/ab-ca83b4bb.json D prod/wikipedia.org/assets/l10n/ace-8922c7e2.json A prod/wikipedia.org/assets/l10n/ace-ca83b4bb.json D prod/wikipedia.org/assets/l10n/af-8922c7e2.json A prod/wikipedia.org/assets/l10n/af-ca83b4bb.json D prod/wikipedia.org/assets/l10n/ak-8922c7e2.json A prod/wikipedia.org/assets/l10n/ak-ca83b4bb.json D prod/wikipedia.org/assets/l10n/als-8922c7e2.json A prod/wikipedia.org/assets/l10n/als-ca83b4bb.json D prod/wikipedia.org/assets/l10n/am-8922c7e2.json A prod/wikipedia.org/assets/l10n/am-ca83b4bb.json D prod/wikipedia.org/assets/l10n/an-8922c7e2.json A prod/wikipedia.org/assets/l10n/an-ca83b4bb.json D prod/wikipedia.org/assets/l10n/ang-8922c7e2.json A prod/wikipedia.org/assets/l10n/ang-ca83b4bb.json D prod/wikipedia.org/assets/l10n/ar-8922c7e2.json A prod/wikipedia.org/assets/l10n/ar-ca83b4bb.json D prod/wikipedia.org/assets/l10n/arc-8922c7e2.json A prod/wikipedia.org/assets/l10n/arc-ca83b4bb.json D prod/wikipedia.org/assets/l10n/arz-8922c7e2.json A prod/wikipedia.org/assets/l10n/arz-ca83b4bb.json D prod/wikipedia.org/assets/l10n/as-8922c7e2.json A prod/wikipedia.org/assets/l10n/as-ca83b4bb.json D prod/wikipedia.org/assets/l10n/ast-8922c7e2.json A prod/wikipedia.org/assets/l10n/ast-ca83b4bb.json D prod/wikipedia.org/assets/l10n/av-8922c7e2.json A prod/wikipedia.org/assets/l10n/av-ca83b4bb.json D prod/wikipedia.org/assets/l10n/ay-8922c7e2.json A prod/wikipedia.org/assets/l10n/ay-ca83b4bb.json D prod/wikipedia.org/assets/l10n/az-8922c7e2.json A prod/wikipedia.org/assets/l10n/az-ca83b4bb.json D prod/wikipedia.org/assets/l10n/azb-8922c7e2.json A prod/wikipedia.org/assets/l10n/azb-ca83b4bb.json D prod/wikipedia.org/assets/l10n/ba-8922c7e2.json A prod/wikipedia.org/assets/l10n/ba-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bar-8922c7e2.json A prod/wikipedia.org/assets/l10n/bar-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bat-smg-8922c7e2.json A prod/wikipedia.org/assets/l10n/bat-smg-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bcl-8922c7e2.json A prod/wikipedia.org/assets/l10n/bcl-ca83b4bb.json D prod/wikipedia.org/assets/l10n/be-8922c7e2.json A prod/wikipedia.org/assets/l10n/be-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bg-8922c7e2.json A prod/wikipedia.org/assets/l10n/bg-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bh-8922c7e2.json A prod/wikipedia.org/assets/l10n/bh-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bi-8922c7e2.json A prod/wikipedia.org/assets/l10n/bi-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bjn-8922c7e2.json A prod/wikipedia.org/assets/l10n/bjn-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bm-8922c7e2.json A prod/wikipedia.org/assets/l10n/bm-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bn-8922c7e2.json A prod/wikipedia.org/assets/l10n/bn-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bo-8922c7e2.json A prod/wikipedia.org/assets/l10n/bo-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bpy-8922c7e2.json A prod/wikipedia.org/assets/l10n/bpy-ca83b4bb.json D prod/wikipedia.org/assets/l10n/br-8922c7e2.json A prod/wikipedia.org/assets/l10n/br-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bs-8922c7e2.json A prod/wikipedia.org/assets/l10n/bs-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bug-8922c7e2.json A prod/wikipedia.org/assets/l10n/bug-ca83b4bb.json D prod/wikipedia.org/assets/l10n/bxr-8922c7e2.json A prod/wikipedia.org/assets/l10n/bxr-ca83b4bb.json D prod/wikipedia.org/assets/l10n/ca-8922c7e2.json
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add a module for EasyTimeline
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304128
Change subject: Add a module for EasyTimeline
..
Add a module for EasyTimeline
Change-Id: Ic9e1f3ca8a5c39370bcf8be1dd205f9d46fdb837
---
A puppet/modules/role/manifests/easytimeline.pp
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/28/304128/1
diff --git a/puppet/modules/role/manifests/easytimeline.pp
b/puppet/modules/role/manifests/easytimeline.pp
new file mode 100644
index 000..9fa296f
--- /dev/null
+++ b/puppet/modules/role/manifests/easytimeline.pp
@@ -0,0 +1,9 @@
+# == Class: role::easytimeline
+# Configures the EasyTimeline extension
+class role::easytimeline {
+ package { ['ploticus', 'ttf-freefont']:
+ensure => latest,
+ }
+
+ mediawiki::extension { 'timeline': }
+}
--
To view, visit https://gerrit.wikimedia.org/r/304128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9e1f3ca8a5c39370bcf8be1dd205f9d46fdb837
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Update package.json
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304127
Change subject: Update package.json
..
Update package.json
Change-Id: Ia7cf652ec176dd71a45f11fdab60503d2775b562
---
M package.json
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/27/304127/1
diff --git a/package.json b/package.json
index 6f85da3..81f5a00 100644
--- a/package.json
+++ b/package.json
@@ -7,10 +7,9 @@
"test": "grunt test"
},
"devDependencies": {
-"grunt": "0.4.5",
-"grunt-cli": "0.1.13",
-"grunt-banana-checker": "0.4.0",
-"grunt-contrib-jshint": "0.12.0",
+"grunt": "1.0.1",
+"grunt-banana-checker": "0.5.0",
+"grunt-contrib-jshint": "1.0.0",
"grunt-jsonlint": "1.0.7"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/304127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7cf652ec176dd71a45f11fdab60503d2775b562
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
