[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Repool db2041 and db2049
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354085 ) Change subject: db-codfw.php: Repool db2041 and db2049 .. db-codfw.php: Repool db2041 and db2049 They finished the alter table Bug: T162611 Change-Id: If7659e6b48eae3090059986fa33028ecc830ece4 --- M wmf-config/db-codfw.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 80163ba..b1a5b0a 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -106,8 +106,8 @@ 's2' => [ 'db2017' => 0, # B6 2.9TB 96GB, master 'db2035' => 50, # C6 2.9TB 160GB, rc, log -# 'db2041' => 100, # C6 2.9TB 160GB, api #T162611 -# 'db2049' => 400, # C6 2.9TB 160GB, #T162611 + 'db2041' => 100, # C6 2.9TB 160GB, api + 'db2049' => 400, # C6 2.9TB 160GB, 'db2056' => 50, # D6 3.3TB 160GB, dump (inactive), vslow 'db2063' => 100, # D6 3.3TB 160GB, api 'db2064' => 400, # D6 3.3TB 160GB @@ -274,7 +274,7 @@ 'db2056' => 1, ], 'api' => [ -# 'db2041' => 1, + 'db2041' => 1, 'db2063' => 1, ], ], -- To view, visit https://gerrit.wikimedia.org/r/354085 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7659e6b48eae3090059986fa33028ecc830ece4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Repool db2041 and db2049
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354085 ) Change subject: db-codfw.php: Repool db2041 and db2049 .. db-codfw.php: Repool db2041 and db2049 They finished the alter table Bug: T162611 Change-Id: If7659e6b48eae3090059986fa33028ecc830ece4 --- M wmf-config/db-codfw.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/85/354085/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 80163ba..b1a5b0a 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -106,8 +106,8 @@ 's2' => [ 'db2017' => 0, # B6 2.9TB 96GB, master 'db2035' => 50, # C6 2.9TB 160GB, rc, log -# 'db2041' => 100, # C6 2.9TB 160GB, api #T162611 -# 'db2049' => 400, # C6 2.9TB 160GB, #T162611 + 'db2041' => 100, # C6 2.9TB 160GB, api + 'db2049' => 400, # C6 2.9TB 160GB, 'db2056' => 50, # D6 3.3TB 160GB, dump (inactive), vslow 'db2063' => 100, # D6 3.3TB 160GB, api 'db2064' => 400, # D6 3.3TB 160GB @@ -274,7 +274,7 @@ 'db2056' => 1, ], 'api' => [ -# 'db2041' => 1, + 'db2041' => 1, 'db2063' => 1, ], ], -- To view, visit https://gerrit.wikimedia.org/r/354085 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7659e6b48eae3090059986fa33028ecc830ece4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Rewrite the LLDP fact(s)
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354084 ) Change subject: Rewrite the LLDP fact(s) .. Rewrite the LLDP fact(s) Rewrite the LLDP fact, removing all of the existing string facts and adding the following instead: * "lldp", a structured fact resulting in a hash that contains interfaces, each of which contain a neighbor, a port and a VLAN. Note that we are not returning port/id (lldpswportid) anymore, as this was of limited usefulness (e.g. on Junipers it returned the internal port number). * "lldp_parent", a fact returning a string with the LLDP neighbor of the primary interface (interface_primary, in our setup). * "lldp_neighbors", a fact returning an array with the LLDP neighbors across all interfaces. Note that since "lldp" is a structured fact, it will only work with Facter >= 2.0 and will be stringified by Puppet in our setup. Also note that since "lldp_parent" and "lldp_neighbors" rely on "lldp", they implicitly require Facter >= 2.0 as well (so >= jessie). Change-Id: Ia156007346d7938a3f5a065fd8953f853748c314 --- M modules/base/lib/facter/lldp.rb M modules/monitoring/manifests/host.pp 2 files changed, 66 insertions(+), 52 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/84/354084/1 diff --git a/modules/base/lib/facter/lldp.rb b/modules/base/lib/facter/lldp.rb index 32abe04..0d5d956 100644 --- a/modules/base/lib/facter/lldp.rb +++ b/modules/base/lib/facter/lldp.rb @@ -1,58 +1,72 @@ require 'facter' require 'rexml/document' -if Facter.value('virtual') == 'physical' && File.exists?('/usr/sbin/lldpctl') +Facter.add(:lldp) do + confine :kernel => %w{Linux FreeBSD OpenBSD} + confine :virtual => "physical" # TODO: actually needed? + confine do +File.exists?('/usr/sbin/lldpctl') + end -lldppeers = nil - + setcode do +lldp = {} data = Facter::Util::Resolution.exec('/usr/sbin/lldpctl -f xml') document = REXML::Document.new(data) -document.elements.each('lldp/interface') do |iface| -eth = iface.attributes['name'] -iface.elements.each('chassis/name') do |switch| -Facter.add('lldppeer_%s' % eth) do -confine :kernel => %w{Linux FreeBSD OpenBSD} -setcode do -switch.text -end -end -if lldppeers -lldppeers = lldppeers + ',' + switch.text -else -lldppeers = switch.text -end -end -iface.elements.each('port/descr') do |port| -Facter.add('lldpswport_%s' % eth) do -confine :kernel => %w{Linux FreeBSD OpenBSD} -setcode do -port.text -end -end -end -iface.elements.each('port/id') do |port| -Facter.add('lldpswportid_%s' % eth) do -confine :kernel => %w{Linux FreeBSD OpenBSD} -setcode do -port.text -end -end -end -iface.elements.each('vlan') do |vlan| -Facter.add('lldpswport_vlan_%s' % eth) do -confine :kernel => %w{Linux FreeBSD OpenBSD} -setcode do -vlan.text -end -end -end + +document.elements.each('lldp/interface') do |interface| + eth = interface.attributes['name'] + lldp[eth] = {} + + interface.elements.each('chassis/name') do |switch| +lldp[eth]['neighbor'] = switch.text + end + interface.elements.each('port/descr') do |port| +lldp[eth]['port'] = port.text + end + interface.elements.each('vlan') do |vlan| +lldp[eth]['vlan'] = vlan.text + end end -# Aggregate all the lldp peers on one single variable -Facter.add('lldppeers') do -confine :kernel => %w{Linux FreeBSD OpenBSD} -setcode do -lldppeers -end +lldp + end +end + +Facter.add(:lldp_parent) do + confine :kernel => %w{Linux FreeBSD OpenBSD} + + setcode do +begin + # Facter 3 + primary = Facter.value(:networking)['primary'] +rescue + # fallback to our own implementation + primary = Facter.value(:interface_primary) end + +begin + Facter.value(:lldp)[primary]['neighbor'] +rescue + nil +end + end +end + +Facter.add(:lldp_neighbors) do + confine :kernel => %w{Linux FreeBSD OpenBSD} + confine do +!Facter.value(:lldp).nil? + end + + setcode do +neighbors = [] +Facter.value(:lldp).each do |interface, values| + neighbor = values['neighbor'] + if neighbor +neighbors.push(neighbor) + end +end + +neighbors + end end diff --git a/modules/monitoring/manifests/host.pp b/modules/monitoring/manifests/host.pp index f121a4d..eec1e4b 100644 --- a/modules/mo
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make sure unique keys carry over to postgres table duplicates
Aaron Schulz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354083 ) Change subject: Make sure unique keys carry over to postgres table duplicates .. Make sure unique keys carry over to postgres table duplicates This fixes BotPasswordTest failures. Change-Id: I81003187af0c57020f9fc4cbcd2606e71907a903 --- M includes/libs/rdbms/database/DatabasePostgres.php M tests/phpunit/includes/user/BotPasswordTest.php 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/83/354083/1 diff --git a/includes/libs/rdbms/database/DatabasePostgres.php b/includes/libs/rdbms/database/DatabasePostgres.php index 6cf890d..f84ffa9 100644 --- a/includes/libs/rdbms/database/DatabasePostgres.php +++ b/includes/libs/rdbms/database/DatabasePostgres.php @@ -828,7 +828,7 @@ $oldName = $this->addIdentifierQuotes( $oldName ); return $this->query( 'CREATE ' . ( $temporary ? 'TEMPORARY ' : '' ) . " TABLE $newName " . - "(LIKE $oldName INCLUDING DEFAULTS)", $fname ); + "(LIKE $oldName INCLUDING DEFAULTS INCLUDING INDEXES)", $fname ); } public function listTables( $prefix = null, $fname = __METHOD__ ) { diff --git a/tests/phpunit/includes/user/BotPasswordTest.php b/tests/phpunit/includes/user/BotPasswordTest.php index 58f1e5f..09cf350 100644 --- a/tests/phpunit/includes/user/BotPasswordTest.php +++ b/tests/phpunit/includes/user/BotPasswordTest.php @@ -382,6 +382,8 @@ } $token = $bp->getToken(); + $this->assertEquals( 42, $bp->getUserCentralId() ); + $this->assertEquals( 'TestSave', $bp->getAppId() ); $this->assertFalse( $bp->save( 'insert' ) ); $this->assertTrue( $bp->save( 'update' ) ); $this->assertNotEquals( $token, $bp->getToken() ); -- To view, visit https://gerrit.wikimedia.org/r/354083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81003187af0c57020f9fc4cbcd2606e71907a903 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]: Various test fixes for postgres
Aaron Schulz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354082 ) Change subject: Various test fixes for postgres .. Various test fixes for postgres * Do not expect timestamp conversion for pager mOffset (used in URLs for ages) * Do not assume the user_id for UTSysop is 1; use the row value Change-Id: I590a4b7363ccff26d9ac9f51b95fc1aa072503b2 --- M includes/WatchedItemStore.php M tests/phpunit/includes/logging/NewUsersLogFormatterTest.php M tests/phpunit/includes/pager/RangeChronologicalPagerTest.php 3 files changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/82/354082/1 diff --git a/includes/WatchedItemStore.php b/includes/WatchedItemStore.php index 228f93b..273f47c 100644 --- a/includes/WatchedItemStore.php +++ b/includes/WatchedItemStore.php @@ -581,7 +581,8 @@ ); foreach ( $res as $row ) { - $timestamps[$row->wl_namespace][$row->wl_title] = $row->wl_notificationtimestamp; + $timestamps[$row->wl_namespace][$row->wl_title] = + wfTimestamp( TS_MW, $row->wl_notificationtimestamp ); } return $timestamps; diff --git a/tests/phpunit/includes/logging/NewUsersLogFormatterTest.php b/tests/phpunit/includes/logging/NewUsersLogFormatterTest.php index c4b52f0..333fd88 100644 --- a/tests/phpunit/includes/logging/NewUsersLogFormatterTest.php +++ b/tests/phpunit/includes/logging/NewUsersLogFormatterTest.php @@ -107,16 +107,10 @@ 'user' => 0, 'user_text' => 'User', 'namespace' => NS_USER, - 'title' => 'UTSysop', - 'params' => [ - '4::userid' => 1, - ], + 'title' => 'UTSysop' ], [ - 'text' => 'User account UTSysop was created by User', - 'api' => [ - 'userid' => 1, - ], + 'text' => 'User account UTSysop was created by User' ], ], ]; @@ -126,6 +120,10 @@ * @dataProvider provideCreate2LogDatabaseRows */ public function testCreate2LogDatabaseRows( $row, $extra ) { + // Make UTSysop user and use its user_id (sequence does not reset to 1 for postgres) + $user = static::getTestSysop()->getUser(); + $row['params']['4::userid'] = $user->getId(); + $extra['api']['userid'] = $user->getId(); $this->doTestLogFormatter( $row, $extra ); } @@ -145,16 +143,10 @@ 'user' => 0, 'user_text' => 'Sysop', 'namespace' => NS_USER, - 'title' => 'UTSysop', - 'params' => [ - '4::userid' => 1, - ], + 'title' => 'UTSysop' ], [ - 'text' => 'User account UTSysop was created by Sysop and password was sent by email', - 'api' => [ - 'userid' => 1, - ], + 'text' => 'User account UTSysop was created by Sysop and password was sent by email' ], ], ]; @@ -164,6 +156,10 @@ * @dataProvider provideByemailLogDatabaseRows */ public function testByemailLogDatabaseRows( $row, $extra ) { + // Make UTSysop user and use its user_id (sequence does not reset to 1 for postgres) + $user = static::getTestSysop()->getUser(); + $row['params']['4::userid'] = $user->getId(); + $extra['api']['userid'] = $user->getId(); $this->doTestLogFormatter( $row, $extra ); } diff --git a/tests/phpunit/includes/pager/RangeChronologicalPagerTest.php b/tests/phpunit/includes/pager/RangeChronologicalPagerTest.php index 3374f4a..4721ce6 100644 --- a/tests/phpunit/includes/pager/RangeChronologicalPagerTest.php +++ b/tests/phpunit/includes/pager/RangeChronologicalPagerTest.php @@ -15,7 +15,10 @@
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cassandra/aqs: drop Hiera values equal to defaults
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354081 ) Change subject: cassandra/aqs: drop Hiera values equal to defaults .. cassandra/aqs: drop Hiera values equal to defaults Commit b4b5c21d46a added support for default values to cassandra::instance's options, as defined in Hiera for Cassandra hosts (including AQS). Moreover, commit 28d597f2d2 removed support for the rpc_interface key entirely. Remove the jmx_port, rpc_address and rpc_interface options from the aqs100N.yaml hosts in the Hiera hierarchy and rely on their (equivalent) default values. These hosts should still be moved to the profile/role structure to make this even more DRY, but that will do for now and is not work wasted. Change-Id: I5e0b6ef789212198f3ca436818936eef67f11155 --- M hieradata/hosts/aqs1004.yaml M hieradata/hosts/aqs1005.yaml M hieradata/hosts/aqs1006.yaml M hieradata/hosts/aqs1007.yaml M hieradata/hosts/aqs1008.yaml M hieradata/hosts/aqs1009.yaml 6 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/81/354081/1 diff --git a/hieradata/hosts/aqs1004.yaml b/hieradata/hosts/aqs1004.yaml index 3d2168d..3494d86 100644 --- a/hieradata/hosts/aqs1004.yaml +++ b/hieradata/hosts/aqs1004.yaml @@ -4,12 +4,6 @@ cassandra::instances: a: -jmx_port: 7189 listen_address: 10.64.0.126 #aqs1004-a.eqiad.wmnet -rpc_address: 10.64.0.126 -rpc_interface: eth0 b: -jmx_port: 7190 listen_address: 10.64.0.127 #aqs1004-b.eqiad.wmnet -rpc_address: 10.64.0.127 -rpc_interface: eth0 diff --git a/hieradata/hosts/aqs1005.yaml b/hieradata/hosts/aqs1005.yaml index a0f7435..a85b68a 100644 --- a/hieradata/hosts/aqs1005.yaml +++ b/hieradata/hosts/aqs1005.yaml @@ -4,12 +4,6 @@ cassandra::instances: a: -jmx_port: 7189 listen_address: 10.64.32.189 #aqs1005-a.eqiad.wmnet -rpc_address: 10.64.32.189 -rpc_interface: eth0 b: -jmx_port: 7190 listen_address: 10.64.32.190 #aqs1005-b.eqiad.wmnet -rpc_address: 10.64.32.190 -rpc_interface: eth0 \ No newline at end of file diff --git a/hieradata/hosts/aqs1006.yaml b/hieradata/hosts/aqs1006.yaml index 1484eec..2fa64d0 100644 --- a/hieradata/hosts/aqs1006.yaml +++ b/hieradata/hosts/aqs1006.yaml @@ -4,12 +4,6 @@ cassandra::instances: a: -jmx_port: 7189 listen_address: 10.64.48.148 #aqs1006-a.eqiad.wmnet -rpc_address: 10.64.48.148 -rpc_interface: eth0 b: -jmx_port: 7190 listen_address: 10.64.48.149 #aqs1006-b.eqiad.wmnet -rpc_address: 10.64.48.149 -rpc_interface: eth0 \ No newline at end of file diff --git a/hieradata/hosts/aqs1007.yaml b/hieradata/hosts/aqs1007.yaml index 40795bf..7536822 100644 --- a/hieradata/hosts/aqs1007.yaml +++ b/hieradata/hosts/aqs1007.yaml @@ -4,12 +4,6 @@ cassandra::instances: a: -jmx_port: 7189 listen_address: 10.64.0.213 #aqs1007-a.eqiad.wmnet -rpc_address: 10.64.0.213 -rpc_interface: eth0 b: -jmx_port: 7190 listen_address: 10.64.0.237 #aqs1007-b.eqiad.wmnet -rpc_address: 10.64.0.237 -rpc_interface: eth0 diff --git a/hieradata/hosts/aqs1008.yaml b/hieradata/hosts/aqs1008.yaml index eb5e3b9..f4ed70f 100644 --- a/hieradata/hosts/aqs1008.yaml +++ b/hieradata/hosts/aqs1008.yaml @@ -4,12 +4,6 @@ cassandra::instances: a: -jmx_port: 7189 listen_address: 10.64.16.74 #aqs1008-a.eqiad.wmnet -rpc_address: 10.64.16.74 -rpc_interface: eth0 b: -jmx_port: 7190 listen_address: 10.64.16.78 #aqs1008-b.eqiad.wmnet -rpc_address: 10.64.16.78 -rpc_interface: eth0 diff --git a/hieradata/hosts/aqs1009.yaml b/hieradata/hosts/aqs1009.yaml index 660a401..d029674 100644 --- a/hieradata/hosts/aqs1009.yaml +++ b/hieradata/hosts/aqs1009.yaml @@ -4,12 +4,6 @@ cassandra::instances: a: -jmx_port: 7189 listen_address: 10.64.48.122 #aqs1009-a.eqiad.wmnet -rpc_address: 10.64.48.122 -rpc_interface: eth0 b: -jmx_port: 7190 listen_address: 10.64.48.123 #aqs1009-b.eqiad.wmnet -rpc_address: 10.64.48.123 -rpc_interface: eth0 \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/354081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e0b6ef789212198f3ca436818936eef67f11155 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: raid/hpssacli: check for cable errors/no batteries
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354080 ) Change subject: raid/hpssacli: check for cable errors/no batteries .. raid/hpssacli: check for cable errors/no batteries T163777 had a case where the following "show status" resulted in an OK: Controller Status: OK Cache Status: Permanently Disabled We already fixed the check to emit a WARNING when Cache Status is not "OK" or "Not Configured" in a previous commit, but it seems there's another thing we could check: "controller slot=N show detail". This had a few more values we could check, and specifically: Cache Status Details: Cable Error Battery/Capacitor Count: 0 Emit CRITICAL for the former, and CRITICAL for the latter if the count is 0 and the argument --no-battery hasn't been passed to us. This is untested on systems that have no battery by design -- hopefully, Cable Error won't be reported on these. Bug: T163998 Change-Id: Iaa099ec825a86445f6e79cfad895e9aec757725c --- M modules/raid/files/dsa-check-hpssacli 1 file changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/80/354080/1 diff --git a/modules/raid/files/dsa-check-hpssacli b/modules/raid/files/dsa-check-hpssacli index d10874b..8ae7121 100755 --- a/modules/raid/files/dsa-check-hpssacli +++ b/modules/raid/files/dsa-check-hpssacli @@ -111,6 +111,7 @@ my @drives; my $nodrives = 0; my %status; + my @freetext; my $ldallshow = runcmd("controller slot=$slot ld all show"); my @logicaldrives; @@ -300,12 +301,12 @@ next; }; - my $cst = runcmd("controller slot=$slot show status"); + my $cst = runcmd("controller slot=$slot show detail"); for (@$cst) { chomp; next if /^$/; next if (/^\S.*in Slot $slot/); - if (/^ *(.*) Status: (.*)$/) { + if (/^ *(Controller|Cache|Battery\/Capacitor) Status: (.*)$/) { my $system = $1; my $status = $2; @@ -318,17 +319,23 @@ next if $status =~ /^(OK|Not Configured)$/; } - push @{$status{$status}}, $system; + push @freetext, "$system: $status"; if ($status ne 'OK') { next if ($params->{'no-battery'} && $system eq 'Battery/Capacitor'); record('WARNING'); }; - } else { - die ("Cannot read line '$_' gotten from hpssacli controller slot=$slot show status\n"); + } elsif (/^ *(Cache Status Details): (Cable Error)/) { + push @freetext, $2; + record('CRITICAL'); + } elsif (/^ *(Battery\/Capacitor Count): (.*)/) { + next if $params->{'no-battery'} || int($2) > 0; + push @freetext, "Battery count: $2"; + record('CRITICAL'); }; }; - my $status = join(" - ", (map { $_.": ".join(", ", @{$status{$_}}) } keys %status)); + my $status = join(" - ", ((map { $_.": ".join(", ", @{$status{$_}}) } keys %status), @freetext)); + push @resultstr, "Slot $slot: $status"; }; -- To view, visit https://gerrit.wikimedia.org/r/354080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa099ec825a86445f6e79cfad895e9aec757725c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: raid/hpssacli: WARN on permanently disabled cache
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354079 ) Change subject: raid/hpssacli: WARN on permanently disabled cache .. raid/hpssacli: WARN on permanently disabled cache Commit 94f371f1f400a636694eead5a228285314a48db3 skipped the Cache Status line of "controller slot=N show status", in an effort to make it not warn on HP SSD Smart Path configurations where Cache Status was set to "Not Configured". We were checking instead the LD Acceleration Status for each logical drive, which was indicative in the past. We have now seen a case out in the wild where Cache Status is set to "Permanently Disabled", indicative of an issue with the hardware's battery, but LDs all report "LD Acceleration Status: Controller Cache" and "Caching: Enabled". Change the Cache Status check to explicitly check for "OK" or "Not Configured" and otherwise emit a WARNING. Bug: T163998 Change-Id: Ib186044a8d349ca82f112c4f90da0ca20ccad96f --- M modules/raid/files/dsa-check-hpssacli 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/354079/1 diff --git a/modules/raid/files/dsa-check-hpssacli b/modules/raid/files/dsa-check-hpssacli index 959198e..d10874b 100755 --- a/modules/raid/files/dsa-check-hpssacli +++ b/modules/raid/files/dsa-check-hpssacli @@ -309,8 +309,14 @@ my $system = $1; my $status = $2; - # skip the cache check, we track the LD Acceleration Method above - next if ($system eq 'Cache'); + if ($system eq 'Cache') { + # Can be: + # - 'OK' + # - 'Not Configured' (for e.g. HP SSD Smart Path) + # - 'Permanently Disabled' + # - ...? + next if $status =~ /^(OK|Not Configured)$/; + } push @{$status{$status}}, $system; if ($status ne 'OK') { -- To view, visit https://gerrit.wikimedia.org/r/354079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib186044a8d349ca82f112c4f90da0ca20ccad96f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: let Apache proxy only listen on service IP
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354078 ) Change subject: gerrit: let Apache proxy only listen on service IP .. gerrit: let Apache proxy only listen on service IP Instead of listening on all IPs, let the Apache proxy for Gerrit only listen on the _service_ IP, not the server IP, since each Gerrit server now has both, a server and a service IP. Avoid that https://cobalt.wikimedia.org works but with a cert error. Change-Id: I54b26eb1662e3fa68b1fcd147d8c4436f1adac54 --- M modules/gerrit/manifests/proxy.pp A modules/gerrit/templates/apache.ports.conf.erb 2 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/78/354078/1 diff --git a/modules/gerrit/manifests/proxy.pp b/modules/gerrit/manifests/proxy.pp index b055e5c..8bf34c7 100644 --- a/modules/gerrit/manifests/proxy.pp +++ b/modules/gerrit/manifests/proxy.pp @@ -21,6 +21,15 @@ content => template('gerrit/gerrit.wikimedia.org.erb'), } +# Let Apache only listen on the service IP. +file { '/etc/apache2/ports.conf': +ensure => present, +owner => 'root', +group => 'root', +mode => '0444', +content => template('gerrit/apache.ports.conf.erb'), +} + # Error page stuff file { '/var/www/error.html': ensure => present, diff --git a/modules/gerrit/templates/apache.ports.conf.erb b/modules/gerrit/templates/apache.ports.conf.erb new file mode 100644 index 000..a718414 --- /dev/null +++ b/modules/gerrit/templates/apache.ports.conf.erb @@ -0,0 +1,19 @@ +# If you just change the port or add more ports here, you will likely also +# have to change the VirtualHost statement in +# /etc/apache2/sites-enabled/000-default.conf + +Listen <%= @profile::gerrit::server::ipv4 %>:80 +Listen [<%= @profile::gerrit::server::ipv6 %>]:80 + + Listen <%= @profile::gerrit::server::ipv4 %>:443 +Listen [<%= @profile::gerrit::server::ipv6 %>]:443 + + + + Listen <%= @profile::gerrit::server::ipv4 %>:443 +Listen [<%= @profile::gerrit::server::ipv6 %>]:443 + + + + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet -- To view, visit https://gerrit.wikimedia.org/r/354078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54b26eb1662e3fa68b1fcd147d8c4436f1adac54 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[master]: RCFilters UI: Actually backwards-compat instead of overridin...
Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354077 ) Change subject: RCFilters UI: Actually backwards-compat instead of overriding false .. RCFilters UI: Actually backwards-compat instead of overriding false Another typo in the code made highlight feature always load as false when you loaded a saved filter. Bug: T165437 Change-Id: I0e0efa3576659e4145b20013e4af7a06e4e7c0ff --- M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/77/354077/1 diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js index b8f2db5..3ffc12e 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js @@ -85,7 +85,7 @@ // not need this line when we release this to the general wikis. // This method will automatically fix all saved queries anyways // for existing users, who are only betalabs users at the moment. - normalizedData.highlights.highlight = !!Number( normalizedData.highlight ); + normalizedData.highlights.highlight = !!Number( normalizedData.highlights.highlight ); items.push( new mw.rcfilters.dm.SavedQueryItemModel( -- To view, visit https://gerrit.wikimedia.org/r/354077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e0efa3576659e4145b20013e4af7a06e4e7c0ff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mooeypoo ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: switch SSHD from port 29418 to 22
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354076 ) Change subject: gerrit: switch SSHD from port 29418 to 22 .. gerrit: switch SSHD from port 29418 to 22 Since a Gerrit server has a service and a server IP and we are now (since: Idbc1654033fb075ededd0) not listening on ALL interfaces anymore, but just on the service IP and gerrit2001 also has a service IP, we should be able to just use port 22 also for the Gerrit sshd. Then users don't have to use the high port anymore. (We also had a report at least once how somebody got blocked by their corporate/school firewall because of the high port). Change-Id: I91fd0f6feb4452429c9e64e7e423831163440c7f --- M modules/gerrit/templates/gerrit.config.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/76/354076/1 diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb index 6c32e3f..22549ba 100644 --- a/modules/gerrit/templates/gerrit.config.erb +++ b/modules/gerrit/templates/gerrit.config.erb @@ -164,7 +164,7 @@ connectTimeout = 1 min smtpServer = <%= @mail_smarthost[0] %> [sshd] -listenAddress = <%= @profile::gerrit::service::ipv4 %>:29418 <%= @profile::gerrit::service::ipv6 %>:29418 +listenAddress = <%= @profile::gerrit::service::ipv4 %>:22 <%= @profile::gerrit::service::ipv6 %>:22 threads = 8 batchThreads = 2 idleTimeout = 864000 -- To view, visit https://gerrit.wikimedia.org/r/354076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91fd0f6feb4452429c9e64e7e423831163440c7f 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] operations/puppet[production]: gerrit: rename "server" IP to "service" IP
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354075 ) Change subject: gerrit: rename "server" IP to "service" IP .. gerrit: rename "server" IP to "service" IP Because that's what this is, a service IP, NOT the server IP. Rename the variables to make this less confusing. Change-Id: I26d3afe502e3b0080a3e87c1d3a1c422cc858fc7 --- M hieradata/role/codfw/gerrit/server.yaml M hieradata/role/eqiad/gerrit/server.yaml M modules/gerrit/templates/gerrit.config.erb M modules/profile/manifests/gerrit/server.pp 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/75/354075/1 diff --git a/hieradata/role/codfw/gerrit/server.yaml b/hieradata/role/codfw/gerrit/server.yaml index e0aca96..e5b7adb 100644 --- a/hieradata/role/codfw/gerrit/server.yaml +++ b/hieradata/role/codfw/gerrit/server.yaml @@ -1,3 +1,3 @@ gerrit::jetty::db_host: 'm2-master.codfw.wmnet' -profile::gerrit::server::ipv4: '208.80.153.107' -profile::gerrit::server::ipv6: '2620:0:860:4:208:80:153:107' +profile::gerrit::service::ipv4: '208.80.153.107' +profile::gerrit::service::ipv6: '2620:0:860:4:208:80:153:107' diff --git a/hieradata/role/eqiad/gerrit/server.yaml b/hieradata/role/eqiad/gerrit/server.yaml index 1e8e0d8..72c4020 100644 --- a/hieradata/role/eqiad/gerrit/server.yaml +++ b/hieradata/role/eqiad/gerrit/server.yaml @@ -1,3 +1,3 @@ gerrit::jetty::db_host: 'm2-master.eqiad.wmnet' -profile::gerrit::server::ipv4: '208.80.154.85' -profile::gerrit::server::ipv6: '2620:0:861:3:208:80:154:85' +profile::gerrit::service::ipv4: '208.80.154.85' +profile::gerrit::service::ipv6: '2620:0:861:3:208:80:154:85' diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb index 0d28692..6c32e3f 100644 --- a/modules/gerrit/templates/gerrit.config.erb +++ b/modules/gerrit/templates/gerrit.config.erb @@ -164,7 +164,7 @@ connectTimeout = 1 min smtpServer = <%= @mail_smarthost[0] %> [sshd] -listenAddress = <%= @profile::gerrit::server::ipv4 %>:29418 <%= @profile::gerrit::server::ipv6 %>:29418 +listenAddress = <%= @profile::gerrit::service::ipv4 %>:29418 <%= @profile::gerrit::service::ipv6 %>:29418 threads = 8 batchThreads = 2 idleTimeout = 864000 diff --git a/modules/profile/manifests/gerrit/server.pp b/modules/profile/manifests/gerrit/server.pp index 1fcfeb4..7ef290b 100644 --- a/modules/profile/manifests/gerrit/server.pp +++ b/modules/profile/manifests/gerrit/server.pp @@ -2,8 +2,8 @@ # # filtertags: labs-project-git labs-project-ci-staging class profile::gerrit::server( -$ipv4 = hiera('gerrit::server::ipv4'), -$ipv6 = hiera('gerrit::server::ipv6'), +$ipv4 = hiera('gerrit::service::ipv4'), +$ipv6 = hiera('gerrit::service::ipv6'), $host = hiera('gerrit::server::host'), $master_host = hiera('gerrit::server::master_host'), $bacula = hiera('gerrit::server::bacula'), -- To view, visit https://gerrit.wikimedia.org/r/354075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26d3afe502e3b0080a3e87c1d3a1c422cc858fc7 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] operations/puppet[production]: gerrit: dont let sshd listen on all interfaces
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354074 ) Change subject: gerrit: dont let sshd listen on all interfaces .. gerrit: dont let sshd listen on all interfaces Gerrit servers have a server and a service IP, and we also do pass the service IP to the manifests but then we let the Gerrit SSHd listen on all interfaces anyways, not just on the service IP. Change that and listen only on the service IP, but v4 and v6, Docs say: "If multiple values are supplied, the daemon will listen on all of them." https://gerrit-review.googlesource.com/Documentation/config-gerrit.html Change-Id: Idbc1654033fb075ededd0dd5fcd7d460f288735b --- M modules/gerrit/templates/gerrit.config.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/74/354074/1 diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb index a13e63e..0d28692 100644 --- a/modules/gerrit/templates/gerrit.config.erb +++ b/modules/gerrit/templates/gerrit.config.erb @@ -164,7 +164,7 @@ connectTimeout = 1 min smtpServer = <%= @mail_smarthost[0] %> [sshd] -listenAddress = *:29418 +listenAddress = <%= @profile::gerrit::server::ipv4 %>:29418 <%= @profile::gerrit::server::ipv6 %>:29418 threads = 8 batchThreads = 2 idleTimeout = 864000 -- To view, visit https://gerrit.wikimedia.org/r/354074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbc1654033fb075ededd0dd5fcd7d460f288735b 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] operations/puppet[production]: authdns: switch to interface::alias
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354073 ) Change subject: authdns: switch to interface::alias .. authdns: switch to interface::alias Due to create_resources() this is a bit more convoluted than the rest of the interface::alias conversions. In particular, this needed changes in authdns::monitoring::global, which made it a little less DRY but OTOH providing making the alerts themselves clearer with regards to which address family is really affected. Longer-term, we should probably make monitoring::host and monitoring::service dual-stack and do the right thing. Change-Id: Ia0ea973904ca34a2d37786214a4af7bdaf6ab88b --- M modules/authdns/manifests/monitoring/global.pp M modules/role/manifests/authdns/data.pp M modules/role/manifests/authdns/server.pp 3 files changed, 22 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/73/354073/1 diff --git a/modules/authdns/manifests/monitoring/global.pp b/modules/authdns/manifests/monitoring/global.pp index 8bfe987..f965fa9 100644 --- a/modules/authdns/manifests/monitoring/global.pp +++ b/modules/authdns/manifests/monitoring/global.pp @@ -7,14 +7,27 @@ # Obviously, its view will be limited to how they're routed # *from the monitoring machine*, which is imperfect but # better than nothing. -define authdns::monitoring::global($address, $prefixlen=undef) { +define authdns::monitoring::global($ipv4, $ipv6) { $hostlabel = $title # just for semantic clarity below -@monitoring::host { $hostlabel: ip_address => $address } +@monitoring::host { "${hostlabel}_ipv4": +ip_address => $ipv4, +} -@monitoring::service { $hostlabel: -host => $hostlabel, -description => 'Auth DNS', +@monitoring::host { "${hostlabel}_ipv6": +ip_address => $ipv6, +} + +@monitoring::service { "${hostlabel}_ipv4": +host => "${hostlabel}_ipv4", +description => 'AuthDNS IPv4', +check_command => 'check_dns!www.wikipedia.org', +critical => true, +} + +@monitoring::service { "${hostlabel}_ipv6": +host => "${hostlabel}_ipv6", +description => 'AuthDNS IPv6', check_command => 'check_dns!www.wikipedia.org', critical => true, } diff --git a/modules/role/manifests/authdns/data.pp b/modules/role/manifests/authdns/data.pp index d0bc40d..9ff2713 100644 --- a/modules/role/manifests/authdns/data.pp +++ b/modules/role/manifests/authdns/data.pp @@ -16,11 +16,8 @@ # These are all of the public addresses the Internet finds us at # (Note the IPv6 ones aren't published yet, not in "real" use) $ns_addrs = { -ns0-v4 => { address => '208.80.154.238', prefixlen => '32' }, -ns1-v4 => { address => '208.80.153.231', prefixlen => '32' }, -ns2-v4 => { address => '91.198.174.239', prefixlen => '32' }, -ns0-v6 => { address => '2620:0:861:ed1a::e', prefixlen => '128' }, -ns1-v6 => { address => '2620:0:860:ed1a::e', prefixlen => '128' }, -ns2-v6 => { address => '2620:0:862:ed1a::e', prefixlen => '128' }, +ns0 => { ipv4 => '208.80.154.238', ipv6 => '2620:0:861:ed1a::e' }, +ns1 => { ipv4 => '208.80.153.231', ipv6 => '2620:0:860:ed1a::e' }, +ns2 => { ipv4 => '91.198.174.239', ipv6 => '2620:0:862:ed1a::e' }, } } diff --git a/modules/role/manifests/authdns/server.pp b/modules/role/manifests/authdns/server.pp index 2320679..264c004 100644 --- a/modules/role/manifests/authdns/server.pp +++ b/modules/role/manifests/authdns/server.pp @@ -8,7 +8,7 @@ include role::authdns::data create_resources( -interface::ip, +interface::alias, $role::authdns::data::ns_addrs, { interface => 'lo' } ) -- To view, visit https://gerrit.wikimedia.org/r/354073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0ea973904ca34a2d37786214a4af7bdaf6ab88b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: lists: raise TTL back to 1H after service IP change
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354072 ) Change subject: lists: raise TTL back to 1H after service IP change .. lists: raise TTL back to 1H after service IP change Does it even make sense to raise them back to 1H after they have been lowered to 5M? (looking at the existing ones in here that are all 5M or 600). Change-Id: I314ac78c76ed6ac4d8a26476e92aa765a6d14e22 --- M templates/wikimedia.org 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/72/354072/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 9fbf3f1..943c3d0 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -59,8 +59,8 @@ dumps 1H IN CNAME dataset1001 -lists 5M IN A208.80.154.75 -lists 5M IN 2620:0:861:3:208:80:154:75 +lists 1H IN A208.80.154.75 +lists 1H IN 2620:0:861:3:208:80:154:75 lists 1H IN MX 10 lists lists 1H IN TXT "v=spf1 mx ?all" -- To view, visit https://gerrit.wikimedia.org/r/354072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I314ac78c76ed6ac4d8a26476e92aa765a6d14e22 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: lists: switch v6 service IP
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354071 ) Change subject: lists: switch v6 service IP .. lists: switch v6 service IP Switch to the new v6 service IP 2620:0:861:3:208:80:154:75 for consistency: fermium.wikimedia.org has address 208.80.154.74 fermium.wikimedia.org has IPv6 address 2620:0:861:3:208:80:154:74 lists.wikimedia.org has address 208.80.154.75 lists.wikimedia.org has IPv6 address 2620:0:861:3::2 Change-Id: Iea4109b4aa3b8b746f983d4efd6f5ebdc8a704b1 --- M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/wikimedia.org 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/71/354071/1 diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 95d62c4..532a078 100644 --- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -59,7 +59,6 @@ ; public1-c-eqiad (2620:0:861:3::/64) $ORIGIN 3.0.0.0.{{ zonename }}. 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR vrrp-gw-1003.wikimedia.org. -2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lists.wikimedia.org. ; service IP for lists on fermium 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae3-1003.cr1-eqiad.wikimedia.org. 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae3-1003.cr2-eqiad.wikimedia.org. 1.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR cobalt.wikimedia.org. @@ -67,7 +66,7 @@ 1.9.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR wiki-mail-eqiad.wikimedia.org. 3.9.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR radon.wikimedia.org. 4.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR fermium.wikimedia.org. -5.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR lists.wikimedia.org. +5.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR lists.wikimedia.org. ; service IP for lists on fermium 6.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR mx1001.wikimedia.org. 2.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR dbmonitor1001.wikimedia.org. 5.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR gerrit.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 9848696..9fbf3f1 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -60,7 +60,7 @@ dumps 1H IN CNAME dataset1001 lists 5M IN A208.80.154.75 -lists 5M IN 2620:0:861:3::2 +lists 5M IN 2620:0:861:3:208:80:154:75 lists 1H IN MX 10 lists lists 1H IN TXT "v=spf1 mx ?all" -- To view, visit https://gerrit.wikimedia.org/r/354071 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea4109b4aa3b8b746f983d4efd6f5ebdc8a704b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: switch to interface::alias
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/350776 ) Change subject: gerrit: switch to interface::alias .. gerrit: switch to interface::alias This is not a straight replacement: the new manifests adds the preferred_lft 0 as an option to the IPv6 address which didn't exist before (even though it should had!). Easier to cleanup manually as these are just a couple of hosts that are affected. Change-Id: Ice5366f09c75122bbfc04e869d2daf375ec5d0f6 --- M modules/profile/manifests/gerrit/server.pp 1 file changed, 3 insertions(+), 12 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/profile/manifests/gerrit/server.pp b/modules/profile/manifests/gerrit/server.pp index 76bbaf4..1fcfeb4 100644 --- a/modules/profile/manifests/gerrit/server.pp +++ b/modules/profile/manifests/gerrit/server.pp @@ -10,18 +10,9 @@ $gerrit_servers = join(hiera('gerrit::servers'), ' ') ) { -interface::ip { 'role::gerrit::server_ipv4': -interface => 'eth0', -address => $ipv4, -prefixlen => '32', -} - -if $ipv6 != undef { -interface::ip { 'role::gerrit::server_ipv6': -interface => 'eth0', -address => $ipv6, -prefixlen => '128', -} +interface::alias { 'gerrit server': +ipv4 => $ipv4, +ipv6 => $ipv6, } # Detect if we're a master or a slave. If we're been given a master host -- To view, visit https://gerrit.wikimedia.org/r/350776 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ice5366f09c75122bbfc04e869d2daf375ec5d0f6 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: Volans 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]: gerrit: codfw, use service IP for gerrit-slave, not server IP
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354070 ) Change subject: gerrit: codfw, use service IP for gerrit-slave, not server IP .. gerrit: codfw, use service IP for gerrit-slave, not server IP Change-Id: I122d92c13e3f2aa288eeb3115317d11d74386f98 --- M hieradata/role/codfw/gerrit/server.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/codfw/gerrit/server.yaml b/hieradata/role/codfw/gerrit/server.yaml index d21c21c..e0aca96 100644 --- a/hieradata/role/codfw/gerrit/server.yaml +++ b/hieradata/role/codfw/gerrit/server.yaml @@ -1,3 +1,3 @@ gerrit::jetty::db_host: 'm2-master.codfw.wmnet' -profile::gerrit::server::ipv4: '208.80.153.106' -profile::gerrit::server::ipv6: '2620:0:860:4:208:80:153:106' +profile::gerrit::server::ipv4: '208.80.153.107' +profile::gerrit::server::ipv6: '2620:0:860:4:208:80:153:107' -- To view, visit https://gerrit.wikimedia.org/r/354070 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I122d92c13e3f2aa288eeb3115317d11d74386f98 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Faidon Liambotis 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]: gerrit: codfw, use service IP for gerrit-slave, not server IP
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354070 ) Change subject: gerrit: codfw, use service IP for gerrit-slave, not server IP .. gerrit: codfw, use service IP for gerrit-slave, not server IP Change-Id: I122d92c13e3f2aa288eeb3115317d11d74386f98 --- M hieradata/role/codfw/gerrit/server.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/70/354070/1 diff --git a/hieradata/role/codfw/gerrit/server.yaml b/hieradata/role/codfw/gerrit/server.yaml index d21c21c..e0aca96 100644 --- a/hieradata/role/codfw/gerrit/server.yaml +++ b/hieradata/role/codfw/gerrit/server.yaml @@ -1,3 +1,3 @@ gerrit::jetty::db_host: 'm2-master.codfw.wmnet' -profile::gerrit::server::ipv4: '208.80.153.106' -profile::gerrit::server::ipv6: '2620:0:860:4:208:80:153:106' +profile::gerrit::server::ipv4: '208.80.153.107' +profile::gerrit::server::ipv6: '2620:0:860:4:208:80:153:107' -- To view, visit https://gerrit.wikimedia.org/r/354070 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I122d92c13e3f2aa288eeb3115317d11d74386f98 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...Refreshed[master]: hange echo element to #pt-ntifications-notice as #pt-notific...
LegoFan4000 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354069 ) Change subject: hange echo element to #pt-ntifications-notice as #pt-notifications-message is no longer used. (T163616) .. hange echo element to #pt-ntifications-notice as #pt-notifications-message is no longer used. (T163616) Change-Id: I34593acc1bfdb5b9d5f85cbf118914cfd498d578 --- M refreshed/refreshed.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Refreshed refs/changes/69/354069/1 diff --git a/refreshed/refreshed.js b/refreshed/refreshed.js index 35bd068..ad30cdf 100644 --- a/refreshed/refreshed.js +++ b/refreshed/refreshed.js @@ -260,7 +260,7 @@ /* Fix for Echo in Refreshed */ if ( document.getElementById( 'echo' ) ) { $( '#pt-notifications-alert' ).prependTo( '#echo' ); - $( '#pt-notifications-message' ).prependTo( '#echo' ); + $( '#pt-notifications-notice' ).prependTo( '#echo' ); } if ( $( '.mw-echo-notifications-badge' ).hasClass( 'mw-echo-unread-notifications' ) ) { -- To view, visit https://gerrit.wikimedia.org/r/354069 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I34593acc1bfdb5b9d5f85cbf118914cfd498d578 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Refreshed Gerrit-Branch: master Gerrit-Owner: LegoFan4000 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: add service IP to be used by gerrit slave/standby
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354068 ) Change subject: add service IP to be used by gerrit slave/standby .. add service IP to be used by gerrit slave/standby A gerrit host has a server IP and a service IP, the latter being profile::gerrit::server::ipv4 and profile::gerrit::server::ipv6 in Hiera. cobalt uses 208.80.154.85 (from hiera/role/eqiad), which is gerrit.wikimedia.org but gerrit2001 uses 208.80.153.106 (from hiera/role/codfw), which is NOT a service IP but the server IP itself (gerrit2001). So add a service IP to be used by the standy/slave gerrit server instead. Change-Id: I6710347ed28fcaa01521a1335b2201d8d6d3d4e9 --- M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/153.80.208.in-addr.arpa M templates/wikimedia.org 3 files changed, 4 insertions(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 3ebe349..aa45742 100644 --- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -57,6 +57,7 @@ 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae4-2004.cr2-codfw.wikimedia.org. 6.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR gerrit2001.wikimedia.org. +7.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR gerrit-slave.wikimedia.org. ; codfw private subnets (2620:0:860:100::/56) diff --git a/templates/153.80.208.in-addr.arpa b/templates/153.80.208.in-addr.arpa index a290dba..7ec5f74 100644 --- a/templates/153.80.208.in-addr.arpa +++ b/templates/153.80.208.in-addr.arpa @@ -75,6 +75,7 @@ 104 1H IN PTR vl2004-eth3.lvs2005.codfw.wmnet. 105 1H IN PTR vl2004-eth3.lvs2006.codfw.wmnet. 106 1H IN PTR gerrit2001.wikimedia.org. +107 1H IN PTR gerrit-slave.wikimedia.org. ; 208.80.153.128/27 labtest codfw public IPs (pool used by openstack) diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 7df1b9d..27fd229 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -476,6 +476,8 @@ gerrit 600 IN A208.80.154.85 gerrit 600 IN 2620:0:861:3:208:80:154:85 +gerrit-slave600 IN A208.80.153.107 +gerrit-slave600 IN 2620:0:860:4:208:80:153:107 git 600 IN DYNA geoip!misc-addrs graphite600 IN DYNA geoip!misc-addrs graphite-labs 600 IN DYNA geoip!misc-addrs -- To view, visit https://gerrit.wikimedia.org/r/354068 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6710347ed28fcaa01521a1335b2201d8d6d3d4e9 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn Gerrit-Reviewer: Chad Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Faidon Liambotis 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]: add service IP to be used by gerrit slave/standby
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354068 ) Change subject: add service IP to be used by gerrit slave/standby .. add service IP to be used by gerrit slave/standby A gerrit host has a server IP and a service IP, the latter being profile::gerrit::server::ipv4 and profile::gerrit::server::ipv6 in Hiera. cobalt uses 208.80.154.85 (from hiera/role/eqiad), which is gerrit.wikimedia.org but gerrit2001 uses 208.80.153.106 (from hiera/role/codfw), which is NOT a service IP but the server IP itself (gerrit2001). So add a service IP to be used by the standy/slave gerrit server instead. Change-Id: I6710347ed28fcaa01521a1335b2201d8d6d3d4e9 --- M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/153.80.208.in-addr.arpa M templates/wikimedia.org 3 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/68/354068/1 diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 3ebe349..aa45742 100644 --- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -57,6 +57,7 @@ 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae4-2004.cr2-codfw.wikimedia.org. 6.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR gerrit2001.wikimedia.org. +7.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR gerrit-slave.wikimedia.org. ; codfw private subnets (2620:0:860:100::/56) diff --git a/templates/153.80.208.in-addr.arpa b/templates/153.80.208.in-addr.arpa index a290dba..7ec5f74 100644 --- a/templates/153.80.208.in-addr.arpa +++ b/templates/153.80.208.in-addr.arpa @@ -75,6 +75,7 @@ 104 1H IN PTR vl2004-eth3.lvs2005.codfw.wmnet. 105 1H IN PTR vl2004-eth3.lvs2006.codfw.wmnet. 106 1H IN PTR gerrit2001.wikimedia.org. +107 1H IN PTR gerrit-slave.wikimedia.org. ; 208.80.153.128/27 labtest codfw public IPs (pool used by openstack) diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 7df1b9d..27fd229 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -476,6 +476,8 @@ gerrit 600 IN A208.80.154.85 gerrit 600 IN 2620:0:861:3:208:80:154:85 +gerrit-slave600 IN A208.80.153.107 +gerrit-slave600 IN 2620:0:860:4:208:80:153:107 git 600 IN DYNA geoip!misc-addrs graphite600 IN DYNA geoip!misc-addrs graphite-labs 600 IN DYNA geoip!misc-addrs -- To view, visit https://gerrit.wikimedia.org/r/354068 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6710347ed28fcaa01521a1335b2201d8d6d3d4e9 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cassandra: switch to interface::alias
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/350775 ) Change subject: cassandra: switch to interface::alias .. cassandra: switch to interface::alias Also drop the $rpc_interface variable, instead of passing interface => $rpc_interface to interface::alias, as it defaults to that. Change-Id: Id6882a15b0a5a795cd2bd897049fe9c05988b0ca --- M modules/cassandra/manifests/instance.pp 1 file changed, 2 insertions(+), 6 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/cassandra/manifests/instance.pp b/modules/cassandra/manifests/instance.pp index d555c70..2a76fea 100644 --- a/modules/cassandra/manifests/instance.pp +++ b/modules/cassandra/manifests/instance.pp @@ -27,7 +27,6 @@ # * jmx_portmust be unique per-host # * listen_address address to use for cassandra clients # * rpc_address address to use for cassandra cluster traffic -# * rpc_interface if specified, add rpc_address to this interface # # Note any other parameter from the "cassandra" class is in scope and # will be inherited here and can be used e.g. in templates. @@ -54,11 +53,8 @@ # Add the IP address if not present if $rpc_address != $facts['ipaddress'] { -$rpc_interface = $facts['interface_primary'] -interface::ip { "cassandra-${instance_name}_rpc_${rpc_interface}": -interface => $rpc_interface, -address => $rpc_address, -prefixlen => '32', +interface::alias { "cassandra-${instance_name}": +ipv4 => $rpc_address, } } -- To view, visit https://gerrit.wikimedia.org/r/350775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6882a15b0a5a795cd2bd897049fe9c05988b0ca Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: Filippo Giunchedi Gerrit-Reviewer: Volans Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Replace one feed at metawiki
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354024 ) Change subject: Replace one feed at metawiki .. Replace one feed at metawiki URL of that feed: https://tagteam.harvard.edu/hubs/wmde-policy/items.rss Bug: T165285 Change-Id: Ic035a6abc27837e9b3731357f866bf6b379e83b4 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4fb0f93..540e232 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14634,7 +14634,7 @@ 'https://codeclimate.com/github/wikimedia/wikimedia-fundraising-tools/feed.atom', ], 'metawiki' => [ - 'https://tagteam.harvard.edu/hubs/wmde-policy-update/tag/rss/wmde.policy.update', // WM DE political RSS feed - T155830 + 'https://tagteam.harvard.edu/hubs/wmde-policy/items.rss', // WM DE political RSS feed - T165285 ], ], -- To view, visit https://gerrit.wikimedia.org/r/354024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic035a6abc27837e9b3731357f866bf6b379e83b4 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Framawiki Gerrit-Reviewer: Dereckson 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]: phabricator: switch to interface::alias
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/350777 ) Change subject: phabricator: switch to interface::alias .. phabricator: switch to interface::alias This is not a straight replacement: the old manifest used a /21 netmask for the IPv4 address instead of a /32, although that was definitely wrong (and it was also not in Hiera, despite the address itself being in Hiera). Easier to cleanup manually as these are just a few hosts that are affected. Change-Id: Ieded3b493a7fb0b7d99fd4eaf18d99154f2b431d --- M modules/role/manifests/phabricator/main.pp 1 file changed, 3 insertions(+), 17 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified Dzahn: Looks good to me, but someone else must approve diff --git a/modules/role/manifests/phabricator/main.pp b/modules/role/manifests/phabricator/main.pp index 73e6a67..f3182a2 100644 --- a/modules/role/manifests/phabricator/main.pp +++ b/modules/role/manifests/phabricator/main.pp @@ -169,23 +169,9 @@ # lint:endignore # This exists to offer git services -$vcs_address_ipv4 = hiera('phabricator::vcs::address::v4', undef) -if $vcs_address_ipv4 != undef { -interface::ip { 'role::phabricator::main::ipv4': -interface => 'eth0', -address => $vcs_address_ipv4, -prefixlen => '21', -} -} -$vcs_address_ipv6 = hiera('phabricator::vcs::address::v6', undef) -if $vcs_address_ipv6 != undef { -interface::ip { 'role::phabricator::main::ipv6': -interface => 'eth0', -address => $vcs_address_ipv6, -prefixlen => '128', -# mark as deprecated = never pick this address unless explicitly asked -options => 'preferred_lft 0', -} +interface::alias { 'phabricator vcs': +ipv4 => hiera('phabricator::vcs::address::v4', undef), +ipv6 => hiera('phabricator::vcs::address::v6', undef), } class { '::phabricator::tools': -- To view, visit https://gerrit.wikimedia.org/r/350777 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieded3b493a7fb0b7d99fd4eaf18d99154f2b431d Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis Gerrit-Reviewer: 20after4 Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: Paladox Gerrit-Reviewer: Volans 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]: lists: split mailman::lists_ip variable into v4/v6
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354058 ) Change subject: lists: split mailman::lists_ip variable into v4/v6 .. lists: split mailman::lists_ip variable into v4/v6 Stop assuming that mailman::lists_ip[0] is the IPv4 address and [1] is the IPv6 one and split into two different variables. This was actually the case before commit 14333a539ef18287612ab1cce3035e44350f1f49 and this commit basically reverts to that. Change-Id: Ida84faa00302f644d36bf1526df838994ac4d224 --- M hieradata/role/common/lists.yaml M modules/profile/manifests/lists.pp 2 files changed, 10 insertions(+), 11 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/lists.yaml b/hieradata/role/common/lists.yaml index b744fe9..6194848 100644 --- a/hieradata/role/common/lists.yaml +++ b/hieradata/role/common/lists.yaml @@ -1,8 +1,7 @@ standard::has_default_mail_relay: false mailman::lists_servername: 'lists.wikimedia.org' -mailman::lists_ip: - - '208.80.154.75' - - '2620:0:861:3::2' +mailman::lists::ipv4: '208.80.154.75' +mailman::lists::ipv6: '2620:0:861:3::2' debdeploy::grains: debdeploy-lists: value: standard diff --git a/modules/profile/manifests/lists.pp b/modules/profile/manifests/lists.pp index 6aa0a44..b939413 100644 --- a/modules/profile/manifests/lists.pp +++ b/modules/profile/manifests/lists.pp @@ -1,7 +1,4 @@ -class profile::lists ( -$list_outbound_ips = hiera_array('mailman::lists_ip'), -) { - +class profile::lists { include ::base::firewall include ::network::constants include ::mailman @@ -10,11 +7,9 @@ mailalias { 'root': recipient => 'r...@wikimedia.org' } -# XXX: needs to be split to v4/v6 variables, like it was pre-14333a539e -$lists_ip = hiera('mailman::lists_ip') interface::alias { 'lists.wikimedia.org': -ipv4 => $lists_ip[0], -ipv6 => $lists_ip[1], +ipv4 => hiera('mailman::lists::ipv4', undef), +ipv6 => hiera('mailman::lists::ipv6', undef), } letsencrypt::cert::integrated { 'lists': @@ -31,6 +26,11 @@ trusted_networks => $network::constants::all_networks, } +$list_outbound_ips = [ +hiera('mailman::lists::ipv4'), +hiera('mailman::lists::ipv6'), +] + class { 'exim4': variant => 'heavy', config => template('profile/exim/exim4.conf.mailman.erb'), -- To view, visit https://gerrit.wikimedia.org/r/354058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida84faa00302f644d36bf1526df838994ac4d224 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis Gerrit-Reviewer: Faidon Liambotis 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/vendor[master]: Update OOjs UI to v0.21.4
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354063 ) Change subject: Update OOjs UI to v0.21.4 .. Update OOjs UI to v0.21.4 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.21.4 Change-Id: I676c9aadbf4739437b94ec729cc4fe47ed19c886 --- M composer.json M composer.lock M composer/LICENSE M composer/installed.json M oojs/oojs-ui/.eslintrc.json M oojs/oojs-ui/History.md M oojs/oojs-ui/README.md M oojs/oojs-ui/demos/classes/IndexedDialog.js D oojs/oojs-ui/demos/classes/SampleCard.js A oojs/oojs-ui/demos/classes/SampleTabPanel.js M oojs/oojs-ui/demos/demo.js M oojs/oojs-ui/demos/demos.php M oojs/oojs-ui/demos/index.html M oojs/oojs-ui/demos/pages/dialogs.js M oojs/oojs-ui/demos/pages/icons.js M oojs/oojs-ui/demos/pages/toolbars.js M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/demos/styles/demo.css M oojs/oojs-ui/i18n/af.json M oojs/oojs-ui/i18n/bs.json M oojs/oojs-ui/package.json M oojs/oojs-ui/php/Widget.php M oojs/oojs-ui/php/layouts/FieldLayout.php M oojs/oojs-ui/php/mixins/TabIndexedElement.php M oojs/oojs-ui/php/widgets/ButtonInputWidget.php M oojs/oojs-ui/php/widgets/CheckboxMultiselectInputWidget.php M oojs/oojs-ui/php/widgets/InputWidget.php M oojs/oojs-ui/php/widgets/LabelWidget.php M oojs/oojs-ui/php/widgets/RadioSelectInputWidget.php 29 files changed, 268 insertions(+), 152 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/composer.json b/composer.json index 7214523..81a005a 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "mediawiki/at-ease": "1.1.0", "monolog/monolog": "1.22.1", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.21.3", + "oojs/oojs-ui": "0.21.4", "oyejorge/less.php": "1.7.0.14", "pear/console_getopt": "1.4.1", "pear/mail": "1.3.0", diff --git a/composer.lock b/composer.lock index b8f92b1..6a87f3e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";, "This file is @generated automatically" ], -"content-hash": "843344da37e5420c13808704151d709b", +"content-hash": "cd93aa55f7367dac55ef9320802dc034", "packages": [ { "name": "composer/semver", @@ -466,16 +466,16 @@ }, { "name": "oojs/oojs-ui", -"version": "v0.21.3", +"version": "v0.21.4", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, -"reference": "3e818731f2e0c19366fbb297fb58927fac123543" +"reference": "ed5dd92664b765a160e68e46ec0337e75451b0ad" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/3e818731f2e0c19366fbb297fb58927fac123543";, -"reference": "3e818731f2e0c19366fbb297fb58927fac123543", +"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/ed5dd92664b765a160e68e46ec0337e75451b0ad";, +"reference": "ed5dd92664b765a160e68e46ec0337e75451b0ad", "shasum": "" }, "require": { @@ -541,7 +541,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";, -"time": "2017-05-10T00:39:25+00:00" +"time": "2017-05-16T22:09:22+00:00" }, { "name": "oyejorge/less.php", diff --git a/composer/LICENSE b/composer/LICENSE index 62ecfd8..f27399a 100644 --- a/composer/LICENSE +++ b/composer/LICENSE @@ -1,3 +1,4 @@ + Copyright (c) Nils Adermann, Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy @@ -17,3 +18,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + diff --git a/composer/installed.json b/composer/installed.json index 884315d..4b0ce9e 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2111,18 +2111,70 @@ "homepage": "https://symfony.com"; }, { -"name": "oojs/oojs-ui", -"version": "v0.21.3", -"version_normalized": "0.21.3.0", +"name": "wikimedia/testing-access-wrapper", +"version": "1.0.0", +"version_normalized": "1.0.0.0", "source": { "type": "git", -"url": "https://github.com/wikimedia/oojs-ui.git";, -"reference": "3e818731f2e0c19366fbb297fb58927fac123543" +"url": "https://github.com/wiki
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.21.4
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354060 ) Change subject: Update OOjs UI to v0.21.4 .. Update OOjs UI to v0.21.4 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.21.4 Change-Id: I676c9aadbf4739437b94ec729cc4fe47ed19c886 --- D lib/oojs-ui/AUTHORS.txt D lib/oojs-ui/LICENSE-MIT D lib/oojs-ui/README.md M lib/oojs-ui/i18n/af.json M lib/oojs-ui/i18n/bs.json M lib/oojs-ui/oojs-ui-apex-icons-alerts.css M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-content.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-layout.css M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-core-apex.css M lib/oojs-ui/oojs-ui-core-apex.rtl.css M lib/oojs-ui/oojs-ui-core-mediawiki.css M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-core.js M lib/oojs-ui/oojs-ui-core.js.map M lib/oojs-ui/oojs-ui-images-apex.css M lib/oojs-ui/oojs-ui-images-apex.rtl.css M lib/oojs-ui/oojs-ui-images-mediawiki.css M lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-apex.css M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars.js M lib/oojs-ui/oojs-ui-toolbars.js.map M lib/oojs-ui/oojs-ui-widgets-apex.css M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-widgets.js M lib/oojs-ui/oojs-ui-widgets.js.map M lib/oojs-ui/oojs-ui-windows-apex.css M lib/oojs-ui/oojs-ui-windows-apex.rtl.css M lib/oojs-ui/oojs-ui-windows-mediawiki.css M lib/oojs-ui/oojs-ui-windows-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-windows.js M lib/oojs-ui/oojs-ui-windows.js.map 91 files changed, 390 insertions(+), 585 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/354060 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I676c9aadbf4739437b94ec729cc4fe47ed19c886 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualE
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ContribsPager: Use one TemplateParser instance
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354067 ) Change subject: ContribsPager: Use one TemplateParser instance .. ContribsPager: Use one TemplateParser instance TemplateParser has an instance cache to avoid reading from APC repeatedly for the same template, but that only works if the code uses the same TemplateParser object. Change-Id: I59e37306c5a3216cf8ed3bfef9c80d50934a9146 --- M includes/specials/pagers/ContribsPager.php 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/67/354067/1 diff --git a/includes/specials/pagers/ContribsPager.php b/includes/specials/pagers/ContribsPager.php index 7d303de..ea93f1f 100644 --- a/includes/specials/pagers/ContribsPager.php +++ b/includes/specials/pagers/ContribsPager.php @@ -45,6 +45,11 @@ */ protected $mParentLens; + /** +* @var TemplateParser +*/ + protected $templateParser; + function __construct( IContextSource $context, array $options ) { parent::__construct( $context ); @@ -80,6 +85,7 @@ // queries should use a regular replica DB since the lookup pattern is not all by user. $this->mDbSecondary = wfGetDB( DB_REPLICA ); // any random replica DB $this->mDb = wfGetDB( DB_REPLICA, 'contributions' ); + $this->templateParser = new TemplateParser(); } function getDefaultQuery() { @@ -516,8 +522,7 @@ $this->msg( 'rev-deleted-user-contribs' )->escaped(); } - $templateParser = new TemplateParser(); - $ret = $templateParser->processTemplate( + $ret = $this->templateParser->processTemplate( 'SpecialContributionsLine', $templateParams ); -- To view, visit https://gerrit.wikimedia.org/r/354067 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59e37306c5a3216cf8ed3bfef9c80d50934a9146 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] mediawiki/core[master]: TemplateParser: Improve cache integrity check failure scenario
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354065 ) Change subject: TemplateParser: Improve cache integrity check failure scenario .. TemplateParser: Improve cache integrity check failure scenario Previously, if the cache integrity check failed then it would emit a warning but then continue to use the code. The integrity check could genuinely fail if the secret key was changed, if the cache was truncated, or other edge case scenarios. Now TemplateParser will recompile if the cache fails the integrity check, and then update the cache with the newly compiled version. Bug: T163154 Change-Id: I9a6c8d528f84cfbabf402cfaf6468c162fab1f15 --- M includes/TemplateParser.php 1 file changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/65/354065/1 diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php index 924c347..2759ff9 100644 --- a/includes/TemplateParser.php +++ b/includes/TemplateParser.php @@ -102,19 +102,21 @@ $key = $cache->makeKey( 'template', $templateName, $fastHash ); $code = $this->forceRecompile ? null : $cache->get( $key ); + if ( $code ) { + // Verify the integrity of the cached PHP code + $keyedHash = substr( $code, 0, 64 ); + $code = substr( $code, 64 ); + if ( $keyedHash !== hash_hmac( 'sha256', $code, $secretKey ) ) { + // If the integrity check fails, don't use the cached code + // We'll update the invalid cache below + $code = null; + } + } if ( !$code ) { $code = $this->compileForEval( $fileContents, $filename ); // Prefix the cached code with a keyed hash (64 hex chars) as an integrity check $cache->set( $key, hash_hmac( 'sha256', $code, $secretKey ) . $code ); - } else { - // Verify the integrity of the cached PHP code - $keyedHash = substr( $code, 0, 64 ); - $code = substr( $code, 64 ); - if ( $keyedHash !== hash_hmac( 'sha256', $code, $secretKey ) ) { - // Generate a notice if integrity check fails - trigger_error( "Template failed integrity check: {$filename}" ); - } } // If there is no secret key available, don't use cache } else { -- To view, visit https://gerrit.wikimedia.org/r/354065 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a6c8d528f84cfbabf402cfaf6468c162fab1f15 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] mediawiki/core[master]: EnhancedChangesList: Use one TemplateParser instance
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354066 ) Change subject: EnhancedChangesList: Use one TemplateParser instance .. EnhancedChangesList: Use one TemplateParser instance TemplateParser has an instance cache to avoid reading from APC repeatedly for the same template, but that only works if the code uses the same TemplateParser object. Noticed while investigating T163154. Change-Id: I645895a0965f7150e9a5aebc5a7788f27aa5a26d --- M includes/changes/EnhancedChangesList.php 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/66/354066/1 diff --git a/includes/changes/EnhancedChangesList.php b/includes/changes/EnhancedChangesList.php index b8a2ac8..1a2da1a 100644 --- a/includes/changes/EnhancedChangesList.php +++ b/includes/changes/EnhancedChangesList.php @@ -33,6 +33,11 @@ protected $rc_cache; /** +* @var TemplateParser +*/ + protected $templateParser; + + /** * @param IContextSource|Skin $obj * @param array $filterGroups Array of ChangesListFilterGroup objects (currently optional) * @throws MWException @@ -58,6 +63,7 @@ $this->message, $this->linkRenderer ); + $this->templateParser = new TemplateParser(); } /** @@ -340,8 +346,7 @@ $this->rcCacheIndex++; - $templateParser = new TemplateParser(); - return $templateParser->processTemplate( + return $this->templateParser->processTemplate( 'EnhancedChangesListGroup', $templateParams ); -- To view, visit https://gerrit.wikimedia.org/r/354066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I645895a0965f7150e9a5aebc5a7788f27aa5a26d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] operations/dns[master]: lists: lower TTL for service IP change
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354064 ) Change subject: lists: lower TTL for service IP change .. lists: lower TTL for service IP change In anticipation of the upcoming change of the v6 lists.wikimedia.org service IP to 2620:0:861:3:208:80:154:75, lower the TTL for the existing record. Change-Id: Ia1464009bdc2c80f243e9582a338ec5cb085c3cb --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/64/354064/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 7df1b9d..1545114 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -60,7 +60,7 @@ dumps 1H IN CNAME dataset1001 lists 1H IN A208.80.154.75 -lists 1H IN 2620:0:861:3::2 +lists 5M IN 2620:0:861:3::2 lists 1H IN MX 10 lists lists 1H IN TXT "v=spf1 mx ?all" -- To view, visit https://gerrit.wikimedia.org/r/354064 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1464009bdc2c80f243e9582a338ec5cb085c3cb Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.21.4
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354063 ) Change subject: Update OOjs UI to v0.21.4 .. Update OOjs UI to v0.21.4 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.21.4 Change-Id: I676c9aadbf4739437b94ec729cc4fe47ed19c886 --- M composer.json M composer.lock M composer/LICENSE M composer/installed.json M oojs/oojs-ui/.eslintrc.json M oojs/oojs-ui/History.md M oojs/oojs-ui/README.md M oojs/oojs-ui/demos/classes/IndexedDialog.js D oojs/oojs-ui/demos/classes/SampleCard.js A oojs/oojs-ui/demos/classes/SampleTabPanel.js M oojs/oojs-ui/demos/demo.js M oojs/oojs-ui/demos/demos.php M oojs/oojs-ui/demos/index.html M oojs/oojs-ui/demos/pages/dialogs.js M oojs/oojs-ui/demos/pages/icons.js M oojs/oojs-ui/demos/pages/toolbars.js M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/demos/styles/demo.css M oojs/oojs-ui/i18n/af.json M oojs/oojs-ui/i18n/bs.json M oojs/oojs-ui/package.json M oojs/oojs-ui/php/Widget.php M oojs/oojs-ui/php/layouts/FieldLayout.php M oojs/oojs-ui/php/mixins/TabIndexedElement.php M oojs/oojs-ui/php/widgets/ButtonInputWidget.php M oojs/oojs-ui/php/widgets/CheckboxMultiselectInputWidget.php M oojs/oojs-ui/php/widgets/InputWidget.php M oojs/oojs-ui/php/widgets/LabelWidget.php M oojs/oojs-ui/php/widgets/RadioSelectInputWidget.php 29 files changed, 268 insertions(+), 152 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor refs/changes/63/354063/1 diff --git a/composer.json b/composer.json index 7214523..81a005a 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "mediawiki/at-ease": "1.1.0", "monolog/monolog": "1.22.1", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.21.3", + "oojs/oojs-ui": "0.21.4", "oyejorge/less.php": "1.7.0.14", "pear/console_getopt": "1.4.1", "pear/mail": "1.3.0", diff --git a/composer.lock b/composer.lock index b8f92b1..6a87f3e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";, "This file is @generated automatically" ], -"content-hash": "843344da37e5420c13808704151d709b", +"content-hash": "cd93aa55f7367dac55ef9320802dc034", "packages": [ { "name": "composer/semver", @@ -466,16 +466,16 @@ }, { "name": "oojs/oojs-ui", -"version": "v0.21.3", +"version": "v0.21.4", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, -"reference": "3e818731f2e0c19366fbb297fb58927fac123543" +"reference": "ed5dd92664b765a160e68e46ec0337e75451b0ad" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/3e818731f2e0c19366fbb297fb58927fac123543";, -"reference": "3e818731f2e0c19366fbb297fb58927fac123543", +"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/ed5dd92664b765a160e68e46ec0337e75451b0ad";, +"reference": "ed5dd92664b765a160e68e46ec0337e75451b0ad", "shasum": "" }, "require": { @@ -541,7 +541,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";, -"time": "2017-05-10T00:39:25+00:00" +"time": "2017-05-16T22:09:22+00:00" }, { "name": "oyejorge/less.php", diff --git a/composer/LICENSE b/composer/LICENSE index 62ecfd8..f27399a 100644 --- a/composer/LICENSE +++ b/composer/LICENSE @@ -1,3 +1,4 @@ + Copyright (c) Nils Adermann, Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy @@ -17,3 +18,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + diff --git a/composer/installed.json b/composer/installed.json index 884315d..4b0ce9e 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2111,18 +2111,70 @@ "homepage": "https://symfony.com"; }, { -"name": "oojs/oojs-ui", -"version": "v0.21.3", -"version_normalized": "0.21.3.0", +"name": "wikimedia/testing-access-wrapper", +"version": "1.0.0", +"version_normalized": "1.0.0.0", "source": { "type": "git", -"url": "https://github.com/wikimedia/oojs-ui.git";, -"reference": "3e818731f2e0c19366fbb297fb58927fac123543" +"url": "https://github.com/
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "Revert "mariadb: Depool db1055 for reimage"""
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354062 ) Change subject: Revert "Revert "Revert "mariadb: Depool db1055 for reimage""" .. Revert "Revert "Revert "mariadb: Depool db1055 for reimage""" According both to server admin log and checks on an app server, the repool change 8c8f9a6d4d1 was sent to prod. This reverts commit efe62318396ef32b05f9f9ca1d01f96d05ea0bcc. The previous commit restored repository / staging parity. This commit restores repository / staging / prod parity. Change-Id: Ib41c51701fb1ede45cdcf5d2c1714a2fb0763d74 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 10601c6..705c97e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1052' => 0, # B3 2.8TB 96GB, master 'db1067' => 0, # D1 2.8TB 160GB, old master 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager -# 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager + 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api @@ -236,23 +236,23 @@ 's1' => [ 'watchlist' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchanges' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'contributions' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'logpager' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354062 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib41c51701fb1ede45cdcf5d2c1714a2fb0763d74 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson Gerrit-Reviewer: Dereckson 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]: Update OOjs UI to v0.21.4
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354061 ) Change subject: Update OOjs UI to v0.21.4 .. Update OOjs UI to v0.21.4 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.21.4 Depends-On: I676c9aadbf4739437b94ec729cc4fe47ed19c886 Change-Id: Ie9f8e42c46948688495cbd80e778b484c7b03982 --- M composer.json M resources/lib/oojs-ui/i18n/af.json M resources/lib/oojs-ui/i18n/bs.json M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-core-apex.css M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css M resources/lib/oojs-ui/oojs-ui-core.js M resources/lib/oojs-ui/oojs-ui-core.js.map M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M resources/lib/oojs-ui/oojs-ui-toolbars.js M resources/lib/oojs-ui/oojs-ui-toolbars.js.map M resources/lib/oojs-ui/oojs-ui-widgets-apex.css M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css M resources/lib/oojs-ui/oojs-ui-widgets.js M resources/lib/oojs-ui/oojs-ui-widgets.js.map M resources/lib/oojs-ui/oojs-ui-windows-apex.css M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css M resources/lib/oojs-ui/oojs-ui-windows.js M resources/lib/oojs-ui/oojs-ui-windows.js.map 21 files changed, 208 insertions(+), 230 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/61/354061/1 -- To view, visit https://gerrit.wikimedia.org/r/354061 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9f8e42c46948688495cbd80e778b484c7b03982 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester ___ 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 "Revert "Revert "mariadb: Depool db1055 for reimage"""
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354062 ) Change subject: Revert "Revert "Revert "mariadb: Depool db1055 for reimage""" .. Revert "Revert "Revert "mariadb: Depool db1055 for reimage""" According both to server admin log and checks on an app server, the repool change 8c8f9a6d4d1 was sent to prod. This reverts commit efe62318396ef32b05f9f9ca1d01f96d05ea0bcc. The previous commit restored repository / staging parity. This commit restores repository / staging / prod parity. Change-Id: Ib41c51701fb1ede45cdcf5d2c1714a2fb0763d74 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/62/354062/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 10601c6..705c97e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1052' => 0, # B3 2.8TB 96GB, master 'db1067' => 0, # D1 2.8TB 160GB, old master 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager -# 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager + 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api @@ -236,23 +236,23 @@ 's1' => [ 'watchlist' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchanges' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'contributions' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'logpager' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354062 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib41c51701fb1ede45cdcf5d2c1714a2fb0763d74 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.21.4
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354060 ) Change subject: Update OOjs UI to v0.21.4 .. Update OOjs UI to v0.21.4 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.21.4 Change-Id: I676c9aadbf4739437b94ec729cc4fe47ed19c886 --- D lib/oojs-ui/AUTHORS.txt D lib/oojs-ui/LICENSE-MIT D lib/oojs-ui/README.md M lib/oojs-ui/i18n/af.json M lib/oojs-ui/i18n/bs.json M lib/oojs-ui/oojs-ui-apex-icons-alerts.css M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-content.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-layout.css M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-core-apex.css M lib/oojs-ui/oojs-ui-core-apex.rtl.css M lib/oojs-ui/oojs-ui-core-mediawiki.css M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-core.js M lib/oojs-ui/oojs-ui-core.js.map M lib/oojs-ui/oojs-ui-images-apex.css M lib/oojs-ui/oojs-ui-images-apex.rtl.css M lib/oojs-ui/oojs-ui-images-mediawiki.css M lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-apex.css M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars.js M lib/oojs-ui/oojs-ui-toolbars.js.map M lib/oojs-ui/oojs-ui-widgets-apex.css M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-widgets.js M lib/oojs-ui/oojs-ui-widgets.js.map M lib/oojs-ui/oojs-ui-windows-apex.css M lib/oojs-ui/oojs-ui-windows-apex.rtl.css M lib/oojs-ui/oojs-ui-windows-mediawiki.css M lib/oojs-ui/oojs-ui-windows-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-windows.js M lib/oojs-ui/oojs-ui-windows.js.map 91 files changed, 390 insertions(+), 585 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/60/354060/1 -- To view, visit https://gerrit.wikimedia.org/r/354060 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I676c9aadbf4739437b94ec729cc4fe47ed19c886 Gerrit-PatchSet: 1 Gerrit-Project: Visu
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Cite: Add span wrapper around linkback a tags when |linkback...
Subramanya Sastry has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354059 ) Change subject: Cite: Add span wrapper around linkback a tags when |linkbacks| > 1 .. Cite: Add span wrapper around linkback a tags when |linkbacks| > 1 Add a span-wrapper around the tag so that wikis can use the CSS :before and :after pseudo-elements to add custom rendering of references without having the content of those pseudo-elements be part of the link text. For example, without this span wrapper, frwiki would use span[rel="mw:referencedBy"] a:last-child::before { content: ' et ' counter(mw-ref-linkback, lower-alpha); } But, the ' et ' will be part of the clickable link which makes for bad UX. By adding this additional span wrapper below, the CSS would change to: span[rel="mw:referencedBy"] span:last-child::before { content: ' et ' counter(mw-ref-linkback, lower-alpha); } which preserves the existing style without making the ' et ' part of the link. Change-Id: Ibf444a7f9f42326360103b65df1ed003f11441d5 --- M lib/ext/Cite/index.js M tests/citeParserTests-blacklist.js M tests/citeParserTests.txt M tests/parserTests.txt 4 files changed, 45 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/59/354059/1 diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js index e3a03f3..9340b17 100644 --- a/lib/ext/Cite/index.js +++ b/lib/ext/Cite/index.js @@ -195,7 +195,7 @@ li.appendChild(reftextSpan); // Generate leading linkbacks - var createLinkback = function(href, group, text) { + var createLinkback = function(href, group, text, hasMultipleLinkbacks) { var a = ownerDoc.createElement('a'); var s = ownerDoc.createElement('span'); var textNode = ownerDoc.createTextNode(text + " "); @@ -206,7 +206,34 @@ } s.appendChild(textNode); a.appendChild(s); - return a; + + if (!hasMultipleLinkbacks) { + return a; + } else { + // Add a span-wrapper around the tag so that wikis + // can use the CSS :before and :after pseudo-elements + // to add custom rendering of references without having + // the content of those pseudo-elements be part of the + // link text. + // + // For example, without this span wrapper, frwiki would use + // span[rel="mw:referencedBy"] a:last-child::before { + // content: ' et ' counter(mw-ref-linkback, lower-alpha); + // } + // But, the ' et ' will be part of the clickable link which + // makes for bad UX. By adding this additional span wrapper + // below, the CSS would change to + // span[rel="mw:referencedBy"] span:last-child::before { + // content: ' et ' counter(mw-ref-linkback, lower-alpha); + // } + // which preserves the existing style without making the ' et ' + // part of the link + // + var spanWrapper = ownerDoc.createElement('span'); + spanWrapper.appendChild(a); + + return spanWrapper; + } }; if (ref.linkbacks.length === 1) { var linkback = createLinkback(ref.id, ref.group, '↑'); @@ -219,7 +246,7 @@ li.insertBefore(span, reftextSpan); ref.linkbacks.forEach(function(lb, i) { - span.appendChild(createLinkback(lb, ref.group, i + 1)); + span.appendChild(createLinkback(lb, ref.group, i + 1, true)); }); } diff --git a/tests/citeParserTests-blacklist.js b/tests/citeParserTests-blacklist.js index fa281d2..2e0f5f6 100644 --- a/tests/citeParserTests-blacklist.js +++ b/tests/citeParserTests-blacklist.js @@ -49,16 +49,16 @@ add("wt2html", " after (bug 6164)", "[1]\n\n\n\n\n\n↑ one"); add("wt2html", "{{REVISIONID}} on page with (bug 6299)", "{{REVISIONID}}[1]\n↑ elite"); add("wt2html", "{{REVISIONID}} on page without (bug 6299 sanity check)", "{{REVISIONID}}"); -add("wt2html", "Ref with content followed by blank ref", "[1]\n\n[1]\n\n1 2 content"); -add("wt2html", "Blank ref followed by ref with content", "[1]\n\n[1]\n\n1 2 content"); -add("wt2html", "Regression: non-blank ref \"0\" followed by ref with content", "[1]\n\n[1]\n\n1 2 0"); -add("wt2html", "Regression sanity check: non-blank ref \"1\" followed by ref with content", "[1]\n\n[1]\n\n1 2 1"); +add("wt2html", "Ref with content f
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.21.4
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354057 ) Change subject: Tag v0.21.4 .. Tag v0.21.4 Change-Id: I7919a7e30539af968cf904d6aefc453f066fcfcb --- M History.md M package.json 2 files changed, 28 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/History.md b/History.md index 8790c01..43652e2 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,31 @@ # OOjs UI Release History +## v0.21.4 / 2017-05-16 +### Features +* Allow more widgets to be focussed programatically (Bartosz Dziewoński) +* Generalize `.getInputId()` for all widgets (Bartosz Dziewoński) +* Use `.focus()` method when possible instead of looking inside widgets (Bartosz Dziewoński) +* TagMultiselectWidget: Fix `Ctrl`+`Backspace` to delete last item (Bartosz Dziewoński) +* TagMultiselectWidget: Fix order of checks for `allowArbitrary`/`allowDuplicates` (Bartosz Dziewoński) + +### Styles +* MediaWiki theme: Separate two active ToggleButton siblings visually (Volker E) + +### Code +* LabelWidget: Fix label click handling (Bartosz Dziewoński) +* RadioSelectInputWidget: When generating a unique 'name', don't make it random (Bartosz Dziewoński) +* Use glaringly wrong tags for elements that are supposed to be unused (Bartosz Dziewoński) +* README: Clarify and simplify descriptions (Volker E) +* build: Upgrade eslint-config-wikimedia from 0.3.0 to 0.4.0 and make pass (James D. Forrester) +* demos: Add ARIA roles (Volker E) +* demos: Clean up the window manager when destroying the dialogs demo (Bartosz Dziewoński) +* demos: Preserve scroll position when changing non-page options (Bartosz Dziewoński) +* demos: Rename deprecated Card to current TabPanel (Volker E) +* demos: Tame buggy mobile browser behaviour on `position: fixed` (Volker E) +* demos: Turn the menu into a fixed header (Bartosz Dziewoński) +* docs: Fix `OO.ui.IndexLayout` example (Volker E) +* tests: Order the `attributes` object keys, for less noisy diffs (Bartosz Dziewoński) + + ## v0.21.3 / 2017-05-09 ### Deprecations * [DEPRECATING CHANGE] Merge functionality of FloatingMenuSelectWidget into MenuSelectWidget (Bartosz Dziewoński) diff --git a/package.json b/package.json index 0162893..88a79a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.21.3", + "version": "0.21.4", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", -- To view, visit https://gerrit.wikimedia.org/r/354057 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7919a7e30539af968cf904d6aefc453f066fcfcb Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: 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] operations/puppet[production]: lists: split mailman::lists_ip variable into v4/v6
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354058 ) Change subject: lists: split mailman::lists_ip variable into v4/v6 .. lists: split mailman::lists_ip variable into v4/v6 Stop assuming that mailman::lists_ip[0] is the IPv4 address and [1] is the IPv6 one and split into two different variables. This was actually the case before commit 14333a539ef18287612ab1cce3035e44350f1f49 and this commit basically reverts to that. Change-Id: Ida84faa00302f644d36bf1526df838994ac4d224 --- M hieradata/role/common/lists.yaml M modules/profile/manifests/lists.pp 2 files changed, 4 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/58/354058/1 diff --git a/hieradata/role/common/lists.yaml b/hieradata/role/common/lists.yaml index b744fe9..6194848 100644 --- a/hieradata/role/common/lists.yaml +++ b/hieradata/role/common/lists.yaml @@ -1,8 +1,7 @@ standard::has_default_mail_relay: false mailman::lists_servername: 'lists.wikimedia.org' -mailman::lists_ip: - - '208.80.154.75' - - '2620:0:861:3::2' +mailman::lists::ipv4: '208.80.154.75' +mailman::lists::ipv6: '2620:0:861:3::2' debdeploy::grains: debdeploy-lists: value: standard diff --git a/modules/profile/manifests/lists.pp b/modules/profile/manifests/lists.pp index 6aa0a44..c305356 100644 --- a/modules/profile/manifests/lists.pp +++ b/modules/profile/manifests/lists.pp @@ -10,11 +10,9 @@ mailalias { 'root': recipient => 'r...@wikimedia.org' } -# XXX: needs to be split to v4/v6 variables, like it was pre-14333a539e -$lists_ip = hiera('mailman::lists_ip') interface::alias { 'lists.wikimedia.org': -ipv4 => $lists_ip[0], -ipv6 => $lists_ip[1], +ipv4 => hiera('mailman::lists::ipv4', undef), +ipv6 => hiera('mailman::lists::ipv6', undef), } letsencrypt::cert::integrated { 'lists': -- To view, visit https://gerrit.wikimedia.org/r/354058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida84faa00302f644d36bf1526df838994ac4d224 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: lists: use ipaddress facts instead of server IP in Hiera
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354051 ) Change subject: lists: use ipaddress facts instead of server IP in Hiera .. lists: use ipaddress facts instead of server IP in Hiera For the $outbound_ips variable which is used in exim config for lists, use facts instead of storing the server IP in Hiera. [fermium:~] $ facter | grep ipaddress ipaddress => 208.80.154.74 ipaddress6 => 2620:0:861:3:208:80:154:74 ipaddress6_eth0 => 2620:0:861:3:208:80:154:74 ipaddress_eth0 => 208.80.154.74 ipaddress_lo => 127.0.0.1 Change-Id: I030f616c28a6ad412a05ea327df77c9fbcb782f5 --- D hieradata/hosts/fermium.yaml M hieradata/role/common/lists.yaml M modules/profile/manifests/lists.pp M modules/profile/templates/exim/exim4.conf.mailman.erb 4 files changed, 2 insertions(+), 11 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/fermium.yaml b/hieradata/hosts/fermium.yaml deleted file mode 100644 index e69de29..000 --- a/hieradata/hosts/fermium.yaml +++ /dev/null diff --git a/hieradata/role/common/lists.yaml b/hieradata/role/common/lists.yaml index 60df589..b744fe9 100644 --- a/hieradata/role/common/lists.yaml +++ b/hieradata/role/common/lists.yaml @@ -3,9 +3,6 @@ mailman::lists_ip: - '208.80.154.75' - '2620:0:861:3::2' -mailman::server_ip: - - '208.80.154.74' - - '2620:0:861:1:208:80:154:74' debdeploy::grains: debdeploy-lists: value: standard diff --git a/modules/profile/manifests/lists.pp b/modules/profile/manifests/lists.pp index f68efb7..6aa0a44 100644 --- a/modules/profile/manifests/lists.pp +++ b/modules/profile/manifests/lists.pp @@ -1,5 +1,4 @@ class profile::lists ( -$outbound_ips = hiera_array('mailman::server_ip'), $list_outbound_ips = hiera_array('mailman::lists_ip'), ) { diff --git a/modules/profile/templates/exim/exim4.conf.mailman.erb b/modules/profile/templates/exim/exim4.conf.mailman.erb index 6c9fe4e..3c53fd2 100644 --- a/modules/profile/templates/exim/exim4.conf.mailman.erb +++ b/modules/profile/templates/exim/exim4.conf.mailman.erb @@ -236,19 +236,14 @@ remote_smtp: driver = smtp -<% if !@outbound_ips.empty? then -%> - interface = <; <%= @outbound_ips.join(" ; ") %> -<% end -%> - + interface = <; <%= @ipaddress %> ; <%= @ipaddress6 %> remote_smtp_signed: driver = smtp dkim_domain = wikimedia.org dkim_selector = wikimedia dkim_private_key = ${if exists{/etc/exim4/dkim/${dkim_domain}-${dkim_selector}.key}{/etc/exim4/dkim/${dkim_domain}-${dkim_selector}.key}{0}} dkim_canon = relaxed -<% if !@outbound_ips.empty? then -%> - interface = <; <%= @outbound_ips.join(" ; ") %> -<% end -%> + interface = <; <%= @ipaddress %> ; <%= @ipaddress6 %> list_smtp: driver = smtp -- To view, visit https://gerrit.wikimedia.org/r/354051 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I030f616c28a6ad412a05ea327df77c9fbcb782f5 Gerrit-PatchSet: 7 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Faidon Liambotis 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]: lists: fix service/server IPs in Hiera
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354038 ) Change subject: lists: fix service/server IPs in Hiera .. lists: fix service/server IPs in Hiera The data for lists in Hiera is inaccurate/weird: role/common/lists.yaml data is stale and incorrect, and being overriden (or worse, overlayed) by the host-specific hosts/fermium.yaml. Remove the latter and merge the contents to the former, making the data accurate again. Change-Id: Idf9f2516b6c6e98ede9e913d6794070fc6a4ea02 --- M hieradata/hosts/fermium.yaml M hieradata/role/common/lists.yaml 2 files changed, 4 insertions(+), 10 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/fermium.yaml b/hieradata/hosts/fermium.yaml index 032d176..e69de29 100644 --- a/hieradata/hosts/fermium.yaml +++ b/hieradata/hosts/fermium.yaml @@ -1,6 +0,0 @@ -mailman::lists_ip: - - '208.80.154.75' - - '2620:0:861:3::2' -mailman::server_ip: - - '208.80.154.74' - - '2620:0:861:3:208:80:154:74' diff --git a/hieradata/role/common/lists.yaml b/hieradata/role/common/lists.yaml index acf42d9..60df589 100644 --- a/hieradata/role/common/lists.yaml +++ b/hieradata/role/common/lists.yaml @@ -1,11 +1,11 @@ standard::has_default_mail_relay: false mailman::lists_servername: 'lists.wikimedia.org' mailman::lists_ip: - - '208.80.154.4' - - '2620:0:861:1::2' + - '208.80.154.75' + - '2620:0:861:3::2' mailman::server_ip: - - '208.80.154.61' - - '2620:0:861:1:208:80:154:61' + - '208.80.154.74' + - '2620:0:861:1:208:80:154:74' debdeploy::grains: debdeploy-lists: value: standard -- To view, visit https://gerrit.wikimedia.org/r/354038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf9f2516b6c6e98ede9e913d6794070fc6a4ea02 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Faidon Liambotis 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/debian[trusty]: Merge branch 'jessie' into trusty
Legoktm has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354054 ) Change subject: Merge branch 'jessie' into trusty .. Merge branch 'jessie' into trusty Change-Id: If39438c0561516b316433c64962c2c4bfe6cbc88 --- M debian/changelog 1 file changed, 9 insertions(+), 5 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 16f6c1d..81ca936 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ -<<< HEAD (51df89 Merge tag 'debian/1%1.27.2-1_bpo8+1' into trusty) -mediawiki (1:1.27.2-1ppa1~trusty1) trusty; urgency=medium +mediawiki (1:1.27.3-1ppa1~trusty1) trusty; urgency=medium * Rebuild for trusty - -- Kunal Mehta Tue, 11 Apr 2017 11:16:03 -0700 -=== + -- Kunal Mehta Tue, 16 May 2017 15:00:32 -0700 + mediawiki (1:1.27.3-1~bpo8+1) jessie-backports; urgency=medium * Rebuild for jessie-backports. @@ -17,7 +16,12 @@ actually contains the fix for CVE-2017-0372 (Closes: #861585) -- Kunal Mehta Mon, 01 May 2017 13:20:11 -0700 ->>> BRANCH (bd463b Merge branch 'master' into jessie) + +mediawiki (1:1.27.2-1ppa1~trusty1) trusty; urgency=medium + + * Rebuild for trusty + + -- Kunal Mehta Tue, 11 Apr 2017 11:16:03 -0700 mediawiki (1:1.27.2-1~bpo8+1) jessie-backports; urgency=medium -- To view, visit https://gerrit.wikimedia.org/r/354054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If39438c0561516b316433c64962c2c4bfe6cbc88 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian Gerrit-Branch: trusty Gerrit-Owner: Legoktm 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] oojs/ui[master]: Tag v0.21.4
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354057 ) Change subject: Tag v0.21.4 .. Tag v0.21.4 Change-Id: I7919a7e30539af968cf904d6aefc453f066fcfcb --- M History.md M package.json 2 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/57/354057/1 diff --git a/History.md b/History.md index 8790c01..43652e2 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,31 @@ # OOjs UI Release History +## v0.21.4 / 2017-05-16 +### Features +* Allow more widgets to be focussed programatically (Bartosz Dziewoński) +* Generalize `.getInputId()` for all widgets (Bartosz Dziewoński) +* Use `.focus()` method when possible instead of looking inside widgets (Bartosz Dziewoński) +* TagMultiselectWidget: Fix `Ctrl`+`Backspace` to delete last item (Bartosz Dziewoński) +* TagMultiselectWidget: Fix order of checks for `allowArbitrary`/`allowDuplicates` (Bartosz Dziewoński) + +### Styles +* MediaWiki theme: Separate two active ToggleButton siblings visually (Volker E) + +### Code +* LabelWidget: Fix label click handling (Bartosz Dziewoński) +* RadioSelectInputWidget: When generating a unique 'name', don't make it random (Bartosz Dziewoński) +* Use glaringly wrong tags for elements that are supposed to be unused (Bartosz Dziewoński) +* README: Clarify and simplify descriptions (Volker E) +* build: Upgrade eslint-config-wikimedia from 0.3.0 to 0.4.0 and make pass (James D. Forrester) +* demos: Add ARIA roles (Volker E) +* demos: Clean up the window manager when destroying the dialogs demo (Bartosz Dziewoński) +* demos: Preserve scroll position when changing non-page options (Bartosz Dziewoński) +* demos: Rename deprecated Card to current TabPanel (Volker E) +* demos: Tame buggy mobile browser behaviour on `position: fixed` (Volker E) +* demos: Turn the menu into a fixed header (Bartosz Dziewoński) +* docs: Fix `OO.ui.IndexLayout` example (Volker E) +* tests: Order the `attributes` object keys, for less noisy diffs (Bartosz Dziewoński) + + ## v0.21.3 / 2017-05-09 ### Deprecations * [DEPRECATING CHANGE] Merge functionality of FloatingMenuSelectWidget into MenuSelectWidget (Bartosz Dziewoński) diff --git a/package.json b/package.json index 0162893..88a79a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.21.3", + "version": "0.21.4", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", -- To view, visit https://gerrit.wikimedia.org/r/354057 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7919a7e30539af968cf904d6aefc453f066fcfcb Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update design of empty Search screen
Jcasariego has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354056 ) Change subject: Update design of empty Search screen .. Update design of empty Search screen This task make the first time search / cleared search history case more visually appealing and provide some prompt for user to search. Bug: T137116 Change-Id: If19f9fade02895c1a745ecc0ab0feb1199f57d2f --- M app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java A app/src/main/res/drawable/ic_search_splash.xml M app/src/main/res/layout/fragment_search_recent.xml M app/src/main/res/values-qq/strings.xml M app/src/main/res/values/strings.xml 5 files changed, 126 insertions(+), 48 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/56/354056/1 diff --git a/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java b/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java index 825d8df..9272094 100644 --- a/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java +++ b/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java @@ -25,6 +25,9 @@ import org.wikipedia.database.contract.SearchHistoryContract; import org.wikipedia.util.FeedbackUtil; +import butterknife.BindView; +import butterknife.ButterKnife; + import static org.wikipedia.Constants.RECENT_SEARCHES_FRAGMENT_LOADER_ID; /** Displays a list of recent searches */ @@ -34,19 +37,20 @@ } private Parent parentFragment; -private View container; -private ListView recentSearchesList; private RecentSearchesAdapter adapter; -private ImageView deleteButton; + +@BindView(R.id.recent_searches_list) ListView recentSearchesList; +@BindView(R.id.search_empty_container) View searchEmptyView; +@BindView(R.id.recent_searches_container) View recentSearchesContainer; +@BindView(R.id.recent_searches) View recentSearches; +@BindView(R.id.recent_searches_delete_button) ImageView deleteButton; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_search_recent, container, false); -parentFragment = (Parent) getParentFragment(); -this.container = rootView.findViewById(R.id.recent_searches_container); -recentSearchesList = (ListView) rootView.findViewById(R.id.recent_searches_list); +ButterKnife.bind(this, rootView); -deleteButton = (ImageView) rootView.findViewById(R.id.recent_searches_delete_button); +parentFragment = (Parent) getParentFragment(); deleteButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -70,11 +74,11 @@ } public void show() { -container.setVisibility(View.VISIBLE); +recentSearchesContainer.setVisibility(View.VISIBLE); } public void hide() { -container.setVisibility(View.GONE); +recentSearchesContainer.setVisibility(View.GONE); } @Override @@ -119,7 +123,8 @@ } adapter.swapCursor(cursorLoader); boolean visible = recentSearchesList.getCount() > 0; -deleteButton.setVisibility(visible ? View.VISIBLE : View.INVISIBLE); +searchEmptyView.setVisibility(!visible ? View.VISIBLE : View.INVISIBLE); +recentSearches.setVisibility(visible ? View.VISIBLE : View.INVISIBLE); } @Override diff --git a/app/src/main/res/drawable/ic_search_splash.xml b/app/src/main/res/drawable/ic_search_splash.xml new file mode 100644 index 000..4218ec1 --- /dev/null +++ b/app/src/main/res/drawable/ic_search_splash.xml @@ -0,0 +1,33 @@ +http://schemas.android.com/apk/res/android"; +android:width="150dp" +android:height="148dp" +android:viewportWidth="150.0" +android:viewportHeight="148.12"> + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_search_recent.xml b/app/src/main/res/layout/fragment_search_recent.xml index feab661..889b42b 100644 --- a/app/src/main/res/layout/fragment_search_recent.xml +++ b/app/src/main/res/layout/fragment_search_recent.xml @@ -1,51 +1,89 @@ -http://schemas.android.com/apk/res/android"; +http://schemas.android.com/apk/res/android"; xmlns:app="http://schemas.android.com/apk/res-auto"; -android:id="@+id/recent_searches_container" -android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" -android:background="?attr/window_background_color"> +android:background="?attr/window_background_color" +android:id="@+id/recent_searches_container"> - - - + +android:id="@+id/search_empty_image" +android:layout_width="150dp" +android:layout_height="148dp" +
[MediaWiki-commits] [Gerrit] mediawiki...ParsoidBatchAPI[master]: Add a defensive is_callable check on setWrapOutputClass
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354050 ) Change subject: Add a defensive is_callable check on setWrapOutputClass .. Add a defensive is_callable check on setWrapOutputClass * Just in case this patch isn't reverted when the corresponding core code has been. * We can remove this defensive check in the future once the core code has stabilized. Change-Id: I5d03d5bbbfea94799b18c133b5d54ec1ecd0ef34 --- M includes/ApiParsoidBatch.php 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/ApiParsoidBatch.php b/includes/ApiParsoidBatch.php index 164442f..fec3894 100644 --- a/includes/ApiParsoidBatch.php +++ b/includes/ApiParsoidBatch.php @@ -223,7 +223,9 @@ $contentHandler = ContentHandler::getForModelID( CONTENT_MODEL_WIKITEXT ); $options = $contentHandler->makeParserOptions( $this->getContext() ); $options->enableLimitReport( false ); - $options->setWrapOutputClass( false ); // Parsoid doesn't want the output wrapper + if ( is_callable( [ $options, 'setWrapOutputClass' ] ) ) { + $options->setWrapOutputClass( false ); // Parsoid doesn't want the output wrapper + } $out = $wgParser->parse( $text, $title, $options ); return array( 'text' => $out->getText(), -- To view, visit https://gerrit.wikimedia.org/r/354050 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d03d5bbbfea94799b18c133b5d54ec1ecd0ef34 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ParsoidBatchAPI Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry Gerrit-Reviewer: Anomie Gerrit-Reviewer: Arlolra 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/puppet[production]: fix lists/fermium: step 3, add new service IP, additionally
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354055 ) Change subject: fix lists/fermium: step 3, add new service IP, additionally .. fix lists/fermium: step 3, add new service IP, additionally Add the new IPv6 service IP to the IP lists in Hiera, first in addition to the existing one. Change-Id: Id8f07bd0ce86eff82db36106d053ad00fa7375de --- M hieradata/hosts/fermium.yaml M hieradata/role/common/lists.yaml 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/354055/1 diff --git a/hieradata/hosts/fermium.yaml b/hieradata/hosts/fermium.yaml index bedc63b..3468b14 100644 --- a/hieradata/hosts/fermium.yaml +++ b/hieradata/hosts/fermium.yaml @@ -1,3 +1,4 @@ mailman::lists_ip: - '208.80.154.75' - '2620:0:861:3::2' + - '2620:0:861:3:208:80:154:75' diff --git a/hieradata/role/common/lists.yaml b/hieradata/role/common/lists.yaml index cd3c035..d6dea16 100644 --- a/hieradata/role/common/lists.yaml +++ b/hieradata/role/common/lists.yaml @@ -3,6 +3,7 @@ mailman::lists_ip: - '208.80.154.4' - '2620:0:861:1::2' + - '2620:0:861:3:208:80:154:75' debdeploy::grains: debdeploy-lists: value: standard -- To view, visit https://gerrit.wikimedia.org/r/354055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8f07bd0ce86eff82db36106d053ad00fa7375de 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] oojs/ui[master]: demos: Tame buggy mobile browser behaviour on `position: fixed`
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354014 ) Change subject: demos: Tame buggy mobile browser behaviour on `position: fixed` .. demos: Tame buggy mobile browser behaviour on `position: fixed` Some older browsers, most notably Android < 5 and iOS Safari < 8 have scroll rendering issues with `position: fixed`. This tames their misbehaviour a bit. Change-Id: I046362ab52d5f76010e430cb7b0f2ae56dbd5f1f --- M demos/styles/demo.css 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/demos/styles/demo.css b/demos/styles/demo.css index 63c6eeb..45c890f 100644 --- a/demos/styles/demo.css +++ b/demos/styles/demo.css @@ -16,16 +16,18 @@ } .demo-menu { + background-color: #fff; position: fixed; top: 0; z-index: 1; width: 62.5em; padding-top: 1em; - background: #fff; /* To better hide Apex's large drop shadows */ margin-left: -1em; padding-left: 1em; padding-right: 1em; + /* Support: Android < 5, iOS < 8 to tame their buggy behaviour */ + -webkit-backface-visibility: hidden; } .demo-menu > .oo-ui-widget { -- To view, visit https://gerrit.wikimedia.org/r/354014 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I046362ab52d5f76010e430cb7b0f2ae56dbd5f1f Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE Gerrit-Reviewer: Bartosz Dziewoński 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/debian[trusty]: Merge branch 'jessie' into trusty
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354054 ) Change subject: Merge branch 'jessie' into trusty .. Merge branch 'jessie' into trusty Change-Id: If39438c0561516b316433c64962c2c4bfe6cbc88 --- M debian/changelog 1 file changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian refs/changes/54/354054/1 diff --git a/debian/changelog b/debian/changelog index 16f6c1d..81ca936 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ -<<< HEAD (51df89 Merge tag 'debian/1%1.27.2-1_bpo8+1' into trusty) -mediawiki (1:1.27.2-1ppa1~trusty1) trusty; urgency=medium +mediawiki (1:1.27.3-1ppa1~trusty1) trusty; urgency=medium * Rebuild for trusty - -- Kunal Mehta Tue, 11 Apr 2017 11:16:03 -0700 -=== + -- Kunal Mehta Tue, 16 May 2017 15:00:32 -0700 + mediawiki (1:1.27.3-1~bpo8+1) jessie-backports; urgency=medium * Rebuild for jessie-backports. @@ -17,7 +16,12 @@ actually contains the fix for CVE-2017-0372 (Closes: #861585) -- Kunal Mehta Mon, 01 May 2017 13:20:11 -0700 ->>> BRANCH (bd463b Merge branch 'master' into jessie) + +mediawiki (1:1.27.2-1ppa1~trusty1) trusty; urgency=medium + + * Rebuild for trusty + + -- Kunal Mehta Tue, 11 Apr 2017 11:16:03 -0700 mediawiki (1:1.27.2-1~bpo8+1) jessie-backports; urgency=medium -- To view, visit https://gerrit.wikimedia.org/r/354054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If39438c0561516b316433c64962c2c4bfe6cbc88 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian Gerrit-Branch: trusty Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: lists: brown paper bag fix for 128c6df
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354053 ) Change subject: lists: brown paper bag fix for 128c6df .. lists: brown paper bag fix for 128c6df Fix a "require" to refer to the new interface::alias resource. Change-Id: I65861e4c07c955112fc5150a6d2e59687b2cf1b3 --- M modules/profile/manifests/lists.pp 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/profile/manifests/lists.pp b/modules/profile/manifests/lists.pp index 84795e8..f68efb7 100644 --- a/modules/profile/manifests/lists.pp +++ b/modules/profile/manifests/lists.pp @@ -38,8 +38,7 @@ filter => template('profile/exim/system_filter.conf.mailman.erb'), require => [ Class['spamassassin'], -Interface::Ip['lists.wikimedia.org_v4'], -Interface::Ip['lists.wikimedia.org_v6'], +Interface::Alias['lists.wikimedia.org'], ], } -- To view, visit https://gerrit.wikimedia.org/r/354053 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I65861e4c07c955112fc5150a6d2e59687b2cf1b3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis Gerrit-Reviewer: Faidon Liambotis 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]: lists: brown paper bag fix for 128c6df
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354053 ) Change subject: lists: brown paper bag fix for 128c6df .. lists: brown paper bag fix for 128c6df Fix a "require" to refer to the new interface::alias resource. Change-Id: I65861e4c07c955112fc5150a6d2e59687b2cf1b3 --- M modules/profile/manifests/lists.pp 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/53/354053/1 diff --git a/modules/profile/manifests/lists.pp b/modules/profile/manifests/lists.pp index 84795e8..f68efb7 100644 --- a/modules/profile/manifests/lists.pp +++ b/modules/profile/manifests/lists.pp @@ -38,8 +38,7 @@ filter => template('profile/exim/system_filter.conf.mailman.erb'), require => [ Class['spamassassin'], -Interface::Ip['lists.wikimedia.org_v4'], -Interface::Ip['lists.wikimedia.org_v6'], +Interface::Alias['lists.wikimedia.org'], ], } -- To view, visit https://gerrit.wikimedia.org/r/354053 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65861e4c07c955112fc5150a6d2e59687b2cf1b3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: lists: switch to interface::alias
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/350778 ) Change subject: lists: switch to interface::alias .. lists: switch to interface::alias This is not a straight replacement: the new manifests adds the preferred_lft 0 as an option to the IPv6 address which didn't exist before (even though it should had!). Easier to cleanup manually as these are just a couple of hosts that are affected. This is also not fixing a very silly thing in the existing manifest, which is made a little more evident: it assumes that in the hiera key mailman::lists_ip the IPv4 address is at index 0 and the IPv6 address at index 1. This was two separate hiera keys before commit 14333a539ef18287612ab1cce3035e44350f1f49 but it has regressed since. Change-Id: Idd83f5d5f89c7834f387dc2b05f270371e74c058 --- M modules/profile/manifests/lists.pp 1 file changed, 4 insertions(+), 11 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/profile/manifests/lists.pp b/modules/profile/manifests/lists.pp index bc317e6..84795e8 100644 --- a/modules/profile/manifests/lists.pp +++ b/modules/profile/manifests/lists.pp @@ -11,18 +11,11 @@ mailalias { 'root': recipient => 'r...@wikimedia.org' } +# XXX: needs to be split to v4/v6 variables, like it was pre-14333a539e $lists_ip = hiera('mailman::lists_ip') - -interface::ip { 'lists.wikimedia.org_v4': -interface => 'eth0', -address => $lists_ip[0], -prefixlen => '32', -} - -interface::ip { 'lists.wikimedia.org_v6': -interface => 'eth0', -address => $lists_ip[1], -prefixlen => '128', +interface::alias { 'lists.wikimedia.org': +ipv4 => $lists_ip[0], +ipv6 => $lists_ip[1], } letsencrypt::cert::integrated { 'lists': -- To view, visit https://gerrit.wikimedia.org/r/350778 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd83f5d5f89c7834f387dc2b05f270371e74c058 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: Volans 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]: lists: use $::ipaddress facts instead of server IP in Hiera
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354051 ) Change subject: lists: use $::ipaddress facts instead of server IP in Hiera .. lists: use $::ipaddress facts instead of server IP in Hiera For the $outbound_ips variable which is used in exim config for lists, use facts instead of storing the server IP in Hiera. Make it an array consisting of the v4 and the v6 address on eth0 specifically. [fermium:~] $ facter | grep ipaddress ipaddress => 208.80.154.74 ipaddress6 => 2620:0:861:3::2 ipaddress6_eth0 => 2620:0:861:3:208:80:154:74 ipaddress_eth0 => 208.80.154.74 ipaddress_lo => 127.0.0.1 Change-Id: I030f616c28a6ad412a05ea327df77c9fbcb782f5 --- M hieradata/hosts/fermium.yaml M hieradata/role/common/lists.yaml M modules/profile/manifests/lists.pp 3 files changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/51/354051/1 diff --git a/hieradata/hosts/fermium.yaml b/hieradata/hosts/fermium.yaml index 032d176..bedc63b 100644 --- a/hieradata/hosts/fermium.yaml +++ b/hieradata/hosts/fermium.yaml @@ -1,6 +1,3 @@ mailman::lists_ip: - '208.80.154.75' - '2620:0:861:3::2' -mailman::server_ip: - - '208.80.154.74' - - '2620:0:861:3:208:80:154:74' diff --git a/hieradata/role/common/lists.yaml b/hieradata/role/common/lists.yaml index acf42d9..cd3c035 100644 --- a/hieradata/role/common/lists.yaml +++ b/hieradata/role/common/lists.yaml @@ -3,9 +3,6 @@ mailman::lists_ip: - '208.80.154.4' - '2620:0:861:1::2' -mailman::server_ip: - - '208.80.154.61' - - '2620:0:861:1:208:80:154:61' debdeploy::grains: debdeploy-lists: value: standard diff --git a/modules/profile/manifests/lists.pp b/modules/profile/manifests/lists.pp index bc317e6..69533a8 100644 --- a/modules/profile/manifests/lists.pp +++ b/modules/profile/manifests/lists.pp @@ -1,5 +1,4 @@ class profile::lists ( -$outbound_ips = hiera_array('mailman::server_ip'), $list_outbound_ips = hiera_array('mailman::lists_ip'), ) { @@ -13,6 +12,8 @@ $lists_ip = hiera('mailman::lists_ip') +$outbound_ips = [ $::ipaddress_eth0, $::ipaddress6_eth0 ] + interface::ip { 'lists.wikimedia.org_v4': interface => 'eth0', address => $lists_ip[0], -- To view, visit https://gerrit.wikimedia.org/r/354051 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I030f616c28a6ad412a05ea327df77c9fbcb782f5 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] operations/dns[master]: fix lists/fermium: step 2, add PTR for new v6 service IP
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354046 ) Change subject: fix lists/fermium: step 2, add PTR for new v6 service IP .. fix lists/fermium: step 2, add PTR for new v6 service IP step 2: add the PTR for the new correct v6 service IP for lists.wikimedia.org: 2620:0:861:3:208:80:154:75 Just like fermium is 208.80.154.74 and 2620:0:861:3:208:80:154:74 we want lists to be 208.80.154.75 and 2620:0:861:3:208:80:154:75 for consistency. Current situation is: lists.wikimedia.org has address 208.80.154.75 lists.wikimedia.org has IPv6 address 2620:0:861:3::2 Change-Id: Ida252cf3b18cf44a3700a6ca2ee5988372c94533 --- M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index a9ad794..95d62c4 100644 --- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -67,6 +67,7 @@ 1.9.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR wiki-mail-eqiad.wikimedia.org. 3.9.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR radon.wikimedia.org. 4.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR fermium.wikimedia.org. +5.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR lists.wikimedia.org. 6.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR mx1001.wikimedia.org. 2.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR dbmonitor1001.wikimedia.org. 5.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR gerrit.wikimedia.org. -- To view, visit https://gerrit.wikimedia.org/r/354046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida252cf3b18cf44a3700a6ca2ee5988372c94533 Gerrit-PatchSet: 4 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Introduce IContentProvider
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/349130 ) Change subject: Introduce IContentProvider .. Introduce IContentProvider Create interface IContentProvider and write DefaultContentProvider to implement current behaviour * New MwApiContentProvider is added that implements IContentProvider Changes: * New MwApiContentProvider can be enabled with $wgMFContentProviderClass = 'MwApiContentProvider'; ** FYI: to replicate production you'll also need to match $wgMFRemovableClasses with the production config value e.g. [ '.toc', '.mw-editsection', '.navbox', '.nomobile' ] * A config variable MFMwApiContentProviderBaseUri is provided for use with the MwApiContentProvider to allow pointing to an arbitary MediaWiki instance's API. * Moved various transformation setters/getters inside the MobileFormatter::newFromContext method for readability Bug: T156408 Change-Id: I0358810637853b9de9a67788bf78f8a2b5d81c4c --- M README.md M extension.json M includes/MobileFormatter.php M includes/MobileFrontend.body.php A includes/content-providers/ContentProviderFactory.php A includes/content-providers/DefaultContentProvider.php A includes/content-providers/IContentProvider.php A includes/content-providers/MwApiContentProvider.php 8 files changed, 167 insertions(+), 12 deletions(-) Approvals: Pmiazga: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index 3ac1171..3ffba7b 100644 --- a/README.md +++ b/README.md @@ -191,6 +191,23 @@ * Type: `Boolean` * Default: `true` + $wgMFContentProviderClass + +Name of PHP class that is responsible for formatting HTML for mobile. +Must implement IContentProvider. + +* Type: `string` +* Default: `DefaultContentProvider` + + + $wgMwApiContentProviderBaseUri" + +URL to be used by the MwApiMobileFormatter class. Points to a MediaWiki +API that can be queried to obtain content. + +* Type: `string` +* Default: `https://en.wikipedia.org/w/api.php` + $wgMFMobileFormatterHeadings This is a list of html tags, that could be recognized as the first heading of diff --git a/extension.json b/extension.json index e67c3e9..272747e 100644 --- a/extension.json +++ b/extension.json @@ -93,7 +93,11 @@ "MobileFrontend\\Devices\\AMFDeviceDetector": "includes/devices/AMFDeviceDetector.php", "MobileFrontend\\Devices\\CustomHeaderDeviceDetector": "includes/devices/CustomHeaderDeviceDetector.php", "MobileFrontend\\Devices\\UADeviceDetector": "includes/devices/UADeviceDetector.php", - "MobileFrontend\\Devices\\DeviceDetectorService": "includes/devices/DeviceDetectorService.php" + "MobileFrontend\\Devices\\DeviceDetectorService": "includes/devices/DeviceDetectorService.php", + "MobileFrontend\\ContentProviders\\ContentProviderFactory": "includes/content-providers/ContentProviderFactory.php", + "MobileFrontend\\ContentProviders\\DefaultContentProvider": "includes/content-providers/DefaultContentProvider.php", + "MobileFrontend\\ContentProviders\\IContentProvider": "includes/content-providers/IContentProvider.php", + "MobileFrontend\\ContentProviders\\MwApiContentProvider": "includes/content-providers/MwApiContentProvider.php" }, "ResourceModules": { "skins.minerva.base.reset": { @@ -1725,6 +1729,8 @@ ] }, "config": { + "MFContentProviderClass": "MobileFrontend\\ContentProviders\\DefaultContentProvider", + "MFMwApiContentProviderBaseUri": "https://en.wikipedia.org/w/api.php";, "MFEnableXAnalyticsLogging": false, "MFAppPackageId": false, "MFAppScheme": "http", @@ -1758,7 +1764,7 @@ "MFMobileHeader": "X-Subdomain", "MFRemovableClasses": { "beta": [], - "base": [] + "base": [ ".toc", ".mw-editsection", ".navbox", ".nomobile" ] }, "MFShowFirstParagraphBeforeInfobox": { "base": false, diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php index 9d7db0a..dc2f246 100644 --- a/includes/MobileFormatter.php +++ b/includes/MobileFormatter.php @@ -4,6 +4,7 @@ */ use HtmlFormatter\HtmlFormatter; +use MobileFrontend\ContentProviders\IContentProvider; /** * Converts HTML into a mobile-friendly version @@ -94,11 +95,18 @@ * Creates and returns a MobileFormatter * * @param MobileContext $context -* @param string $html +* @param IContentProvider $provider +* @param boolean $enableSections (optional) +* whether to wrap the content of sections +* @param boolean $includeTOC (optional) whether to include the +* table of contents in
[MediaWiki-commits] [Gerrit] operations/dns[master]: fix lists/fermium: step 1, remove wrong PTRs for service IP
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354048 ) Change subject: fix lists/fermium: step 1, remove wrong PTRs for service IP .. fix lists/fermium: step 1, remove wrong PTRs for service IP Remove the wrong PTR remnant for old v4 and v6 service IPs. These are just a remnant from the past and be removed separately from other steps. For v4 it is NOT the .4 IP it is also not bound to an interface on fermium. lists.wikimedia.org has address 208.80.154.75 lists.wikimedia.org has IPv6 address 2620:0:861:3::2 75.154.80.208.in-addr.arpa domain name pointer lists.wikimedia.org. [fermium:~] $ ip a s | grep 208 inet 208.80.154.74/26 brd 208.80.154.127 scope global eth0 inet 208.80.154.75/32 scope global eth0 inet6 2620:0:861:3:208:80:154:74/64 scope global though: host 208.80.154.4 4.154.80.208.in-addr.arpa domain name pointer lists.wikimedia.org. And for IPv6 there are both: 2620:0:861:1::2 and 2620:0:861:3::2 but only inet6 2620:0:861:3::2 is bound to an interface. Change-Id: Ie63c3a82f3fad2385a84f0fef41bde3b96f6cd1b --- M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/154.80.208.in-addr.arpa 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 0c6f5d2..a9ad794 100644 --- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -21,9 +21,6 @@ ; (in-subnet) service IPs - -2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lists.wikimedia.org. - 5.0.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR netmon1002.wikimedia.org. 7.1.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR contint1001.wikimedia.org. diff --git a/templates/154.80.208.in-addr.arpa b/templates/154.80.208.in-addr.arpa index 033c9b4..f8cdab0 100644 --- a/templates/154.80.208.in-addr.arpa +++ b/templates/154.80.208.in-addr.arpa @@ -17,7 +17,6 @@ 1 1H IN PTR vrrp-gw-1001.wikimedia.org. 2 1H IN PTR ae1-1001.cr1-eqiad.wikimedia.org. 3 1H IN PTR ae1-1001.cr2-eqiad.wikimedia.org. -4 1H IN PTR lists.wikimedia.org. 5 1H IN PTR netmon1002.wikimedia.org. 11 1H IN PTR dataset1001.wikimedia.org. -- To view, visit https://gerrit.wikimedia.org/r/354048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie63c3a82f3fad2385a84f0fef41bde3b96f6cd1b Gerrit-PatchSet: 3 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Faidon Liambotis 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...ParsoidBatchAPI[master]: Add a defensive is_callable check on setWrapOutputClass
Subramanya Sastry has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354050 ) Change subject: Add a defensive is_callable check on setWrapOutputClass .. Add a defensive is_callable check on setWrapOutputClass * Just in case this patch isn't reverted when the corresponding core code has been. * We can remove this defensive check in the future once the core code has stabilized. Change-Id: I5d03d5bbbfea94799b18c133b5d54ec1ecd0ef34 --- M includes/ApiParsoidBatch.php 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParsoidBatchAPI refs/changes/50/354050/1 diff --git a/includes/ApiParsoidBatch.php b/includes/ApiParsoidBatch.php index 164442f..fec3894 100644 --- a/includes/ApiParsoidBatch.php +++ b/includes/ApiParsoidBatch.php @@ -223,7 +223,9 @@ $contentHandler = ContentHandler::getForModelID( CONTENT_MODEL_WIKITEXT ); $options = $contentHandler->makeParserOptions( $this->getContext() ); $options->enableLimitReport( false ); - $options->setWrapOutputClass( false ); // Parsoid doesn't want the output wrapper + if ( is_callable( [ $options, 'setWrapOutputClass' ] ) ) { + $options->setWrapOutputClass( false ); // Parsoid doesn't want the output wrapper + } $out = $wgParser->parse( $text, $title, $options ); return array( 'text' => $out->getText(), -- To view, visit https://gerrit.wikimedia.org/r/354050 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d03d5bbbfea94799b18c133b5d54ec1ecd0ef34 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ParsoidBatchAPI Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "mariadb: Depool db1055 for reimage""
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354049 ) Change subject: Revert "Revert "mariadb: Depool db1055 for reimage"" .. Revert "Revert "mariadb: Depool db1055 for reimage"" To restore the operations/mediawiki-config prod/repo parity. Jynus or marostegui can repool it later. This reverts commit 8c8f9a6d4d15d1ec0cc146a0bfc042e8ea32c6d4. Change-Id: I9120d080d2bb20651b858338a30301bd1cee004b --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 705c97e..10601c6 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1052' => 0, # B3 2.8TB 96GB, master 'db1067' => 0, # D1 2.8TB 160GB, old master 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager - 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager +# 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api @@ -236,23 +236,23 @@ 's1' => [ 'watchlist' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'recentchanges' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'contributions' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'logpager' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9120d080d2bb20651b858338a30301bd1cee004b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson Gerrit-Reviewer: Dereckson Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "mariadb: Depool db1055 for reimage""
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354049 ) Change subject: Revert "Revert "mariadb: Depool db1055 for reimage"" .. Revert "Revert "mariadb: Depool db1055 for reimage"" To restore the operations/mediawiki-config prod/repo parity. Jynus or marostegui can repool it later. This reverts commit 8c8f9a6d4d15d1ec0cc146a0bfc042e8ea32c6d4. Change-Id: I9120d080d2bb20651b858338a30301bd1cee004b --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/49/354049/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 705c97e..10601c6 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1052' => 0, # B3 2.8TB 96GB, master 'db1067' => 0, # D1 2.8TB 160GB, old master 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager - 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager +# 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api @@ -236,23 +236,23 @@ 's1' => [ 'watchlist' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'recentchanges' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'contributions' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'logpager' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9120d080d2bb20651b858338a30301bd1cee004b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: fix lists/fermium: step 2, remove wrong PTR for service IP
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354048 ) Change subject: fix lists/fermium: step 2, remove wrong PTR for service IP .. fix lists/fermium: step 2, remove wrong PTR for service IP Remove the wrong PTR remnant for old v4 service IP. This is just a remnant from the past and be removed separately from other steps. For v4 it is NOT the .2 IP it is also not bound to an interface on fermium. lists.wikimedia.org has address 208.80.154.75 lists.wikimedia.org has IPv6 address 2620:0:861:3::2 75.154.80.208.in-addr.arpa domain name pointer lists.wikimedia.org. [fermium:~] $ ip a s | grep 208 inet 208.80.154.74/26 brd 208.80.154.127 scope global eth0 inet 208.80.154.75/32 scope global eth0 inet6 2620:0:861:3:208:80:154:74/64 scope global Change-Id: Ie63c3a82f3fad2385a84f0fef41bde3b96f6cd1b --- M templates/154.80.208.in-addr.arpa 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/48/354048/1 diff --git a/templates/154.80.208.in-addr.arpa b/templates/154.80.208.in-addr.arpa index 033c9b4..f8cdab0 100644 --- a/templates/154.80.208.in-addr.arpa +++ b/templates/154.80.208.in-addr.arpa @@ -17,7 +17,6 @@ 1 1H IN PTR vrrp-gw-1001.wikimedia.org. 2 1H IN PTR ae1-1001.cr1-eqiad.wikimedia.org. 3 1H IN PTR ae1-1001.cr2-eqiad.wikimedia.org. -4 1H IN PTR lists.wikimedia.org. 5 1H IN PTR netmon1002.wikimedia.org. 11 1H IN PTR dataset1001.wikimedia.org. -- To view, visit https://gerrit.wikimedia.org/r/354048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie63c3a82f3fad2385a84f0fef41bde3b96f6cd1b Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ 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 "Fixing "Book_talk" namespace alias for ro.wikipedia:"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354047 ) Change subject: Revert "Fixing "Book_talk" namespace alias for ro.wikipedia:" .. Revert "Fixing "Book_talk" namespace alias for ro.wikipedia:" Merged without deployment, and based on an old community consensus. This reverts commit 97f3ab1c77225e5535bcadae94e37a22455f0b95. Change-Id: I5f26e5dd6f3314f57e2d66f7545d83183155b140 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ea5b046..4fb0f93 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -3864,7 +3864,7 @@ 'Discuţie_Portal' => 101, 'Discuţie_Proiect' => 103, 'Book' => 110, // T68530 - 'Book_talk' => 111, // T68530#2824358 + 'Discuţie_Book' => 111, ], '+rowikibooks' => [ 'Discuţie_Wikibooks' => NS_PROJECT_TALK, -- To view, visit https://gerrit.wikimedia.org/r/354047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f26e5dd6f3314f57e2d66f7545d83183155b140 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson Gerrit-Reviewer: Dereckson Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Fixing "Book_talk" namespace alias for ro.wikipedia:"
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354047 ) Change subject: Revert "Fixing "Book_talk" namespace alias for ro.wikipedia:" .. Revert "Fixing "Book_talk" namespace alias for ro.wikipedia:" Merged without deployment, and based on an old community consensus. This reverts commit 97f3ab1c77225e5535bcadae94e37a22455f0b95. Change-Id: I5f26e5dd6f3314f57e2d66f7545d83183155b140 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/47/354047/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ea5b046..4fb0f93 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -3864,7 +3864,7 @@ 'Discuţie_Portal' => 101, 'Discuţie_Proiect' => 103, 'Book' => 110, // T68530 - 'Book_talk' => 111, // T68530#2824358 + 'Discuţie_Book' => 111, ], '+rowikibooks' => [ 'Discuţie_Wikibooks' => NS_PROJECT_TALK, -- To view, visit https://gerrit.wikimedia.org/r/354047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f26e5dd6f3314f57e2d66f7545d83183155b140 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: fix lists/fermium: step 1, add PTR for new v6 service IP
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354046 ) Change subject: fix lists/fermium: step 1, add PTR for new v6 service IP .. fix lists/fermium: step 1, add PTR for new v6 service IP step 1: add the PTR for the new correct v6 service IP for lists.wikimedia.org: 2620:0:861:3:208:80:154:74 Just like fermium is 208.80.154.74 and 2620:0:861:3:208:80:154:74 we want lists to be 208.80.154.75 and 2620:0:861:3:208:80:154:75 for consistency. Current situation is: lists.wikimedia.org has address 208.80.154.75 lists.wikimedia.org has IPv6 address 2620:0:861:3::2 Change-Id: Ida252cf3b18cf44a3700a6ca2ee5988372c94533 --- M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/46/354046/1 diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 0c6f5d2..839d2ed 100644 --- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -70,6 +70,7 @@ 1.9.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR wiki-mail-eqiad.wikimedia.org. 3.9.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR radon.wikimedia.org. 4.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR fermium.wikimedia.org. +5.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR lists.wikimedia.org. 6.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR mx1001.wikimedia.org. 2.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR dbmonitor1001.wikimedia.org. 5.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR gerrit.wikimedia.org. -- To view, visit https://gerrit.wikimedia.org/r/354046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida252cf3b18cf44a3700a6ca2ee5988372c94533 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: New: record physical and logical file size of saved pages
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/351212 ) Change subject: New: record physical and logical file size of saved pages .. New: record physical and logical file size of saved pages Bug: T160469 Change-Id: I4b021e7a9b43f2891e5b5d520928bafca536a68d --- M app/src/main/java/okhttp3/CacheDelegate.java M app/src/main/java/org/wikipedia/database/Database.java M app/src/main/java/org/wikipedia/database/contract/ReadingListPageContract.java A app/src/main/java/org/wikipedia/dataclient/okhttp/cache/DiskLruCacheUtil.java M app/src/main/java/org/wikipedia/readinglist/page/ReadingListPageRow.java M app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageTable.java M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java M app/src/main/java/org/wikipedia/util/FileUtil.java M app/src/test/java/okhttp3/internal/cache/CacheDelegateInterceptorTest.java 9 files changed, 360 insertions(+), 36 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified Mholloway: Looks good to me, but someone else must approve diff --git a/app/src/main/java/okhttp3/CacheDelegate.java b/app/src/main/java/okhttp3/CacheDelegate.java index f696b21..607c3ec 100644 --- a/app/src/main/java/okhttp3/CacheDelegate.java +++ b/app/src/main/java/okhttp3/CacheDelegate.java @@ -1,6 +1,7 @@ package okhttp3; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import java.io.IOException; @@ -20,6 +21,18 @@ this.cache = cache; } +@NonNull public DiskLruCache diskLruCache() { +return cache.cache; +} + +@Nullable public DiskLruCache.Snapshot entry(@NonNull Request req) { +try { +return cache.cache.get(key(req.url().toString())); +} catch (IOException ignore) { +return null; +} +} + // Copy of Cache.get(). Calling this method modifies the Cache. If the URL is present, it's // cache entry is moved to the head of the LRU queue. This method performs file I/O public boolean isCached(@NonNull String url) { diff --git a/app/src/main/java/org/wikipedia/database/Database.java b/app/src/main/java/org/wikipedia/database/Database.java index ac45469..611fbc9 100644 --- a/app/src/main/java/org/wikipedia/database/Database.java +++ b/app/src/main/java/org/wikipedia/database/Database.java @@ -17,7 +17,7 @@ public class Database extends SQLiteOpenHelper { private static final String DATABASE_NAME = "wikipedia.db"; -private static final int DATABASE_VERSION = 16; +private static final int DATABASE_VERSION = 17; private final DatabaseTable[] databaseTables = { HistoryEntry.DATABASE_TABLE, diff --git a/app/src/main/java/org/wikipedia/database/contract/ReadingListPageContract.java b/app/src/main/java/org/wikipedia/database/contract/ReadingListPageContract.java index 58b3a45..e950253 100644 --- a/app/src/main/java/org/wikipedia/database/contract/ReadingListPageContract.java +++ b/app/src/main/java/org/wikipedia/database/contract/ReadingListPageContract.java @@ -60,11 +60,38 @@ StrColumn THUMBNAIL_URL = new StrColumn(TABLE_PAGE, "thumbnailUrl", "text"); StrColumn DESCRIPTION = new StrColumn(TABLE_PAGE, "description", "text"); +// The cumulative size in bytes for an offline page and all page resources downloaded by +// SavedPageSyncService. Null or 0 if DiskStatus.ONLINE, not yet downloaded, or not yet +// downloaded since these columns were added. Outdated if the saved page cache size is later +// exceeded and resources are evicted. Written to by SavedPageSyncService. +// Android appears to present the user with logical size in app settings so it is the +// preferred metric to display and physical size will likely never be used. Since quantities +// are aggregated across files, neither can be derived from the other. +// wc -c /data/data/org.wikipedia.dev/files/okhttp-cache/*.[0-9]|tail -n1 +// stat -c %s /data/data/org.wikipedia.dev/files/okhttp-cache/*.[0-9] +LongColumn PHYSICAL_SIZE = new LongColumn(TABLE_PAGE, "physicalSize", "integer"); +// du -c /data/data/org.wikipedia.dev/files/okhttp-cache/*.[0-9]|tail -n1 +// Block size: stat -c %B /data/data/org.wikipedia.dev/files/okhttp-cache +LongColumn LOGICAL_SIZE = new LongColumn(TABLE_PAGE, "logicalSize", "integer"); + +// Example: +// 1 Download the Obama article. +// - Physical size recorded by us is 5 729 692 bytes. +// - Logical size recorded by us is 6 754 304 bytes (6 596 kibibytes). +// 2 Terminate the app and check the sizes (note: journal size is never included): +// - Physical: wc -c /data/data/org.wikipedia.dev/files/okhttp-cache/*.[0-9]|tail -n1 => 5 729 692 b
[MediaWiki-commits] [Gerrit] operations/puppet[production]: redis: Remove support for precise
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354045 ) Change subject: redis: Remove support for precise .. redis: Remove support for precise We no longer support precise on wikimedia hosts including labs. We stopped supporting precise at the end of march. Else where in this repo we removed precise. We no longer need this precise file now. Change-Id: If426c44a65a0e0eea391134a116eb7e74ea2dcf0 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/45/354045/1 -- To view, visit https://gerrit.wikimedia.org/r/354045 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If426c44a65a0e0eea391134a116eb7e74ea2dcf0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Introduce PHPCS check in CI
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354030 ) Change subject: Introduce PHPCS check in CI .. Introduce PHPCS check in CI Introduced PHPCS check in CI - using same configuration as in MobileFrontend. Additionally fixed wrong code style. Change-Id: I0c879553d355c2a277fcc4349a93e85c65eb2291 --- M composer.json M includes/PopupsGadgetsIntegration.php A phpcs.xml M tests/phpunit/PopupsHooksTest.php 4 files changed, 25 insertions(+), 3 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 686b65b..3e676f3 100644 --- a/composer.json +++ b/composer.json @@ -1,11 +1,16 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", + "mediawiki/mediawiki-codesniffer": "0.7.2", "jakub-onderka/php-console-highlighter": "0.3.2" }, "scripts": { "test": [ - "parallel-lint . --exclude vendor" + "parallel-lint . --exclude vendor", + "phpcs -p -s" + ], + "fix": [ + "phpcbf" ] } } diff --git a/includes/PopupsGadgetsIntegration.php b/includes/PopupsGadgetsIntegration.php index 763999d..4693653 100644 --- a/includes/PopupsGadgetsIntegration.php +++ b/includes/PopupsGadgetsIntegration.php @@ -49,7 +49,7 @@ * @param Config $config * @param ExtensionRegistry $extensionRegistry */ - public function __construct( Config $config , ExtensionRegistry $extensionRegistry ) { + public function __construct( Config $config, ExtensionRegistry $extensionRegistry ) { $this->extensionRegistry = $extensionRegistry; $this->navPopupsGadgetName = $this->sanitizeGadgetName( $config->get( self::CONFIG_NAVIGATION_POPUPS_NAME ) ); diff --git a/phpcs.xml b/phpcs.xml new file mode 100644 index 000..750e66a --- /dev/null +++ b/phpcs.xml @@ -0,0 +1,16 @@ + + + + . + + + vendor + + + + + + + + + diff --git a/tests/phpunit/PopupsHooksTest.php b/tests/phpunit/PopupsHooksTest.php index e50ff5c..6dc50fd 100644 --- a/tests/phpunit/PopupsHooksTest.php +++ b/tests/phpunit/PopupsHooksTest.php @@ -263,7 +263,8 @@ * @covers ::onBeforePageDisplay * @dataProvider providerOnBeforePageDisplay */ - public function testOnBeforePageDisplay( $shouldSendModuleToUser, $isBetaFeatureEnabled, $isCodeLoaded ) { + public function testOnBeforePageDisplay( $shouldSendModuleToUser, + $isBetaFeatureEnabled, $isCodeLoaded ) { $skinMock = $this->getMock( Skin::class ); $outPageMock = $this->getMock( -- To view, visit https://gerrit.wikimedia.org/r/354030 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c879553d355c2a277fcc4349a93e85c65eb2291 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Pmiazga Gerrit-Reviewer: Bmansurov Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Jhernandez Gerrit-Reviewer: Phuedx Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Sync parserTests with core
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354044 ) Change subject: Sync parserTests with core .. Sync parserTests with core Change-Id: Ie87ffed05cf6e4c7b86ebd65d3d90ae859986cd5 --- M tests/parserTests.json M tests/parserTests.txt 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/parserTests.json b/tests/parserTests.json index ebb2a0d..3e11b75 100644 --- a/tests/parserTests.json +++ b/tests/parserTests.json @@ -2,8 +2,8 @@ "parserTests.txt": { "repo": "/wikimedia/mediawiki/", "path": "tests/parser/parserTests.txt", - "expectedSHA1": "b95c6136eac1a685ee499aaf59cd2f6204585804", - "latestCommit": "ed1afdee3578bf757dc315a7cfd60525dab9dbd4" + "expectedSHA1": "ce0665cff572231b0a7d5cae5ef280a4322a6377", + "latestCommit": "f9de807e28c5194ef4e2ddbcf31375041816fab6" }, "citeParserTests.txt": { "repo": "/wikimedia/mediawiki-extensions-Cite/", diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 37ae227..2d107e7 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -32,6 +32,7 @@ # local format section links in edit comment text as local links # notoc disable table of contents # thumbsize=NNN set the default thumb size to NNNpx for this test +# wrap include the normal wrapper (since 1.30) # # You can also set the following parser properties via test options: # wgEnableUploads, wgAllowExternalImages, wgMaxTocLevel, -- To view, visit https://gerrit.wikimedia.org/r/354044 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie87ffed05cf6e4c7b86ebd65d3d90ae859986cd5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: C. Scott Ananian Gerrit-Reviewer: Arlolra Gerrit-Reviewer: C. Scott Ananian Gerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ParsoidBatchAPI[master]: Add a pageprop action
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/351535 ) Change subject: Add a pageprop action .. Add a pageprop action * Used to add redlink, redirect, disambiguation, etc. classes to the Parsoid HTML. * This can equivalently be done with, action=query&prop=pageprops|info&ppprop=disambiguation but would require following the continuation links in series. Change-Id: I8e0a8a96853035fdb9138ee84750a3a4ebafe6f7 --- M includes/ApiParsoidBatch.php 1 file changed, 75 insertions(+), 0 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/ApiParsoidBatch.php b/includes/ApiParsoidBatch.php index 5d8e656..164442f 100644 --- a/includes/ApiParsoidBatch.php +++ b/includes/ApiParsoidBatch.php @@ -3,6 +3,17 @@ use IPSet\IPSet; class ApiParsoidBatch extends ApiBase { + + private $mPageSet; + + private function getPageSet() { + if ( !isset( $this->mPageSet ) ) { + $this->mPageSet = new ApiPageSet( $this ); + } + + return $this->mPageSet; + } + public function execute() { $params = $this->extractRequestParams(); @@ -47,6 +58,15 @@ $this->assertScalar( $itemParams, 'text' ); $this->assertScalarOrMissing( $itemParams, 'revid' ); $size += strlen( $itemParams['text'] ); + } elseif ( $action === 'pageprops' ) { + $this->assertArray( $itemParams, 'titles' ); + if ( count( $itemParams['titles'] ) > ApiBase::LIMIT_BIG1 ) { + if ( is_callable( array( $this, 'dieWithError' ) ) ) { + $this->dieWithError( [ 'apiwarn-toomanyvalues', 'titles', ApiBase::LIMIT_BIG1 ] ); + } else { + $this->dieUsage( "Too many titles", 'too-many-titles' ); + } + } } elseif ( $action === 'imageinfo' ) { $this->assertScalar( $itemParams, 'filename' ); if ( isset( $itemParams['txopts'] ) ) { @@ -119,6 +139,8 @@ $txopts = isset( $itemParams['txopts'] ) ? $itemParams['txopts'] : array(); $page = isset( $itemParams['page'] ) ? Title::newFromText( $itemParams['page'] ) : null; $itemResult = $this->imageinfo( $filename, $file, $txopts, $page ); + } elseif ( $action === 'pageprops' ) { + $itemResult = $this->pageprops( $itemParams['titles'] ); } else { throw new Exception( "Invalid action despite validation already being done" ); } @@ -260,6 +282,59 @@ return $result; } + protected function pageprops( array $titles ) { + $pageSet = $this->getPageSet(); + $pageSet->populateFromTitles( $titles ); + + $pages = []; + + // This is pretty much copied from ApiQuery::outputGeneralPageInfo(), + // except for adding page properties and redirect to good titles. + + foreach ( $pageSet->getMissingTitles() as $fakeId => $title ) { + $vals = []; + ApiQueryBase::addTitleInfo( $vals, $title ); + $vals['missing'] = true; + if ( $title->isKnown() ) { + $vals['known'] = true; + } + $pages[$fakeId] = $vals; + } + + foreach ( $pageSet->getInvalidTitlesAndReasons() as $fakeId => $data ) { + $pages[$fakeId] = $data + [ 'invalid' => true ]; + } + + foreach ( $pageSet->getSpecialTitles() as $fakeId => $title ) { + $vals = []; + ApiQueryBase::addTitleInfo( $vals, $title ); + $vals['special'] = true; + if ( !$title->isKnown() ) { + $vals['missing'] = true; + } + $pages[$fakeId] = $vals; + } + + $pageProps = PageProps::getInstance(); + $goodTitles = $pageSet->getGoodTitles(); + $props = $pageProps->getProperties( $goodTitles, 'disambiguation' ); + + foreach ( $goodTitles as $pageid => $title ) { + $vals = []; + $vals['pageid'] = $pageid; +
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Sync parserTests with core
C. Scott Ananian has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354044 ) Change subject: Sync parserTests with core .. Sync parserTests with core Change-Id: Ie87ffed05cf6e4c7b86ebd65d3d90ae859986cd5 --- M tests/parserTests.json M tests/parserTests.txt 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/44/354044/1 diff --git a/tests/parserTests.json b/tests/parserTests.json index ebb2a0d..3e11b75 100644 --- a/tests/parserTests.json +++ b/tests/parserTests.json @@ -2,8 +2,8 @@ "parserTests.txt": { "repo": "/wikimedia/mediawiki/", "path": "tests/parser/parserTests.txt", - "expectedSHA1": "b95c6136eac1a685ee499aaf59cd2f6204585804", - "latestCommit": "ed1afdee3578bf757dc315a7cfd60525dab9dbd4" + "expectedSHA1": "ce0665cff572231b0a7d5cae5ef280a4322a6377", + "latestCommit": "f9de807e28c5194ef4e2ddbcf31375041816fab6" }, "citeParserTests.txt": { "repo": "/wikimedia/mediawiki-extensions-Cite/", diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 37ae227..2d107e7 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -32,6 +32,7 @@ # local format section links in edit comment text as local links # notoc disable table of contents # thumbsize=NNN set the default thumb size to NNNpx for this test +# wrap include the normal wrapper (since 1.30) # # You can also set the following parser properties via test options: # wgEnableUploads, wgAllowExternalImages, wgMaxTocLevel, -- To view, visit https://gerrit.wikimedia.org/r/354044 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie87ffed05cf6e4c7b86ebd65d3d90ae859986cd5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: C. Scott Ananian ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Only skip to the phase end in native template expansion
Arlolra has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354043 ) Change subject: Only skip to the phase end in native template expansion .. Only skip to the phase end in native template expansion * When loop / depth detection mechanism is triggered. * Follow up to 60ee19ac Change-Id: I40b65bb48f969b93bf759f33bed2d3376cf3bfe8 --- M lib/wt2html/tt/TemplateHandler.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/43/354043/1 diff --git a/lib/wt2html/tt/TemplateHandler.js b/lib/wt2html/tt/TemplateHandler.js index 858f553..6faca61 100644 --- a/lib/wt2html/tt/TemplateHandler.js +++ b/lib/wt2html/tt/TemplateHandler.js @@ -630,7 +630,6 @@ target, new EndTagTk('a'), ]; - res.rank = this.manager.phaseEndRank; return res; } }; @@ -699,6 +698,7 @@ var checkRes = this.checkRes(target); if (Array.isArray(checkRes)) { + checkRes.rank = this.manager.phaseEndRank; cb({ tokens: checkRes }); return; } -- To view, visit https://gerrit.wikimedia.org/r/354043 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40b65bb48f969b93bf759f33bed2d3376cf3bfe8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AntiSpoof[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354042 ) Change subject: Add phpcs and make pass .. Add phpcs and make pass Change-Id: I7c6f27bfc4b7ca746ac3a452030203b3f6549c95 --- M AntiSpoof.php M AntiSpoofHooks.php M AntiSpoof_body.php M SpoofUser.php M api/ApiAntiSpoof.php M composer.json M maintenance/BatchAntiSpoofClass.php M maintenance/batchAntiSpoof.php M maintenance/generateEquivset.php A phpcs.xml M tests/phpunit/AntiSpoofTest.php M tests/phpunit/SpoofUserTest.php 12 files changed, 294 insertions(+), 263 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiSpoof refs/changes/42/354042/1 diff --git a/AntiSpoof.php b/AntiSpoof.php index 2e4ae93..151756e 100644 --- a/AntiSpoof.php +++ b/AntiSpoof.php @@ -29,17 +29,18 @@ /** * Blacklisted character codes. + * defaults: + * 0x0337 - Combining short solidus overlay + * 0x0338 - Combining long solidus overlay + * 0x2044 - Fraction slash + * 0x2215 - Division slash + * 0x23AE - Integral extension + * 0x29F6 - Solidus with overbar + * 0x29F8 - Big solidus + * 0x2AFB - Triple solidus binary relation + * 0x2AFD - Double solidus operator + * 0xFF0F - Fullwidth solidus + * * @var int[] */ $wgAntiSpoofBlacklist = null; -// defaults: -// 0x0337, # Combining short solidus overlay -// 0x0338, # Combining long solidus overlay -// 0x2044, # Fraction slash -// 0x2215, # Division slash -// 0x23AE, # Integral extension -// 0x29F6, # Solidus with overbar -// 0x29F8, # Big solidus -// 0x2AFB, # Triple solidus binary relation -// 0x2AFD, # Double solidus operator -// 0xFF0F # Fullwidth solidus diff --git a/AntiSpoofHooks.php b/AntiSpoofHooks.php index 4ae3c85..b38f91c 100644 --- a/AntiSpoofHooks.php +++ b/AntiSpoofHooks.php @@ -62,7 +62,8 @@ if ( empty( $conflicts ) ) { wfDebugLog( 'antispoof', "{$mode}PASS new account '$name' [$normalized]" ); } else { - wfDebugLog( 'antispoof', "{$mode}CONFLICT new account '$name' [$normalized] spoofs " . implode( ',', $conflicts ) ); + wfDebugLog( 'antispoof', "{$mode}CONFLICT new account '$name' [$normalized] spoofs " + . implode( ',', $conflicts ) ); if ( $active ) { $numConflicts = count( $conflicts ); $message = wfMessage( 'antispoof-conflict-top', $name ) @@ -158,10 +159,10 @@ */ public static function onAPIGetAllowedParams( &$module, &$params ) { if ( $module instanceof ApiCreateAccount ) { - $params['ignoreantispoof'] = array( + $params['ignoreantispoof'] = [ ApiBase::PARAM_TYPE => 'boolean', ApiBase::PARAM_DFLT => false - ); + ]; } return true; diff --git a/AntiSpoof_body.php b/AntiSpoof_body.php index 6ac03c9..c5a7a5f 100644 --- a/AntiSpoof_body.php +++ b/AntiSpoof_body.php @@ -1,135 +1,142 @@ PHP conversion by Brion Vibber - -# 2006-06-30 Handles non-CJK scripts as per UTR #39 + my extensions -# 2006-07-01 Now handles Simplified <-> Traditional Chinese rules, as -# per JET Guidelines for Internationalized Domain Names, -# and the ICANN language registry values for .cn -# 2006-09-14 Now handles 'rn' etc better, and uses stdin for input -# 2006-09-18 Added exception handling for nasty cases, eg BiDi violations -# 2006-09-19 Converted to PHP for easier integration into a MW extension - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 -# USA +/** + * AntiSpoof.php + * Username spoofing prevention for MediaWiki + * Version 0.04 + * + * Copyright (C) Neil Harris 2006 + * Python->PHP conversion by Brion Vibber + * + * 2006-06-30 Handles non-CJK scripts as per UTR #39 + my extensions + * 2006-07-01 Now handles Simplified <-> Traditional Chinese rules, as + *per JET Guidelines for I
[MediaWiki-commits] [Gerrit] operations/puppet[production]: redis: Fix redis for stretch
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354041 ) Change subject: redis: Fix redis for stretch .. redis: Fix redis for stretch it fails puppet with Change-Id: I70dfc6ee699b3233540766a5733ce48fd26c399e Error: /Stage[main]/Redis/File[/etc/redis/redis.conf]: Could not evaluate: Could not retrieve information from environment production source(s) puppet:///modules/redis/redis-stretch.conf --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/41/354041/1 -- To view, visit https://gerrit.wikimedia.org/r/354041 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I70dfc6ee699b3233540766a5733ce48fd26c399e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Sync up with Parsoid parserTests.txt
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354040 ) Change subject: Sync up with Parsoid parserTests.txt .. Sync up with Parsoid parserTests.txt This now aligns with Parsoid commit d163deefa3aaeb0926af09a91075d6a611b36363 Change-Id: I9e543f0803247ffc264e634bf66b6bd0e143f187 --- M tests/parser/parserTests.txt 1 file changed, 266 insertions(+), 48 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index 6477356..2d107e7 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -2737,6 +2737,39 @@ !! end !! test +Templates: Don't recognize targets split by newlines +!! options +parsoid=wt2html +!! wikitext +{{ech +o|foo}} +!! html/php +{{ech +o|foo}} + +!! html/parsoid +{{ech +o|foo}} +!! end + +!! test +Templates: Recognize targets when newlines and comments don't split the target +!! options +parsoid=wt2html +!! wikitext +{{ + echo + + + |foo}} +!! html/php +foo + +!! html/parsoid +foo +!! end + +!! test Templates: Handle empty comment-and-ws-only lines correctly !! wikitext {{echo|foo @@ -5270,6 +5303,49 @@ !! html [http:/example.com title] +!! end + +# wt2html only because Parsoid would want to add s coming from html +!! test +Broken wikilinks (but not external links) prevent templates from closing +!! options +parsoid=wt2html +!! wikitext +[http://example.com x + +{{echo|[http://example.com x}} + +[[Foo + +{{echo|[[Foo}} +!! html/php +[http://example.com";>http://example.com x +[http://example.com";>http://example.com x +[[Foo +{{echo|[[Foo}} + +!! html/parsoid +[http://example.com";>http://example.com x +[http://example.com";>http://example.com x +[[Foo +{{echo|[[Foo}} +!! end + +!! test +Broken templates +!! options +parsoid=wt2html +!! wikitext +{{echo|[[Foo|}}]] + +[[Foo|{{echo|]]}} +!! html/php +{{echo|}} +[[Foo|]] + +!! html/parsoid +{{echo|}} +[[Foo|]] !! end !! test @@ -7848,7 +7924,7 @@ !! wikitext [[File:Cool "Gator".png]] !! html/parsoid - + !! end !! test @@ -7896,7 +7972,7 @@ Pentecoste !! html/parsoid - + ''Pentecoste'' Pentecoste Pentecoste @@ -7916,10 +7992,10 @@ abc !! html/parsoid - - - - + + + + !! end !! test @@ -10435,15 +10511,26 @@ !! wikitext {{DISPLAYTITLE:''{{PAGENAME}}''}} !! html/parsoid - + !! end +# NOTE: mw:ExpandedAttrs is not the best typeof here. mw:Transclusion is better. +# But, this is a limitation of our representation and is documented in +# TemplateHandler.js in processSpecialMagicWord !! test Parsoid: Template-generated DISPLAYTITLE !! wikitext echo|DISPLAYTITLE}}:Foo}} +!! options +showtitle +!! config +wgAllowDisplayTitle=true +wgRestrictDisplayTitle=false +!! html/php +Foo + !! html/parsoid - + !! end !! test @@ -11007,6 +11094,39 @@ !! end !! test +Templates with templated name +!! wikitext +echo|echo}}|foo}} +echo|inner list}} }} +!! html +foo + + item 1 + +!! html/parsoid +foo + item 1 +!! end + +# Parsoid markup is deliberate "broken". This is an edge case. +# See long comment in TemplateHandler.js:convertAttribsToString. +!! test +Templates with invalid templated targets +!! wikitext +{{echo +{{echo|foo}} +}} +!! html/php +{{echo +foo +}} + +!! html/parsoid +{{echo +foo }} +!! end + +!! test Template with thumb image (with link in description) !! wikitext {{paramtest|param=[[Image:noimage.png|thumb|[[no link|link]] [[no link|caption}} @@ -11021,7 +11141,7 @@ !! html/parsoid -This is a test template with parameter link caption +This is a test template with parameter link caption !! end !! article @@ -11253,17 +11373,23 @@ !! test Template with targets containing wikilinks +!! options +parsoid=wt2html !! wikitext {{[[foo]]}} {{[[{{echo|foo}}]]}} echo|[[foo}}]]}} -!! html +!! html/php {{foo}} {{foo}} {{[[foo}}]] +!! html/parsoid +{{foo}} +{{foo}} +{{[[foo}}]] !! end !! article @@ -13113,6 +13239,17 @@ !! end !! test +Parsoid: backwards pipe trick +!! wikitext +[[|'''bar''']] +!! html/php +[[|bar]] + +!! html/parsoid +[[|bar]] +!! end + +!! test pre-save transform: trim trailing empty lines !! options pst @@ -14318,7 +14455,7 @@ 7% solution !! html/parsoid - + !! end !! test @@ -14533,7 +14670,7 @@ File:Foobaz.jpg !! html/parsoid - + !! end # Parsoid-specific testing for images @@ -14866,6 +15003,7 @@ [[.]] [[..]] [[foo././bar]] +[[foo[http://example.com]xyz]] [[{{echo|./../foo}}|bar]] [[{{echo|foo/.}}|bar]] @@ -14889,6 +15027,7 @@ [[.]] [[..]] [[foo././bar]] +[[foohttp://example.com";>[1]xyz]] [[./../foo|bar]] [[foo/.|bar]] [[foo/..|bar]] @@ -14911,7 +15050,8 @@ [[foo[bar]] [[.]] [[..]] -[[foo././bar]] +[[foo././bar]] +[[foohttp://example.com";>xyz]] [[./../foo|bar]] [[foo/.|bar]] @@ -15377,12 +15517,15 @@ !! end +# NOTE: mw:Expan
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix path to parserTests.php.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354039 ) Change subject: Fix path to parserTests.php. .. Fix path to parserTests.php. Change-Id: Ic29143de111d6abfdbd90281a2554e01e54bd314 --- M tools/sync-parserTests.js 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/tools/sync-parserTests.js b/tools/sync-parserTests.js index d0ea830..56cfd5d 100755 --- a/tools/sync-parserTests.js +++ b/tools/sync-parserTests.js @@ -21,7 +21,7 @@ $ cd $REPO $ git rebase master ... resolve conflicts, sigh ... - $ php tests/parserTests.php + $ php tests/parser/parserTests.php ... fix any failures by marking tests parsoid-only, etc ... $ git review @@ -159,7 +159,7 @@ console.log(' cd', mwpath); console.log(' git rebase origin/master'); console.log(' .. fix any conflicts .. '); - console.log(' php tests/parserTests.php'); + console.log(' php tests/parser/parserTests.php'); console.log(' git review'); // XXX to rebase semi-automatically, we might do something like: -- To view, visit https://gerrit.wikimedia.org/r/354039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic29143de111d6abfdbd90281a2554e01e54bd314 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: C. Scott Ananian Gerrit-Reviewer: Arlolra Gerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Sync up with Parsoid parserTests.txt
C. Scott Ananian has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354040 ) Change subject: Sync up with Parsoid parserTests.txt .. Sync up with Parsoid parserTests.txt This now aligns with Parsoid commit d163deefa3aaeb0926af09a91075d6a611b36363 Change-Id: I9e543f0803247ffc264e634bf66b6bd0e143f187 --- M tests/parser/parserTests.txt 1 file changed, 266 insertions(+), 48 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/40/354040/1 diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index 6477356..2d107e7 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -2737,6 +2737,39 @@ !! end !! test +Templates: Don't recognize targets split by newlines +!! options +parsoid=wt2html +!! wikitext +{{ech +o|foo}} +!! html/php +{{ech +o|foo}} + +!! html/parsoid +{{ech +o|foo}} +!! end + +!! test +Templates: Recognize targets when newlines and comments don't split the target +!! options +parsoid=wt2html +!! wikitext +{{ + echo + + + |foo}} +!! html/php +foo + +!! html/parsoid +foo +!! end + +!! test Templates: Handle empty comment-and-ws-only lines correctly !! wikitext {{echo|foo @@ -5270,6 +5303,49 @@ !! html [http:/example.com title] +!! end + +# wt2html only because Parsoid would want to add s coming from html +!! test +Broken wikilinks (but not external links) prevent templates from closing +!! options +parsoid=wt2html +!! wikitext +[http://example.com x + +{{echo|[http://example.com x}} + +[[Foo + +{{echo|[[Foo}} +!! html/php +[http://example.com";>http://example.com x +[http://example.com";>http://example.com x +[[Foo +{{echo|[[Foo}} + +!! html/parsoid +[http://example.com";>http://example.com x +[http://example.com";>http://example.com x +[[Foo +{{echo|[[Foo}} +!! end + +!! test +Broken templates +!! options +parsoid=wt2html +!! wikitext +{{echo|[[Foo|}}]] + +[[Foo|{{echo|]]}} +!! html/php +{{echo|}} +[[Foo|]] + +!! html/parsoid +{{echo|}} +[[Foo|]] !! end !! test @@ -7848,7 +7924,7 @@ !! wikitext [[File:Cool "Gator".png]] !! html/parsoid - + !! end !! test @@ -7896,7 +7972,7 @@ Pentecoste !! html/parsoid - + ''Pentecoste'' Pentecoste Pentecoste @@ -7916,10 +7992,10 @@ abc !! html/parsoid - - - - + + + + !! end !! test @@ -10435,15 +10511,26 @@ !! wikitext {{DISPLAYTITLE:''{{PAGENAME}}''}} !! html/parsoid - + !! end +# NOTE: mw:ExpandedAttrs is not the best typeof here. mw:Transclusion is better. +# But, this is a limitation of our representation and is documented in +# TemplateHandler.js in processSpecialMagicWord !! test Parsoid: Template-generated DISPLAYTITLE !! wikitext echo|DISPLAYTITLE}}:Foo}} +!! options +showtitle +!! config +wgAllowDisplayTitle=true +wgRestrictDisplayTitle=false +!! html/php +Foo + !! html/parsoid - + !! end !! test @@ -11007,6 +11094,39 @@ !! end !! test +Templates with templated name +!! wikitext +echo|echo}}|foo}} +echo|inner list}} }} +!! html +foo + + item 1 + +!! html/parsoid +foo + item 1 +!! end + +# Parsoid markup is deliberate "broken". This is an edge case. +# See long comment in TemplateHandler.js:convertAttribsToString. +!! test +Templates with invalid templated targets +!! wikitext +{{echo +{{echo|foo}} +}} +!! html/php +{{echo +foo +}} + +!! html/parsoid +{{echo +foo }} +!! end + +!! test Template with thumb image (with link in description) !! wikitext {{paramtest|param=[[Image:noimage.png|thumb|[[no link|link]] [[no link|caption}} @@ -11021,7 +11141,7 @@ !! html/parsoid -This is a test template with parameter link caption +This is a test template with parameter link caption !! end !! article @@ -11253,17 +11373,23 @@ !! test Template with targets containing wikilinks +!! options +parsoid=wt2html !! wikitext {{[[foo]]}} {{[[{{echo|foo}}]]}} echo|[[foo}}]]}} -!! html +!! html/php {{foo}} {{foo}} {{[[foo}}]] +!! html/parsoid +{{foo}} +{{foo}} +{{[[foo}}]] !! end !! article @@ -13113,6 +13239,17 @@ !! end !! test +Parsoid: backwards pipe trick +!! wikitext +[[|'''bar''']] +!! html/php +[[|bar]] + +!! html/parsoid +[[|bar]] +!! end + +!! test pre-save transform: trim trailing empty lines !! options pst @@ -14318,7 +14455,7 @@ 7% solution !! html/parsoid - + !! end !! test @@ -14533,7 +14670,7 @@ File:Foobaz.jpg !! html/parsoid - + !! end # Parsoid-specific testing for images @@ -14866,6 +15003,7 @@ [[.]] [[..]] [[foo././bar]] +[[foo[http://example.com]xyz]] [[{{echo|./../foo}}|bar]] [[{{echo|foo/.}}|bar]] @@ -14889,6 +15027,7 @@ [[.]] [[..]] [[foo././bar]] +[[foohttp://example.com";>[1]xyz]] [[./../foo|bar]] [[foo/.|bar]] [[foo/..|bar]] @@ -14911,7 +15050,8 @@ [[foo[bar]] [[.]] [[..]] -[[foo././bar]] +[[foo././bar]] +[[foohttp://example.com";>xyz]] [[./../foo|bar]] [[foo/.|bar]] @@ -15377,12 +15517,15 @@ !! end +# NOTE: mw:Expande
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix path to parserTests.php.
C. Scott Ananian has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354039 ) Change subject: Fix path to parserTests.php. .. Fix path to parserTests.php. Change-Id: Ic29143de111d6abfdbd90281a2554e01e54bd314 --- M tools/sync-parserTests.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/39/354039/1 diff --git a/tools/sync-parserTests.js b/tools/sync-parserTests.js index d0ea830..737186c 100755 --- a/tools/sync-parserTests.js +++ b/tools/sync-parserTests.js @@ -21,7 +21,7 @@ $ cd $REPO $ git rebase master ... resolve conflicts, sigh ... - $ php tests/parserTests.php + $ php tests/parser/parserTests.php ... fix any failures by marking tests parsoid-only, etc ... $ git review -- To view, visit https://gerrit.wikimedia.org/r/354039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic29143de111d6abfdbd90281a2554e01e54bd314 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: C. Scott Ananian ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve output of refreshImageMetadata and refreshFileHeaders
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/353919 ) Change subject: Improve output of refreshImageMetadata and refreshFileHeaders .. Improve output of refreshImageMetadata and refreshFileHeaders Bug: T150741 Change-Id: Ie5f787fd77ecd31b8852d0f66de912baced4ca46 --- M maintenance/refreshFileHeaders.php M maintenance/refreshImageMetadata.php 2 files changed, 9 insertions(+), 4 deletions(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/maintenance/refreshFileHeaders.php b/maintenance/refreshFileHeaders.php index f922055..b9b418c 100644 --- a/maintenance/refreshFileHeaders.php +++ b/maintenance/refreshFileHeaders.php @@ -55,6 +55,13 @@ } $res = $dbr->select( 'image', '*', $conds, __METHOD__, [ 'LIMIT' => $this->mBatchSize, 'ORDER BY' => 'img_name ASC' ] ); + + if ( $res->numRows() > 0 ) { + $row1 = $res->current(); + $this->output( "Processing next {$res->numRows()} row(s) starting with {$row1->img_name}.\n" ); + $res->rewind(); + } + foreach ( $res as $row ) { $file = $repo->newFileFromRow( $row ); $headers = $file->getContentHeaders(); @@ -74,7 +81,7 @@ ++$count; $start = $row->img_name; // advance } - } while ( $res->numRows() > 0 ); + } while ( $res->numRows() === $this->mBatchSize ); $this->output( "Done. Updated headers for $count file(s).\n" ); } diff --git a/maintenance/refreshImageMetadata.php b/maintenance/refreshImageMetadata.php index b557f3d..f6e9e9c 100644 --- a/maintenance/refreshImageMetadata.php +++ b/maintenance/refreshImageMetadata.php @@ -135,10 +135,8 @@ if ( $res->numRows() > 0 ) { $row1 = $res->current(); - $this->output( "Processing next {$this->mBatchSize} rows starting with {$row1->img_name}.\n" ); + $this->output( "Processing next {$res->numRows()} row(s) starting with {$row1->img_name}.\n" ); $res->rewind(); - } else { - $this->error( "No images to process.", 4 ); } foreach ( $res as $row ) { -- To view, visit https://gerrit.wikimedia.org/r/353919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5f787fd77ecd31b8852d0f66de912baced4ca46 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gilles Gerrit-Reviewer: Aaron Schulz Gerrit-Reviewer: Gilles Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: TalkpageManager: Add non-master mode to checkIfCreationIsPos...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/353966 ) Change subject: TalkpageManager: Add non-master mode to checkIfCreationIsPossible() for API .. TalkpageManager: Add non-master mode to checkIfCreationIsPossible() for API The API calls this function for all requests, even on GET, so it needs to not query the master in that case. But in all other cases, it's called to prepare for creating a page, and it does need to query the master. Bug: T165251 Change-Id: I212994e71ddc9765561e80f9a0e1346c2853eda8 --- M includes/Api/ApiFlow.php M includes/TalkpageManager.php 2 files changed, 6 insertions(+), 5 deletions(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Api/ApiFlow.php b/includes/Api/ApiFlow.php index d55ccd9..6623be6 100644 --- a/includes/Api/ApiFlow.php +++ b/includes/Api/ApiFlow.php @@ -119,7 +119,8 @@ // Just check for permissions, nothing else to do. The Flow board // will be put in place right before the rest of the data is stored // (in SubmissionHandler::commit), after everything's been validated. - $status = $controller->safeAllowCreation( $page, $this->getUser() ); + $status = $controller->safeAllowCreation( $page, $this->getUser(), + /* $mustNotExist = */ true, /* $forWrite = */ false ); if ( !$status->isGood() ) { $this->dieWithError( [ 'apierror-flow-safeallowcreationfailed', $status->getMessage() ], 'invalid-page' ); } diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php index b1882ec..8befa0b 100644 --- a/includes/TalkpageManager.php +++ b/includes/TalkpageManager.php @@ -143,7 +143,7 @@ /** * {@inheritdoc} */ - public function checkIfCreationIsPossible( Title $title, $mustNotExist = true) { + public function checkIfCreationIsPossible( Title $title, $mustNotExist = true, $forWrite = true ) { global $wgContentHandlerUseDB; // Arbitrary pages can only be enabled when content handler @@ -154,7 +154,7 @@ // Only allow converting a non-existent page to Flow if ( $mustNotExist ) { - if ( $title->exists( Title::GAID_FOR_UPDATE ) ) { + if ( $title->exists( $forWrite ? Title::GAID_FOR_UPDATE : 0 ) ) { return Status::newFatal( 'flow-error-allowcreation-already-exists' ); } } @@ -185,10 +185,10 @@ /** * {@inheritdoc} */ - public function safeAllowCreation( Title $title, User $user, $mustNotExist = true ) { + public function safeAllowCreation( Title $title, User $user, $mustNotExist = true, $forWrite = true ) { $status = Status::newGood(); - $technicallyAllowedStatus = $this->checkIfCreationIsPossible( $title, $mustNotExist ); + $technicallyAllowedStatus = $this->checkIfCreationIsPossible( $title, $mustNotExist, $forWrite ); $permissionStatus = $this->checkIfUserHasPermission( $title, $user ); -- To view, visit https://gerrit.wikimedia.org/r/353966 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I212994e71ddc9765561e80f9a0e1346c2853eda8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Catrope 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] operations/puppet[production]: lists: fix service IPs in Hiera
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354038 ) Change subject: lists: fix service IPs in Hiera .. lists: fix service IPs in Hiera Change-Id: Idf9f2516b6c6e98ede9e913d6794070fc6a4ea02 --- M hieradata/role/common/lists.yaml 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/38/354038/1 diff --git a/hieradata/role/common/lists.yaml b/hieradata/role/common/lists.yaml index acf42d9..e21c310 100644 --- a/hieradata/role/common/lists.yaml +++ b/hieradata/role/common/lists.yaml @@ -1,11 +1,11 @@ standard::has_default_mail_relay: false mailman::lists_servername: 'lists.wikimedia.org' mailman::lists_ip: - - '208.80.154.4' - - '2620:0:861:1::2' + - '208.80.154.75' + - '2620:0:861:3:208:80:154:75' mailman::server_ip: - - '208.80.154.61' - - '2620:0:861:1:208:80:154:61' + - '208.80.154.74' + - '2620:0:861:1:208:80:154:74' debdeploy::grains: debdeploy-lists: value: standard -- To view, visit https://gerrit.wikimedia.org/r/354038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf9f2516b6c6e98ede9e913d6794070fc6a4ea02 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] apps...wikipedia[master]: Design tweaks for article-level reading list actions.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354025 ) Change subject: Design tweaks for article-level reading list actions. .. Design tweaks for article-level reading list actions. Bug: T159720 Change-Id: If52fb088f3ed670b91100dea358ae9da838dc7c1 --- M app/src/main/java/org/wikipedia/history/HistoryFragment.java M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java M app/src/main/java/org/wikipedia/views/PageItemView.java M app/src/main/res/layout/item_page_list_entry.xml M app/src/main/res/layout/view_reading_list_page_actions.xml 5 files changed, 53 insertions(+), 40 deletions(-) Approvals: Niedzielski: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/java/org/wikipedia/history/HistoryFragment.java b/app/src/main/java/org/wikipedia/history/HistoryFragment.java index 5f69e10..2c5b9a8 100644 --- a/app/src/main/java/org/wikipedia/history/HistoryFragment.java +++ b/app/src/main/java/org/wikipedia/history/HistoryFragment.java @@ -471,6 +471,9 @@ @Override public void onActionClick(@Nullable IndexedHistoryEntry entry, @NonNull PageItemView view) { } +@Override +public void onSecondaryActionClick(@Nullable IndexedHistoryEntry entry, @NonNull PageItemView view) { +} } private class HistorySearchCallback extends SearchActionModeCallback { diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java index 6839ef0..6a39276 100644 --- a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java +++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java @@ -546,7 +546,8 @@ getView().setSelected(page.isSelected()); getView().setActionIcon(R.drawable.ic_more_vert_white_24dp); getView().setActionHint(R.string.abc_action_menu_overflow_description); -getView().setStatusIcon(R.drawable.ic_download_circle_black_24px, !page.isOffline()); + getView().setSecondaryActionIcon(R.drawable.ic_download_circle_black_24px, !page.isOffline()); + getView().setSecondaryActionHint(R.string.reading_list_article_make_offline); } @Override @@ -638,6 +639,13 @@ bottomSheetPresenter.show(getChildFragmentManager(), ReadingListItemActionsDialog.newInstance(page, readingList)); } + +@Override +public void onSecondaryActionClick(@Nullable ReadingListPage page, @NonNull PageItemView view) { +if (page != null) { +toggleOffline(page); +} +} } private class SearchCallback extends SearchActionModeCallback { diff --git a/app/src/main/java/org/wikipedia/views/PageItemView.java b/app/src/main/java/org/wikipedia/views/PageItemView.java index ff0569f..7078be1 100644 --- a/app/src/main/java/org/wikipedia/views/PageItemView.java +++ b/app/src/main/java/org/wikipedia/views/PageItemView.java @@ -34,13 +34,14 @@ boolean onLongClick(@Nullable T item); void onThumbClick(@Nullable T item); void onActionClick(@Nullable T item, @NonNull PageItemView view); +void onSecondaryActionClick(@Nullable T item, @NonNull PageItemView view); } @BindView(R.id.page_list_item_title) TextView titleView; @BindView(R.id.page_list_item_description) TextView descriptionView; @BindView(R.id.page_list_item_image) SimpleDraweeView imageView; -@BindView(R.id.page_list_item_action_button) ImageView actionView; -@BindView(R.id.page_list_item_status_icon) ImageView statusIconView; +@BindView(R.id.page_list_item_action_primary) ImageView primaryActionView; +@BindView(R.id.page_list_item_action_secondary) ImageView secondaryActionView; @BindView(R.id.page_list_item_selected_image) View imageSelectedView; @BindView(R.id.page_list_header_text) GoneIfEmptyTextView headerView; @@ -74,17 +75,23 @@ } public void setActionIcon(@DrawableRes int id) { -actionView.setImageResource(id); -actionView.setVisibility(VISIBLE); +primaryActionView.setImageResource(id); +primaryActionView.setVisibility(VISIBLE); } public void setActionHint(@StringRes int id) { -actionView.setContentDescription(getContext().getString(id)); +primaryActionView.setContentDescription(getContext().getString(id)); } -public void setStatusIcon(@DrawableRes int id, boolean show) { -statusIconView.setImageResource(id); -statusIconView.setVisibility(show ? VISIBLE : GONE); +public void setSecondaryActionIcon(@DrawableRes int id, boolean show) { +if (show) { +secondaryActionView.setImageResource(id); +} +secondaryActionView.setVisibility(show ? VISIBLE : G
[MediaWiki-commits] [Gerrit] mediawiki...ZeroBanner[REL1_29]: Update attributes for new extension.json format
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354027 ) Change subject: Update attributes for new extension.json format .. Update attributes for new extension.json format See I8613a027c56e2c9d2c6. Change-Id: I5a148763f68989c8da313a4fb1d0213658ee4495 --- M extension.json 1 file changed, 15 insertions(+), 11 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index e3778d7..f1cd154 100644 --- a/extension.json +++ b/extension.json @@ -130,17 +130,21 @@ "SpecialMobileEditWatchlist::images": "ZeroBanner\\PageRenderingHooks::onSpecialMobileEditWatchlist_images", "ResourceLoaderTestModules": "ZeroBanner\\TestHooks::onResourceLoaderTestModules" }, - "JsonConfigModels": { - "JsonZeroConfig": { - "class": "ZeroBanner\\ZeroConfig" - } - }, - "JsonConfigs": { - "JsonZeroConfig": { - "namespace": 480, - "nsName": "Zero", - "isLocal": false, - "cacheKey": "1" + "attributes": { + "JsonConfig": { + "Models": { + "JsonZeroConfig": { + "class": "ZeroBanner\\ZeroConfig" + } + }, + "s": { + "JsonZeroConfig": { + "namespace": 480, + "nsName": "Zero", + "isLocal": false, + "cacheKey": "1" + } + } } }, "config": { -- To view, visit https://gerrit.wikimedia.org/r/354027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a148763f68989c8da313a4fb1d0213658ee4495 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ZeroBanner Gerrit-Branch: REL1_29 Gerrit-Owner: Legoktm 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...XenForoAuth[master]: Fix access a non-object when no data provided by XenForo
Florianschmidtwelzow has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354037 ) Change subject: Fix access a non-object when no data provided by XenForo .. Fix access a non-object when no data provided by XenForo Until now, the extension expected, that XenForo returns data in any case. However, in some circumstances, the Xenforo API seems to return a non-OK status code (e.g. 403) when trying to retrieve information about the current user, even if an oauth_token is provided. This case is now handled with this commit, with an error message that indicates, that there was a problem with the external site and, if provided, an error message. Bug: T165517 Change-Id: I378610dd11b2fc0c9e1ee029f96039e3d305c9a8 --- M i18n/en.json M i18n/qqq.json M includes/auth/XenForoPrimaryAuthenticationProvider.php 3 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/XenForoAuth refs/changes/37/354037/1 diff --git a/i18n/en.json b/i18n/en.json index 434bee7..40e6c3b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -9,6 +9,7 @@ "xenforoauth-create": "Create with XenForo", "xenforoauth-desc": "Allow users to login with a XenForo account", "xenforoauth-generic-error": "Oops, there was an error. Please go back and try again. Message: $1", + "xenforoauth-external-error": "The external site refused to authenticate you or encountered an error. Please try it again or contact the administrator of the site. The message was: $1", "xenforoauth-form-merge": "Link XenForo to wiki account", "xenforoauth-form-unlink": "Unlink XenForo from wiki account", "xenforoauth-link-other": "Your XenForo account is already linked to another user. Please unlink the connection or contact an administrator, if you have no other wiki account.", diff --git a/i18n/qqq.json b/i18n/qqq.json index 58fde88..91f4fed 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -14,6 +14,7 @@ "xenforoauth-create": "Used as label for the button shown in [[Special:CreateAccount]].", "xenforoauth-desc": "{{desc|name=XenForoAuth|url=https://www.mediawiki.org/wiki/Extension:XenForoAuth}}";, "xenforoauth-generic-error": "Generic error message for errors with no specific error message.\n\nParameters:\n* $1 - a short description of the error (e.g. Database error)", + "xenforoauth-external-error": "Error message if the request to the external site results in an error and no data could be refused. This message is used to indicate, that the problem is most likely related to the third party authentication site, not this wiki.\n* $1 - The error message provided by the external site, if there was one.", "xenforoauth-form-merge": "Title of button to merge the wikiaccount and XenForo account, if the user is logged into a wikiaccount (and not connected to a XenForo account) and navigates to Special:XenForoLogin.", "xenforoauth-form-unlink": "Title of button to unlink the connection between the wiki user account and XenForo account.", "xenforoauth-link-other": "The XenForo account is already linked to a wiki user, but not to the actual logged in wiki user. To link the XenForo account with the actual wiki account, the user must unlink the connection wit the other wiki account, only one connection per XenForo account is allowed.", diff --git a/includes/auth/XenForoPrimaryAuthenticationProvider.php b/includes/auth/XenForoPrimaryAuthenticationProvider.php index 6efa62a..25fbe4c 100644 --- a/includes/auth/XenForoPrimaryAuthenticationProvider.php +++ b/includes/auth/XenForoPrimaryAuthenticationProvider.php @@ -53,6 +53,12 @@ try { $userInfo = $xfUser->get( 'me' ); + if ($userInfo === false) { + $errors = implode( $xfUser->getErrors(), ', ' ); + return AuthenticationResponse::newFail( + wfMessage( 'xenforoauth-external-error', $errors ) + ); + } $connectedUser = XenForoUser::getUserFromXFUserId( $userInfo['user']['user_id'] ); $mwUser = User::newFromName( $userInfo['user']['username'] ); if ( $connectedUser ) { -- To view, visit https://gerrit.wikimedia.org/r/354037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I378610dd11b2fc0c9e1ee029f96039e3d305c9a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/XenForoAuth Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Amend description for kubernetes clusters in hiera
Alexandros Kosiaris has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354036 ) Change subject: Amend description for kubernetes clusters in hiera .. Amend description for kubernetes clusters in hiera Add the site Change-Id: Ia7ee328c60f5ca4d07664d87c5c13f297897f608 --- M hieradata/common/monitoring.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml index 5733bec..893621b 100644 --- a/hieradata/common/monitoring.yaml +++ b/hieradata/common/monitoring.yaml @@ -79,9 +79,9 @@ # Kubernetes kubernetes_eqiad: -description: Kubernetes cluster +description: Kubernetes cluster eqiad kubernetes_codfw: -description: Kubernetes cluster +description: Kubernetes cluster codfw # Labs OpenStack Nova (labvirt***) labvirt_eqiad: -- To view, visit https://gerrit.wikimedia.org/r/354036 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7ee328c60f5ca4d07664d87c5c13f297897f608 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Amend description for kubernetes clusters in hiera
Alexandros Kosiaris has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354036 ) Change subject: Amend description for kubernetes clusters in hiera .. Amend description for kubernetes clusters in hiera Add the site Change-Id: Ia7ee328c60f5ca4d07664d87c5c13f297897f608 --- M hieradata/common/monitoring.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/36/354036/1 diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml index 5733bec..893621b 100644 --- a/hieradata/common/monitoring.yaml +++ b/hieradata/common/monitoring.yaml @@ -79,9 +79,9 @@ # Kubernetes kubernetes_eqiad: -description: Kubernetes cluster +description: Kubernetes cluster eqiad kubernetes_codfw: -description: Kubernetes cluster +description: Kubernetes cluster codfw # Labs OpenStack Nova (labvirt***) labvirt_eqiad: -- To view, visit https://gerrit.wikimedia.org/r/354036 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7ee328c60f5ca4d07664d87c5c13f297897f608 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "mariadb: Depool db1055 for reimage"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354032 ) Change subject: Revert "mariadb: Depool db1055 for reimage" .. Revert "mariadb: Depool db1055 for reimage" This reverts commit 940d4a3c01af0c01a8ffb4b0fdadc5014a1e1dee. Change-Id: Ief5324b6cbe76b611910ec2c2f7255ada0d87c67 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Jcrespo: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 10601c6..705c97e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1052' => 0, # B3 2.8TB 96GB, master 'db1067' => 0, # D1 2.8TB 160GB, old master 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager -# 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager + 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api @@ -236,23 +236,23 @@ 's1' => [ 'watchlist' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchanges' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'contributions' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'logpager' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ief5324b6cbe76b611910ec2c2f7255ada0d87c67 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui 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]: Add kubernetes_codfw cluster as well
Alexandros Kosiaris has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354035 ) Change subject: Add kubernetes_codfw cluster as well .. Add kubernetes_codfw cluster as well Add the kubernetes_codfw cluster in hieradata Change-Id: I75218220d05e14f6fc24b4ab5d2c352e6d931573 --- M hieradata/common/monitoring.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml index b0b7ff4..5733bec 100644 --- a/hieradata/common/monitoring.yaml +++ b/hieradata/common/monitoring.yaml @@ -80,6 +80,8 @@ # Kubernetes kubernetes_eqiad: description: Kubernetes cluster + kubernetes_codfw: +description: Kubernetes cluster # Labs OpenStack Nova (labvirt***) labvirt_eqiad: -- To view, visit https://gerrit.wikimedia.org/r/354035 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I75218220d05e14f6fc24b4ab5d2c352e6d931573 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add kubernetes_codfw cluster as well
Alexandros Kosiaris has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354035 ) Change subject: Add kubernetes_codfw cluster as well .. Add kubernetes_codfw cluster as well Add the kubernetes_codfw cluster in hieradata Change-Id: I75218220d05e14f6fc24b4ab5d2c352e6d931573 --- M hieradata/common/monitoring.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/35/354035/1 diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml index b0b7ff4..5733bec 100644 --- a/hieradata/common/monitoring.yaml +++ b/hieradata/common/monitoring.yaml @@ -80,6 +80,8 @@ # Kubernetes kubernetes_eqiad: description: Kubernetes cluster + kubernetes_codfw: +description: Kubernetes cluster # Labs OpenStack Nova (labvirt***) labvirt_eqiad: -- To view, visit https://gerrit.wikimedia.org/r/354035 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I75218220d05e14f6fc24b4ab5d2c352e6d931573 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: remove PTR of old lists.wm.org service IP
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354034 ) Change subject: remove PTR of old lists.wm.org service IP .. remove PTR of old lists.wm.org service IP 208.80.154.75 is the current service IP for lists.wm.org: lists.wikimedia.org has address 208.80.154.75 208.80.154.4 is not it anymore but the PTR was still here from the past. Change-Id: Ic84726bc71753ecf11a32a871ae403f37aa93eb5 --- M templates/154.80.208.in-addr.arpa 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/34/354034/1 diff --git a/templates/154.80.208.in-addr.arpa b/templates/154.80.208.in-addr.arpa index 033c9b4..f8cdab0 100644 --- a/templates/154.80.208.in-addr.arpa +++ b/templates/154.80.208.in-addr.arpa @@ -17,7 +17,6 @@ 1 1H IN PTR vrrp-gw-1001.wikimedia.org. 2 1H IN PTR ae1-1001.cr1-eqiad.wikimedia.org. 3 1H IN PTR ae1-1001.cr2-eqiad.wikimedia.org. -4 1H IN PTR lists.wikimedia.org. 5 1H IN PTR netmon1002.wikimedia.org. 11 1H IN PTR dataset1001.wikimedia.org. -- To view, visit https://gerrit.wikimedia.org/r/354034 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic84726bc71753ecf11a32a871ae403f37aa93eb5 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: decom mira
RobH has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354033 ) Change subject: decom mira .. decom mira removing mira mgmt entires, as its been decommissioned and removed from the rack. Bug:T164588 Change-Id: Ia7e71299883c9d7a2861904d3a6f68ccf199f318 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 1 insertion(+), 4 deletions(-) Approvals: jenkins-bot: Verified RobH: Looks good to me, approved diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 49d7499..1cb2d70 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -4135,8 +4135,7 @@ 169 1H IN PTR wmf6299.mgmt.codfw.wmnet. 170 1H IN PTR ganeti2006.mgmt.codfw.wmnet. 170 1H IN PTR wmf6300.mgmt.codfw.wmnet. -171 1H IN PTR mira.mgmt.codfw.wmnet. -171 1H IN PTR wmf5818.mgmt.codfw.wmnet. + 172 1H IN PTR cp2001.mgmt.codfw.wmnet. 172 1H IN PTR wmf6301.mgmt.codfw.wmnet. 173 1H IN PTR cp2002.mgmt.codfw.wmnet. diff --git a/templates/wmnet b/templates/wmnet index f7a970f..e7a990a 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -3302,7 +3302,6 @@ mc2034 1H IN A10.193.3.16 mc2035 1H IN A10.193.3.17 mc2036 1H IN A10.193.3.18 -mira1H IN A10.193.2.171 ms-be2001 1H IN A10.193.1.37 ms-be2002 1H IN A10.193.1.38 ms-be2003 1H IN A10.193.1.39 @@ -3657,7 +3656,6 @@ wmf5815 1H IN A10.192.1.10 wmf5816 1H IN A10.193.2.163 wmf5817 1H IN A10.193.2.164 -wmf5818 1H IN A10.193.2.171 wmf5819 1H IN A10.193.1.31 wmf5820 1H IN A10.193.1.32 wmf5821 1H IN A10.192.1.11 -- To view, visit https://gerrit.wikimedia.org/r/354033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7e71299883c9d7a2861904d3a6f68ccf199f318 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH Gerrit-Reviewer: RobH 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]: decom mira
RobH has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354033 ) Change subject: decom mira .. decom mira removing mira mgmt entires, as its been decommissioned and removed from the rack. Bug:T164588 Change-Id: Ia7e71299883c9d7a2861904d3a6f68ccf199f318 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/33/354033/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 49d7499..1cb2d70 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -4135,8 +4135,7 @@ 169 1H IN PTR wmf6299.mgmt.codfw.wmnet. 170 1H IN PTR ganeti2006.mgmt.codfw.wmnet. 170 1H IN PTR wmf6300.mgmt.codfw.wmnet. -171 1H IN PTR mira.mgmt.codfw.wmnet. -171 1H IN PTR wmf5818.mgmt.codfw.wmnet. + 172 1H IN PTR cp2001.mgmt.codfw.wmnet. 172 1H IN PTR wmf6301.mgmt.codfw.wmnet. 173 1H IN PTR cp2002.mgmt.codfw.wmnet. diff --git a/templates/wmnet b/templates/wmnet index f7a970f..e7a990a 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -3302,7 +3302,6 @@ mc2034 1H IN A10.193.3.16 mc2035 1H IN A10.193.3.17 mc2036 1H IN A10.193.3.18 -mira1H IN A10.193.2.171 ms-be2001 1H IN A10.193.1.37 ms-be2002 1H IN A10.193.1.38 ms-be2003 1H IN A10.193.1.39 @@ -3657,7 +3656,6 @@ wmf5815 1H IN A10.192.1.10 wmf5816 1H IN A10.193.2.163 wmf5817 1H IN A10.193.2.164 -wmf5818 1H IN A10.193.2.171 wmf5819 1H IN A10.193.1.31 wmf5820 1H IN A10.193.1.32 wmf5821 1H IN A10.192.1.11 -- To view, visit https://gerrit.wikimedia.org/r/354033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7e71299883c9d7a2861904d3a6f68ccf199f318 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ZeroPortal[REL1_29]: Update attributes for new extension.json format
Legoktm has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354028 ) Change subject: Update attributes for new extension.json format .. Update attributes for new extension.json format See I8613a027c56e2c9d2c6. Change-Id: I5a148763f68989c8da313a4fb1d0213658ee4459 --- M extension.json 1 file changed, 12 insertions(+), 8 deletions(-) Approvals: Legoktm: Verified; Looks good to me, approved diff --git a/extension.json b/extension.json index 3943938..b0cf705 100644 --- a/extension.json +++ b/extension.json @@ -57,14 +57,18 @@ "BeforePageDisplay": "ZeroPortal\\ConfigPageHooks::onBeforePageDisplay", "ScribuntoExternalLibraries": "ZeroPortal\\LuaLibrary::onScribuntoExternalLibraries" }, - "JsonConfigModels": { - "JsonZeroConfig": { - "view": "ZeroPortal\\ZeroConfigView" - } - }, - "JsonConfigs": { - "JsonZeroConfig": { - "store": true + "attributes": { + "JsonConfig": { + "Models": { + "JsonZeroConfig": { + "view": "ZeroPortal\\ZeroConfigView" + } + }, + "s": { + "JsonZeroConfig": { + "store": true + } + } } }, "config": { -- To view, visit https://gerrit.wikimedia.org/r/354028 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a148763f68989c8da313a4fb1d0213658ee4459 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ZeroPortal Gerrit-Branch: REL1_29 Gerrit-Owner: Legoktm 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/mediawiki-config[master]: Revert "mariadb: Depool db1055 for reimage"
Hello Marostegui, jenkins-bot, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/354032 to review the following change. Change subject: Revert "mariadb: Depool db1055 for reimage" .. Revert "mariadb: Depool db1055 for reimage" This reverts commit 940d4a3c01af0c01a8ffb4b0fdadc5014a1e1dee. Change-Id: Ief5324b6cbe76b611910ec2c2f7255ada0d87c67 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/32/354032/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 10601c6..705c97e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1052' => 0, # B3 2.8TB 96GB, master 'db1067' => 0, # D1 2.8TB 160GB, old master 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager -# 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager + 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api @@ -236,23 +236,23 @@ 's1' => [ 'watchlist' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchanges' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'contributions' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'logpager' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief5324b6cbe76b611910ec2c2f7255ada0d87c67 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo Gerrit-Reviewer: Marostegui 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]: Add codfw to kubernetes ganglia_cluster
Alexandros Kosiaris has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354031 ) Change subject: Add codfw to kubernetes ganglia_cluster .. Add codfw to kubernetes ganglia_cluster While we deprecate ganglia we still have it around and those clusters are also reused for icinga Change-Id: I2d2f41b97dda98daf6c2de0baf9dedf757d32200 --- M hieradata/common.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/common.yaml b/hieradata/common.yaml index b0408af..84778ad 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -63,6 +63,7 @@ id: 9 sites: eqiad: [] + codfw: [] appserver: description: "Application servers" id: 11 -- To view, visit https://gerrit.wikimedia.org/r/354031 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d2f41b97dda98daf6c2de0baf9dedf757d32200 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TextExtracts[master]: Add
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/353998 ) Change subject: Add
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add codfw to kubernetes ganglia_cluster
Alexandros Kosiaris has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354031 ) Change subject: Add codfw to kubernetes ganglia_cluster .. Add codfw to kubernetes ganglia_cluster While we deprecate ganglia we still have it around and those clusters are also reused for icinga Change-Id: I2d2f41b97dda98daf6c2de0baf9dedf757d32200 --- M hieradata/common.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/31/354031/1 diff --git a/hieradata/common.yaml b/hieradata/common.yaml index b0408af..84778ad 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -63,6 +63,7 @@ id: 9 sites: eqiad: [] + codfw: [] appserver: description: "Application servers" id: 11 -- To view, visit https://gerrit.wikimedia.org/r/354031 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d2f41b97dda98daf6c2de0baf9dedf757d32200 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Introduce PHPCS check in CI
Pmiazga has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354030 ) Change subject: Introduce PHPCS check in CI .. Introduce PHPCS check in CI Introduced PHPCS check in CI - using same configuration as in MobileFrontend. Additionally fixed wrong code style. Change-Id: I0c879553d355c2a277fcc4349a93e85c65eb2291 --- M composer.json M includes/PopupsGadgetsIntegration.php A phpcs.xml M tests/phpunit/PopupsHooksTest.php 4 files changed, 25 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/30/354030/1 diff --git a/composer.json b/composer.json index 686b65b..3e676f3 100644 --- a/composer.json +++ b/composer.json @@ -1,11 +1,16 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", + "mediawiki/mediawiki-codesniffer": "0.7.2", "jakub-onderka/php-console-highlighter": "0.3.2" }, "scripts": { "test": [ - "parallel-lint . --exclude vendor" + "parallel-lint . --exclude vendor", + "phpcs -p -s" + ], + "fix": [ + "phpcbf" ] } } diff --git a/includes/PopupsGadgetsIntegration.php b/includes/PopupsGadgetsIntegration.php index 763999d..4693653 100644 --- a/includes/PopupsGadgetsIntegration.php +++ b/includes/PopupsGadgetsIntegration.php @@ -49,7 +49,7 @@ * @param Config $config * @param ExtensionRegistry $extensionRegistry */ - public function __construct( Config $config , ExtensionRegistry $extensionRegistry ) { + public function __construct( Config $config, ExtensionRegistry $extensionRegistry ) { $this->extensionRegistry = $extensionRegistry; $this->navPopupsGadgetName = $this->sanitizeGadgetName( $config->get( self::CONFIG_NAVIGATION_POPUPS_NAME ) ); diff --git a/phpcs.xml b/phpcs.xml new file mode 100644 index 000..750e66a --- /dev/null +++ b/phpcs.xml @@ -0,0 +1,16 @@ + + + + . + + + vendor + + + + + + + + + diff --git a/tests/phpunit/PopupsHooksTest.php b/tests/phpunit/PopupsHooksTest.php index e50ff5c..6dc50fd 100644 --- a/tests/phpunit/PopupsHooksTest.php +++ b/tests/phpunit/PopupsHooksTest.php @@ -263,7 +263,8 @@ * @covers ::onBeforePageDisplay * @dataProvider providerOnBeforePageDisplay */ - public function testOnBeforePageDisplay( $shouldSendModuleToUser, $isBetaFeatureEnabled, $isCodeLoaded ) { + public function testOnBeforePageDisplay( $shouldSendModuleToUser, + $isBetaFeatureEnabled, $isCodeLoaded ) { $skinMock = $this->getMock( Skin::class ); $outPageMock = $this->getMock( -- To view, visit https://gerrit.wikimedia.org/r/354030 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c879553d355c2a277fcc4349a93e85c65eb2291 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Pmiazga ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: registration: Move attributes out of the top level
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354029 ) Change subject: registration: Move attributes out of the top level .. registration: Move attributes out of the top level This moves attributes out of the top level, and namespaces them under each extension. If the extension that it belongs to is not installed, the attribute is not exported and dropped. The full name of the attribute is the name of the extension plus the name of the attribute key. This enforces the recommendation that the attribute name start with the extension's name. Add test coverage for attributes under manifest_version 1 and 2. Bug: T133627 Depends-On: I5a148763f68989c8da313a4fb1d0213658ee4495 Depends-On: I5a148763f68989c8da313a4fb1d0213658ee4459 Change-Id: I8613a027c56e2c9d2c6a83ca14749eb1c8fc23be --- M docs/extension.schema.v2.json M includes/registration/ExtensionProcessor.php M includes/registration/ExtensionRegistry.php M tests/phpunit/includes/registration/ExtensionProcessorTest.php 4 files changed, 153 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/29/354029/1 diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json index a2fdf65..0c476b0 100644 --- a/docs/extension.schema.v2.json +++ b/docs/extension.schema.v2.json @@ -2,6 +2,7 @@ "$schema": "http://json-schema.org/schema#";, "description": "MediaWiki extension.json schema", "type": "object", + "additionalProperties": false, "properties": { "manifest_version": { "type": "integer", @@ -729,6 +730,20 @@ "type": "array", "description": "List of service wiring files to be loaded by the default instance of MediaWikiServices" }, + "attributes": { + "description":"Registration information for other extensions", + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "patternProperties": { + ".*": { + "type": ["array", "object"] + } + } + } + } + }, "load_composer_autoloader": { "type": "boolean", "description": "Load the composer autoloader for this extension, if one is present" diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php index 1212f99..d14be3f 100644 --- a/includes/registration/ExtensionProcessor.php +++ b/includes/registration/ExtensionProcessor.php @@ -57,6 +57,16 @@ ]; /** +* Top-level attributes that come from MW core +* +* @var string[] +*/ + protected static $coreAttributes = [ + 'SkinOOUIThemes', + 'TrackingCategories', + ]; + + /** * Mapping of global settings to their specific merge strategies. * * @see ExtensionRegistry::exportExtractedData @@ -161,6 +171,14 @@ protected $attributes = []; /** +* Extension attributes, keyed by name => +* settings. +* +* @var array +*/ + protected $extAttributes = []; + + /** * @param string $path * @param array $info * @param int $version manifest_version for info @@ -186,14 +204,47 @@ $this->callbacks[$name] = $info['callback']; } + if ( $version === 2 ) { + $this->extractAttributes( $path, $info ); + } + foreach ( $info as $key => $val ) { + // If it's a global setting, if ( in_array( $key, self::$globalSettings ) ) { $this->storeToArray( $path, "wg$key", $val, $this->globals ); + continue; + } // Ignore anything that starts with a @ - } elseif ( $key[0] !== '@' && !in_array( $key, self::$notAttributes ) - && !in_array( $key, self::$creditsAttributes ) - ) { - $this->storeToArray( $path, $key, $val, $this->attributes ); + if ( $key[0] === '@' ) { + continue; + } + + if ( $version === 2 ) { + // Only whitelisted attributes are set +
[MediaWiki-commits] [Gerrit] mediawiki...ZeroPortal[REL1_29]: Update attributes for new extension.json format
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354028 ) Change subject: Update attributes for new extension.json format .. Update attributes for new extension.json format See I8613a027c56e2c9d2c6. Change-Id: I5a148763f68989c8da313a4fb1d0213658ee4459 --- M extension.json 1 file changed, 12 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroPortal refs/changes/28/354028/1 diff --git a/extension.json b/extension.json index 3943938..b0cf705 100644 --- a/extension.json +++ b/extension.json @@ -57,14 +57,18 @@ "BeforePageDisplay": "ZeroPortal\\ConfigPageHooks::onBeforePageDisplay", "ScribuntoExternalLibraries": "ZeroPortal\\LuaLibrary::onScribuntoExternalLibraries" }, - "JsonConfigModels": { - "JsonZeroConfig": { - "view": "ZeroPortal\\ZeroConfigView" - } - }, - "JsonConfigs": { - "JsonZeroConfig": { - "store": true + "attributes": { + "JsonConfig": { + "Models": { + "JsonZeroConfig": { + "view": "ZeroPortal\\ZeroConfigView" + } + }, + "s": { + "JsonZeroConfig": { + "store": true + } + } } }, "config": { -- To view, visit https://gerrit.wikimedia.org/r/354028 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a148763f68989c8da313a4fb1d0213658ee4459 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ZeroPortal Gerrit-Branch: REL1_29 Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ZeroBanner[REL1_29]: Update attributes for new extension.json format
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354027 ) Change subject: Update attributes for new extension.json format .. Update attributes for new extension.json format See I8613a027c56e2c9d2c6. Change-Id: I5a148763f68989c8da313a4fb1d0213658ee4495 --- M extension.json 1 file changed, 15 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroBanner refs/changes/27/354027/1 diff --git a/extension.json b/extension.json index e3778d7..f1cd154 100644 --- a/extension.json +++ b/extension.json @@ -130,17 +130,21 @@ "SpecialMobileEditWatchlist::images": "ZeroBanner\\PageRenderingHooks::onSpecialMobileEditWatchlist_images", "ResourceLoaderTestModules": "ZeroBanner\\TestHooks::onResourceLoaderTestModules" }, - "JsonConfigModels": { - "JsonZeroConfig": { - "class": "ZeroBanner\\ZeroConfig" - } - }, - "JsonConfigs": { - "JsonZeroConfig": { - "namespace": 480, - "nsName": "Zero", - "isLocal": false, - "cacheKey": "1" + "attributes": { + "JsonConfig": { + "Models": { + "JsonZeroConfig": { + "class": "ZeroBanner\\ZeroConfig" + } + }, + "s": { + "JsonZeroConfig": { + "namespace": 480, + "nsName": "Zero", + "isLocal": false, + "cacheKey": "1" + } + } } }, "config": { -- To view, visit https://gerrit.wikimedia.org/r/354027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a148763f68989c8da313a4fb1d0213658ee4495 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ZeroBanner Gerrit-Branch: REL1_29 Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Disambiguator[master]: Disable parser tests due to T159014
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/353548 ) Change subject: Disable parser tests due to T159014 .. Disable parser tests due to T159014 Change-Id: Ic4e9bb88019e51b6b6a1ef0c797e65f9e5024cd1 --- M tests/parserTests.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 59da4c4..411adca 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -13,6 +13,8 @@ !! test Link to disambig and non-disambig page +!! options +disabled !! input I am linking to [[Disambig]] and [[Normal]]. !! result -- To view, visit https://gerrit.wikimedia.org/r/353548 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4e9bb88019e51b6b6a1ef0c797e65f9e5024cd1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Disambiguator Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Addshore Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits