[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Remove unused noScript form function
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332963 )
Change subject: Remove unused noScript form function
..
Remove unused noScript form function
This is properly templatized now.
TODO: same thing with the verisign seal, if we're keeping it.
Change-Id: If1ca1ff53b949036ff427127e23b9b74f9e2353b
---
M gateway_forms/Form.php
1 file changed, 0 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/63/332963/1
diff --git a/gateway_forms/Form.php b/gateway_forms/Form.php
index 83bafd8..b42bcfa 100644
--- a/gateway_forms/Form.php
+++ b/gateway_forms/Form.php
@@ -64,25 +64,6 @@
}
/**
-* Generate HTML for tags
-* For displaying when a user does not have Javascript enabled in their
browser.
-*/
- protected function getNoScript() {
- $noScriptRedirect = $this->gateway->getGlobal(
'NoScriptRedirect' );
-
- $form = '';
- $form .= '';
- $form .= '' . wfMessage(
'donate_interface-noscript-msg' )->escaped() . '';
- if ( $noScriptRedirect ) {
- $form .= '' . wfMessage(
'donate_interface-noscript-redirect-msg' )->escaped() . '';
- $form .= '' . htmlspecialchars(
$noScriptRedirect ) . '';
- }
- $form .= '';
- $form .= '';
- return $form;
- }
-
- /**
* Determine the 'no cache' form action
*
* This mostly exists to ensure that the form does not try to use AJAX
to
--
To view, visit https://gerrit.wikimedia.org/r/332963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1ca1ff53b949036ff427127e23b9b74f9e2353b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: ProcessResponse no longer needs to be public
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332962 )
Change subject: ProcessResponse no longer needs to be public
..
ProcessResponse no longer needs to be public
Remove it from the public interface, mark as protected.
Change-Id: Ibde7cead7ff3b837fe7487937c734fd6a5d6a28b
---
M astropay_gateway/astropay.adapter.php
M gateway_common/GatewayType.php
M gateway_common/gateway.adapter.php
M globalcollect_gateway/globalcollect.adapter.php
M paypal_gateway/express_checkout/paypal_express.adapter.php
5 files changed, 11 insertions(+), 16 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/62/332962/1
diff --git a/astropay_gateway/astropay.adapter.php
b/astropay_gateway/astropay.adapter.php
index fa86262..829dbfa 100644
--- a/astropay_gateway/astropay.adapter.php
+++ b/astropay_gateway/astropay.adapter.php
@@ -251,7 +251,7 @@
*params from request
* @throws ResponseProcessingException
*/
- public function processResponse( $response ) {
+ protected function processResponse( $response ) {
$this->transaction_response->setData( $response );
if ( !$response ) {
throw new ResponseProcessingException(
diff --git a/gateway_common/GatewayType.php b/gateway_common/GatewayType.php
index 31393bb..8c93558 100644
--- a/gateway_common/GatewayType.php
+++ b/gateway_common/GatewayType.php
@@ -48,17 +48,6 @@
public static function getGlobal( $varname );
/**
-* Process the API response obtained from the payment processor and set
-* properties of transaction_response
-* @param array|DomDocument $response Cleaned-up response returned from
-*@see getFormattedResponse. Type depends on
$this->getResponseType
-* @throws ResponseProcessingException with an actionable error code
and any
-* variables to retry
-*/
- public function processResponse( $response );
-
-
- /**
* Perform any additional processing required when donor returns from
* payment processor site. Should set the final status.
* @param array $requestValues all GET and POST values from the request
diff --git a/gateway_common/gateway.adapter.php
b/gateway_common/gateway.adapter.php
index 67a423c..c64eb22 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -1450,10 +1450,16 @@
}
/**
+* Process the API response obtained from the payment processor and set
+* properties of transaction_response.
* Default implementation just says we got a response.
-* @param array|DomDocument $response
+*
+* @param array|DomDocument $response Cleaned-up response returned from
+*@see getFormattedResponse. Type depends on
$this->getResponseType
+* @throws ResponseProcessingException with an actionable error code
and any
+* variables to retry
*/
- public function processResponse( $response ) {
+ protected function processResponse( $response ) {
$this->transaction_response->setCommunicationStatus( true );
}
diff --git a/globalcollect_gateway/globalcollect.adapter.php
b/globalcollect_gateway/globalcollect.adapter.php
index e54f98c..2970e7e 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1271,7 +1271,7 @@
*
* @throws ResponseProcessingException with code and potentially retry
vars.
*/
- public function processResponse( $response ) {
+ protected function processResponse( $response ) {
$this->transaction_response->setCommunicationStatus(
$this->parseResponseCommunicationStatus( $response )
);
diff --git a/paypal_gateway/express_checkout/paypal_express.adapter.php
b/paypal_gateway/express_checkout/paypal_express.adapter.php
index a38a1f6..8b9965b 100644
--- a/paypal_gateway/express_checkout/paypal_express.adapter.php
+++ b/paypal_gateway/express_checkout/paypal_express.adapter.php
@@ -382,7 +382,7 @@
return true;
}
- public function processResponse( $response ) {
+ protected function processResponse( $response ) {
$this->transaction_response->setData( $response );
// FIXME: I'm not sure why we're responsible for failing the
// transaction. If not, we can omit the try/catch here.
--
To view, visit https://gerrit.wikimedia.org/r/332962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibde7cead7ff3b837fe7487937c734fd6a5d6a28b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch
[MediaWiki-commits] [Gerrit] integration/config[master]: Fix node assertion to use nodejs 6 and not nodejs 4
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332918 ) Change subject: Fix node assertion to use nodejs 6 and not nodejs 4 .. Fix node assertion to use nodejs 6 and not nodejs 4 Bug: T155685 Change-Id: I534376fd412b0e3ba65e05e31c5580e832db4c97 --- M jjb/mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 66817fc..4c01d26 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -10,7 +10,7 @@ triggers: - zuul builders: - - assert-node-version-4 + - assert-node-version-6 # FIXME: we should save node_modules and run npm prune - castor-load - shell: | -- To view, visit https://gerrit.wikimedia.org/r/332918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I534376fd412b0e3ba65e05e31c5580e832db4c97 Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: Hashar Gerrit-Reviewer: Jforrester 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...WikibaseLexeme[master]: Very basic ChangeOpDeserializer
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332961 )
Change subject: Very basic ChangeOpDeserializer
..
Very basic ChangeOpDeserializer
Bug: T155700
Change-Id: I2f974247597a009c04aa7a5e373cd1b0e6b709f9
---
M WikibaseLexeme.entitytypes.php
A src/ChangeOp/LexemeChangeOpDeserializer.php
2 files changed, 49 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme
refs/changes/61/332961/1
diff --git a/WikibaseLexeme.entitytypes.php b/WikibaseLexeme.entitytypes.php
index 4570c04..e4569d4 100644
--- a/WikibaseLexeme.entitytypes.php
+++ b/WikibaseLexeme.entitytypes.php
@@ -20,6 +20,7 @@
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
use Wikibase\Lib\LanguageNameLookup;
use Wikibase\LanguageFallbackChain;
+use Wikibase\Lexeme\ChangeOp\LexemeChangeOpDeserializer;
use Wikibase\Lexeme\Content\LexemeContent;
use Wikibase\Lexeme\Content\LexemeHandler;
use Wikibase\Lexeme\DataModel\Lexeme;
@@ -114,5 +115,13 @@
// Identifier of a resource loader module that, when
`require`d, returns a function
// returning a deserializer
'js-deserializer-factory-function' =>
'wikibase.lexeme.getDeserializer',
+ 'changeop-deserializer-callback' => function () {
+ $wikibaseRepo = WikibaseRepo::getDefaultInstance();
+
+ return new LexemeChangeOpDeserializer(
+ $wikibaseRepo->getStringNormalizer(),
+
$wikibaseRepo->getChangeOpFactoryProvider()->getFingerprintChangeOpFactory()
+ );
+ }
]
];
diff --git a/src/ChangeOp/LexemeChangeOpDeserializer.php
b/src/ChangeOp/LexemeChangeOpDeserializer.php
new file mode 100644
index 000..fa36d16
--- /dev/null
+++ b/src/ChangeOp/LexemeChangeOpDeserializer.php
@@ -0,0 +1,40 @@
+
+ */
+class LexemeChangeOpDeserializer implements ChangeOpDeserializer {
+
+ /**
+* @var StringNormalizer
+*/
+ protected $stringNormalizer;
+
+ /**
+* @var FingerprintChangeOpFactory
+*/
+ private $termChangeOpFactory;
+
+ public function __construct(
+ StringNormalizer $stringNormalizer,
+ FingerprintChangeOpFactory $termChangeOpFactory
+ ) {
+ $this->stringNormalizer = $stringNormalizer;
+ $this->termChangeOpFactory = $termChangeOpFactory;
+ }
+
+ public function createEntityChangeOp( array $changeRequest ) {
+ // Do nothing
+ return new ChangeOps();
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/332961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f974247597a009c04aa7a5e373cd1b0e6b709f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix throttle rule for KCES IMR edit-a-thon
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332960 ) Change subject: Fix throttle rule for KCES IMR edit-a-thon .. Fix throttle rule for KCES IMR edit-a-thon Change-Id: I85869f63430e8c3fc0a25f0f7530a27d39ca0de2 --- M wmf-config/throttle.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index d5f11e4..ec95af8 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -81,7 +81,7 @@ $wmgThrottlingExceptions[] = [ // T154312 'from' => '2017-01-19T09:00 +5:30', 'to' => '2017-01-19T18:00 +5:30', - 'range' => '103.19.18.0/24', + 'IP' => '117.211.110.105', 'dbname' => $wmgMaharashtraEventsWikis, 'value' => 60 // 40-50 expected ]; -- To view, visit https://gerrit.wikimedia.org/r/332960 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85869f63430e8c3fc0a25f0f7530a27d39ca0de2 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]: Fix throttle rule for KCES IMR edit-a-thon
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332960 ) Change subject: Fix throttle rule for KCES IMR edit-a-thon .. Fix throttle rule for KCES IMR edit-a-thon Change-Id: I85869f63430e8c3fc0a25f0f7530a27d39ca0de2 --- M wmf-config/throttle.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/60/332960/1 diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index d5f11e4..ec95af8 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -81,7 +81,7 @@ $wmgThrottlingExceptions[] = [ // T154312 'from' => '2017-01-19T09:00 +5:30', 'to' => '2017-01-19T18:00 +5:30', - 'range' => '103.19.18.0/24', + 'IP' => '117.211.110.105', 'dbname' => $wmgMaharashtraEventsWikis, 'value' => 60 // 40-50 expected ]; -- To view, visit https://gerrit.wikimedia.org/r/332960 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85869f63430e8c3fc0a25f0f7530a27d39ca0de2 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/puppet[production]: openstack: instancersync not in autoload module layout
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332954 )
Change subject: openstack: instancersync not in autoload module layout
..
openstack: instancersync not in autoload module layout
Change-Id: I0e89b1be4068c705bb7bf15b8c7c15a87e1fc434
---
M modules/openstack/manifests/nova/instancersync.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/332954/1
diff --git a/modules/openstack/manifests/nova/instancersync.pp
b/modules/openstack/manifests/nova/instancersync.pp
index 9827fdd..71ebdad 100644
--- a/modules/openstack/manifests/nova/instancersync.pp
+++ b/modules/openstack/manifests/nova/instancersync.pp
@@ -1,5 +1,5 @@
# defines an rsync server on an instance
-define instancersync (
+define openstack::nova::instancersync (
$hostname = undef) {
rsync::server::module { "nova_instance_rsync_${hostname}":
--
To view, visit https://gerrit.wikimedia.org/r/332954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e89b1be4068c705bb7bf15b8c7c15a87e1fc434
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]: openstack: fix lint warnings in service.pp
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332953 )
Change subject: openstack: fix lint warnings in service.pp
..
openstack: fix lint warnings in service.pp
Change-Id: Ib5ec92059f98bdabdf788e48e5a6de0fea1c5473
---
M modules/openstack/manifests/keystone/service.pp
1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/332953/1
diff --git a/modules/openstack/manifests/keystone/service.pp
b/modules/openstack/manifests/keystone/service.pp
index 2228754..5a23fa5 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -27,20 +27,20 @@
file {
'/var/log/keystone':
-ensure => directory,
-owner => 'keystone',
-group => 'www-data',
-mode=> '0775';
+ensure => directory,
+owner => 'keystone',
+group => 'www-data',
+mode => '0775';
'/var/log/keystone/uwsgi':
-ensure => directory,
-owner => 'www-data',
-group => 'www-data',
-mode=> '0755';
+ensure => directory,
+owner => 'www-data',
+group => 'www-data',
+mode => '0755';
'/etc/keystone':
-ensure => directory,
-owner => 'keystone',
-group => 'keystone',
-mode=> '0755';
+ensure => directory,
+owner => 'keystone',
+group => 'keystone',
+mode => '0755';
'/etc/keystone/keystone.conf':
content =>
template("openstack/${openstack_version}/keystone/keystone.conf.erb"),
owner => 'keystone',
--
To view, visit https://gerrit.wikimedia.org/r/332953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5ec92059f98bdabdf788e48e5a6de0fea1c5473
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]: interface: rps::modparams, aggregate_member not in autoload ...
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332959 )
Change subject: interface: rps::modparams, aggregate_member not in autoload
layout
..
interface: rps::modparams, aggregate_member not in autoload layout
Change-Id: I9be87e6c05d2f54d437574e6d336c2194f67f2fa
---
M modules/interface/manifests/aggregate.pp
A modules/interface/manifests/aggregate_member.pp
M modules/interface/manifests/rps.pp
A modules/interface/manifests/rps/modparams.pp
4 files changed, 31 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/332959/1
diff --git a/modules/interface/manifests/aggregate.pp
b/modules/interface/manifests/aggregate.pp
index ddd0795..6fa3be5 100644
--- a/modules/interface/manifests/aggregate.pp
+++ b/modules/interface/manifests/aggregate.pp
@@ -1,26 +1,3 @@
-define interface::aggregate_member($master) {
-require_package('ifenslave-2.6')
-
-$interface = $title
-
-augeas { "aggregate member ${interface}":
-context => '/files/etc/network/interfaces/',
-changes => [
-"set auto[./1 = '${interface}']/1 '${interface}'",
-"set iface[. = '${interface}'] '${interface}'",
-"set iface[. = '${interface}']/family 'inet'",
-"set iface[. = '${interface}']/method 'manual'",
-],
-notify => Exec["ifup ${interface}"]
-}
-
-exec { "ifup ${interface}":
-command => "/sbin/ifup --force ${interface}; /sbin/ip link set dev
${interface} up",
-require => Augeas["aggregate member ${interface}"],
-refreshonly => true
-}
-}
-
define interface::aggregate($orig_interface=undef, $members=[],
$lacp_rate='fast', $hash_policy='layer2+3') {
require_package('ifenslave-2.6')
diff --git a/modules/interface/manifests/aggregate_member.pp
b/modules/interface/manifests/aggregate_member.pp
new file mode 100644
index 000..c2c5ee3
--- /dev/null
+++ b/modules/interface/manifests/aggregate_member.pp
@@ -0,0 +1,23 @@
+define interface::aggregate_member($master) {
+require_package('ifenslave-2.6')
+
+$interface = $title
+
+augeas { "aggregate member ${interface}":
+context => '/files/etc/network/interfaces/',
+changes => [
+"set auto[./1 = '${interface}']/1 '${interface}'",
+"set iface[. = '${interface}'] '${interface}'",
+"set iface[. = '${interface}']/family 'inet'",
+"set iface[. = '${interface}']/method 'manual'",
+],
+notify => Exec["ifup ${interface}"]
+}
+
+exec { "ifup ${interface}":
+command => "/sbin/ifup --force ${interface}; /sbin/ip link set dev
${interface} up",
+require => Augeas["aggregate member ${interface}"],
+refreshonly => true
+}
+}
+
diff --git a/modules/interface/manifests/rps.pp
b/modules/interface/manifests/rps.pp
index 023e188..a6c4d69 100644
--- a/modules/interface/manifests/rps.pp
+++ b/modules/interface/manifests/rps.pp
@@ -41,11 +41,3 @@
}
}
-class interface::rps::modparams {
-include initramfs
-
-file { '/etc/modprobe.d/rps.conf':
-content => template("${module_name}/rps.conf.erb"),
-notify => Exec['update-initramfs']
-}
-}
diff --git a/modules/interface/manifests/rps/modparams.pp
b/modules/interface/manifests/rps/modparams.pp
new file mode 100644
index 000..f2bc7bd
--- /dev/null
+++ b/modules/interface/manifests/rps/modparams.pp
@@ -0,0 +1,8 @@
+class interface::rps::modparams {
+include initramfs
+
+file { '/etc/modprobe.d/rps.conf':
+content => template("${module_name}/rps.conf.erb"),
+notify => Exec['update-initramfs']
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/332959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9be87e6c05d2f54d437574e6d336c2194f67f2fa
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]: openstack: designate/glance/keystone not in autoload module
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332955 ) Change subject: openstack: designate/glance/keystone not in autoload module .. openstack: designate/glance/keystone not in autoload module Change-Id: I1af45f39994e350277ded63d644c2943f80f6ead --- R modules/role/manifests/labs/openstack/designate/server.pp R modules/role/manifests/labs/openstack/glance/server.pp R modules/role/manifests/labs/openstack/keystone/server.pp 3 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/332955/1 diff --git a/modules/role/manifests/labs/openstack/designate.pp b/modules/role/manifests/labs/openstack/designate/server.pp similarity index 100% rename from modules/role/manifests/labs/openstack/designate.pp rename to modules/role/manifests/labs/openstack/designate/server.pp diff --git a/modules/role/manifests/labs/openstack/glance.pp b/modules/role/manifests/labs/openstack/glance/server.pp similarity index 100% rename from modules/role/manifests/labs/openstack/glance.pp rename to modules/role/manifests/labs/openstack/glance/server.pp diff --git a/modules/role/manifests/labs/openstack/keystone.pp b/modules/role/manifests/labs/openstack/keystone/server.pp similarity index 100% rename from modules/role/manifests/labs/openstack/keystone.pp rename to modules/role/manifests/labs/openstack/keystone/server.pp -- To view, visit https://gerrit.wikimedia.org/r/332955 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1af45f39994e350277ded63d644c2943f80f6ead 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]: labspuppetbackend: optional parameter before required
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332958 )
Change subject: labspuppetbackend: optional parameter before required
..
labspuppetbackend: optional parameter before required
Change-Id: I40a80abd7b1dee241bb2df77951eb4fcdbb10329
---
M modules/labspuppetbackend/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/332958/1
diff --git a/modules/labspuppetbackend/manifests/init.pp
b/modules/labspuppetbackend/manifests/init.pp
index c212e1e..c036343 100644
--- a/modules/labspuppetbackend/manifests/init.pp
+++ b/modules/labspuppetbackend/manifests/init.pp
@@ -2,9 +2,9 @@
$mysql_host,
$mysql_db,
$mysql_username,
-$mysql_password = hiera('labspuppetbackend_mysql_password'),
$statsd_host,
$statsd_prefix,
+$mysql_password = hiera('labspuppetbackend_mysql_password'),
) {
require_package('python3-pymysql',
'python3-statsd',
--
To view, visit https://gerrit.wikimedia.org/r/332958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40a80abd7b1dee241bb2df77951eb4fcdbb10329
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]: proxysql: optional parameter before required parameter
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332957 ) Change subject: proxysql: optional parameter before required parameter .. proxysql: optional parameter before required parameter Change-Id: Ic9e57692f4dcf06402f7fa2a0aab54c9b2728889 --- M modules/proxysql/manifests/init.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/57/332957/1 diff --git a/modules/proxysql/manifests/init.pp b/modules/proxysql/manifests/init.pp index 9931a06..2daef17 100644 --- a/modules/proxysql/manifests/init.pp +++ b/modules/proxysql/manifests/init.pp @@ -1,9 +1,9 @@ # Class proxysql class proxysql ( +$admin_password, $datadir = '/var/lib/proxysql', $admin_user = 'admin', -$admin_password, $admin_port = 6032, $admin_interface = '127.0.0.1', $admin_socket= '/tmp/proxysql_admin.sock', -- To view, visit https://gerrit.wikimedia.org/r/332957 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9e57692f4dcf06402f7fa2a0aab54c9b2728889 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]: kartotherian: optional parameter listed before required
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332956 )
Change subject: kartotherian: optional parameter listed before required
..
kartotherian: optional parameter listed before required
WARNING: optional parameter listed before required parameter on line
29, 33, 35 ..
Change-Id: I86fb9681abeffe2381465560b9f0d6b39380c349
---
M modules/kartotherian/manifests/init.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/332956/1
diff --git a/modules/kartotherian/manifests/init.pp
b/modules/kartotherian/manifests/init.pp
index 976aa8f..fc9532b 100644
--- a/modules/kartotherian/manifests/init.pp
+++ b/modules/kartotherian/manifests/init.pp
@@ -24,15 +24,15 @@
# List of cassandra server names used by Kartotherian
#
class kartotherian(
+$cassandra_servers,
+$cassandra_kartotherian_pass,
+$pgsql_kartotherian_pass,
$conf_sources = 'sources.prod.yaml',
$contact_groups= 'admins',
-$cassandra_servers,
$port = 6533,
$num_workers = 'ncpu',
$cassandra_kartotherian_user = 'kartotherian',
-$cassandra_kartotherian_pass,
$pgsql_kartotherian_user = 'kartotherian',
-$pgsql_kartotherian_pass,
) {
validate_array($cassandra_servers)
--
To view, visit https://gerrit.wikimedia.org/r/332956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86fb9681abeffe2381465560b9f0d6b39380c349
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...BlueSpiceSubPageTree[master]: Remove non-exist descriptionmsg key
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332806 )
Change subject: Remove non-exist descriptionmsg key
..
Remove non-exist descriptionmsg key
There are no message files at all
Change-Id: I2ae9f2e9e30370105da294cab86c9ed151f85d23
---
M extension.json
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 9bf1bda..e9fa388 100644
--- a/extension.json
+++ b/extension.json
@@ -3,7 +3,6 @@
"version": "2.27.1-alpha",
"url": "https://help.bluespice.com/index.php/BlueSpiceSubPageTree";,
"author": "Leonid Verhovskij",
- "descriptionmsg": "bs-subagetreee-desc",
"type": "bluespice",
"AutoloadClasses": {
"BlueSpiceSubPageTree": "BlueSpiceSubPageTree.class.php"
--
To view, visit https://gerrit.wikimedia.org/r/332806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ae9f2e9e30370105da294cab86c9ed151f85d23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceSubPageTree
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Robert Vogel
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]: Add deprecated annotation to Article::doEditContent()
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332937 ) Change subject: Add deprecated annotation to Article::doEditContent() .. Add deprecated annotation to Article::doEditContent() Change-Id: I5a15b22c8b12fe77105fbd31427e8a15cde327c6 --- M includes/page/Article.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/includes/page/Article.php b/includes/page/Article.php index 208fe1f..d39da90 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -2025,6 +2025,7 @@ /** * Call to WikiPage function for backwards compatibility. +* @deprecated since 1.29. Use WikiPage::doEditContent() directly instead * @see WikiPage::doEditContent */ public function doEditContent( Content $content, $summary, $flags = 0, $baseRevId = false, -- To view, visit https://gerrit.wikimedia.org/r/332937 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a15b22c8b12fe77105fbd31427e8a15cde327c6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Reedy 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...SecurePoll[master]: Avoid DBPerformance log warnings for TranslatePage
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332952 )
Change subject: Avoid DBPerformance log warnings for TranslatePage
..
Avoid DBPerformance log warnings for TranslatePage
Also set doesWrites() to avoid POST warnings.
Change-Id: I24d60958a3903476fbb7ecc01274e3b481192578
---
M includes/main/SpecialSecurePoll.php
M includes/main/Store.php
2 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/52/332952/1
diff --git a/includes/main/SpecialSecurePoll.php
b/includes/main/SpecialSecurePoll.php
index e6c59f3..c0d6504 100644
--- a/includes/main/SpecialSecurePoll.php
+++ b/includes/main/SpecialSecurePoll.php
@@ -31,6 +31,10 @@
$this->sp_context = new SecurePoll_Context;
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* Show the special page
*
diff --git a/includes/main/Store.php b/includes/main/Store.php
index fda55da..e703fce 100644
--- a/includes/main/Store.php
+++ b/includes/main/Store.php
@@ -130,7 +130,7 @@
function getElectionInfo( $ids ) {
$ids = (array)$ids;
- $db = $this->getDB();
+ $db = $this->getDB( DB_SLAVE );
$res = $db->select(
'securepoll_elections',
'*',
--
To view, visit https://gerrit.wikimedia.org/r/332952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24d60958a3903476fbb7ecc01274e3b481192578
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
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...PoolCounter[master]: Implement the methods in InterruptMutexManager in PoolCounte...
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332951 )
Change subject: Implement the methods in InterruptMutexManager in
PoolCounter_Client
..
Implement the methods in InterruptMutexManager in PoolCounter_Client
Change-Id: I77c8c7331114048bfde428fb9aac6c039b26e740
---
M PoolCounterClient_body.php
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PoolCounter
refs/changes/51/332951/1
diff --git a/PoolCounterClient_body.php b/PoolCounterClient_body.php
index 4e76bac..71e07de 100644
--- a/PoolCounterClient_body.php
+++ b/PoolCounterClient_body.php
@@ -1,6 +1,6 @@
sendCommand( 'ACQ4ME', $key, 1, $this->maxqueue,
$timeout );
+ }
+
+ public function releaseQueuedMutex( $key ) {
+ return $this->sendCommand( 'RELEASE', $key );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/332951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I77c8c7331114048bfde428fb9aac6c039b26e740
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PoolCounter
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]: Add InterruptMutexManager interface
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332950 )
Change subject: Add InterruptMutexManager interface
..
Add InterruptMutexManager interface
This lets callers get a high-perfoming queued mutexes rather that polling based
locks.
The C PoolCounter daemon and the like can also be used to back this interface.
Ideally, this could replace the explicit use of DB locks for things like
edit stash mutexes.
Change-Id: I4de91d5fd43700ff0f6d36ff9e2cfa38b3d47679
---
M includes/filebackend/lockmanager/MySqlLockManager.php
A includes/libs/lockmanager/InterruptMutexManager.php
M includes/libs/lockmanager/PostgreSqlLockManager.php
M includes/libs/lockmanager/QuorumLockManager.php
M includes/libs/lockmanager/RedisLockManager.php
5 files changed, 188 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/50/332950/1
diff --git a/includes/filebackend/lockmanager/MySqlLockManager.php
b/includes/filebackend/lockmanager/MySqlLockManager.php
index 5936e7d..2f58914 100644
--- a/includes/filebackend/lockmanager/MySqlLockManager.php
+++ b/includes/filebackend/lockmanager/MySqlLockManager.php
@@ -11,7 +11,7 @@
*
* @ingroup LockManager
*/
-class MySqlLockManager extends DBLockManager {
+class MySqlLockManager extends DBLockManager implements InterruptMutexManager {
/** @var array Mapping of lock types to the type actually used */
protected $lockTypeMap = [
self::LOCK_SH => self::LOCK_SH,
@@ -134,4 +134,48 @@
return $status;
}
+
+ public function acquireQueuedMutex( $key, $timeout = 0 ) {
+ return $this->collectPledgeQuorum(
+ $this->getBucketFromPath( $key ),
+ function ( $lockSrv ) use ( $key, $timeout ) {
+ $status = StatusValue::newGood();
+
+ $db = $this->getConnection( $lockSrv );
+ $res = $db->query(
+ "SELECT GET_LOCK({$db->addQuotes( $key
)},$timeout) AS status",
+ __METHOD__
+ );
+
+ $row = $res->fetchObject();
+ if ( $row->status === 1 ) {
+ $status->fatal(
'lockmanager-fail-acquirelock', $key );
+ }
+
+ return $status;
+ }
+ );
+ }
+
+ public function releaseQueuedMutex( $key ) {
+ return $this->releasePledges(
+ $this->getBucketFromPath( $key ),
+ function ( $lockSrv ) use ( $key ) {
+ $status = StatusValue::newGood();
+
+ $db = $this->getConnection( $lockSrv );
+ $res = $db->query(
+ "SELECT RELEASE_LOCK({$db->addQuotes(
$key )}) AS status",
+ __METHOD__
+ );
+
+ $row = $res->fetchObject();
+ if ( $row->status === 1 ) {
+ $status->fatal(
'lockmanager-fail-releaselock', $key );
+ }
+
+ return $status;
+ }
+ );
+ }
}
diff --git a/includes/libs/lockmanager/InterruptMutexManager.php
b/includes/libs/lockmanager/InterruptMutexManager.php
new file mode 100644
index 000..d030a97
--- /dev/null
+++ b/includes/libs/lockmanager/InterruptMutexManager.php
@@ -0,0 +1,52 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup LockManager
+ * @author Aaron Schulz
+ */
+
+/**
+ * @brief Class for handling high-performance blocking mutexes
+ *
+ * Mutexes are acquired via native blocking and are released automatically on
disconnect.
+ * These are suitable for high-traffic items that need FIFO-style blocking
without polling.
+ *
+ * @ingroup LockManager
+ * @since 1.19
+ */
+interface InterruptMutexManager {
+ /**
+* @param string $key
+* @param int $timeout Timeout in seconds
+* @return StatusValue
+*/
+ public function acquireQueuedMutex( $key, $timeout = 0 );
+
+ /**
+* @param string $key
+* @return StatusValue
+*/
+ public function releaseQueuedMutex( $key );
+}
diff --git a/includes/libs/lockmanager/PostgreSqlLockManager.php
b/includes/libs/lockmanager/PostgreSqlLockManager.php
index d6b1ce8..9d91624 100644
--- a/includes/libs/lockmanager/PostgreSqlLockManager.php
+++ b/includes/libs/lockmanager/PostgreSqlLockManager.php
@@ -5,7 +5,7 @@
*
* @ingroup LockManager
*/
-class PostgreSqlLockManager exte
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Fix a couple of typos
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332949 ) Change subject: Fix a couple of typos .. Fix a couple of typos Change-Id: Ic2cad7046333b7dc69efe6283e86f10f6581e39d --- M data/i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/data/i18n/en.json b/data/i18n/en.json index 44b79f5..408fcb1 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -121,7 +121,7 @@ "form-engagement-option9": "Organizer of Wikimedia events (e.g. WLM, edit-a-thons)", "form-engagement-option10": "None of the above", - "form-wikimedia-staff": "Are you currently a paid or contract staff memeber of any Wikimedia organization?", + "form-wikimedia-staff": "Are you currently a paid or contract staff member of any Wikimedia organization?", "form-wikimedia-board": "Are you currently board member of any Wikimedia organization?", "form-staff-organization": "If yes, please identify the Wikimedia organization here:", "form-board-organization": "If yes, please identify the Wikimedia organization here:", @@ -147,7 +147,7 @@ "form-travel-conditions": "If I am awarded and accept a grant, I agree to use the travel booking service provided and paid for by the Wikimedia Foundation.", "form-travel-only": "If I am awarded and accept a grant, I agree to use the grant exclusively for my travel expenses. I promise to reimburse the Wikimedia Foundation for any unspent or improperly spent funds.", "form-friendly-space": "If I am awarded and accept a grant, I agree to abide by the Wikimedia Foundation https://wikimediafoundation.org/wiki/Special:MyLanguage/Friendly_space_policy\"; target=\"blank\">Friendly Space Policy. If I am found in violation of this policy and asked to leave, I agree to be responsible for any changes in my own travel expenses.", - "form-info-true": "I certify that all of the information provided with my application is true and accurate to the best of my knowledge and belief. The Wikimedia Foundation reserves the right to require me to pay back all or part of the grant if any of the information I provide is found to be untrue or inaccurate.", + "form-info-true": "I certify that all of the information provided with my application is true and accurate to the best of my knowledge and belief. The Wikimedia Foundation reserves the right to require me to pay back all or part of the grant if any of the information I provide is found to be untrue or inaccurate.", "form-privacy": "Privacy", "form-review": "All information contained in this application will be reviewed by the members of the https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\";>Wikimania Scholarship Committee. All personal information will be held strictly confidential by the Committee, and the https://wikimediafoundation.org/\";>Wikimedia Foundation.", -- To view, visit https://gerrit.wikimedia.org/r/332949 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic2cad7046333b7dc69efe6283e86f10f6581e39d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/wikimania-scholarships Gerrit-Branch: master Gerrit-Owner: Niharika29 Gerrit-Reviewer: Niharika29 Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Fix a couple of typos
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332949 ) Change subject: Fix a couple of typos .. Fix a couple of typos Change-Id: Ic2cad7046333b7dc69efe6283e86f10f6581e39d --- M data/i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships refs/changes/49/332949/1 diff --git a/data/i18n/en.json b/data/i18n/en.json index 44b79f5..408fcb1 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -121,7 +121,7 @@ "form-engagement-option9": "Organizer of Wikimedia events (e.g. WLM, edit-a-thons)", "form-engagement-option10": "None of the above", - "form-wikimedia-staff": "Are you currently a paid or contract staff memeber of any Wikimedia organization?", + "form-wikimedia-staff": "Are you currently a paid or contract staff member of any Wikimedia organization?", "form-wikimedia-board": "Are you currently board member of any Wikimedia organization?", "form-staff-organization": "If yes, please identify the Wikimedia organization here:", "form-board-organization": "If yes, please identify the Wikimedia organization here:", @@ -147,7 +147,7 @@ "form-travel-conditions": "If I am awarded and accept a grant, I agree to use the travel booking service provided and paid for by the Wikimedia Foundation.", "form-travel-only": "If I am awarded and accept a grant, I agree to use the grant exclusively for my travel expenses. I promise to reimburse the Wikimedia Foundation for any unspent or improperly spent funds.", "form-friendly-space": "If I am awarded and accept a grant, I agree to abide by the Wikimedia Foundation https://wikimediafoundation.org/wiki/Special:MyLanguage/Friendly_space_policy\"; target=\"blank\">Friendly Space Policy. If I am found in violation of this policy and asked to leave, I agree to be responsible for any changes in my own travel expenses.", - "form-info-true": "I certify that all of the information provided with my application is true and accurate to the best of my knowledge and belief. The Wikimedia Foundation reserves the right to require me to pay back all or part of the grant if any of the information I provide is found to be untrue or inaccurate.", + "form-info-true": "I certify that all of the information provided with my application is true and accurate to the best of my knowledge and belief. The Wikimedia Foundation reserves the right to require me to pay back all or part of the grant if any of the information I provide is found to be untrue or inaccurate.", "form-privacy": "Privacy", "form-review": "All information contained in this application will be reviewed by the members of the https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\";>Wikimania Scholarship Committee. All personal information will be held strictly confidential by the Committee, and the https://wikimediafoundation.org/\";>Wikimedia Foundation.", -- To view, visit https://gerrit.wikimedia.org/r/332949 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2cad7046333b7dc69efe6283e86f10f6581e39d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/wikimania-scholarships Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Ignore empty field definitions in cargo_query
Samwilson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332945 )
Change subject: Ignore empty field definitions in cargo_query
..
Ignore empty field definitions in cargo_query
If a field list ended in a comma (indicating an empty trailing
field definition) then an "Uninitialized string offset: 0" was
being thrown. This change avoids this by discarding empty field
definitions before processing them.
Change-Id: I7cf9160b3a7ee7d341745c8b2347221502f9c22e
---
M CargoSQLQuery.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/45/332945/1
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index af7fffd..2b0b771 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -169,7 +169,7 @@
*/
function setAliasedFieldNames() {
$this->mAliasedFieldNames = array();
- $fieldStrings = CargoUtils::smartSplit( ',', $this->mFieldsStr
);
+ $fieldStrings = array_filter( CargoUtils::smartSplit( ',',
$this->mFieldsStr ) );
// Default is "_pageName".
if ( count( $fieldStrings ) == 0 ) {
$fieldStrings[] = '_pageName';
--
To view, visit https://gerrit.wikimedia.org/r/332945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cf9160b3a7ee7d341745c8b2347221502f9c22e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Samwilson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: WIP: Odin
Nikerabbit has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332941 )
Change subject: WIP: Odin
..
WIP: Odin
Change-Id: I2fb354ace3ee109eac8d8b90f7ef46c606523d55
---
M TranslateSettings.php
M bin/REPONG-PROJECTS
M repoconfig.commit.json
M repoconfig.json
4 files changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/41/332941/1
diff --git a/TranslateSettings.php b/TranslateSettings.php
index 701f4cd..a0bbab7 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -291,6 +291,7 @@
$wgTranslateGroupFiles[] = "$GROUPS/OpenStreetMap/OpenStreetMap.yaml";
$wgTranslateGroupFiles[] = "$GROUPS/OpenStreetMap/Potlatch2.yaml";
$wgTranslateGroupFiles[] = "$GROUPS/OpenStreetMap/WaymarkedTrails.yaml";
+$wgTranslateGroupFiles[] = "$GROUPS/OpenStreetMap/odin.yaml";
$wgTranslateSupportUrlNamespace[NS_OSM] = [
'page' => 'Translating_talk:OpenStreetMap',
'params' => $lqtParams,
diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS
index 98264de..8e59194 100644
--- a/bin/REPONG-PROJECTS
+++ b/bin/REPONG-PROJECTS
@@ -26,6 +26,7 @@
mwgerrit
mwgithub
nfcring-control
+odin
oppia
pageviews
pywikibot
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index bb67cfe..63a8e5b 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -274,6 +274,15 @@
}
}
},
+ "odin": {
+ "group": "odin",
+ "repos": {
+ "odin": {
+ "type": "github",
+ "url": "g...@github.com:valhalla/odin"
+ }
+ }
+ },
"oppia": {
"group": "oppia",
"repos": {
diff --git a/repoconfig.json b/repoconfig.json
index a2b98b6..2712dcf 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -269,6 +269,15 @@
}
}
},
+ "odin": {
+ "group": "odin",
+ "repos": {
+ "odin": {
+ "type": "github",
+ "url": "https://github.com/valhalla/odin";
+ }
+ }
+ },
"oppia": {
"group": "oppia",
"repos": {
--
To view, visit https://gerrit.wikimedia.org/r/332941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fb354ace3ee109eac8d8b90f7ef46c606523d55
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Read closed-labs as closed tag on labs
Alex Monk has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332940 )
Change subject: Read closed-labs as closed tag on labs
..
Read closed-labs as closed tag on labs
Bug: T115584
Change-Id: Ic14e033622140f45b04e3c12b682dac754365a86
---
M tests/cirrusTest.php
M wmf-config/CommonSettings.php
M wmf-config/DatabaseLists.php
3 files changed, 10 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/40/332940/1
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 30c540a..617b54c 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -99,12 +99,13 @@
}
private function loadCirrusConfig( $wmfRealm, $wgDBname, $dbSuffix ) {
+ global $wmfRealm;
$wmfConfigDir = __DIR__ . "/../wmf-config";
require __DIR__ . '/TestServices.php';
$wgConf = $this->loadWgConf( $wmfRealm );
list( $site, $lang ) = $wgConf->siteFromDB( $wgDBname );
- $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname );
+ $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname,
$wmfRealm );
$dbSuffix = ( $site === 'wikipedia' ) ? 'wiki' : $site;
$confParams = [
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e1486a3..4b8b574 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -163,7 +163,7 @@
# Get configuration from SiteConfiguration object
require( "$wmfConfigDir/InitialiseSettings.php" );
- $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname );
+ $wikiTags = DatabaseLists::getTagsListsFor( $wgDBname, $wmfRealm );
$dbSuffix = ( $site === 'wikipedia' ) ? 'wiki' : $site;
$confParams = [
@@ -713,7 +713,7 @@
],
];
-$wgSiteMatrixClosedSites = MWWikiversions::readDbListFile( 'closed' );
+$wgSiteMatrixClosedSites = MWWikiversions::readDbListFile( $wmfRealm ===
'labs' ? 'closed-labs' : 'closed' );
$wgSiteMatrixPrivateSites = MWWikiversions::readDbListFile( 'private' );
$wgSiteMatrixFishbowlSites = MWWikiversions::readDbListFile( 'fishbowl' );
diff --git a/wmf-config/DatabaseLists.php b/wmf-config/DatabaseLists.php
index 59f44dc..405bd77 100644
--- a/wmf-config/DatabaseLists.php
+++ b/wmf-config/DatabaseLists.php
@@ -37,11 +37,15 @@
/**
* @return string[]
*/
- public static function getTagsListsFor ( $databaseName ) {
+ public static function getTagsListsFor ( $databaseName, $realm ) {
$tags = [];
foreach ( self::getAllTagsLists() as $tag ) {
- $databaseList = MWWikiversions::readDbListFile(
$databaseName );
+ $fname = $tag;
+ if ( $realm === 'labs' && $tag === 'closed' ) {
+ $fname .= '-labs';
+ }
+ $databaseList = MWWikiversions::readDbListFile( $fname
);
if ( in_array( $databaseName, $databaseList ) ) {
$tags[] = $tag;
}
--
To view, visit https://gerrit.wikimedia.org/r/332940
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic14e033622140f45b04e3c12b682dac754365a86
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: GeneratorFactory: make getCategory respect self.site
Zhuyifei1999 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332939 )
Change subject: GeneratorFactory: make getCategory respect self.site
..
GeneratorFactory: make getCategory respect self.site
Previous behavior is to generate the pages with the site in
user-config, regardless of the value in self.site.
Bug: T155687
Change-Id: Ic0400fd45b0f44dda65a6b69d6a9c4a7ed5d35ef
---
M pywikibot/pagegenerators.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/39/332939/1
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index c290fd6..afb752c 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -544,6 +544,7 @@
categoryname = u'{0}:{1}'.format(self.site.namespace(14),
categoryname)
cat = pywikibot.Category(pywikibot.Link(categoryname,
+source=self.site,
defaultNamespace=14))
return cat, startfrom
--
To view, visit https://gerrit.wikimedia.org/r/332939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0400fd45b0f44dda65a6b69d6a9c4a7ed5d35ef
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Zhuyifei1999
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: WIP Fix RTL popups
Phuedx has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332938 )
Change subject: WIP Fix RTL popups
..
WIP Fix RTL popups
Change-Id: Ied3dbd7cf82749198e792a2f9d2241582aeff25c
---
M resources/ext.popups/styles/ext.popups.core.less
M resources/ext.popups/templates/preview.mustache
2 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/38/332938/1
diff --git a/resources/ext.popups/styles/ext.popups.core.less
b/resources/ext.popups/styles/ext.popups.core.less
index 2c9872f..9d59dc7 100644
--- a/resources/ext.popups/styles/ext.popups.core.less
+++ b/resources/ext.popups/styles/ext.popups.core.less
@@ -126,7 +126,6 @@
&:after {
content: ' ';
position: absolute;
- right: 0;
bottom: 0;
width: 25%;
height: 24px;
@@ -136,6 +135,14 @@
background-image: -o-linear-gradient( to right, rgba(
255, 255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% );
background-image: linear-gradient( to right, rgba( 255,
255, 255, 0 ), rgba( 255, 255, 255, 1 ) 50% );
}
+
+ [dir="ltr"]:after {
+ right: 0;
+ }
+
+ [dir="rtl"]:after {
+ left: 0;
+ }
}
&.mwe-popups-is-tall {
diff --git a/resources/ext.popups/templates/preview.mustache
b/resources/ext.popups/templates/preview.mustache
index cbeb146..ee98b8d 100644
--- a/resources/ext.popups/templates/preview.mustache
+++ b/resources/ext.popups/templates/preview.mustache
@@ -4,7 +4,7 @@
{{#hasThumbnail}}
{{/hasThumbnail}}
-
+
{{lastModifiedMsg}}
--
To view, visit https://gerrit.wikimedia.org/r/332938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied3dbd7cf82749198e792a2f9d2241582aeff25c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: mpga
Gerrit-Owner: Phuedx
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add deprecated annotation to Article::doEditContent()
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332937 ) Change subject: Add deprecated annotation to Article::doEditContent() .. Add deprecated annotation to Article::doEditContent() Change-Id: I5a15b22c8b12fe77105fbd31427e8a15cde327c6 --- M includes/page/Article.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/37/332937/1 diff --git a/includes/page/Article.php b/includes/page/Article.php index 208fe1f..d39da90 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -2025,6 +2025,7 @@ /** * Call to WikiPage function for backwards compatibility. +* @deprecated since 1.29. Use WikiPage::doEditContent() directly instead * @see WikiPage::doEditContent */ public function doEditContent( Content $content, $summary, $flags = 0, $baseRevId = false, -- To view, visit https://gerrit.wikimedia.org/r/332937 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a15b22c8b12fe77105fbd31427e8a15cde327c6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Reedy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update tests/phpunit/MediaWikiTestCase.php with support for ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/315513 ) Change subject: Update tests/phpunit/MediaWikiTestCase.php with support for apcu .. Update tests/phpunit/MediaWikiTestCase.php with support for apcu Change-Id: I22d54e96c2c002ea53dabfd2772d2ba4c7eb96b1 --- M tests/phpunit/MediaWikiTestCase.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php index fd02a3e..37f76ff 100644 --- a/tests/phpunit/MediaWikiTestCase.php +++ b/tests/phpunit/MediaWikiTestCase.php @@ -255,6 +255,7 @@ CACHE_ACCEL => $hashCache, CACHE_MEMCACHED => $hashCache, 'apc' => $hashCache, + 'apcu' => $hashCache, 'xcache' => $hashCache, 'wincache' => $hashCache, ] + $baseConfig->get( 'ObjectCaches' ); -- To view, visit https://gerrit.wikimedia.org/r/315513 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22d54e96c2c002ea53dabfd2772d2ba4c7eb96b1 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: Aaron Schulz Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add more $wgPoolCounterConf comments
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332919 ) Change subject: Add more $wgPoolCounterConf comments .. Add more $wgPoolCounterConf comments Change-Id: Ic7b376dcada2b58a2f2ddc13b79e392e9d4fae6f --- M includes/DefaultSettings.php 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 566d4aa..086b615 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -8231,7 +8231,19 @@ * The remaining elements are passed through to the class as constructor * parameters. * - * @par Example: + * @par Example using local redis instance: + * @code + * $wgPoolCounterConf = [ 'ArticleView' => [ + * 'class' => 'PoolCounterRedis', + * 'timeout' => 15, // wait timeout in seconds + * 'workers' => 1, // maximum number of active threads in each pool + * 'maxqueue' => 5, // maximum number of total threads in each pool + * 'servers' => [ '127.0.0.1' ], + * 'redisConfig' => [] + * ] ]; + * @endcode + * + * @par Example using C daemon from https://www.mediawiki.org/wiki/Extension:PoolCounter: * @code * $wgPoolCounterConf = [ 'ArticleView' => [ * 'class' => 'PoolCounter_Client', @@ -8239,7 +8251,7 @@ * 'workers' => 5, // maximum number of active threads in each pool * 'maxqueue' => 50, // maximum number of total threads in each pool * ... any extension-specific options... - * ]; + * ] ]; * @endcode */ $wgPoolCounterConf = null; -- To view, visit https://gerrit.wikimedia.org/r/332919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7b376dcada2b58a2f2ddc13b79e392e9d4fae6f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz 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/core[master]: Mark Article::doEditContent() as deprecated
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332936 )
Change subject: Mark Article::doEditContent() as deprecated
..
Mark Article::doEditContent() as deprecated
Bug: T155696
Change-Id: Ie91b428f3a5992ba85c6ca2b2909953d8fce139b
---
M RELEASE-NOTES-1.29
M includes/page/Article.php
2 files changed, 3 insertions(+), 0 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index bde15d5a..024a6f4 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -205,6 +205,8 @@
* Revision::getText() (deprecated in 1.21) was removed.
* Article::doEdit() and WikiPage::doEdit() (deprecated in 1.21) were removed.
* Parser::replaceUnusualEscapes() (deprecated in 1.24) was removed.
+* Article::doEditContent() was marked as deprecated, to be removed in 1.30
+ or later.
== Compatibility ==
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 2052ed3..208fe1f 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -2030,6 +2030,7 @@
public function doEditContent( Content $content, $summary, $flags = 0,
$baseRevId = false,
User $user = null, $serialFormat = null
) {
+ wfDeprecated( __METHOD__, '1.29' );
return $this->mPage->doEditContent( $content, $summary, $flags,
$baseRevId,
$user, $serialFormat
);
--
To view, visit https://gerrit.wikimedia.org/r/332936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie91b428f3a5992ba85c6ca2b2909953d8fce139b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: Daniel Kinzler
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove deprecated Parser::replaceUnusualEscapes()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330343 )
Change subject: Remove deprecated Parser::replaceUnusualEscapes()
..
Remove deprecated Parser::replaceUnusualEscapes()
Deprecated since 1.24, no callers.
Change-Id: Ib780f1a7b77d3ce624112f59c8e57820fecb6bf2
---
M RELEASE-NOTES-1.29
M includes/parser/Parser.php
2 files changed, 1 insertion(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 25cb94a..bde15d5a 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -204,6 +204,7 @@
* Article::getContent() (deprecated in 1.21) was removed.
* Revision::getText() (deprecated in 1.21) was removed.
* Article::doEdit() and WikiPage::doEdit() (deprecated in 1.21) were removed.
+* Parser::replaceUnusualEscapes() (deprecated in 1.24) was removed.
== Compatibility ==
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 79fc172..702a479 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1950,18 +1950,6 @@
/**
* Replace unusual escape codes in a URL with their equivalent
characters
*
-* @deprecated since 1.24, use normalizeLinkUrl
-* @param string $url
-* @return string
-*/
- public static function replaceUnusualEscapes( $url ) {
- wfDeprecated( __METHOD__, '1.24' );
- return self::normalizeLinkUrl( $url );
- }
-
- /**
-* Replace unusual escape codes in a URL with their equivalent
characters
-*
* This generally follows the syntax defined in RFC 3986, with special
* consideration for HTTP query strings.
*
--
To view, visit https://gerrit.wikimedia.org/r/330343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib780f1a7b77d3ce624112f59c8e57820fecb6bf2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: Jackmcbarn
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove deprecated function Article::doEdit() and WikiPage::d...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329336 )
Change subject: Remove deprecated function Article::doEdit() and
WikiPage::doEdit()
..
Remove deprecated function Article::doEdit() and WikiPage::doEdit()
Bug: T61113
Bug: T154498
Change-Id: Ie6c1bb4ee5ee45ac2db432877a7038659231c091
---
M RELEASE-NOTES-1.29
M includes/page/Article.php
M includes/page/WikiPage.php
M tests/phpunit/includes/page/WikiPageTest.php
4 files changed, 1 insertion(+), 127 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index bc5af86..25cb94a 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -203,6 +203,7 @@
Use ContentHandlerDefaultModelFor instead.
* Article::getContent() (deprecated in 1.21) was removed.
* Revision::getText() (deprecated in 1.21) was removed.
+* Article::doEdit() and WikiPage::doEdit() (deprecated in 1.21) were removed.
== Compatibility ==
diff --git a/includes/page/Article.php b/includes/page/Article.php
index b8be294..2052ed3 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -2025,17 +2025,6 @@
/**
* Call to WikiPage function for backwards compatibility.
-* @see WikiPage::doEdit
-*
-* @deprecated since 1.21: use doEditContent() instead.
-*/
- public function doEdit( $text, $summary, $flags = 0, $baseRevId =
false, $user = null ) {
- wfDeprecated( __METHOD__, '1.21' );
- return $this->mPage->doEdit( $text, $summary, $flags,
$baseRevId, $user );
- }
-
- /**
-* Call to WikiPage function for backwards compatibility.
* @see WikiPage::doEditContent
*/
public function doEditContent( Content $content, $summary, $flags = 0,
$baseRevId = false,
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 920ba87..f760cd1 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1508,68 +1508,6 @@
* Change an existing article or create a new article. Updates RC and
all necessary caches,
* optionally via the deferred update array.
*
-* @param string $text New text
-* @param string $summary Edit summary
-* @param int $flags Bitfield:
-* EDIT_NEW
-* Article is known or assumed to be non-existent, create a
new one
-* EDIT_UPDATE
-* Article is known or assumed to be pre-existing, update it
-* EDIT_MINOR
-* Mark this edit minor, if the user is allowed to do so
-* EDIT_SUPPRESS_RC
-* Do not log the change in recentchanges
-* EDIT_FORCE_BOT
-* Mark the edit a "bot" edit regardless of user rights
-* EDIT_AUTOSUMMARY
-* Fill in blank summaries with generated text where possible
-* EDIT_INTERNAL
-* Signal that the page retrieve/save cycle happened entirely
in this request.
-*
-* If neither EDIT_NEW nor EDIT_UPDATE is specified, the status of the
-* article will be detected. If EDIT_UPDATE is specified and the article
-* doesn't exist, the function will return an edit-gone-missing error.
If
-* EDIT_NEW is specified and the article does exist, an
edit-already-exists
-* error will be returned. These two conditions are also possible with
-* auto-detection due to MediaWiki's performance-optimised locking
strategy.
-*
-* @param bool|int $baseRevId The revision ID this edit was based off,
if any.
-* This is not the parent revision ID, rather the revision ID for
older
-* content used as the source for a rollback, for example.
-* @param User $user The user doing the edit
-*
-* @throws MWException
-* @return Status Possible errors:
-* edit-hook-aborted: The ArticleSave hook aborted the edit but didn't
-* set the fatal flag of $status
-* edit-gone-missing: In update mode, but the article didn't exist.
-* edit-conflict: In update mode, the article changed unexpectedly.
-* edit-no-change: Warning that the text was the same as before.
-* edit-already-exists: In creation mode, but the article already
exists.
-*
-* Extensions may define additional errors.
-*
-* $return->value will contain an associative array with members as
follows:
-* new: Boolean indicating if the function attempted to create a
new article.
-* revision: The revision object for the inserted revision, or null.
-*
-* Compatibility note: this function previously returned a boolean value
-* indicating success/failure
-*
-
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Mark Article::doEditContent() as deprecated
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332936 )
Change subject: Mark Article::doEditContent() as deprecated
..
Mark Article::doEditContent() as deprecated
Bug: T155696
Change-Id: Ie91b428f3a5992ba85c6ca2b2909953d8fce139b
---
M RELEASE-NOTES-1.29
M includes/page/Article.php
2 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/36/332936/1
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index bc5af86..a699bd8 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -203,6 +203,8 @@
Use ContentHandlerDefaultModelFor instead.
* Article::getContent() (deprecated in 1.21) was removed.
* Revision::getText() (deprecated in 1.21) was removed.
+* Article::doEditContent() was marked as deprecated, to be removed in 1.30
+ or later.
== Compatibility ==
diff --git a/includes/page/Article.php b/includes/page/Article.php
index b8be294..237bc66 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -2041,6 +2041,7 @@
public function doEditContent( Content $content, $summary, $flags = 0,
$baseRevId = false,
User $user = null, $serialFormat = null
) {
+ wfDeprecated( __METHOD__, '1.29' );
return $this->mPage->doEditContent( $content, $summary, $flags,
$baseRevId,
$user, $serialFormat
);
--
To view, visit https://gerrit.wikimedia.org/r/332936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie91b428f3a5992ba85c6ca2b2909953d8fce139b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove unused img_description field in SpecialUnusedimages q...
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332935 ) Change subject: Remove unused img_description field in SpecialUnusedimages query .. Remove unused img_description field in SpecialUnusedimages query Not used in either UnusedimagesPage or ImageQueryPage. Change-Id: Id0fdac9ac37eef097e8ca9f7bf3d66ef10bb83c2 --- M includes/specials/SpecialUnusedimages.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/35/332935/1 diff --git a/includes/specials/SpecialUnusedimages.php b/includes/specials/SpecialUnusedimages.php index 2cc1a7b..18dfb2e 100644 --- a/includes/specials/SpecialUnusedimages.php +++ b/includes/specials/SpecialUnusedimages.php @@ -51,7 +51,6 @@ 'title' => 'img_name', 'value' => 'img_timestamp', 'img_user', 'img_user_text', - 'img_description' ], 'conds' => [ 'il_to IS NULL' ], 'join_conds' => [ 'imagelinks' => [ 'LEFT JOIN', 'il_to = img_name' ] ] -- To view, visit https://gerrit.wikimedia.org/r/332935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0fdac9ac37eef097e8ca9f7bf3d66ef10bb83c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Removal of editusercssjs (depricated 1.16) and edited releas...
Zppix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332934 ) Change subject: Removal of editusercssjs (depricated 1.16) and edited released notes to reflect it .. Removal of editusercssjs (depricated 1.16) and edited released notes to reflect it Change-Id: Ic9851d53affe0f4ece7a79f541ec5cb39133b109 --- M RELEASE-NOTES-1.29 M includes/user/User.php 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/34/332934/1 diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index e404940..c5cf29b 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -201,7 +201,8 @@ Use ContentHandlerDefaultModelFor instead. * Hook TitleIsWikitextPage (deprecated in 1.21) was removed. Use ContentHandlerDefaultModelFor instead. - +* User right editusercssjs removed (deprecated in 1.16) was removed + Use editusercss and edituserjs instead. == Compatibility == MediaWiki 1.29 requires PHP 5.5.9 or later. There is experimental support for diff --git a/includes/user/User.php b/includes/user/User.php index fed64c2..67df4df 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -146,7 +146,6 @@ 'editmyuserjs', 'editmywatchlist', 'editsemiprotected', - 'editusercssjs', # deprecated 'editusercss', 'edituserjs', 'hideuser', -- To view, visit https://gerrit.wikimedia.org/r/332934 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9851d53affe0f4ece7a79f541ec5cb39133b109 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Zppix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revision::getText() was removed
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332933 )
Change subject: Revision::getText() was removed
..
Revision::getText() was removed
Bug: T154498
Change-Id: I29dcf768a9c176ca27b94359ac99cdc2b5ea930b
---
M RELEASE-NOTES-1.29
M includes/Revision.php
M tests/phpunit/includes/RevisionStorageTest.php
M tests/phpunit/includes/RevisionTest.php
4 files changed, 2 insertions(+), 63 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index cbfd124..bc5af86 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -201,7 +201,8 @@
Use ContentHandlerDefaultModelFor instead.
* Hook TitleIsWikitextPage (deprecated in 1.21) was removed.
Use ContentHandlerDefaultModelFor instead.
-* Article::getContent (deprecated in 1.21) was removed.
+* Article::getContent() (deprecated in 1.21) was removed.
+* Revision::getText() (deprecated in 1.21) was removed.
== Compatibility ==
diff --git a/includes/Revision.php b/includes/Revision.php
index 8721ef9..d9e42ff 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1036,28 +1036,6 @@
}
/**
-* Fetch revision text if it's available to the specified audience.
-* If the specified audience does not have the ability to view this
-* revision, an empty string will be returned.
-*
-* @param int $audience One of:
-* Revision::FOR_PUBLIC to be displayed to all users
-* Revision::FOR_THIS_USERto be displayed to the given user
-* Revision::RAW get the text regardless of permissions
-* @param User $user User object to check for, only if FOR_THIS_USER is
passed
-* to the $audience parameter
-*
-* @deprecated since 1.21, use getContent() instead
-* @return string
-*/
- public function getText( $audience = self::FOR_PUBLIC, User $user =
null ) {
- wfDeprecated( __METHOD__, '1.21' );
-
- $content = $this->getContent( $audience, $user );
- return ContentHandler::getContentText( $content ); # returns
the raw content text, if applicable
- }
-
- /**
* Fetch revision content if it's available to the specified audience.
* If the specified audience does not have the ability to view this
* revision, null will be returned.
diff --git a/tests/phpunit/includes/RevisionStorageTest.php
b/tests/phpunit/includes/RevisionStorageTest.php
index 7d3007b..642ada2 100644
--- a/tests/phpunit/includes/RevisionStorageTest.php
+++ b/tests/phpunit/includes/RevisionStorageTest.php
@@ -275,18 +275,6 @@
}
/**
-* @covers Revision::getText
-*/
- public function testGetText() {
- $this->hideDeprecated( 'Revision::getText' );
-
- $orig = $this->makeRevision( [ 'text' => 'hello hello.' ] );
- $rev = Revision::newFromId( $orig->getId() );
-
- $this->assertEquals( 'hello hello.', $rev->getText() );
- }
-
- /**
* @covers Revision::getContent
*/
public function testGetContent_failure() {
diff --git a/tests/phpunit/includes/RevisionTest.php
b/tests/phpunit/includes/RevisionTest.php
index 767c963..c971a40 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -311,28 +311,6 @@
);
}
- function dataGetText() {
- // NOTE: we expect the help namespace to always contain wikitext
- return [
- [ 'hello world', 'Help:Hello', null, null,
Revision::FOR_PUBLIC, 'hello world' ],
- [ serialize( 'hello world' ), 'Hello', "testing", null,
Revision::FOR_PUBLIC, null ],
- [ serialize( 'hello world' ), 'Dummy:Hello', null,
null, Revision::FOR_PUBLIC, null ],
- ];
- }
-
- /**
-* @group Database
-* @dataProvider dataGetText
-* @covers Revision::getText
-*/
- public function testGetText( $text, $title, $model, $format, $audience,
$expectedText ) {
- $this->hideDeprecated( 'Revision::getText' );
-
- $rev = $this->newTestRevision( $text, $title, $model, $format );
-
- $this->assertEquals( $expectedText, $rev->getText( $audience )
);
- }
-
public function dataGetSize() {
return [
[ "hello world.", CONTENT_MODEL_WIKITEXT, 12 ],
@@ -375,14 +353,11 @@
* @covers Revision::__construct
*/
public function testConstructWithText() {
- $this->hideDeprecated( "Revision::getText" );
-
$rev = new Revision( [
'text' => 'hello world.',
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Article::getContent() was removed
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332931 )
Change subject: Article::getContent() was removed
..
Article::getContent() was removed
Bug: T154498
Change-Id: I27956d494cf19d1204988807130b43f77186db9b
---
M RELEASE-NOTES-1.29
M includes/page/Article.php
2 files changed, 1 insertion(+), 18 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index e404940..cbfd124 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -201,6 +201,7 @@
Use ContentHandlerDefaultModelFor instead.
* Hook TitleIsWikitextPage (deprecated in 1.21) was removed.
Use ContentHandlerDefaultModelFor instead.
+* Article::getContent (deprecated in 1.21) was removed.
== Compatibility ==
diff --git a/includes/page/Article.php b/includes/page/Article.php
index a33c84f..b8be294 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -198,24 +198,6 @@
}
/**
-* Note that getContent does not follow redirects anymore.
-* If you need to fetch redirectable content easily, try
-* the shortcut in WikiPage::getRedirectTarget()
-*
-* This function has side effects! Do not use this function if you
-* only want the real revision text if any.
-*
-* @deprecated since 1.21; use WikiPage::getContent() instead
-*
-* @return string Return the text of this revision
-*/
- public function getContent() {
- wfDeprecated( __METHOD__, '1.21' );
- $content = $this->getContentObject();
- return ContentHandler::getContentText( $content );
- }
-
- /**
* Returns a Content object representing the pages effective display
content,
* not necessarily the revision's content!
*
--
To view, visit https://gerrit.wikimedia.org/r/332931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I27956d494cf19d1204988807130b43f77186db9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: Daniel Kinzler
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Check contribution_id before rectifying orphans
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/328855 )
Change subject: Check contribution_id before rectifying orphans
..
Check contribution_id before rectifying orphans
If there's already a contribution_id in the contribution_tracking
table, that means the donor somehow made two successful donations
with the same contribution tracking ID. In almost all cases this
is inadvertant, so cancel the second one.
Needs tests.
Bug: T153992
Change-Id: I2d0c635148844978f0b856f58b95076d939eb174
---
M globalcollect_gateway/GlobalCollectOrphanRectifier.php
M globalcollect_gateway/orphan.adapter.php
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
3 files changed, 31 insertions(+), 32 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/globalcollect_gateway/GlobalCollectOrphanRectifier.php
b/globalcollect_gateway/GlobalCollectOrphanRectifier.php
index 4de9e49..ac404b1 100644
--- a/globalcollect_gateway/GlobalCollectOrphanRectifier.php
+++ b/globalcollect_gateway/GlobalCollectOrphanRectifier.php
@@ -36,7 +36,7 @@
protected $time_buffer;
/**
-* @var GatewayType Payments adapter to do the processing.
+* @var GlobalCollectOrphanAdapter Payments adapter to do the
processing.
*/
protected $adapter;
@@ -156,17 +156,25 @@
* fully rectified or not.
*
* @param array $normalized Orphaned message
-* @param boolean $query_contribution_tracking A flag specifying if we
-* should query the contribution_tracking table or not. Defaults to
true.
*
* @return boolean True if the orphan has been rectified, false if not.
*/
- protected function rectifyOrphan( $normalized,
$query_contribution_tracking = true ){
+ protected function rectifyOrphan( $normalized ){
$this->logger->info( "Rectifying orphan:
{$normalized['order_id']}" );
$is_rectified = false;
- $this->adapter->loadDataAndReInit( $normalized,
$query_contribution_tracking );
- $results = $this->adapter->do_transaction( 'Confirm_CreditCard'
);
+ $this->adapter->loadDataAndReInit( $normalized );
+ $civiId = $this->adapter->getData_Unstaged_Escaped(
'contribution_id' );
+ if ( $civiId ) {
+ $this->logger->error(
+ $normalized['contribution_tracking_id'] .
+ ": Contribution tracking already has
contribution_id $civiId. " .
+ 'Stop confusing donors!'
+ );
+ $results = $this->adapter->do_transaction(
'CANCEL_PAYMENT' );
+ } else {
+ $results = $this->adapter->do_transaction(
'Confirm_CreditCard' );
+ }
// FIXME: error message is squishy and inconsistent with the
error_map
// used elsewhere.
diff --git a/globalcollect_gateway/orphan.adapter.php
b/globalcollect_gateway/orphan.adapter.php
index 296b0d3..eb85ba8 100644
--- a/globalcollect_gateway/orphan.adapter.php
+++ b/globalcollect_gateway/orphan.adapter.php
@@ -2,7 +2,7 @@
class GlobalCollectOrphanAdapter extends GlobalCollectAdapter {
//Data we know to be good, that we always want to re-assert after a
load or an addData.
- //so far: order_id and the utm data we pull from contribution tracking.
+ //so far: order_id and the data we pull from contribution tracking.
protected $hard_data = array ( );
public static function getLogIdentifier() {
@@ -51,33 +51,21 @@
}
// FIXME: This needs some serious code reuse trickery.
- public function loadDataAndReInit( $data, $useDB = true ) {
+ public function loadDataAndReInit( $data ) {
//re-init all these arrays, because this is a batch thing.
$this->session_killAllEverything(); // just to be sure
$this->transaction_response = new PaymentTransactionResponse();
- $this->hard_data = array( );
+ $this->hard_data = array(
+ 'order_id' => $data['order_id']
+ );
$this->unstaged_data = array( );
$this->staged_data = array( );
-
- $this->hard_data['order_id'] = $data['order_id'];
$this->dataObj = new DonationData( $this, $data );
$this->unstaged_data = $this->dataObj->getDataEscaped();
- if ( $useDB ){
- $this->hard_data = array_merge( $this->hard_data,
$this->getUTMInfoFromDB() );
- } else {
- $utm_keys = array(
- 'utm_source',
- 'utm_campai
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revision::getText() was removed
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332933 )
Change subject: Revision::getText() was removed
..
Revision::getText() was removed
Bug: T154498
Change-Id: I29dcf768a9c176ca27b94359ac99cdc2b5ea930b
---
M RELEASE-NOTES-1.29
M includes/Revision.php
M tests/phpunit/includes/RevisionStorageTest.php
M tests/phpunit/includes/RevisionTest.php
4 files changed, 2 insertions(+), 63 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/33/332933/1
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index cbfd124..bc5af86 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -201,7 +201,8 @@
Use ContentHandlerDefaultModelFor instead.
* Hook TitleIsWikitextPage (deprecated in 1.21) was removed.
Use ContentHandlerDefaultModelFor instead.
-* Article::getContent (deprecated in 1.21) was removed.
+* Article::getContent() (deprecated in 1.21) was removed.
+* Revision::getText() (deprecated in 1.21) was removed.
== Compatibility ==
diff --git a/includes/Revision.php b/includes/Revision.php
index 8721ef9..d9e42ff 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1036,28 +1036,6 @@
}
/**
-* Fetch revision text if it's available to the specified audience.
-* If the specified audience does not have the ability to view this
-* revision, an empty string will be returned.
-*
-* @param int $audience One of:
-* Revision::FOR_PUBLIC to be displayed to all users
-* Revision::FOR_THIS_USERto be displayed to the given user
-* Revision::RAW get the text regardless of permissions
-* @param User $user User object to check for, only if FOR_THIS_USER is
passed
-* to the $audience parameter
-*
-* @deprecated since 1.21, use getContent() instead
-* @return string
-*/
- public function getText( $audience = self::FOR_PUBLIC, User $user =
null ) {
- wfDeprecated( __METHOD__, '1.21' );
-
- $content = $this->getContent( $audience, $user );
- return ContentHandler::getContentText( $content ); # returns
the raw content text, if applicable
- }
-
- /**
* Fetch revision content if it's available to the specified audience.
* If the specified audience does not have the ability to view this
* revision, null will be returned.
diff --git a/tests/phpunit/includes/RevisionStorageTest.php
b/tests/phpunit/includes/RevisionStorageTest.php
index 7d3007b..642ada2 100644
--- a/tests/phpunit/includes/RevisionStorageTest.php
+++ b/tests/phpunit/includes/RevisionStorageTest.php
@@ -275,18 +275,6 @@
}
/**
-* @covers Revision::getText
-*/
- public function testGetText() {
- $this->hideDeprecated( 'Revision::getText' );
-
- $orig = $this->makeRevision( [ 'text' => 'hello hello.' ] );
- $rev = Revision::newFromId( $orig->getId() );
-
- $this->assertEquals( 'hello hello.', $rev->getText() );
- }
-
- /**
* @covers Revision::getContent
*/
public function testGetContent_failure() {
diff --git a/tests/phpunit/includes/RevisionTest.php
b/tests/phpunit/includes/RevisionTest.php
index 767c963..c971a40 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -311,28 +311,6 @@
);
}
- function dataGetText() {
- // NOTE: we expect the help namespace to always contain wikitext
- return [
- [ 'hello world', 'Help:Hello', null, null,
Revision::FOR_PUBLIC, 'hello world' ],
- [ serialize( 'hello world' ), 'Hello', "testing", null,
Revision::FOR_PUBLIC, null ],
- [ serialize( 'hello world' ), 'Dummy:Hello', null,
null, Revision::FOR_PUBLIC, null ],
- ];
- }
-
- /**
-* @group Database
-* @dataProvider dataGetText
-* @covers Revision::getText
-*/
- public function testGetText( $text, $title, $model, $format, $audience,
$expectedText ) {
- $this->hideDeprecated( 'Revision::getText' );
-
- $rev = $this->newTestRevision( $text, $title, $model, $format );
-
- $this->assertEquals( $expectedText, $rev->getText( $audience )
);
- }
-
public function dataGetSize() {
return [
[ "hello world.", CONTENT_MODEL_WIKITEXT, 12 ],
@@ -375,14 +353,11 @@
* @covers Revision::__construct
*/
public function testConstructWithText() {
- $this->hideDeprecated( "Revision::getText" );
-
$rev = new Revision( [
'text' => 'hello world.',
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Hide implemented filters from existing static ...
Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332932 )
Change subject: RCFilters UI: Hide implemented filters from existing static list
..
RCFilters UI: Hide implemented filters from existing static list
This is a bit of a hack until a better, more consistent loading mechanism
can be figured out. For now, the existing Special:RecentChanges has filters
that are implemented in the new RCFilters system and some that are not.
We want to hide the filters that already appear in the RCFilters popup
but leave the ones that aren't, whether they are base filters or come
from an extension. If we hide individual elements for implemented
filters, we end up with a string of "| | | | " which are a pain to get
rid of.
Instead, this method steals the jQuery object of the current filters,
and goes over each one to see if it can recognize its existence.
If the filter is recognized, it's skipped. If it's unrecognized, its
span element is shoved back into the group, and will be displayed.
Enjoy.
Change-Id: I501e69c1cbc22755710007d13bfc6a1daea9404b
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
3 files changed, 71 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/32/332932/1
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index ea44b8b..95da0da 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -27,6 +27,66 @@
};
/**
+* Take the existing static filter list and rebuild it so that only
+* filters that are not reimplemented as filters in the current system
+* are appearing.
+*
+* This method expects the jQuery object of the children() of static
+* Special:RecentChanges under the span.rcshowhide block, and will
return
+* a suitable element to replace its contents.
+*
+* HACK: This entire method is a hack, to make sure that existing
filters that
+* are not implemented yet are still visible and operable to the user,
but
+* filters that are implemented in the new system aren't. Just hiding
the
+* spans of those filters creates a very ugly string that includes
multiple
+* pipes (" | | | | existing filter") so this method rebuilds the
structure
+* using only the relevant non-implemented filters, preserving current
view.
+*
+* NOTE: Since the entire method is one big hack, individual "HACK!"
comments
+* were spared below. To the observant pedantic reader - please
mentally add
+* "HACK" before each line of code.
+*
+* @param {jQuery} $filterList jQuery block of the current static
filters list
+* @return {jQuery} jQuery block of the new static filters to display
+*/
+ mw.rcfilters.Controller.prototype.rebuildStaticFilterList = function (
$filterList ) {
+ var filters = {},
+ controller = this,
+ $newStructure = $filterList.clone( true );
+
+ $newStructure
+ .empty()
+ .addClass( 'mw-rcfilters-rcshowhide' );
+ // Extract the filters
+ $filterList.children().each( function () {
+ var name,
+ classes = $( this ).attr( 'class' ).split( ' '
);
+
+ // Remove the 'rcshowhideoption' class; We're only doing
+ // this to make sure that we don't pick the wrong class
+ // if split() gave us the wrong order
+ classes.splice( classes.indexOf( 'rcshowhideoption' ),
1 );
+
+ // Get rid of the 'rcshow' prefix
+ // This is absolutely terrible, because we're making
+ // an assumption that all prefixes are these, but
+ // since the entire method is a temporary hack, we
+ // will pinch our noses and do it
+ name = classes[ 0 ].substr( 'rcshow'.length );
+
+ // Ignore filters that exist in the view model
+ if ( !controller.model.getItemByName( name ) ) {
+ // This filter doesn't exist, add its element
+ // back into the new structure
+ $newStructure.append( $( this ) );
+ }
+ } );
+
+ // Return the contents
+ return $newStructure;
+ };
+
+ /**
* Updat
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Article::getContent() was removed
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332931 )
Change subject: Article::getContent() was removed
..
Article::getContent() was removed
Bug: T154498
Change-Id: I27956d494cf19d1204988807130b43f77186db9b
---
M RELEASE-NOTES-1.29
M includes/page/Article.php
2 files changed, 1 insertion(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/31/332931/1
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index e404940..cbfd124 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -201,6 +201,7 @@
Use ContentHandlerDefaultModelFor instead.
* Hook TitleIsWikitextPage (deprecated in 1.21) was removed.
Use ContentHandlerDefaultModelFor instead.
+* Article::getContent (deprecated in 1.21) was removed.
== Compatibility ==
diff --git a/includes/page/Article.php b/includes/page/Article.php
index a33c84f..b8be294 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -198,24 +198,6 @@
}
/**
-* Note that getContent does not follow redirects anymore.
-* If you need to fetch redirectable content easily, try
-* the shortcut in WikiPage::getRedirectTarget()
-*
-* This function has side effects! Do not use this function if you
-* only want the real revision text if any.
-*
-* @deprecated since 1.21; use WikiPage::getContent() instead
-*
-* @return string Return the text of this revision
-*/
- public function getContent() {
- wfDeprecated( __METHOD__, '1.21' );
- $content = $this->getContentObject();
- return ContentHandler::getContentText( $content );
- }
-
- /**
* Returns a Content object representing the pages effective display
content,
* not necessarily the revision's content!
*
--
To view, visit https://gerrit.wikimedia.org/r/332931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27956d494cf19d1204988807130b43f77186db9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: install: make mw2251 use trusty installer (debug)
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332930 )
Change subject: install: make mw2251 use trusty installer (debug)
..
install: make mw2251 use trusty installer (debug)
Change-Id: I3ddb4f472b55bc4eb1e37be5195df837704bf5c4
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Papaul: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index dab10ae..20a3107 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5575,6 +5575,8 @@
host mw2251 {
hardware ethernet 18:66:DA:84:12:5B;
fixed-address mw2251.codfw.wmnet;
+option pxelinux.pathprefix "trusty-installer/";
+filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host mw2252 {
--
To view, visit https://gerrit.wikimedia.org/r/332930
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ddb4f472b55bc4eb1e37be5195df837704bf5c4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Papaul
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]: install: make mw2251 use trusty installer (debug)
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332930 )
Change subject: install: make mw2251 use trusty installer (debug)
..
install: make mw2251 use trusty installer (debug)
Change-Id: I3ddb4f472b55bc4eb1e37be5195df837704bf5c4
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/332930/1
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index a458a31..1531150 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -,6 +,8 @@
host mw2251 {
hardware ethernet 18:66:DA:84:12:5B;
fixed-address mw2251.codfw.wmnet;
+option pxelinux.pathprefix "trusty-installer/";
+filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
host mw2252 {
--
To view, visit https://gerrit.wikimedia.org/r/332930
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ddb4f472b55bc4eb1e37be5195df837704bf5c4
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]: Enable remaining restbase-dev* instances
Volans has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332876 ) Change subject: Enable remaining restbase-dev* instances .. Enable remaining restbase-dev* instances This may fail spectacularly when merged (you cannot simultaneously bootstrap nodes), but since the cluster contains no data, it should be easiest to just (re)start the failed ones one by one (they should bootstrap/join almost instantly). Bug: T153880 Change-Id: I0d8af1bcc1b7626df2263ada92e8269c35686c2f --- M hieradata/hosts/restbase-dev1001.yaml M hieradata/hosts/restbase-dev1002.yaml M hieradata/hosts/restbase-dev1003.yaml 3 files changed, 29 insertions(+), 29 deletions(-) Approvals: Eevans: Looks good to me, but someone else must approve jenkins-bot: Verified Volans: Looks good to me, approved diff --git a/hieradata/hosts/restbase-dev1001.yaml b/hieradata/hosts/restbase-dev1001.yaml index b3b5303..482406d 100644 --- a/hieradata/hosts/restbase-dev1001.yaml +++ b/hieradata/hosts/restbase-dev1001.yaml @@ -5,10 +5,10 @@ listen_address: 10.64.0.36 rpc_address: 10.64.0.36 rpc_interface: eth0 -# b: -#jmx_port: 7190 -#listen_address: 10.64.0.37 -#rpc_address: 10.64.0.37 -#rpc_interface: eth0 + b: +jmx_port: 7190 +listen_address: 10.64.0.37 +rpc_address: 10.64.0.37 +rpc_interface: eth0 do_paging: false diff --git a/hieradata/hosts/restbase-dev1002.yaml b/hieradata/hosts/restbase-dev1002.yaml index 135f898..8ddbeb6 100644 --- a/hieradata/hosts/restbase-dev1002.yaml +++ b/hieradata/hosts/restbase-dev1002.yaml @@ -1,14 +1,14 @@ -#cassandra::rack: 'rack2' -#cassandra::instances: -# a: -#jmx_port: 7189 -#listen_address: 10.64.32.159 -#rpc_address: 10.64.32.159 -#rpc_interface: eth0 -# b: -#jmx_port: 7190 -#listen_address: 10.64.32.160 -#rpc_address: 10.64.32.160 -#rpc_interface: eth0 +cassandra::rack: 'rack2' +cassandra::instances: + a: +jmx_port: 7189 +listen_address: 10.64.32.159 +rpc_address: 10.64.32.159 +rpc_interface: eth0 + b: +jmx_port: 7190 +listen_address: 10.64.32.160 +rpc_address: 10.64.32.160 +rpc_interface: eth0 do_paging: false diff --git a/hieradata/hosts/restbase-dev1003.yaml b/hieradata/hosts/restbase-dev1003.yaml index 27de4f0..e674e0b 100644 --- a/hieradata/hosts/restbase-dev1003.yaml +++ b/hieradata/hosts/restbase-dev1003.yaml @@ -1,14 +1,14 @@ -#cassandra::rack: 'rack3' -#cassandra::instances: -# a: -#jmx_port: 7189 -#listen_address: 10.64.48.117 -#rpc_address: 10.64.48.117 -#rpc_interface: eth0 -# b: -#jmx_port: 7190 -#listen_address: 10.64.48.118 -#rpc_address: 10.64.48.118 -#rpc_interface: eth0 +cassandra::rack: 'rack3' +cassandra::instances: + a: +jmx_port: 7189 +listen_address: 10.64.48.117 +rpc_address: 10.64.48.117 +rpc_interface: eth0 + b: +jmx_port: 7190 +listen_address: 10.64.48.118 +rpc_address: 10.64.48.118 +rpc_interface: eth0 do_paging: false -- To view, visit https://gerrit.wikimedia.org/r/332876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d8af1bcc1b7626df2263ada92e8269c35686c2f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Eevans Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Eevans Gerrit-Reviewer: Filippo Giunchedi Gerrit-Reviewer: Mobrovac 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] mediawiki...Collection[master]: Move all functions into CollectionAjaxFunctions file in prep...
Hello Chad, Reedy, C. Scott Ananian, Addshore, Legoktm, MaxSem, jenkins-bot,
Siebrand, MarkAHershberger, Thiemo Mättig (WMDE), Jforrester,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/332929
to review the following change.
Change subject: Move all functions into CollectionAjaxFunctions file in
preparation for extension.json
..
Move all functions into CollectionAjaxFunctions file in preparation for
extension.json
Change-Id: I240b65f68d3023d21be3f281deaaaf07e1105391
---
M Collection.php
A CollectionAjaxFunctions.php
2 files changed, 258 insertions(+), 253 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection
refs/changes/29/332929/1
diff --git a/Collection.php b/Collection.php
index 8587dfd..80852a9 100644
--- a/Collection.php
+++ b/Collection.php
@@ -176,6 +176,7 @@
$wgAutoloadClasses['SpecialCollection'] = __DIR__ . '/Collection.body.php';
$wgAutoloadClasses['CollectionSession'] = __DIR__ . '/Collection.session.php';
$wgAutoloadClasses['CollectionHooks'] = __DIR__ . '/Collection.hooks.php';
+$wgAutoloadClasses['CollectionAjaxFunctions'] = __DIR__ .
'/CollectionAjaxFunctions.php';
$wgAutoloadClasses['CollectionSuggest'] = __DIR__ . '/Collection.suggest.php';
$wgAutoloadClasses['CollectionProposals'] = __DIR__ .
'/Collection.suggest.php';
@@ -250,275 +251,42 @@
# register global Ajax functions:
-function wfAjaxGetCollection() {
- if ( isset( $_SESSION['wsCollection'] ) ) {
- $collection = $_SESSION['wsCollection'];
- } else {
- $collection = array();
- }
- $r = new AjaxResponse( FormatJson::encode( array( 'collection' =>
$collection ) ) );
- $r->setContentType( 'application/json' );
- return $r;
-}
+$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxGetCollection';
-$wgAjaxExportList[] = 'wfAjaxGetCollection';
+$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxPostCollection';
-function wfAjaxPostCollection( $collection = '', $redirect = '' ) {
- if ( session_id() == '' ) {
- wfSetupSession();
- }
- $collection = FormatJson::decode( $collection, true );
- $collection['enabled'] = true;
- $_SESSION['wsCollection'] = $collection;
- $r = new AjaxResponse();
- if ( $redirect ) {
- $title = Title::newFromText( $redirect );
- $redirecturl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT
);
- $r->setResponseCode( 302 );
- header( 'Location: ' . $redirecturl );
- } else {
- $title = SpecialPage::getTitleFor( 'Book' );
- $redirecturl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT
);
- $r->setContentType( 'application/json' );
- $r->addText( FormatJson::encode( array( 'redirect_url' =>
$redirecturl ) ) );
- }
- return $r;
-}
+$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxGetMWServeStatus';
-$wgAjaxExportList[] = 'wfAjaxPostCollection';
+$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddArticle';
-function wfAjaxGetMWServeStatus( $collection_id = '', $writer = 'rl' ) {
- $response = CollectionRenderingAPI::instance( $writer )
- ->getRenderStatus( $collection_id );
- $result = $response->response;
- if ( isset( $result['status']['progress'] ) ) {
- $result['status']['progress'] = number_format(
$result['status']['progress'], 2, '.', '' );
- }
- $r = new AjaxResponse( FormatJson::encode( $result ) );
- $r->setContentType( 'application/json' );
- return $r;
-}
+$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRemoveArticle';
-$wgAjaxExportList[] = 'wfAjaxGetMWServeStatus';
+$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddCategory';
-function wfAjaxCollectionAddArticle( $namespace = 0, $title = '', $oldid = ''
) {
- SpecialCollection::addArticleFromName( $namespace, $title, $oldid );
- return wfAjaxCollectionGetItemList();
-}
+$wgAjaxExportList[] =
'CollectionAjaxFunctions::onAjaxCollectionGetBookCreatorBoxContent';
-$wgAjaxExportList[] = 'wfAjaxCollectionAddArticle';
+$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionGetItemList';
-function wfAjaxCollectionRemoveArticle( $namespace = 0, $title = '', $oldid =
'' ) {
- SpecialCollection::removeArticleFromName( $namespace, $title, $oldid );
- return wfAjaxCollectionGetItemList();
-}
+$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRemoveItem';
-$wgAjaxExportList[] = 'wfAjaxCollectionRemoveArticle';
+$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddChapter';
-function wfAjaxCollectionAddCategory( $title = '' ) {
- SpecialCollection::addCategoryFromName( $title );
- return wfAjaxCollectionGetItemList();
-}
+$wgAjaxEx
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[mfui]: Hygiene: Skin moved to mobile.frontend library
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332928 )
Change subject: Hygiene: Skin moved to mobile.frontend library
..
Hygiene: Skin moved to mobile.frontend library
Change-Id: Ieb5cb151c009b40f41b4f6acbd0f33feac876914
---
R build_resources/mobile.frontend/Skin.js
M build_resources/mobile.frontend/index.js
M extension.json
M includes/MobileFrontend.hooks.php
M resources/mobile.frontend/index.js
M resources/skins.minerva.scripts/preInit.js
R tests/qunit/mobile.frontend/test_Skin.js
7 files changed, 393 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/28/332928/1
diff --git a/resources/mobile.startup/Skin.js
b/build_resources/mobile.frontend/Skin.js
similarity index 98%
rename from resources/mobile.startup/Skin.js
rename to build_resources/mobile.frontend/Skin.js
index 7b4579d..d6fddb1 100644
--- a/resources/mobile.startup/Skin.js
+++ b/build_resources/mobile.frontend/Skin.js
@@ -1,8 +1,8 @@
( function ( M, $ ) {
- var browser = mw.mf.Browser.getSingleton(),
- View = mw.mf.View,
- icons = mw.mf.icons;
+ var browser = require( './Browser' ).getSingleton(),
+ View = require( './View' ),
+ icons = require( './icons' );
/**
* Get the id of the section $el belongs to.
@@ -372,6 +372,6 @@
} );
Skin.getSectionId = getSectionId;
- M.define( 'mobile.startup/Skin', Skin );
+ module.exports = Skin;
}( mw.mobileFrontend, jQuery ) );
diff --git a/build_resources/mobile.frontend/index.js
b/build_resources/mobile.frontend/index.js
index 5d3dfc3..3f1415c 100644
--- a/build_resources/mobile.frontend/index.js
+++ b/build_resources/mobile.frontend/index.js
@@ -2,6 +2,7 @@
icons: require( './icons' ),
Browser: require( './Browser' ),
Icon: require( './Icon' ),
+ Skin: require( './Skin' ),
View: require( './View' ),
util: require( './util.js' )
};
diff --git a/extension.json b/extension.json
index e1b8ea2..95c08f4 100644
--- a/extension.json
+++ b/extension.json
@@ -579,7 +579,6 @@
"resources/mobile.startup/Section.js",
"resources/mobile.startup/Thumbnail.js",
"resources/mobile.startup/Page.js",
- "resources/mobile.startup/Skin.js",
"resources/mobile.startup/OverlayManager.js"
],
"position": "bottom"
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index fb6013f..4b1f637 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -329,6 +329,7 @@
$dependencies[] = 'mobile.frontend';
$testFiles[] = 'tests/qunit/mobile.frontend/test_browser.js';
$testFiles[] = 'tests/qunit/mobile.frontend/test_View.js';
+ $testFiles[] = 'tests/qunit/mobile.frontend/test_Skin.js';
$testModule = [
'dependencies' => $dependencies,
diff --git a/resources/mobile.frontend/index.js
b/resources/mobile.frontend/index.js
index 99fe584..3ab9cb8 100644
--- a/resources/mobile.frontend/index.js
+++ b/resources/mobile.frontend/index.js
@@ -48,8 +48,9 @@
icons: __webpack_require__( 1 ),
Browser: __webpack_require__( 8 ),
Icon: __webpack_require__( 2 ),
+ Skin: __webpack_require__( 9 ),
View: __webpack_require__( 3 ),
- util: __webpack_require__( 9 )
+ util: __webpack_require__( 10 )
};
@@ -1571,6 +1572,389 @@
/***/ },
/* 9 */
+/***/ function(module, exports, __webpack_require__) {
+
+ ( function ( M, $ ) {
+
+ var browser = __webpack_require__( 8 ).getSingleton(),
+ View = __webpack_require__( 3 ),
+ icons = __webpack_require__( 1 );
+
+ /**
+* Get the id of the section $el belongs to.
+* @param {jQuery.Object} $el
+* @return {string|null} either the anchor (id attribute of the
section heading
+* or null if none found)
+* @ignore
+*/
+ function getSectionId( $el ) {
+ var id,
+ hSelector = 'h1,h2,h3,h4,h5,h6',
+ $parent = $el.parent(),
+ // e.g. matches Subheading in
+ // HSubh
+ $heading = $el.prevAll( hSelector ).eq( 0 );
+
+ if ( $heading.length ) {
+ id = $heading.find( '.mw-headline' ).attr( 'id'
);
+
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[mfui]: WIP: Building of common code is done by webpack
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332924 )
Change subject: WIP: Building of common code is done by webpack
..
WIP: Building of common code is done by webpack
Change-Id: I2e3e71a3b709aa029e1087e442178ba13c1e9d0b
---
R build_resources/mobile.frontend/Browser.js
A build_resources/mobile.frontend/index.js
A build_resources/mobile.frontend/util.js
M extension.json
M includes/MobileFrontend.hooks.php
M package.json
M resources/mobile.editor.common/EditorOverlayBase.js
A resources/mobile.frontend/index.js
M resources/mobile.mainMenu/MainMenu.js
M resources/mobile.nearby/Nearby.js
M resources/mobile.overlays/Overlay.js
M resources/mobile.pagelist/PageList.js
M resources/mobile.startup/Skin.js
D resources/mobile.startup/util.js
M resources/mobile.toggle/toggle.js
M resources/skins.minerva.backtotop/init.js
M resources/skins.minerva.newusers/init.js
M resources/skins.minerva.scripts/search.js
R tests/qunit/mobile.frontend/test_browser.js
M tests/qunit/mobile.toggle/test_toggle.js
A webpack.config.js
21 files changed, 408 insertions(+), 75 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/24/332924/1
diff --git a/resources/mobile.browser/browser.js
b/build_resources/mobile.frontend/Browser.js
similarity index 98%
rename from resources/mobile.browser/browser.js
rename to build_resources/mobile.frontend/Browser.js
index 1ac1ade..d72cfad 100644
--- a/resources/mobile.browser/browser.js
+++ b/build_resources/mobile.frontend/Browser.js
@@ -205,5 +205,5 @@
return browser;
};
- M.define( 'mobile.browser/Browser', Browser );
+ module.exports = Browser;
}( mw.mobileFrontend, jQuery ) );
diff --git a/build_resources/mobile.frontend/index.js
b/build_resources/mobile.frontend/index.js
new file mode 100644
index 000..3ad67d0
--- /dev/null
+++ b/build_resources/mobile.frontend/index.js
@@ -0,0 +1,4 @@
+module.exports = mediaWiki.mf = {
+ Browser: require( './Browser' ),
+ util: require( './util.js' )
+};
diff --git a/build_resources/mobile.frontend/util.js
b/build_resources/mobile.frontend/util.js
new file mode 100644
index 000..e82339d
--- /dev/null
+++ b/build_resources/mobile.frontend/util.js
@@ -0,0 +1,41 @@
+var util;
+
+/**
+ * Utility library
+ * @class util
+ * @singleton
+ */
+util = {
+ /**
+* Escape dots and colons in a hash, jQuery doesn't like them beause
they
+* look like CSS classes and pseudoclasses. See
+* http://bugs.jquery.com/ticket/5241
+*
http://stackoverflow.com/questions/350292/how-do-i-get-jquery-to-select-elements-with-a-period-in-their-id
+*
+* @method
+* @param {string} hash A hash to escape
+* @return {string}
+*/
+ escapeHash: function ( hash ) {
+ return hash.replace( /(:|\.)/g, '\\$1' );
+ },
+ /**
+* Return wgWikiBaseItemID config variable or 'wikidataid' query
parameter if exits
+* @return {null|string}
+*/
+ getWikiBaseItemId: function () {
+ var id = mw.config.get( 'wgWikibaseItemId' ),
+ idOverride;
+
+ if ( !id ) {
+ idOverride = mw.util.getParamValue( 'wikidataid' );
+ if ( idOverride ) {
+ mw.config.set( 'wgWikibaseItemId', idOverride );
+ id = idOverride;
+ }
+ }
+ return id;
+ }
+};
+
+module.exports = util;
diff --git a/extension.json b/extension.json
index 4e27aa9..2c0ad61 100644
--- a/extension.json
+++ b/extension.json
@@ -331,18 +331,6 @@
"resources/mobile.context/context.js"
]
},
- "mobile.browser": {
- "targets": [
- "mobile",
- "desktop"
- ],
- "dependencies": [
- "mobile.view"
- ],
- "scripts": [
- "resources/mobile.browser/browser.js"
- ]
- },
"mobile.mainMenu.icons": {
"class": "ResourceLoaderImageModule",
"selector": ".mw-ui-icon-mf-{name}:before",
@@ -366,7 +354,7 @@
"dependencies": [
"mobile.mainMenu.icons",
"mobile.view",
- "mobile.browser",
+ "mobile.frontend",
"mobile.loggingSchemas.mobileWebMainMenuClickTracking"
],
"position": "bottom",
@@ -444,7 +432,7 @@
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[mfui]: WIP: View now packaged
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332925 )
Change subject: WIP: View now packaged
..
WIP: View now packaged
Change-Id: Ic3136b2d6434fecf02aae8ff81a525b82b13ddf1
---
A build_resources/mobile.frontend/View.js
M build_resources/mobile.frontend/index.js
M extension.json
M includes/MobileFrontend.hooks.php
M resources/mobile.abusefilter/AbuseFilterPanel.js
M resources/mobile.backtotop/BackToTopOverlay.js
M resources/mobile.fontchanger/FontChanger.js
M resources/mobile.frontend/index.js
M resources/mobile.gallery/PhotoItem.js
M resources/mobile.gallery/PhotoList.js
M resources/mobile.mainMenu/MainMenu.js
M resources/mobile.messageBox/MessageBox.js
M resources/mobile.overlays/Overlay.js
M resources/mobile.pagelist/PageList.js
M resources/mobile.special.mobileoptions.scripts/mobileoptions.js
M resources/mobile.startup/Anchor.js
M resources/mobile.startup/Button.js
M resources/mobile.startup/Icon.js
M resources/mobile.startup/Page.js
M resources/mobile.startup/Panel.js
M resources/mobile.startup/Section.js
M resources/mobile.startup/Skin.js
M resources/mobile.startup/Thumbnail.js
M resources/mobile.toc/TableOfContents.js
D resources/mobile.view/View.js
M resources/mobile.watchstar/Watchstar.js
R tests/qunit/mobile.frontend/test_View.js
27 files changed, 750 insertions(+), 397 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/25/332925/1
diff --git a/build_resources/mobile.frontend/View.js
b/build_resources/mobile.frontend/View.js
new file mode 100644
index 000..a0e4068
--- /dev/null
+++ b/build_resources/mobile.frontend/View.js
@@ -0,0 +1,357 @@
+var
+ // Cached regex to split keys for `delegate`.
+ delegateEventSplitter = /^(\S+)\s*(.*)$/,
+ idCounter = 0;
+
+/**
+ * Generate a unique integer id (unique within the entire client session).
+ * Useful for temporary DOM ids.
+ * @ignore
+ * @param {string} prefix Prefix to be used when generating the id.
+ * @return {string}
+ */
+function uniqueId( prefix ) {
+ var id = ( ++idCounter ).toString();
+ return prefix ? prefix + id : id;
+}
+
+/**
+ * Should be extended using extend().
+ *
+ * When options contains el property, this.$el in the constructed object
+ * will be set to the corresponding jQuery object. Otherwise, this.$el
+ * will be an empty div.
+ *
+ * When extended using extend(), if the extended prototype contains
+ * template property, this.$el will be filled with rendered template (with
+ * options parameter used as template data).
+ *
+ * template property can be a string which will be passed to
mw.template.compile()
+ * or an object that has a render() function which accepts an object with
+ * template data as its argument (similarly to an object created by
+ * mw.template.compile()).
+ *
+ * You can also define a defaults property which should be an object
+ * containing default values for the template (if they're not present in
+ * the options parameter).
+ *
+ * If this.$el is not a jQuery object bound to existing DOM element, the
+ * view can be attached to an element using appendTo(), prependTo(),
+ * insertBefore(), insertAfter() proxy functions.
+ *
+ * append(), prepend(), before(), after() can be used to modify $el. on()
+ * can be used to bind events.
+ *
+ * You can also use declarative DOM events binding by specifying an `events`
+ * map on the class. The keys will be 'event selector' and the value can be
+ * either the name of a method to call, or a function. All methods and
+ * functions will be executed on the context of the View.
+ *
+ * Inspired from Backbone.js
+ * https://github.com/jashkenas/backbone/blob/master/backbone.js#L1128
+ *
+ * @example
+ *
+ * var MyComponent = View.extend( {
+ * events: {
+ *'mousedown .title': 'edit',
+ *'click .button': 'save',
+ *'click .open': function(e) { ... }
+ * },
+ * edit: function ( ev ) {
+ * //...
+ * },
+ * save: function ( ev ) {
+ * //...
+ * }
+ * } );
+ *
+ *
+ * @class View
+ * @mixins OO.EventEmitter
+ * Example:
+ * @example
+ *
+ * var View, section;
+ * function Section( options ) {
+ * View.call( this, options );
+ * }
+ * View = mw.mf.View;
+ * OO.mfExtend( Section, View, {
+ * template: mw.template.compile( "{{title}}
" ),
+ * } );
+ * section = new Section( { title: 'Test', text: 'Test section body' } );
+ * section.appendTo( 'body' );
+ *
+ */
+function View() {
+ this.initialize.apply( this, arguments );
+}
+OO.mixinClass( View, OO.EventEmitter );
+OO.mfExtend( View, {
+ /**
+* A css class to apply to the containing element of the View.
+* @property {string} className
+*/
+ className: undefined,
+ /**
+* Name of tag that contains the re
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[mfui]: Hygiene: icons moved to build_resources
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332927 )
Change subject: Hygiene: icons moved to build_resources
..
Hygiene: icons moved to build_resources
Change-Id: I7ed4985786fd3fb2546e0d7b5abb8972d8565337
---
R build_resources/mobile.frontend/icons.js
M build_resources/mobile.frontend/index.js
M extension.json
M resources/mobile.categories.overlays/CategoryAddOverlay.js
M resources/mobile.frontend/index.js
M resources/mobile.gallery/PhotoList.js
M resources/mobile.nearby/Nearby.js
M resources/mobile.overlays/Overlay.js
M resources/mobile.references/ReferencesDrawer.js
M resources/mobile.startup/Section.js
M resources/mobile.startup/Skin.js
M resources/skins.minerva.notifications/init.js
12 files changed, 261 insertions(+), 214 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/27/332927/1
diff --git a/resources/mobile.startup/icons.js
b/build_resources/mobile.frontend/icons.js
similarity index 91%
rename from resources/mobile.startup/icons.js
rename to build_resources/mobile.frontend/icons.js
index 3ee54b9..bd98a80 100644
--- a/resources/mobile.startup/icons.js
+++ b/build_resources/mobile.frontend/icons.js
@@ -1,6 +1,6 @@
( function ( M, $ ) {
- var Icon = mw.mf.Icon;
+ var Icon = require( './Icon' );
/**
* A set of shared icons.
@@ -13,7 +13,7 @@
* @singleton
* @uses Icon
*/
- M.define( 'mobile.startup/icons', {
+ module.exports = {
/**
* Gets a spinner icon.
@@ -33,6 +33,6 @@
additionalClassNames: 'spinner loading'
} ) );
}
- } );
+ };
}( mw.mobileFrontend, jQuery ) );
diff --git a/build_resources/mobile.frontend/index.js
b/build_resources/mobile.frontend/index.js
index d99043d..5d3dfc3 100644
--- a/build_resources/mobile.frontend/index.js
+++ b/build_resources/mobile.frontend/index.js
@@ -1,4 +1,5 @@
module.exports = mediaWiki.mf = {
+ icons: require( './icons' ),
Browser: require( './Browser' ),
Icon: require( './Icon' ),
View: require( './View' ),
diff --git a/extension.json b/extension.json
index f95320f..e1b8ea2 100644
--- a/extension.json
+++ b/extension.json
@@ -534,6 +534,9 @@
"dependencies": [
"mobile.oo"
],
+ "messages": [
+ "mobile-frontend-loading-message"
+ ],
"scripts": [
"resources/mobile.frontend/index.js"
]
@@ -561,7 +564,6 @@
"button.hogan":
"resources/mobile.startup/button.hogan"
},
"messages": [
- "mobile-frontend-loading-message",
"mobile-frontend-editor-licensing",
"mobile-frontend-editor-licensing-with-terms",
"mobile-frontend-editor-terms-link"
@@ -573,7 +575,6 @@
"resources/mobile.startup/PageGateway.js",
"resources/mobile.startup/Anchor.js",
"resources/mobile.startup/Button.js",
- "resources/mobile.startup/icons.js",
"resources/mobile.startup/Panel.js",
"resources/mobile.startup/Section.js",
"resources/mobile.startup/Thumbnail.js",
diff --git a/resources/mobile.categories.overlays/CategoryAddOverlay.js
b/resources/mobile.categories.overlays/CategoryAddOverlay.js
index 13a4b66..a6f4d2d 100644
--- a/resources/mobile.categories.overlays/CategoryAddOverlay.js
+++ b/resources/mobile.categories.overlays/CategoryAddOverlay.js
@@ -3,7 +3,7 @@
var Overlay = M.require( 'mobile.overlays/Overlay' ),
CategoryGateway = M.require(
'mobile.categories.overlays/CategoryGateway' ),
CategoryLookupInputWidget = M.require(
'mobile.categories.overlays/CategoryLookupInputWidget' ),
- icons = M.require( 'mobile.startup/icons' ),
+ icons = mw.mf.icons,
toast = M.require( 'mobile.toast/toast' );
/**
diff --git a/resources/mobile.frontend/index.js
b/resources/mobile.frontend/index.js
index e7641f8..99fe584 100644
--- a/resources/mobile.frontend/index.js
+++ b/resources/mobile.frontend/index.js
@@ -45,225 +45,55 @@
/***/ function(module, exports, __webpack_require__) {
module.exports = mediaWiki.mf = {
- Browser: __webpack_require__( 1 ),
+ icons: __webpack_require__( 1 ),
+ Browser: __webpack_require__( 8 ),
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[mfui]: Icon moved to precompiled mobile.frontend module
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332926 )
Change subject: Icon moved to precompiled mobile.frontend module
..
Icon moved to precompiled mobile.frontend module
Change-Id: If9dca17ecfecc385928ba326e39134cfbdb32f72
---
R build_resources/mobile.frontend/Icon.js
M build_resources/mobile.frontend/index.js
R build_resources/mobile.frontend/templates/icon.hogan
M extension.json
M package.json
M resources/mobile.drawers/CtaDrawer.js
M resources/mobile.drawers/Drawer.js
M resources/mobile.editor.common/EditorOverlayBase.js
M resources/mobile.frontend/index.js
M resources/mobile.issues/CleanupOverlay.js
M resources/mobile.mediaViewer/ImageOverlay.js
M resources/mobile.overlays/Overlay.js
M resources/mobile.patrol.ajax/init.js
M resources/mobile.references/ReferencesDrawer.js
M resources/mobile.search/SearchOverlay.js
M resources/mobile.special.nearby.scripts/nearby.js
M resources/mobile.startup/icons.js
M resources/mobile.talk.overlays/TalkSectionAddOverlay.js
M resources/mobile.toc/TableOfContents.js
M resources/mobile.toggle/toggle.js
M resources/mobile.watchstar/Watchstar.js
M resources/skins.minerva.editor/init.js
M tests/qunit/mobile.pagelist.scripts/test_WatchstarPageList.js
M tests/qunit/mobile.watchlist/test_WatchList.js
M tests/qunit/mobile.watchstar/test_Watchstar.js
M webpack.config.js
26 files changed, 952 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/26/332926/1
diff --git a/resources/mobile.startup/Icon.js
b/build_resources/mobile.frontend/Icon.js
similarity index 93%
rename from resources/mobile.startup/Icon.js
rename to build_resources/mobile.frontend/Icon.js
index 0cdba11..15728b8 100644
--- a/resources/mobile.startup/Icon.js
+++ b/build_resources/mobile.frontend/Icon.js
@@ -1,6 +1,6 @@
( function ( M, $ ) {
- var View = mw.mf.View;
+ var View = require( './View.js' );
/**
* A wrapper for creating an icon.
@@ -70,9 +70,9 @@
toHtmlString: function () {
return $( '' ).append( this.$el ).html();
},
- template: mw.template.get( 'mobile.startup', 'icon.hogan' )
+ template: require( './templates/icon.hogan' )
} );
- M.define( 'mobile.startup/Icon', Icon );
+ module.exports = Icon;
}( mw.mobileFrontend, jQuery ) );
diff --git a/build_resources/mobile.frontend/index.js
b/build_resources/mobile.frontend/index.js
index 08acc21..d99043d 100644
--- a/build_resources/mobile.frontend/index.js
+++ b/build_resources/mobile.frontend/index.js
@@ -1,5 +1,6 @@
module.exports = mediaWiki.mf = {
Browser: require( './Browser' ),
+ Icon: require( './Icon' ),
View: require( './View' ),
util: require( './util.js' )
};
diff --git a/resources/mobile.startup/icon.hogan
b/build_resources/mobile.frontend/templates/icon.hogan
similarity index 100%
rename from resources/mobile.startup/icon.hogan
rename to build_resources/mobile.frontend/templates/icon.hogan
diff --git a/extension.json b/extension.json
index 3d10e29..f95320f 100644
--- a/extension.json
+++ b/extension.json
@@ -557,7 +557,6 @@
],
"templates": {
"anchor.hogan":
"resources/mobile.startup/anchor.hogan",
- "icon.hogan":
"resources/mobile.startup/icon.hogan",
"Section.hogan":
"resources/mobile.startup/Section.hogan",
"button.hogan":
"resources/mobile.startup/button.hogan"
},
@@ -574,7 +573,6 @@
"resources/mobile.startup/PageGateway.js",
"resources/mobile.startup/Anchor.js",
"resources/mobile.startup/Button.js",
- "resources/mobile.startup/Icon.js",
"resources/mobile.startup/icons.js",
"resources/mobile.startup/Panel.js",
"resources/mobile.startup/Section.js",
diff --git a/package.json b/package.json
index 0234171..4202945 100644
--- a/package.json
+++ b/package.json
@@ -1,24 +1,25 @@
{
- "private": true,
- "scripts": {
- "test": "grunt test && npm run doc",
- "build": "webpack",
- "predoc": "bundle install --path vendor/bundle",
- "doc": "bundle exec jsduck"
- },
- "dependencies": {
- "jsdoc": "3.4.2",
- "svgo": ">=0.4.4"
- },
- "devDependencies": {
- "eslint-config-wikimedia": "0.3.0",
- "grunt": "^1.0.1",
- "grunt-banana-checker": "^0.5.0",
- "grunt-contrib-watch": "^1.0.0",
- "grunt-eslint": "1
[MediaWiki-commits] [Gerrit] mediawiki...InterwikiSorting[master]: Remove out of date doc
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332886 )
Change subject: Remove out of date doc
..
Remove out of date doc
Change-Id: I1e9bb4cc4ac5b29fa088bb2b60a1eed4131f8730
---
M src/InterwikiSorter.php
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/InterwikiSorter.php b/src/InterwikiSorter.php
index 02ced82..1456286 100644
--- a/src/InterwikiSorter.php
+++ b/src/InterwikiSorter.php
@@ -12,9 +12,6 @@
*/
class InterwikiSorter {
- /**
-* @see Documentation of "sort" and "interwikiSortOrders" options in
docs/options.wiki.
-*/
const SORT_CODE = 'code';
/**
--
To view, visit https://gerrit.wikimedia.org/r/332886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e9bb4cc4ac5b29fa088bb2b60a1eed4131f8730
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiSorting
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Andrew-WMDE
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: WMDE-Fisch
Gerrit-Reviewer: WMDE-leszek
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]: Hygiene: Remove getWikiBaseItemId util
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332923 )
Change subject: Hygiene: Remove getWikiBaseItemId util
..
Hygiene: Remove getWikiBaseItemId util
Method is not used anywhere.
Bug: T155595
Change-Id: Ic3aaf95791a8e85efa56408ef2a40ed9cac1d4bd
---
M resources/mobile.startup/util.js
1 file changed, 0 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/23/332923/1
diff --git a/resources/mobile.startup/util.js b/resources/mobile.startup/util.js
index 95d7bc8..473722e 100644
--- a/resources/mobile.startup/util.js
+++ b/resources/mobile.startup/util.js
@@ -19,23 +19,6 @@
*/
escapeHash: function ( hash ) {
return hash.replace( /(:|\.)/g, '\\$1' );
- },
- /**
-* Return wgWikiBaseItemID config variable or 'wikidataid'
query parameter if exits
-* @return {null|string}
-*/
- getWikiBaseItemId: function () {
- var id = mw.config.get( 'wgWikibaseItemId' ),
- idOverride;
-
- if ( !id ) {
- idOverride = mw.util.getParamValue(
'wikidataid' );
- if ( idOverride ) {
- mw.config.set( 'wgWikibaseItemId',
idOverride );
- id = idOverride;
- }
- }
- return id;
}
};
--
To view, visit https://gerrit.wikimedia.org/r/332923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3aaf95791a8e85efa56408ef2a40ed9cac1d4bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Replace jshint/jscs with eslint and add stylelint
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332762 )
Change subject: Replace jshint/jscs with eslint and add stylelint
..
Replace jshint/jscs with eslint and add stylelint
Change-Id: I9c33c65c913d891739b913d5363abba66c2cd0dd
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
A .stylelintrc
M FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
M FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
M Gruntfile.js
M maintenance/GenerateFancyCaptchas.php
M package.json
M resources/ext.confirmEdit.editPreview.ipwhitelist.styles.css
11 files changed, 44 insertions(+), 39 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..4843240
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,10 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true
+ },
+ "globals": {
+ "mediaWiki": false
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 9d22e3f..000
--- a/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "preset": "wikimedia"
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 82eaa05..000
--- a/.jshintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/**
-vendor/**
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index e1c2afe..000
--- a/.jshintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "globals": {
- "mediaWiki": true,
- "jQuery": true
- }
-}
-
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 000..2c90730
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,3 @@
+{
+ "extends": "stylelint-config-wikimedia"
+}
diff --git a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
index 96e4dd6..3be8933 100644
--- a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
+++ b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
@@ -1,6 +1,6 @@
.fancycaptcha-wrapper {
display: table;
- background-color: #FFF;
+ background-color: #fff;
}
/* Prevents the size of the container from changing, affecting page
@@ -11,27 +11,28 @@
display: inline-block;
}
-.client-nojs .fancycaptcha-reload {
- display: none;
-}
-
.fancycaptcha-reload {
/* @embed */
- background: url(images/fancycaptcha-reload-icon.png) no-repeat scroll
left center transparent;
+ background: url( images/fancycaptcha-reload-icon.png ) no-repeat scroll
left center transparent;
margin: 0 0 0 3px;
padding: 1px 2px 1px 12px;
- color: #0645AD;
+ color: #0645ad;
cursor: pointer;
cursor: hand;
+}
+
+.client-nojs .fancycaptcha-reload {
+ display: none;
}
.fancycaptcha-reload:hover {
text-decoration: underline;
}
+
.fancycaptcha-reload-loading {
/* @embed */
- background: url(images/ajax-loader-10x10.gif) no-repeat scroll left
center transparent;
+ background: url( images/ajax-loader-10x10.gif ) no-repeat scroll left
center transparent;
}
.fancycaptcha-image-container .fancycaptcha-reload {
diff --git a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
index c010db8..b57b965 100644
--- a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
+++ b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
@@ -42,4 +42,4 @@
return false;
} );
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/Gruntfile.js b/Gruntfile.js
index 4e1660c..97f1b48 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,19 +1,22 @@
-/*jshint node:true */
+/* eslint-env node */
module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
- jshint: {
+ eslint: {
all: [
'**/*.js',
'!node_modules/**'
]
},
- jscs: {
- src: '<%= jshint.all %>'
+ stylelint: {
+ all: [
+ '**/*.css',
+ '!node_modules/**'
+ ]
},
banana: {
all: [
@@ -30,6 +33,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonl
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fixing: Grammar and spelling in comments
Gerrit Patch Uploader has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332922 )
Change subject: Fixing: Grammar and spelling in comments
..
Fixing: Grammar and spelling in comments
Change-Id: Iac80f6668be17c0e35908fc8fdacbae0201f2d7f
---
M includes/db/DatabaseMssql.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/22/332922/1
diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index 7c4bb3b..6971037 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -156,7 +156,7 @@
// LIMIT clause and pass $sql through $this->LimitToTopN()
which parses
// the limit clause and passes the result to
$this->limitResult();
if ( preg_match( '/\bLIMIT\s*/i', $sql ) ) {
- // massage LIMIT -> TopN
+ // message LIMIT -> TopN
$sql = $this->LimitToTopN( $sql );
}
@@ -187,7 +187,7 @@
$success = (bool)$stmt;
}
- // make a copy so that anything we add below does not get
reflected in future queries
+ // make a copy to prevent anything we add below does not get
reflected in future queries
$ignoreErrors = $this->mIgnoreErrors;
if ( $this->mIgnoreDupKeyErrors ) {
@@ -520,7 +520,7 @@
public function indexInfo( $table, $index, $fname = __METHOD__ ) {
# This does not return the same info as MYSQL would, but that's
OK
# because MediaWiki never uses the returned value except to
check for
- # the existance of indexes.
+ # the existence of indexes.
$sql = "sp_helpindex '" . $this->tableName( $table ) . "'";
$res = $this->query( $sql, $fname );
@@ -609,7 +609,7 @@
foreach ( $arrToInsert as $a ) {
// start out with empty identity column, this is so we
can return
- // it as a result of the insert logic
+ // it as a result of the INSERT logic
$sqlPre = '';
$sqlPost = '';
$identityClause = '';
--
To view, visit https://gerrit.wikimedia.org/r/332922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac80f6668be17c0e35908fc8fdacbae0201f2d7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
Gerrit-Reviewer: Zppix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.rcfilters: Add the remaining MW core filters
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331094 )
Change subject: mediawiki.rcfilters: Add the remaining MW core filters
..
mediawiki.rcfilters: Add the remaining MW core filters
Add JSON definitions and i18n messages.
Bug: T149452
Change-Id: I287e9e5db9ff625bde026056efc81ce4b2401607
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
4 files changed, 166 insertions(+), 20 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
Mooeypoo: Looks good to me, approved
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 68abd7c..2653689 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1364,18 +1364,42 @@
"rcfilters-invalid-filter": "Invalid filter",
"rcfilters-filterlist-title": "Filters",
"rcfilters-filterlist-noresults": "No filters found",
+ "rcfilters-filtergroup-registration": "User registration",
+ "rcfilters-filter-registered-label": "Registered",
+ "rcfilters-filter-registered-description": "Logged-in editors.",
+ "rcfilters-filter-unregistered-label": "Unregistered",
+ "rcfilters-filter-unregistered-description": " Editors who aren’t
logged in.",
"rcfilters-filtergroup-authorship": "Edit authorship",
"rcfilters-filter-editsbyself-label": "Your own edits",
"rcfilters-filter-editsbyself-description": "Edits by you.",
"rcfilters-filter-editsbyother-label": "Edits by others",
- "rcfilters-filter-editsbyother-description": "Edits created by other
users (not you.)",
- "rcfilters-filtergroup-userExpLevel": "User experience level",
+ "rcfilters-filter-editsbyother-description": "Edits created by other
users (not you).",
+ "rcfilters-filtergroup-userExpLevel": "Experience level (for registered
users only)",
"rcfilters-filter-userExpLevel-newcomer-label": "Newcomers",
- "rcfilters-filter-userExpLevel-newcomer-description": "Very new
editors: fewer than 10 edits and 4 days of activity.",
+ "rcfilters-filter-userExpLevel-newcomer-description": "Fewer than 10
edits and 4 days of activity.",
"rcfilters-filter-userExpLevel-learner-label": "Learners",
- "rcfilters-filter-userExpLevel-learner-description": "More days of
activity and edits than 'Newcomers' but fewer than 'Experienced users.'",
+ "rcfilters-filter-userExpLevel-learner-description": "More days of
activity and edits than \"Newcomers\" but fewer than \"Experienced users\".",
"rcfilters-filter-userExpLevel-experienced-label": "Experienced users",
"rcfilters-filter-userExpLevel-experienced-description": "More than 30
days of activity and 500 edits.",
+ "rcfilters-filtergroup-automated": "Automated contributions",
+ "rcfilters-filter-bots-label": "Bot",
+ "rcfilters-filter-bots-description": "Edits made by automated tools.",
+ "rcfilters-filter-humans-label": "Human (not bot)",
+ "rcfilters-filter-humans-description": "Edits made by human editors.",
+ "rcfilters-filtergroup-significance": "Significance",
+ "rcfilters-filter-minor-label": "Minor edits",
+ "rcfilters-filter-minor-description": "Edits the author labeled as
minor.",
+ "rcfilters-filter-major-label": "Non-minor edits",
+ "rcfilters-filter-major-description": "Edits not labeled as minor.",
+ "rcfilters-filtergroup-changetype": "Type of change",
+ "rcfilters-filter-pageedits-label": "Page edits",
+ "rcfilters-filter-pageedits-description": "Edits to wiki content,
discussions, category descriptions",
+ "rcfilters-filter-newpages-label": "Page creations",
+ "rcfilters-filter-newpages-description": "Edits that make new pages.",
+ "rcfilters-filter-categorization-label": "Category changes",
+ "rcfilters-filter-categorization-description": "Records of pages being
added or removed from categories.",
+ "rcfilters-filter-logactions-label": "Logged actions",
+ "rcfilters-filter-logactions-description": "Administrative actions,
account creations, page deletions, uploads",
"rcnotefrom": "Below {{PLURAL:$5|is the change|are the changes}} since
$3, $4 (up to $1 shown).",
"rclistfrom": "Show new changes starting from $2, $3",
"rcshowhideminor": "$1 minor edits",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index a6d6228..7219eb6 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1550,6 +1550,11 @@
"rcfilters-invalid-filter": "A label for an invalid filter.",
"rcfilters-filterlist-title": "Title for the filters
list.\n{{Identical|Filter}}",
"rcfilters-filterlist-noresults": "Message showing no results found for
searching a filter.",
+
[MediaWiki-commits] [Gerrit] mediawiki...SemanticComments[master]: Fix remaining usage of doEdit in SemanticComments
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332881 ) Change subject: Fix remaining usage of doEdit in SemanticComments .. Fix remaining usage of doEdit in SemanticComments Bug: T145736 Change-Id: Icd897f910bed0ceb51d00f1ca3447bd7f3321f63 --- M specials/Comment/CE_CommentAjaxAccess.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/specials/Comment/CE_CommentAjaxAccess.php b/specials/Comment/CE_CommentAjaxAccess.php index 9027329..18da4e8 100644 --- a/specials/Comment/CE_CommentAjaxAccess.php +++ b/specials/Comment/CE_CommentAjaxAccess.php @@ -81,16 +81,16 @@ $title = Title::makeTitle( CE_COMMENT_NS, $title ); } $article = new Article( $title ); - $articleContent = ContentHandler::getContentText( $article->getPage()->getContent() ); + $articleContentText = ContentHandler::getContentText( $article->getPage()->getContent() ); $date = new Datetime( null, new DateTimeZone( 'UTC' ) ); - $articleContent = preg_replace( '/\|CommentContent.*}}/', + $articleContentText = preg_replace( '/\|CommentContent.*}}/', '|CommentContent=' . $wgUser->getName() . ' ' . wfMessage( 'ce_comment_has_deleted' )->text() . ' ' . $date->format( 'r' ) . '|CommentWasDeleted=true|}}', - $articleContent + $articleContentText ); - $article->doEdit( $articleContent, wfMessage( 'ce_comment_delete_reason' )->text() ); - CEComment::updateRelatedArticle( $articleContent ); + $article->doEditContent( ContentHandler::makeContent( $articleContentText, $title ), wfMessage( 'ce_comment_delete_reason' )->text() ); + CEComment::updateRelatedArticle( $articleContentText ); $result = wfMessage( 'ce_comment_deletion_successful' )->text(); wfProfileOut( __METHOD__ . ' [Semantic Comments]' ); return CECommentUtils::createXMLResponse( $result, '0', $pageName ); @@ -139,4 +139,4 @@ wfProfileOut( __METHOD__ . ' [Semantic Comments]' ); return CECommentUtils::createXMLResponse( 'sth went wrong here', '1', $pageNames ); } -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/332881 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd897f910bed0ceb51d00f1ca3447bd7f3321f63 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticComments Gerrit-Branch: master Gerrit-Owner: Reedy Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: i18n JSON metadata on separate lines
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332920 )
Change subject: i18n JSON metadata on separate lines
..
i18n JSON metadata on separate lines
This is the usual practice in MediaWiki.
Change-Id: Iee933fb4c18bbfe37cfd010781e9e65ef077e5df
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 10 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/i18n/en.json b/i18n/en.json
index 522c987..893ee35 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,6 +1,10 @@
{
"@metadata": {
- "authors": [ "Isarra", "Harej", "bawolff" ]
+ "authors": [
+ "Isarra",
+ "Harej",
+ "bawolff"
+ ]
},
"collaborationkit-desc": "Next-generation WikiProjects and
collaborative workspaces for wikis",
"createcollaborationhub": "Create new Collaboration Hub",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d6d7ccd..5f7e19a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,6 +1,10 @@
{
"@metadata": {
- "authors": [ "Isarra", "bawolff" ]
+ "authors": [
+ "Isarra",
+ "Harej",
+ "bawolff"
+ ]
},
"collaborationkit-desc":
"{{desc|name=CollaborationKit|url=https://www.mediawiki.org/wiki/Extension:CollaborationKit}}";,
"createcollaborationhub": "Header for Special:CreateCollaborationHub",
--
To view, visit https://gerrit.wikimedia.org/r/332920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee933fb4c18bbfe37cfd010781e9e65ef077e5df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Amire80
Gerrit-Reviewer: Harej
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Activate the Collaboration Kit extension
Amire80 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332921 ) Change subject: Activate the Collaboration Kit extension .. Activate the Collaboration Kit extension en.json and qqq.json look good to me. Change-Id: Ife6a3ac35c2b16b7daf4dc5de7daa3dccd6464ff Depends-On: Iee933fb4c18bbfe37cfd010781e9e65ef077e5df --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/21/332921/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 98c597a..68ac57d 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -637,7 +637,7 @@ Cognate -# Collaboration Kit // 2016-03-08: Boilerplate only +Collaboration Kit Collapsible Vector -- To view, visit https://gerrit.wikimedia.org/r/332921 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife6a3ac35c2b16b7daf4dc5de7daa3dccd6464ff Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: i18n JSON metadata on separate lines
Amire80 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332920 )
Change subject: i18n JSON metadata on separate lines
..
i18n JSON metadata on separate lines
This is the usual practice in MediaWiki.
Change-Id: Iee933fb4c18bbfe37cfd010781e9e65ef077e5df
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 10 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/20/332920/1
diff --git a/i18n/en.json b/i18n/en.json
index 522c987..893ee35 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,6 +1,10 @@
{
"@metadata": {
- "authors": [ "Isarra", "Harej", "bawolff" ]
+ "authors": [
+ "Isarra",
+ "Harej",
+ "bawolff"
+ ]
},
"collaborationkit-desc": "Next-generation WikiProjects and
collaborative workspaces for wikis",
"createcollaborationhub": "Create new Collaboration Hub",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d6d7ccd..5f7e19a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,6 +1,10 @@
{
"@metadata": {
- "authors": [ "Isarra", "bawolff" ]
+ "authors": [
+ "Isarra",
+ "Harej",
+ "bawolff"
+ ]
},
"collaborationkit-desc":
"{{desc|name=CollaborationKit|url=https://www.mediawiki.org/wiki/Extension:CollaborationKit}}";,
"createcollaborationhub": "Header for Special:CreateCollaborationHub",
--
To view, visit https://gerrit.wikimedia.org/r/332920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee933fb4c18bbfe37cfd010781e9e65ef077e5df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add more $wgPoolCounterConf comments
Aaron Schulz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332919 ) Change subject: Add more $wgPoolCounterConf comments .. Add more $wgPoolCounterConf comments Change-Id: Ic7b376dcada2b58a2f2ddc13b79e392e9d4fae6f --- M includes/DefaultSettings.php 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/19/332919/1 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 566d4aa..086b615 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -8231,7 +8231,19 @@ * The remaining elements are passed through to the class as constructor * parameters. * - * @par Example: + * @par Example using local redis instance: + * @code + * $wgPoolCounterConf = [ 'ArticleView' => [ + * 'class' => 'PoolCounterRedis', + * 'timeout' => 15, // wait timeout in seconds + * 'workers' => 1, // maximum number of active threads in each pool + * 'maxqueue' => 5, // maximum number of total threads in each pool + * 'servers' => [ '127.0.0.1' ], + * 'redisConfig' => [] + * ] ]; + * @endcode + * + * @par Example using C daemon from https://www.mediawiki.org/wiki/Extension:PoolCounter: * @code * $wgPoolCounterConf = [ 'ArticleView' => [ * 'class' => 'PoolCounter_Client', @@ -8239,7 +8251,7 @@ * 'workers' => 5, // maximum number of active threads in each pool * 'maxqueue' => 50, // maximum number of total threads in each pool * ... any extension-specific options... - * ]; + * ] ]; * @endcode */ $wgPoolCounterConf = null; -- To view, visit https://gerrit.wikimedia.org/r/332919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7b376dcada2b58a2f2ddc13b79e392e9d4fae6f 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] integration/config[master]: Fix node assertion to use nodejs 6 and not nodejs 4
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332918 ) Change subject: Fix node assertion to use nodejs 6 and not nodejs 4 .. Fix node assertion to use nodejs 6 and not nodejs 4 Bug: T155685 Change-Id: I534376fd412b0e3ba65e05e31c5580e832db4c97 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/18/332918/1 -- To view, visit https://gerrit.wikimedia.org/r/332918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I534376fd412b0e3ba65e05e31c5580e832db4c97 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Graph[wmf/1.29.0-wmf.8]: Add logging of pages with broken data
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332916 )
Change subject: Add logging of pages with broken data
..
Add logging of pages with broken data
Bug: T155057
Change-Id: Ide9d9c363b767e69ccfc8e9f490d1c2176f10edf
(cherry picked from commit 25b65d83ec04b0e9057ab4ff21eb9ec1849edf3c)
---
M includes/ApiGraph.php
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ApiGraph.php b/includes/ApiGraph.php
index a0bdc2d..f2f387e 100644
--- a/includes/ApiGraph.php
+++ b/includes/ApiGraph.php
@@ -160,6 +160,9 @@
$st = FormatJson::parse( $ppValue );
if ( $st->isOK() ) {
$allGraphs = $st->getValue();
+ if ( !is_object( $allGraphs ) ) {
+ wfDebugLog( 'AdHocDebug',
"ApiGraph: invalid data on page '$titleText'" );
+ }
if ( is_object( $allGraphs ) &&
property_exists( $allGraphs, $hash ) ) {
$graph = $allGraphs->$hash;
}
--
To view, visit https://gerrit.wikimedia.org/r/332916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide9d9c363b767e69ccfc8e9f490d1c2176f10edf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: wmf/1.29.0-wmf.8
Gerrit-Owner: MaxSem
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use the term "field" for template parameters (fields) everyw...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/324142 )
Change subject: Use the term "field" for template parameters (fields) everywhere
..
Use the term "field" for template parameters (fields) everywhere
Bug: T151865
Change-Id: Iffcf0b800c852773eb290af61b8b841f4643e7b9
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/i18n/en.json b/i18n/en.json
index b6c1ec7..a0a6673 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -218,6 +218,6 @@
"cx-template-action-skip": "Skip template",
"cx-template-not-available": "Not available in $1",
"cx-translation-template-add-param": "+ Translate field",
- "cx-translation-template-add-more": "Add more properties",
- "cx-translation-template-select-param": "Select target field"
+ "cx-translation-template-add-more": "Add more fields",
+ "cx-translation-template-select-param": "Select target fields"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e119a8d..5ad4394 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -223,7 +223,7 @@
"cx-template-action-keep-original": "Menu item label in template tool
card when adapting a template while translating. Selecting this action will
insert the wiki syntax of the original template in the original language
as-is.",
"cx-template-action-skip": "Menu item label in template tool card when
adapting a template while translating. Selecting this option will not insert
any template.",
"cx-template-not-available": "Text shown when a corresponding template
not available in target language\n* $1 - Target language name",
- "cx-translation-template-add-param": "Hover text for the template
parameter placeholders. Shown in the form for translating the template
parameters.",
- "cx-translation-template-add-more": "Label for the control to add more
template parameters. Shown at the bottom of the form for translating the
template parameters.",
- "cx-translation-template-select-param": "Label for the template param
selector."
+ "cx-translation-template-add-param": "Hover text for the template field
placeholders. Shown in the form for translating the template fields. \"Field\"
should be the same word as in
{{msg-mw|visualeditor-dialog-transclusion-required-parameter-dialog-title}}.",
+ "cx-translation-template-add-more": "Label for the control to add more
template fields. Shown at the bottom of the form for translating the template
parameters. \"Field\" should be the same word as in
{{msg-mw|visualeditor-dialog-transclusion-required-parameter-dialog-title}}",
+ "cx-translation-template-select-param": "Label for the template field
selector. \"Field\" should be the same word as in
{{msg-mw|visualeditor-dialog-transclusion-required-parameter-dialog-title}}"
}
--
To view, visit https://gerrit.wikimedia.org/r/324142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iffcf0b800c852773eb290af61b8b841f4643e7b9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Siebrand
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]: WIP Enable InterwikiSorting on beta cluster
Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332917 )
Change subject: WIP Enable InterwikiSorting on beta cluster
..
WIP Enable InterwikiSorting on beta cluster
The depends-on change should also be in the build!
Change-Id: Ie570935ef419276cdc37a4273b34559b0a6c6795
Depends-On: I5031bd892ca8d7e7dcc6f0fbbaffbd3e1464c894
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list-labs
4 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/17/332917/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 15de867..bc52d05 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2994,6 +2994,12 @@
$wgExtensionEntryPointListFiles[] =
"$IP/extensions/Wikidata/extension-list-wikidata";
+if ( $wmgUseInterwikiSorting ) {
+ wfLoadExtension( 'InterwikiSorting' );
+ // This setting must be set before loading WikibaseClient
+ $wgWikibaseInterwikiSorting = false;
+}
+
if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) {
if ( $wmgUseWikibaseRepo && $wmfRealm === 'labs' ) {
// enable on beta only
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 52f6f51..6eabe8b 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -570,5 +570,8 @@
'wgLinterStatsdSampleFactor' => [
'default' => 10,
],
+ 'wmgUseInterwikiSorting' => [
+ 'default' => true,
+ ],
];
} # wmflLabsSettings()
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 4957c13..2bdae92 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16583,6 +16583,10 @@
'default' => true,
],
+'wmgUseInterwikiSorting' => [
+ 'default' => false,
+],
+
'wmgWikibaseCachePrefix' => [
'default' => 'wikidatawiki',
'testwikidatawiki' => 'testwikidatawiki0',
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index ee7a5d9..135c4f2 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,4 +1,5 @@
$IP/extensions/EmailAuth/extension.json
+$IP/extensions/InterwikiSorting/extension.json
$IP/extensions/Linter/extension.json
$IP/extensions/Newsletter/extension.json
$IP/extensions/PageViewInfo/extension.json
--
To view, visit https://gerrit.wikimedia.org/r/332917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie570935ef419276cdc37a4273b34559b0a6c6795
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Graph[wmf/1.29.0-wmf.8]: Add logging of pages with broken data
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332916 )
Change subject: Add logging of pages with broken data
..
Add logging of pages with broken data
Bug: T155057
Change-Id: Ide9d9c363b767e69ccfc8e9f490d1c2176f10edf
(cherry picked from commit 25b65d83ec04b0e9057ab4ff21eb9ec1849edf3c)
---
M includes/ApiGraph.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Graph
refs/changes/16/332916/1
diff --git a/includes/ApiGraph.php b/includes/ApiGraph.php
index a0bdc2d..f2f387e 100644
--- a/includes/ApiGraph.php
+++ b/includes/ApiGraph.php
@@ -160,6 +160,9 @@
$st = FormatJson::parse( $ppValue );
if ( $st->isOK() ) {
$allGraphs = $st->getValue();
+ if ( !is_object( $allGraphs ) ) {
+ wfDebugLog( 'AdHocDebug',
"ApiGraph: invalid data on page '$titleText'" );
+ }
if ( is_object( $allGraphs ) &&
property_exists( $allGraphs, $hash ) ) {
$graph = $allGraphs->$hash;
}
--
To view, visit https://gerrit.wikimedia.org/r/332916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide9d9c363b767e69ccfc8e9f490d1c2176f10edf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: wmf/1.29.0-wmf.8
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: Add logging of pages with broken data
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332913 )
Change subject: Add logging of pages with broken data
..
Add logging of pages with broken data
Bug: T155057
Change-Id: Ide9d9c363b767e69ccfc8e9f490d1c2176f10edf
---
M includes/ApiGraph.php
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
JGirault: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ApiGraph.php b/includes/ApiGraph.php
index a0bdc2d..f2f387e 100644
--- a/includes/ApiGraph.php
+++ b/includes/ApiGraph.php
@@ -160,6 +160,9 @@
$st = FormatJson::parse( $ppValue );
if ( $st->isOK() ) {
$allGraphs = $st->getValue();
+ if ( !is_object( $allGraphs ) ) {
+ wfDebugLog( 'AdHocDebug',
"ApiGraph: invalid data on page '$titleText'" );
+ }
if ( is_object( $allGraphs ) &&
property_exists( $allGraphs, $hash ) ) {
$graph = $allGraphs->$hash;
}
--
To view, visit https://gerrit.wikimedia.org/r/332913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide9d9c363b767e69ccfc8e9f490d1c2176f10edf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: JGirault
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...JsonConfig[master]: Always lua-reindex tabular data
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331958 )
Change subject: Always lua-reindex tabular data
..
Always lua-reindex tabular data
Bug: T155213
Change-Id: I6b58d3f82ced0e50369eb740287b7296103accb0
---
M includes/JCLuaLibrary.php
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/JCLuaLibrary.php b/includes/JCLuaLibrary.php
index 49a491e..df5781b 100644
--- a/includes/JCLuaLibrary.php
+++ b/includes/JCLuaLibrary.php
@@ -64,12 +64,14 @@
if ( !$content ) {
$result = false;
- } elseif ( $language === null || !method_exists( $content,
'getLocalizedData' ) ) {
- $result = $content->getData();
} else {
- /** @var JCDataContent $content */
- $result = $content->getLocalizedData( $language );
-
+ if ( $language === null || !method_exists( $content,
'getLocalizedData' ) ) {
+ $result = $content->getData();
+ } else {
+ /** @var JCDataContent $content */
+ $result = $content->getLocalizedData( $language
);
+ }
+ // Always re-index tabular data
if ( $content instanceof JCTabularContent ) {
self::reindexTabularData( $result );
}
--
To view, visit https://gerrit.wikimedia.org/r/331958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b58d3f82ced0e50369eb740287b7296103accb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/JsonConfig
Gerrit-Branch: master
Gerrit-Owner: Yurik
Gerrit-Reviewer: Jackmcbarn
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add small script for common job queue admin tasks
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332915 )
Change subject: Add small script for common job queue admin tasks
..
Add small script for common job queue admin tasks
This can handle dropping queued and re-enqueueing abandoned jobs.
Also use the DB cache table to avoid re-enqueuing duplicate jobs
if this has to get used several times for a queue during a week.
Change-Id: Ib56cf57e56f03ce6f1c4b52e3e36f228413c1056
---
A maintenance/manageJobs.php
1 file changed, 98 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/15/332915/1
diff --git a/maintenance/manageJobs.php b/maintenance/manageJobs.php
new file mode 100644
index 000..9585ed8
--- /dev/null
+++ b/maintenance/manageJobs.php
@@ -0,0 +1,98 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
+ * @author Aaron Schulz
+ */
+
+require_once __DIR__ . '/Maintenance.php';
+
+/**
+ * Maintenance script that handles managing job queue admin tasks (re-push,
delete, ...)
+ *
+ * @ingroup Maintenance
+ */
+class ManageJobs extends Maintenance {
+ public function __construct() {
+ parent::__construct();
+ $this->addDescription( 'Perform administrative tasks on a job
queue' );
+ $this->addOption( 'type', 'Job type', true, true );
+ $this->addOption( 'action', 'Queue operation ("delete",
"repush-abandoned")', true, true );
+ }
+
+ public function execute() {
+ $type = $this->getOption( 'type' );
+ $action = $this->getOption( 'action' );
+
+ $group = JobQueueGroup::singleton();
+ $queue = $group->get( $type );
+
+ if ( $action === 'delete' ) {
+ $this->delete( $queue );
+ } elseif ( $action === 'repush-abandoned' ) {
+ $this->repushAbandoned( $queue );
+ } else {
+ $this->error( "Invalid action '$action'.", 1 );
+ }
+ }
+
+ private function delete( JobQueue $queue ) {
+ $this->output( "Queue has {$queue->getSize()} job(s);
deleting...\n" );
+ $queue->delete();
+ $this->output( "Done; current size is {$queue->getSize()}
job(s).\n" );
+ }
+
+ private function repushAbandoned( JobQueue $queue ) {
+ $cache = ObjectCache::getInstance( CACHE_DB );
+ $key = $cache->makeGlobalKey( 'last-job-repush',
$queue->getWiki(), $queue->getType() );
+
+ $now = wfTimestampNow();
+ $lastRepushTime = $cache->get( $key );
+ if ( $lastRepushTime === false ) {
+ $lastRepushTime = wfTimestamp( TS_MW, 1 ); // include
all jobs
+ }
+
+ $this->output( "Last re-push time: $lastRepushTime; current
time: $now\n" );
+
+ $count = 0;
+ $skipped = 0;
+ foreach ( $queue->getAllAbandonedJobs() as $job ) {
+ /** @var Job $job */
+ if ( $job->getQueuedTimestamp() < $lastRepushTime ) {
+ ++$skipped;
+ continue; // already re-pushed in prior round
+ }
+
+ $queue->push( $job );
+ ++$count;
+
+ if ( ( $count % $this->mBatchSize ) == 0 ) {
+ $queue->waitForBackups();
+ }
+ }
+
+ $cache->set( $key, $now ); // next run will ignore these jobs
+
+ $this->output( "Re-pushed $count job(s) [$skipped skipped].\n"
);
+ }
+}
+
+$maintClass = "ManageJobs";
+require_once RUN_MAINTENANCE_IF_MAIN;
--
To view, visit https://gerrit.wikimedia.org/r/332915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib56cf57e56f03ce6f1c4b52e3e36f228413c1056
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]: Only expand URLs for printing in references
Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332914 )
Change subject: Only expand URLs for printing in references
..
Only expand URLs for printing in references
Bug: T152393
Change-Id: I7f4be9460776f3c69000d95e5888056e47cd20b7
---
M resources/src/mediawiki.legacy/commonPrint.css
1 file changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/14/332914/1
diff --git a/resources/src/mediawiki.legacy/commonPrint.css
b/resources/src/mediawiki.legacy/commonPrint.css
index ec94df3..ca647c6 100644
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -169,16 +169,18 @@
}
/* Expand URLs for printing */
-.mw-body a.external.text:after,
-.mw-body a.external.autonumber:after {
+ol.references a.external.text:after,
+ol.references a.external.autonumber:after,
+cite {
content: " (" attr( href ) ")";
word-break: break-all;
word-wrap: break-word;
}
/* Expand protocol-relative URLs for printing */
-.mw-body a.external.text[href^='//']:after,
-.mw-body a.external.autonumber[href^='//']:after {
+ol.references a.external.text[href^='//']:after,
+ol.references a.external.autonumber[href^='//']:after,
+cite {
content: " (https:" attr( href ) ")";
}
--
To view, visit https://gerrit.wikimedia.org/r/332914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f4be9460776f3c69000d95e5888056e47cd20b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: Add logging of pages with broken data
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332913 )
Change subject: Add logging of pages with broken data
..
Add logging of pages with broken data
Bug: T155057
Change-Id: Ide9d9c363b767e69ccfc8e9f490d1c2176f10edf
---
M includes/ApiGraph.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Graph
refs/changes/13/332913/1
diff --git a/includes/ApiGraph.php b/includes/ApiGraph.php
index a0bdc2d..f2f387e 100644
--- a/includes/ApiGraph.php
+++ b/includes/ApiGraph.php
@@ -160,6 +160,9 @@
$st = FormatJson::parse( $ppValue );
if ( $st->isOK() ) {
$allGraphs = $st->getValue();
+ if ( !is_object( $allGraphs ) ) {
+ wfDebugLog( 'AdHocDebug',
"ApiGraph: invalid data on page '$titleText'" );
+ }
if ( is_object( $allGraphs ) &&
property_exists( $allGraphs, $hash ) ) {
$graph = $allGraphs->$hash;
}
--
To view, visit https://gerrit.wikimedia.org/r/332913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide9d9c363b767e69ccfc8e9f490d1c2176f10edf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable TwoColConflict on dewiki
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332911 ) Change subject: Enable TwoColConflict on dewiki .. Enable TwoColConflict on dewiki Scheduled for end of week of 13th of Feb Change-Id: I861e26876d2bd5cdac78c338467a12bff5611902 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/11/332911/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4499af0..7bb4d03 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16497,6 +16497,7 @@ 'testwikidatawiki' => true, 'mediawikiwiki' => true, 'metawiki' => true, + 'dewiki' => true, ], 'wmgUseUserMerge' => [ -- To view, visit https://gerrit.wikimedia.org/r/332911 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I861e26876d2bd5cdac78c338467a12bff5611902 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable TwoColConflict on mw.org
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332909 ) Change subject: Enable TwoColConflict on mw.org .. Enable TwoColConflict on mw.org Scheduled for week of 6th of Feb Change-Id: Iab5b4f38c7d7c31e69e526f7f5bc73c3313ca7a2 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/09/332909/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 259f97f..63317c4 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16495,6 +16495,7 @@ 'testwiki' => true, 'test2wiki' => true, 'testwikidatawiki' => true, + 'mediawikiwiki' => true, ], 'wmgUseUserMerge' => [ -- To view, visit https://gerrit.wikimedia.org/r/332909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iab5b4f38c7d7c31e69e526f7f5bc73c3313ca7a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable TwoColConflict on test wikis
Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332908 )
Change subject: Enable TwoColConflict on test wikis
..
Enable TwoColConflict on test wikis
Change-Id: I534603d71b02c7ed7a8147d6ea700a52da9b39de
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
5 files changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/08/332908/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 95ee390..4ce9d83 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -335,10 +335,6 @@
wfLoadExtension( 'Linter' );
}
-if ( $wmgUseTwoColConflict ) {
- wfLoadExtension( 'TwoColConflict' );
-}
-
$wgMessageCacheType = CACHE_ACCEL;
// Let Beta Cluster Commons do upload-from-URL from production Commons.
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 15de867..e670c0e 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2870,6 +2870,10 @@
$wgRevisionSliderBetaFeature = $wmgRevisionSliderBetaFeature;
}
+if ( $wmgUseTwoColConflict ) {
+ wfLoadExtension( 'TwoColConflict' );
+}
+
if ( $wmgUseUserMerge ) {
wfLoadExtension( 'UserMerge' );
// Don't let users get deleted outright (T69789)
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 4957c13..259f97f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16490,6 +16490,13 @@
'hewiki' => false, // T150573
],
+'wmgUseTwoColConflict' => [
+ 'default' => false,
+ 'testwiki' => true,
+ 'test2wiki' => true,
+ 'testwikidatawiki' => true,
+],
+
'wmgUseUserMerge' => [
'default' => true,
'private' => false,
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 9c867ce..057e489 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -126,6 +126,7 @@
$IP/extensions/Translate/Translate.php
$IP/extensions/TranslationNotifications/extension.json
$IP/extensions/TrustedXFF/extension.json
+$IP/extensions/TwoColConflict/extension.json
$IP/extensions/UnicodeConverter/extension.json
$IP/extensions/UniversalLanguageSelector/extension.json
$IP/extensions/UploadsLink/extension.json
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index ee7a5d9..bbd8459 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -4,4 +4,3 @@
$IP/extensions/PageViewInfo/extension.json
$IP/extensions/PerformanceInspector/extension.json
$IP/extensions/Sentry/extension.json
-$IP/extensions/TwoColConflict/extension.json
--
To view, visit https://gerrit.wikimedia.org/r/332908
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I534603d71b02c7ed7a8147d6ea700a52da9b39de
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable TwoColConflict on metawiki
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332910 ) Change subject: Enable TwoColConflict on metawiki .. Enable TwoColConflict on metawiki Scheduled for week of 13th Feb Change-Id: I7f20252b800e8e2b3bc29fee29fca43216144426 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/10/332910/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 63317c4..4499af0 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16496,6 +16496,7 @@ 'test2wiki' => true, 'testwikidatawiki' => true, 'mediawikiwiki' => true, + 'metawiki' => true, ], 'wmgUseUserMerge' => [ -- To view, visit https://gerrit.wikimedia.org/r/332910 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f20252b800e8e2b3bc29fee29fca43216144426 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Add InterwikiSorting to make-wmf-branch
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332907 ) Change subject: Add InterwikiSorting to make-wmf-branch .. Add InterwikiSorting to make-wmf-branch Bug: T150183 Change-Id: Icf7fec378a908a78acdefe9806be6b59ab3392fb --- M make-wmf-branch/config.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/07/332907/1 diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json index 0536356..f07da7b 100644 --- a/make-wmf-branch/config.json +++ b/make-wmf-branch/config.json @@ -66,6 +66,7 @@ "Insider", "intersection", "Interwiki", + "InterwikiSorting", "Josa", "JsonConfig", "Kartographer", -- To view, visit https://gerrit.wikimedia.org/r/332907 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf7fec378a908a78acdefe9806be6b59ab3392fb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Collection[wmf/1.29.0-wmf.8]: Revert "Move all functions into CollectionAjaxFunctions file...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332903 )
Change subject: Revert "Move all functions into CollectionAjaxFunctions file in
preparation for extension.json"
..
Revert "Move all functions into CollectionAjaxFunctions file in preparation for
extension.json"
Completely broke all the AJAX calls because JS wasn't updated with
new function names.
E.g. try adding pages to books, etc.
This reverts commit 52f2af1b6f7ad3ff463246e668b7c7886ad31a6c.
Change-Id: Iaf51dc459782693f0cbdc0f49ea61802dfe2a1aa
(cherry picked from commit 89e627f5b880b448253919ae10d0d86ac1b54d97)
---
M Collection.php
D CollectionAjaxFunctions.php
2 files changed, 253 insertions(+), 258 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Collection.php b/Collection.php
index 80852a9..8587dfd 100644
--- a/Collection.php
+++ b/Collection.php
@@ -176,7 +176,6 @@
$wgAutoloadClasses['SpecialCollection'] = __DIR__ . '/Collection.body.php';
$wgAutoloadClasses['CollectionSession'] = __DIR__ . '/Collection.session.php';
$wgAutoloadClasses['CollectionHooks'] = __DIR__ . '/Collection.hooks.php';
-$wgAutoloadClasses['CollectionAjaxFunctions'] = __DIR__ .
'/CollectionAjaxFunctions.php';
$wgAutoloadClasses['CollectionSuggest'] = __DIR__ . '/Collection.suggest.php';
$wgAutoloadClasses['CollectionProposals'] = __DIR__ .
'/Collection.suggest.php';
@@ -251,42 +250,275 @@
# register global Ajax functions:
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxGetCollection';
+function wfAjaxGetCollection() {
+ if ( isset( $_SESSION['wsCollection'] ) ) {
+ $collection = $_SESSION['wsCollection'];
+ } else {
+ $collection = array();
+ }
+ $r = new AjaxResponse( FormatJson::encode( array( 'collection' =>
$collection ) ) );
+ $r->setContentType( 'application/json' );
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxPostCollection';
+$wgAjaxExportList[] = 'wfAjaxGetCollection';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxGetMWServeStatus';
+function wfAjaxPostCollection( $collection = '', $redirect = '' ) {
+ if ( session_id() == '' ) {
+ wfSetupSession();
+ }
+ $collection = FormatJson::decode( $collection, true );
+ $collection['enabled'] = true;
+ $_SESSION['wsCollection'] = $collection;
+ $r = new AjaxResponse();
+ if ( $redirect ) {
+ $title = Title::newFromText( $redirect );
+ $redirecturl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT
);
+ $r->setResponseCode( 302 );
+ header( 'Location: ' . $redirecturl );
+ } else {
+ $title = SpecialPage::getTitleFor( 'Book' );
+ $redirecturl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT
);
+ $r->setContentType( 'application/json' );
+ $r->addText( FormatJson::encode( array( 'redirect_url' =>
$redirecturl ) ) );
+ }
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddArticle';
+$wgAjaxExportList[] = 'wfAjaxPostCollection';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRemoveArticle';
+function wfAjaxGetMWServeStatus( $collection_id = '', $writer = 'rl' ) {
+ $response = CollectionRenderingAPI::instance( $writer )
+ ->getRenderStatus( $collection_id );
+ $result = $response->response;
+ if ( isset( $result['status']['progress'] ) ) {
+ $result['status']['progress'] = number_format(
$result['status']['progress'], 2, '.', '' );
+ }
+ $r = new AjaxResponse( FormatJson::encode( $result ) );
+ $r->setContentType( 'application/json' );
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddCategory';
+$wgAjaxExportList[] = 'wfAjaxGetMWServeStatus';
-$wgAjaxExportList[] =
'CollectionAjaxFunctions::onAjaxCollectionGetBookCreatorBoxContent';
+function wfAjaxCollectionAddArticle( $namespace = 0, $title = '', $oldid = ''
) {
+ SpecialCollection::addArticleFromName( $namespace, $title, $oldid );
+ return wfAjaxCollectionGetItemList();
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionGetItemList';
+$wgAjaxExportList[] = 'wfAjaxCollectionAddArticle';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRemoveItem';
+function wfAjaxCollectionRemoveArticle( $namespace = 0, $title = '', $oldid =
'' ) {
+ SpecialCollection::removeArticleFromName( $namespace, $title, $oldid );
+ return wfAjaxCollectionGetItemList();
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddChapter';
+$wgAjaxExportList[] = 'wfAjaxCollectionRemoveArticle';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRenameChapter';
+function
[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Add TwoColConflict to make-wmf-branch
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332906 ) Change subject: Add TwoColConflict to make-wmf-branch .. Add TwoColConflict to make-wmf-branch Bug: T150184 Change-Id: I9b980860977833d3a35340c6733e6b18abb5a44a --- M make-wmf-branch/config.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/06/332906/1 diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json index 0536356..13f7626 100644 --- a/make-wmf-branch/config.json +++ b/make-wmf-branch/config.json @@ -133,6 +133,7 @@ "Translate", "TranslationNotifications", "TrustedXFF", + "TwoColConflict", "UnicodeConverter", "UniversalLanguageSelector", "UploadsLink", -- To view, visit https://gerrit.wikimedia.org/r/332906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b980860977833d3a35340c6733e6b18abb5a44a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Collection[wmf/1.29.0-wmf.8]: Revert "Move all functions into CollectionAjaxFunctions file...
Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332903 )
Change subject: Revert "Move all functions into CollectionAjaxFunctions file in
preparation for extension.json"
..
Revert "Move all functions into CollectionAjaxFunctions file in preparation for
extension.json"
Completely broke all the AJAX calls because JS wasn't updated with
new function names.
E.g. try adding pages to books, etc.
This reverts commit 52f2af1b6f7ad3ff463246e668b7c7886ad31a6c.
Change-Id: Iaf51dc459782693f0cbdc0f49ea61802dfe2a1aa
(cherry picked from commit 89e627f5b880b448253919ae10d0d86ac1b54d97)
---
M Collection.php
D CollectionAjaxFunctions.php
2 files changed, 253 insertions(+), 258 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection
refs/changes/03/332903/1
diff --git a/Collection.php b/Collection.php
index 80852a9..8587dfd 100644
--- a/Collection.php
+++ b/Collection.php
@@ -176,7 +176,6 @@
$wgAutoloadClasses['SpecialCollection'] = __DIR__ . '/Collection.body.php';
$wgAutoloadClasses['CollectionSession'] = __DIR__ . '/Collection.session.php';
$wgAutoloadClasses['CollectionHooks'] = __DIR__ . '/Collection.hooks.php';
-$wgAutoloadClasses['CollectionAjaxFunctions'] = __DIR__ .
'/CollectionAjaxFunctions.php';
$wgAutoloadClasses['CollectionSuggest'] = __DIR__ . '/Collection.suggest.php';
$wgAutoloadClasses['CollectionProposals'] = __DIR__ .
'/Collection.suggest.php';
@@ -251,42 +250,275 @@
# register global Ajax functions:
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxGetCollection';
+function wfAjaxGetCollection() {
+ if ( isset( $_SESSION['wsCollection'] ) ) {
+ $collection = $_SESSION['wsCollection'];
+ } else {
+ $collection = array();
+ }
+ $r = new AjaxResponse( FormatJson::encode( array( 'collection' =>
$collection ) ) );
+ $r->setContentType( 'application/json' );
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxPostCollection';
+$wgAjaxExportList[] = 'wfAjaxGetCollection';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxGetMWServeStatus';
+function wfAjaxPostCollection( $collection = '', $redirect = '' ) {
+ if ( session_id() == '' ) {
+ wfSetupSession();
+ }
+ $collection = FormatJson::decode( $collection, true );
+ $collection['enabled'] = true;
+ $_SESSION['wsCollection'] = $collection;
+ $r = new AjaxResponse();
+ if ( $redirect ) {
+ $title = Title::newFromText( $redirect );
+ $redirecturl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT
);
+ $r->setResponseCode( 302 );
+ header( 'Location: ' . $redirecturl );
+ } else {
+ $title = SpecialPage::getTitleFor( 'Book' );
+ $redirecturl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT
);
+ $r->setContentType( 'application/json' );
+ $r->addText( FormatJson::encode( array( 'redirect_url' =>
$redirecturl ) ) );
+ }
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddArticle';
+$wgAjaxExportList[] = 'wfAjaxPostCollection';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRemoveArticle';
+function wfAjaxGetMWServeStatus( $collection_id = '', $writer = 'rl' ) {
+ $response = CollectionRenderingAPI::instance( $writer )
+ ->getRenderStatus( $collection_id );
+ $result = $response->response;
+ if ( isset( $result['status']['progress'] ) ) {
+ $result['status']['progress'] = number_format(
$result['status']['progress'], 2, '.', '' );
+ }
+ $r = new AjaxResponse( FormatJson::encode( $result ) );
+ $r->setContentType( 'application/json' );
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddCategory';
+$wgAjaxExportList[] = 'wfAjaxGetMWServeStatus';
-$wgAjaxExportList[] =
'CollectionAjaxFunctions::onAjaxCollectionGetBookCreatorBoxContent';
+function wfAjaxCollectionAddArticle( $namespace = 0, $title = '', $oldid = ''
) {
+ SpecialCollection::addArticleFromName( $namespace, $title, $oldid );
+ return wfAjaxCollectionGetItemList();
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionGetItemList';
+$wgAjaxExportList[] = 'wfAjaxCollectionAddArticle';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRemoveItem';
+function wfAjaxCollectionRemoveArticle( $namespace = 0, $title = '', $oldid =
'' ) {
+ SpecialCollection::removeArticleFromName( $namespace, $title, $oldid );
+ return wfAjaxCollectionGetItemList();
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddChapter';
+$wgAjaxExportList[] = 'wfAjaxCollectionRemoveArticle';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRenameChapt
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add twocolconflict to wgBetaFeaturesWhitelist
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332904 ) Change subject: Add twocolconflict to wgBetaFeaturesWhitelist .. Add twocolconflict to wgBetaFeaturesWhitelist Needs a +1 from Greg Grossmeier or James Forrester. Bug: T150184 Change-Id: I3bd5a9d0e093c243effda5b01efdb0c9c6f69789 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/04/332904/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 91db1aa..a88aa70 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12998,6 +12998,7 @@ 'ores-enabled', // [Research] 2017-05-10 - ORES 'revisionslider', // [WMDE] 2017-05-08 - RevisionSlider 'visualeditor-newwikitext', // [Editing] 2017-05-29 – New wikitext editor + 'twocolconflict', // [WMDE] 2017-07-18 – New edit conflict view ], ], -- To view, visit https://gerrit.wikimedia.org/r/332904 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3bd5a9d0e093c243effda5b01efdb0c9c6f69789 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Revert "Move all functions into CollectionAjaxFunctions file...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332902 )
Change subject: Revert "Move all functions into CollectionAjaxFunctions file in
preparation for extension.json"
..
Revert "Move all functions into CollectionAjaxFunctions file in preparation for
extension.json"
Completely broke all the AJAX calls because JS wasn't updated with
new function names.
E.g. try adding pages to books, etc.
This reverts commit 52f2af1b6f7ad3ff463246e668b7c7886ad31a6c.
Change-Id: Iaf51dc459782693f0cbdc0f49ea61802dfe2a1aa
---
M Collection.php
D CollectionAjaxFunctions.php
2 files changed, 253 insertions(+), 258 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Collection.php b/Collection.php
index 80852a9..8587dfd 100644
--- a/Collection.php
+++ b/Collection.php
@@ -176,7 +176,6 @@
$wgAutoloadClasses['SpecialCollection'] = __DIR__ . '/Collection.body.php';
$wgAutoloadClasses['CollectionSession'] = __DIR__ . '/Collection.session.php';
$wgAutoloadClasses['CollectionHooks'] = __DIR__ . '/Collection.hooks.php';
-$wgAutoloadClasses['CollectionAjaxFunctions'] = __DIR__ .
'/CollectionAjaxFunctions.php';
$wgAutoloadClasses['CollectionSuggest'] = __DIR__ . '/Collection.suggest.php';
$wgAutoloadClasses['CollectionProposals'] = __DIR__ .
'/Collection.suggest.php';
@@ -251,42 +250,275 @@
# register global Ajax functions:
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxGetCollection';
+function wfAjaxGetCollection() {
+ if ( isset( $_SESSION['wsCollection'] ) ) {
+ $collection = $_SESSION['wsCollection'];
+ } else {
+ $collection = array();
+ }
+ $r = new AjaxResponse( FormatJson::encode( array( 'collection' =>
$collection ) ) );
+ $r->setContentType( 'application/json' );
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxPostCollection';
+$wgAjaxExportList[] = 'wfAjaxGetCollection';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxGetMWServeStatus';
+function wfAjaxPostCollection( $collection = '', $redirect = '' ) {
+ if ( session_id() == '' ) {
+ wfSetupSession();
+ }
+ $collection = FormatJson::decode( $collection, true );
+ $collection['enabled'] = true;
+ $_SESSION['wsCollection'] = $collection;
+ $r = new AjaxResponse();
+ if ( $redirect ) {
+ $title = Title::newFromText( $redirect );
+ $redirecturl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT
);
+ $r->setResponseCode( 302 );
+ header( 'Location: ' . $redirecturl );
+ } else {
+ $title = SpecialPage::getTitleFor( 'Book' );
+ $redirecturl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT
);
+ $r->setContentType( 'application/json' );
+ $r->addText( FormatJson::encode( array( 'redirect_url' =>
$redirecturl ) ) );
+ }
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddArticle';
+$wgAjaxExportList[] = 'wfAjaxPostCollection';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRemoveArticle';
+function wfAjaxGetMWServeStatus( $collection_id = '', $writer = 'rl' ) {
+ $response = CollectionRenderingAPI::instance( $writer )
+ ->getRenderStatus( $collection_id );
+ $result = $response->response;
+ if ( isset( $result['status']['progress'] ) ) {
+ $result['status']['progress'] = number_format(
$result['status']['progress'], 2, '.', '' );
+ }
+ $r = new AjaxResponse( FormatJson::encode( $result ) );
+ $r->setContentType( 'application/json' );
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddCategory';
+$wgAjaxExportList[] = 'wfAjaxGetMWServeStatus';
-$wgAjaxExportList[] =
'CollectionAjaxFunctions::onAjaxCollectionGetBookCreatorBoxContent';
+function wfAjaxCollectionAddArticle( $namespace = 0, $title = '', $oldid = ''
) {
+ SpecialCollection::addArticleFromName( $namespace, $title, $oldid );
+ return wfAjaxCollectionGetItemList();
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionGetItemList';
+$wgAjaxExportList[] = 'wfAjaxCollectionAddArticle';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRemoveItem';
+function wfAjaxCollectionRemoveArticle( $namespace = 0, $title = '', $oldid =
'' ) {
+ SpecialCollection::removeArticleFromName( $namespace, $title, $oldid );
+ return wfAjaxCollectionGetItemList();
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddChapter';
+$wgAjaxExportList[] = 'wfAjaxCollectionRemoveArticle';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRenameChapter';
+function wfAjaxCollectionAddCategory( $title = '' ) {
+ SpecialCollection
[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Revert "Move all functions into CollectionAjaxFunctions file...
Hello Paladox, Reedy, C. Scott Ananian, Addshore, Legoktm, jenkins-bot,
Siebrand, MarkAHershberger, Thiemo Mättig (WMDE), Jforrester,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/332902
to review the following change.
Change subject: Revert "Move all functions into CollectionAjaxFunctions file in
preparation for extension.json"
..
Revert "Move all functions into CollectionAjaxFunctions file in preparation for
extension.json"
Completely broke all the AJAX calls because JS wasn't updated with
new function names.
E.g. try adding pages to books, etc.
This reverts commit 52f2af1b6f7ad3ff463246e668b7c7886ad31a6c.
Change-Id: Iaf51dc459782693f0cbdc0f49ea61802dfe2a1aa
---
M Collection.php
D CollectionAjaxFunctions.php
2 files changed, 253 insertions(+), 258 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection
refs/changes/02/332902/1
diff --git a/Collection.php b/Collection.php
index 80852a9..8587dfd 100644
--- a/Collection.php
+++ b/Collection.php
@@ -176,7 +176,6 @@
$wgAutoloadClasses['SpecialCollection'] = __DIR__ . '/Collection.body.php';
$wgAutoloadClasses['CollectionSession'] = __DIR__ . '/Collection.session.php';
$wgAutoloadClasses['CollectionHooks'] = __DIR__ . '/Collection.hooks.php';
-$wgAutoloadClasses['CollectionAjaxFunctions'] = __DIR__ .
'/CollectionAjaxFunctions.php';
$wgAutoloadClasses['CollectionSuggest'] = __DIR__ . '/Collection.suggest.php';
$wgAutoloadClasses['CollectionProposals'] = __DIR__ .
'/Collection.suggest.php';
@@ -251,42 +250,275 @@
# register global Ajax functions:
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxGetCollection';
+function wfAjaxGetCollection() {
+ if ( isset( $_SESSION['wsCollection'] ) ) {
+ $collection = $_SESSION['wsCollection'];
+ } else {
+ $collection = array();
+ }
+ $r = new AjaxResponse( FormatJson::encode( array( 'collection' =>
$collection ) ) );
+ $r->setContentType( 'application/json' );
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxPostCollection';
+$wgAjaxExportList[] = 'wfAjaxGetCollection';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxGetMWServeStatus';
+function wfAjaxPostCollection( $collection = '', $redirect = '' ) {
+ if ( session_id() == '' ) {
+ wfSetupSession();
+ }
+ $collection = FormatJson::decode( $collection, true );
+ $collection['enabled'] = true;
+ $_SESSION['wsCollection'] = $collection;
+ $r = new AjaxResponse();
+ if ( $redirect ) {
+ $title = Title::newFromText( $redirect );
+ $redirecturl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT
);
+ $r->setResponseCode( 302 );
+ header( 'Location: ' . $redirecturl );
+ } else {
+ $title = SpecialPage::getTitleFor( 'Book' );
+ $redirecturl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT
);
+ $r->setContentType( 'application/json' );
+ $r->addText( FormatJson::encode( array( 'redirect_url' =>
$redirecturl ) ) );
+ }
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddArticle';
+$wgAjaxExportList[] = 'wfAjaxPostCollection';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRemoveArticle';
+function wfAjaxGetMWServeStatus( $collection_id = '', $writer = 'rl' ) {
+ $response = CollectionRenderingAPI::instance( $writer )
+ ->getRenderStatus( $collection_id );
+ $result = $response->response;
+ if ( isset( $result['status']['progress'] ) ) {
+ $result['status']['progress'] = number_format(
$result['status']['progress'], 2, '.', '' );
+ }
+ $r = new AjaxResponse( FormatJson::encode( $result ) );
+ $r->setContentType( 'application/json' );
+ return $r;
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddCategory';
+$wgAjaxExportList[] = 'wfAjaxGetMWServeStatus';
-$wgAjaxExportList[] =
'CollectionAjaxFunctions::onAjaxCollectionGetBookCreatorBoxContent';
+function wfAjaxCollectionAddArticle( $namespace = 0, $title = '', $oldid = ''
) {
+ SpecialCollection::addArticleFromName( $namespace, $title, $oldid );
+ return wfAjaxCollectionGetItemList();
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionGetItemList';
+$wgAjaxExportList[] = 'wfAjaxCollectionAddArticle';
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionRemoveItem';
+function wfAjaxCollectionRemoveArticle( $namespace = 0, $title = '', $oldid =
'' ) {
+ SpecialCollection::removeArticleFromName( $namespace, $title, $oldid );
+ return wfAjaxCollectionGetItemList();
+}
-$wgAjaxExportList[] = 'CollectionAjaxFunctions::onAjaxCollectionAddChapter';
+$wgAjaxExportList[] = 'wfAj
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: Change display of notifications count
Bmansurov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332901 )
Change subject: Change display of notifications count
..
Change display of notifications count
Rather than showing the number of notifications at the top rigth corner
of the bell, show the number on top of the bell. The number background
is red when there are un-read notifications. The number will disappear
if all notifications are read.
Bug: T152457
Change-Id: I98f27d63241ae0a0acca55b29c0562f4a7c1b331
---
M includes/skins/SkinMinerva.php
A includes/skins/secondaryButton.mustache
M minerva.less/minerva.variables.less
M resources/mobile.notifications.overlay/NotificationsOverlay.js
M resources/skins.minerva.base.styles/ui.less
5 files changed, 50 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/01/332901/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 3efd434..9d0802f 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -310,35 +310,6 @@
}
/**
-* Creates element relating to secondary button
-* @param string $title Title attribute value of secondary button
-* @param string $url of secondary button
-* @param string $spanLabel text of span associated with secondary
button.
-* @param string $spanClass the class of the secondary button
-* @return string html relating to button
-*/
- protected function createSecondaryButton( $title, $url, $spanLabel,
$spanClass ) {
- return Html::openElement( 'a', [
- 'title' => $title,
- 'href' => $url,
- 'class' => MobileUI::iconClass(
'notifications', 'element',
- 'user-button main-header-button
icon-32px' ),
- 'id' => 'secondary-button',
- ] ) .
- Html::element(
- 'span',
- [ 'class' => 'label' ],
- $title
- ) .
- Html::closeElement( 'a' ) .
- Html::element(
- 'span',
- [ 'class' => $spanClass ],
- $spanLabel
- );
- }
-
- /**
* Prepares the user button.
* @param QuickTemplate $tpl
*/
@@ -383,16 +354,19 @@
}
if ( $notificationsTitle ) {
- $spanClass = $isZero ? 'zero' : '';
- $spanClass .= ' notification-count';
- $spanClass .= $hasUnseen ? ' notification-unseen' : '';
-
$url = $notificationsTitle->getLocalURL(
[ 'returnto' =>
$currentTitle->getPrefixedText() ] );
- $tpl->set( 'secondaryButton',
- $this->createSecondaryButton(
$notificationsMsg, $url, $countLabel, $spanClass )
- );
+ $templateParser = new TemplateParser( __DIR__ );
+ $secondaryButton = $templateParser->processTemplate(
'secondaryButton', [
+ 'class' => MobileUI::iconClass(
'notifications' ),
+ 'title' => $notificationsMsg,
+ 'url' => $url,
+ 'notificationCount' => $countLabel,
+ 'isNotificationCountZero' => $isZero,
+ 'hasUnseenNotifications' => $hasUnseen
+ ] );
+ $tpl->set( 'secondaryButton', $secondaryButton );
}
}
diff --git a/includes/skins/secondaryButton.mustache
b/includes/skins/secondaryButton.mustache
new file mode 100644
index 000..765f4d4
--- /dev/null
+++ b/includes/skins/secondaryButton.mustache
@@ -0,0 +1,11 @@
+
+ {{title}}
+
+
+
+{{notificationCount}}
+
+
diff --git a/minerva.less/minerva.variables.less
b/minerva.less/minerva.variables.less
index 9d20b40..c42d15e 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -104,3 +104,8 @@
@lastModifiedBarTextColor: @colorGray6;
@footerBorderColor: @grayLight;
+
+@notificationBackgroundRead: @colorGray14;
+@notificationColorRead: @colorGray5;
+@notificationBackgroundUnread: @colorDestructive;
+@notificationColorUnread: #fff;
diff --git a/resources/mobile.notifications.overlay/NotificationsOverlay.js
b/resources/mobile.notifications.overlay/NotificationsOverlay.js
index d33849c..512bea4 100644
--- a/resour
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Add some html/parsoid sections for safety tests
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332724 )
Change subject: Add some html/parsoid sections for safety tests
..
Add some html/parsoid sections for safety tests
Change-Id: I4c36dce117eaf266e760483f23973204446c51d8
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
2 files changed, 33 insertions(+), 27 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index f6b670a..29310ae 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -496,11 +496,6 @@
add("html2html", "Character reference normalization in link text (bug 1938)",
"this&that\n");
add("html2html", "(bug 19451) Links should refer to the normalized form.", "אַ\nאַ\nאַ\nאַ\nאַ\n");
add("html2html", "Bug 2095: link with pipe and three closing brackets, version
2", "[http://example.com/]\n");
-add("html2html", "Bug 2304: HTML attribute safety (dangerous style template;
2309)", "\n");
-add("html2html", "Bug 2304: HTML attribute safety (unsafe parameter; 2309)",
"Magic
div\n");
-add("html2html", "Bug 3244: HTML attribute safety (extension; unsafe)", "\n");
-add("html2html", "MSIE CSS safety test: spurious slash", "evil\n");
-add("html2html", "MSIE CSS safety test: hex code", "evil\n");
add("html2html", "Table attribute safety", "\n
status\n\n");
add("html2html", "CSS line continuation 1", "\n");
add("html2html", "CSS line continuation 2", "\n");
@@ -1021,18 +1016,8 @@
add("html2wt", "Empty attribute crash test single-quotes (bug 2067)", "foo\n");
add("html2wt", "Attribute test: unquoted but illegal value (hash)", "foo\n");
add("html2wt", "Bug 2095: link with pipe and three closing brackets, version
2", "[[Main Page|[http://example.com/]]]\n");
-add("html2wt", "Bug 2304: HTML attribute safety (safe template; regression bug
2309)", "\n");
-add("html2wt", "Bug 2304: HTML attribute safety (dangerous style template;
2309)", "\n");
-add("html2wt", "Bug 2304: HTML attribute safety (safe parameter; 2309)", "Magic div\n");
-add("html2wt", "Bug 2304: HTML attribute safety (unsafe parameter; 2309)",
"Magic div\n");
add("html2wt", "Bug 2304: HTML attribute safety (unsafe breakout parameter;
2309)", "alert(document.cookie)\">Magic div\n");
add("html2wt", "Bug 2304: HTML attribute safety (unsafe breakout parameter 2;
2309)", "alert(document.cookie)\">Magic div\n");
-add("html2wt", "Bug 3244: HTML attribute safety (extension; safe)", "\n");
-add("html2wt", "Bug 3244: HTML attribute safety (extension; unsafe)", "\n");
-add("html2wt", "MSIE CSS safety test: spurious slash", "evil\n");
-add("html2wt", "MSIE CSS safety test: hex code", "evil\n");
-add("html2wt", "MSIE CSS safety test: comment in url", "evil\n");
-add("html2wt", "MSIE CSS safety test: comment in expression", "evil4\n");
add("html2wt", "Table attribute legitimate extension", "{|\n!
style=\"color:blue\" | status\n|}\n");
add("html2wt", "Table attribute safety", "{|\n! style=\"/* insecure input */\"
| status\n|}\n");
add("html2wt", "CSS line continuation 1", "\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index a93ce62..fb9f7dc 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -16487,9 +16487,11 @@
Bug 2304: HTML attribute safety (safe template; regression bug 2309)
!! wikitext
-!! html
+!! html/php
+!! html/parsoid
+
!! end
# Parsoid has enough context to handle this case
@@ -16508,29 +16510,36 @@
Bug 2304: HTML attribute safety (dangerous style template; 2309)
!! wikitext
-!! html
+!! html/php
+!! html/parsoid
+
!! end
!! test
Bug 2304: HTML attribute safety (safe parameter; 2309)
!! wikitext
{{div style|width: 200px}}
-!! html
+!! html/php
Magic div
+!! html/parsoid
+Magic div
!! end
!! test
Bug 2304: HTML attribute safety (unsafe parameter; 2309)
!! wikitext
{{div style|width: expression(alert(document.cookie))}}
-!! html
+!! html/php
Magic div
+!! html/parsoid
+Magic div
!! end
+## Parsoid output here differs; needs investigation.
!! test
Bug 2304: HTML attribute safety (unsafe breakout parameter; 2309)
!! wikitext
@@ -16540,6 +16549,7 @@
!! end
+## Parsoid output here differs; needs investigation.
!! test
Bug 2304: HTML attribute safety (unsafe breakout parameter 2; 2309)
!! wikitext
@@ -16575,7 +16585,6 @@
!! end
-
!! test
Bug 2304: HTML attribute safety (ISBN)
@@ -16626,18 +16635,22 @@
Bug 3244: HTML attribute safety (extension; safe)
!! wikitext
-!! html
+!! html/php
+!! html/parsoid
+
!! end
!! test
Bug 3244: HTML attribute safety (extension; unsafe)
!! wikitext
-!! html
+!! html/php
+!! html/parsoid
+
!! end
# More MSIE fun discovered by Tom Gilder
@@ -16646,36 +16659,44 @@
MSIE CSS safety test: spurious slash
!! wikitext
evil
-!! html
+!! html/php
evil
+!! html/pa
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T58846: Port sanitizer changes from core commit feb23b46
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332711 )
Change subject: T58846: Port sanitizer changes from core commit feb23b46
..
T58846: Port sanitizer changes from core commit feb23b46
Change-Id: I59163d62fface3a77ba223cb0dd49bc8602ba49a
---
M lib/utils/Util.js
M lib/wt2html/tt/Sanitizer.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
4 files changed, 133 insertions(+), 89 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/utils/Util.js b/lib/utils/Util.js
index 93d54ec..c308abc 100644
--- a/lib/utils/Util.js
+++ b/lib/utils/Util.js
@@ -1215,14 +1215,14 @@
return src.substring(tagWidths[0], src.length - tagWidths[1]);
},
- // Returns the utf8 encoding of the code point
+ // Returns a JS string from the provided code point
codepointToUtf8: function(cp) {
- try {
- return String.fromCharCode(cp);
- } catch (e) {
- // Return a tofu?
- return cp.toString();
- }
+ return String.fromCodePoint(cp);
+ },
+
+ // Returns the code point at the first position of the string
+ utf8ToCodepoint: function(str) {
+ return str.codePointAt(0);
},
// Returns true if a given Unicode codepoint is a valid character in
XML.
diff --git a/lib/wt2html/tt/Sanitizer.js b/lib/wt2html/tt/Sanitizer.js
index 60fd0a0..2c48739 100644
--- a/lib/wt2html/tt/Sanitizer.js
+++ b/lib/wt2html/tt/Sanitizer.js
@@ -818,52 +818,76 @@
});
};
-Sanitizer.prototype.checkCss = function(text) {
- function removeMismatchedQuoteChar(str, quoteChar) {
- var re1, re2;
- if (quoteChar === "'") {
- re1 = /'/g;
- re2 = /'([^'\n\r\f]*)$/;
- } else {
- re1 = /"/g;
- re2 = /"([^"\n\r\f]*)$/;
- }
-
- var mismatch = ((str.match(re1) || []).length) % 2 === 1;
- if (mismatch) {
- str = str.replace(re2, function() {
- // replace the mismatched quoteChar with a space
- return " " + arguments[1];
- });
- }
-
- return str;
+function removeMismatchedQuoteChar(str, quoteChar) {
+ var re1, re2;
+ if (quoteChar === "'") {
+ re1 = /'/g;
+ re2 = /'([^'\n\r\f]*)$/;
+ } else {
+ re1 = /"/g;
+ re2 = /"([^"\n\r\f]*)$/;
}
+ var mismatch = ((str.match(re1) || []).length) % 2 === 1;
+ if (mismatch) {
+ str = str.replace(re2, function() {
+ // replace the mismatched quoteChar with a space
+ return " " + arguments[1];
+ });
+ }
+ return str;
+}
+var ieReplace = new Map(Object.entries({
+ 'ʀ': 'r',
+ 'ɴ': 'n',
+ 'ⁿ': 'n',
+ 'ʟ': 'l',
+ 'ɪ': 'i',
+ '⁽': '(',
+ '₍': '(',
+}));
+
+Sanitizer.prototype.normalizeCss = function(text) {
// Decode character references like {
text = Sanitizer.decodeCharReferences(text);
- text = text.replace(this.constants.cssDecodeRE, function() {
- var c;
- if (arguments[1] !== undefined) {
- // Line continuation
- return '';
- } else if (arguments[2] !== undefined) {
- c =
Util.codepointToUtf8(parseInt(arguments[2], 16));
- } else if (arguments[3] !== undefined) {
- c = arguments[3];
- } else {
- c = '\\';
- }
- if (c === "\n" || c === '"' || c === "'" || c
=== '\\') {
- // These characters need to be escaped
in strings
- // Clean up the escape sequence to
avoid parsing errors by clients
- return '\\' +
(c.charCodeAt(0)).toString(16) + ' ';
- } else {
- // Decode unnecessary escape
- return c;
- }
- });
+ text = text.replace(this.constants.cssDecodeRE, function
cssDecodeCallback() {
+ var c;
+ if (arguments[1] !== undefined) {
+ // Line continuation
+ return '
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Keystone hooks: Set up default security groups for new proj...
Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332899 )
Change subject: Keystone hooks: Set up default security groups for new
projects.
..
Keystone hooks: Set up default security groups for new projects.
Nova sort of supports this, but it doesn't handle the
project-wide groups correctly.
Wikitech sort of handles this, but has a race.
Bug: T136871
Change-Id: I185651527faf0a44814a1acf3eea2ba5b64ad6bc
---
M modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
M modules/openstack/templates/liberty/keystone/keystone.conf.erb
M modules/openstack/templates/mitaka/keystone/keystone.conf.erb
3 files changed, 72 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/332899/1
diff --git
a/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
b/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
index 70027ec..576f1a2 100644
---
a/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
+++
b/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
@@ -13,8 +13,12 @@
#License for the specific language governing permissions and limitations
#under the License.
+from keystoneclient.auth.identity import generic
+from keystoneclient import session as keystone_session
from keystone.common import dependency
from keystone import exception
+from novaclient import client as nova_client
+from novaclient import exceptions
from oslo_log import log as logging
from oslo_config import cfg
@@ -36,6 +40,12 @@
cfg.StrOpt('admin_user',
default='novaadmin',
help='Admin user to add to all new projects'),
+cfg.StrOpt('admin_pass',
+ default='',
+ help='Admin password, used to authenticate with other
services'),
+cfg.StrOpt('auth_url',
+ default='',
+ help='Keystone URL, used to authenticate with other services'),
cfg.StrOpt('observer_user',
default='novaobserver',
help='Observer user to add to all new projects'),
@@ -48,10 +58,10 @@
cfg.StrOpt('admin_role_name',
default='projectadmin',
help='Name of project-local admin role'),
-cfg.MultiStrOpt('wmf_keystone_eventtype_whitelist',
+cfg.MultiStrOpt('eventtype_whitelist',
default=['identity.project.deleted',
'identity.project.created'],
help='Event types to always handle.'),
-cfg.MultiStrOpt('wmf_keystone_eventtype_blacklist',
+cfg.MultiStrOpt('eventtype_blacklist',
default=[],
help='Event types to always ignore.'
'In the event of a conflict, '
@@ -60,7 +70,7 @@
CONF = cfg.CONF
-CONF.register_opts(wmfkeystone_opts)
+CONF.register_opts(wmfkeystone_opts, group='wmfhooks')
@dependency.requires('assignment_api', 'resource_api', 'role_api')
@@ -82,25 +92,59 @@
# Make a dict to relate role names to ids
for role in rolelist:
roledict[role['name']] = role['id']
-if CONF.observer_role_name not in roledict.keys():
-LOG.error("Failed to find id for role %s" %
CONF.observer_role_name)
+if CONF.wmfhooks.observer_role_name not in roledict.keys():
+LOG.error("Failed to find id for role %s" %
CONF.wmfhooks.observer_role_name)
raise exception.NotImplemented()
-if CONF.admin_role_name not in roledict.keys():
-LOG.error("Failed to find id for role %s" % CONF.admin_role_name)
+if CONF.wmfhooks.admin_role_name not in roledict.keys():
+LOG.error("Failed to find id for role %s" %
CONF.wmfhooks.admin_role_name)
raise exception.NotImplemented()
-if CONF.user_role_name not in roledict.keys():
-LOG.error("Failed to find id for role %s" % CONF.user_role_name)
+if CONF.wmfhooks.user_role_name not in roledict.keys():
+LOG.error("Failed to find id for role %s" %
CONF.wmfhooks.user_role_name)
raise exception.NotImplemented()
-self.assignment_api.add_role_to_user_and_project(CONF.admin_user,
+
self.assignment_api.add_role_to_user_and_project(CONF.wmfhooks.admin_user,
project_id,
-
roledict[CONF.admin_role_name])
-self.assignment_api.add_role_to_user_and_project(CONF.admin_user,
+
roledict[CONF.wmfhooks.admin_role_name])
+
self.assignment_api.add_role_to_user_and_project(CONF.wmfhooks.admin_user,
project_id,
-
rol
[MediaWiki-commits] [Gerrit] translatewiki[master]: repong: Fix project detection for auto-merge
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332898 )
Change subject: repong: Fix project detection for auto-merge
..
repong: Fix project detection for auto-merge
Change-Id: I124698a76bf4a5b24afdf20c037b257ace1bd60c
---
M repoconfig.commit.json
M repong/repong.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index e8a1949..bb67cfe 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -489,7 +489,7 @@
"repos": {
"wikipedia-android": {
"type": "wmgerrit",
- "url":
"https://gerrit.wikimedia.org/r/apps/android/wikipedia";,
+ "url":
"ssh://l10n-...@gerrit.wikimedia.org:29418/apps/android/wikipedia",
"auto-merge": false
}
}
diff --git a/repong/repong.php b/repong/repong.php
index 283e32b..86aa246 100644
--- a/repong/repong.php
+++ b/repong/repong.php
@@ -139,7 +139,7 @@
// Merge patch sets submitted to Wikimedia's Gerrit.
if ( $repo['type'] === 'wmgerrit' && $autoMerge ) {
- $project = str_replace(
'https://gerrit.wikimedia.org/r/', '', $repo['url'] );
+ $project = str_replace(
'ssh://l10n-...@gerrit.wikimedia.org:29418/', '', $repo['url'] );
$process = new Process( $this->bindir .
"/merge-wmgerrit-patches '$project'" );
$process->setTimeout( 120 );
$process->mustRun();
--
To view, visit https://gerrit.wikimedia.org/r/332898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I124698a76bf4a5b24afdf20c037b257ace1bd60c
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: repong: Fix project detection for auto-merge
Nikerabbit has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332898 )
Change subject: repong: Fix project detection for auto-merge
..
repong: Fix project detection for auto-merge
Change-Id: I124698a76bf4a5b24afdf20c037b257ace1bd60c
---
M repoconfig.commit.json
M repong/repong.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/98/332898/1
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index e8a1949..bb67cfe 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -489,7 +489,7 @@
"repos": {
"wikipedia-android": {
"type": "wmgerrit",
- "url":
"https://gerrit.wikimedia.org/r/apps/android/wikipedia";,
+ "url":
"ssh://l10n-...@gerrit.wikimedia.org:29418/apps/android/wikipedia",
"auto-merge": false
}
}
diff --git a/repong/repong.php b/repong/repong.php
index 283e32b..86aa246 100644
--- a/repong/repong.php
+++ b/repong/repong.php
@@ -139,7 +139,7 @@
// Merge patch sets submitted to Wikimedia's Gerrit.
if ( $repo['type'] === 'wmgerrit' && $autoMerge ) {
- $project = str_replace(
'https://gerrit.wikimedia.org/r/', '', $repo['url'] );
+ $project = str_replace(
'ssh://l10n-...@gerrit.wikimedia.org:29418/', '', $repo['url'] );
$process = new Process( $this->bindir .
"/merge-wmgerrit-patches '$project'" );
$process->setTimeout( 120 );
$process->mustRun();
--
To view, visit https://gerrit.wikimedia.org/r/332898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I124698a76bf4a5b24afdf20c037b257ace1bd60c
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[wmf/1.29.0-wmf.8]: Revert "Use the parser to get each template parameter in the...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332897 )
Change subject: Revert "Use the parser to get each template parameter in the
Index: namespace"
..
Revert "Use the parser to get each template parameter in the Index: namespace"
This reverts commit cb081bc3c8c31152a87a4e590662b12522ca0204.
Bug: T155682
Change-Id: I662b45fe3eea8cad022098582116465676d20c19
---
M includes/index/ProofreadIndexPage.php
1 file changed, 3 insertions(+), 16 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/index/ProofreadIndexPage.php
b/includes/index/ProofreadIndexPage.php
index 0554b4b..e1543f6 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -235,27 +235,14 @@
* @return array of ProofreadIndexEntry
*/
public function getIndexEntries() {
- global $wgUser, $wgContLang;
if ( $this->entries === null ) {
$text = $this->getText();
$values = [];
-
- $parser = self::getParser();
- $options = new ParserOptions( $wgUser, $wgContLang );
- $parser->startExternalParse( $this->title, $options,
Parser::OT_PLAIN, true );
-
- $dom = $parser->preprocessToDom( $text );
- $frame = $parser->getPreprocessor()->newFrame();
- $dom = $dom->getFirstChild();
- $childframe = $frame->newChild(
$dom->getChildrenOfType( 'part' ) );
-
foreach ( $this->config as $varName => $property ) {
- if ( !array_key_exists( $varName,
$childframe->namedArgs ) ) {
- continue;
+ $tagPattern = "/\n\|" . preg_quote( $varName,
'/' ) . "=(.*?)\n(\||\}\})/is";
+ if ( preg_match( $tagPattern, $text, $matches )
) {
+ $values[$varName] = $matches[1];
}
- $values[$varName] =
$parser->mStripState->unstripBoth(
$parser->getPreprocessor()->newFrame()->expand(
- $childframe->namedArgs[$varName],
PPFrame::RECOVER_ORIG
- ) );
}
$this->entries =
$this->getIndexEntriesFromIndexContent( $values );
}
--
To view, visit https://gerrit.wikimedia.org/r/332897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I662b45fe3eea8cad022098582116465676d20c19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: wmf/1.29.0-wmf.8
Gerrit-Owner: Chad
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Revert "Use the parser to get each template parameter in the...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332895 )
Change subject: Revert "Use the parser to get each template parameter in the
Index: namespace"
..
Revert "Use the parser to get each template parameter in the Index: namespace"
This reverts commit cb081bc3c8c31152a87a4e590662b12522ca0204.
Bug: T155682
Change-Id: I662b45fe3eea8cad022098582116465676d20c19
---
M includes/index/ProofreadIndexPage.php
1 file changed, 3 insertions(+), 16 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/index/ProofreadIndexPage.php
b/includes/index/ProofreadIndexPage.php
index e73716b..fd6f63d 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -235,27 +235,14 @@
* @return array of ProofreadIndexEntry
*/
public function getIndexEntries() {
- global $wgUser, $wgContLang;
if ( $this->entries === null ) {
$text = $this->getText();
$values = [];
-
- $parser = self::getParser();
- $options = new ParserOptions( $wgUser, $wgContLang );
- $parser->startExternalParse( $this->title, $options,
Parser::OT_PLAIN, true );
-
- $dom = $parser->preprocessToDom( $text );
- $frame = $parser->getPreprocessor()->newFrame();
- $dom = $dom->getFirstChild();
- $childframe = $frame->newChild(
$dom->getChildrenOfType( 'part' ) );
-
foreach ( $this->config as $varName => $property ) {
- if ( !array_key_exists( $varName,
$childframe->namedArgs ) ) {
- continue;
+ $tagPattern = "/\n\|" . preg_quote( $varName,
'/' ) . "=(.*?)\n(\||\}\})/is";
+ if ( preg_match( $tagPattern, $text, $matches )
) {
+ $values[$varName] = $matches[1];
}
- $values[$varName] =
$parser->mStripState->unstripBoth(
$parser->getPreprocessor()->newFrame()->expand(
- $childframe->namedArgs[$varName],
PPFrame::RECOVER_ORIG
- ) );
}
$this->entries =
$this->getIndexEntriesFromIndexContent( $values );
}
--
To view, visit https://gerrit.wikimedia.org/r/332895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I662b45fe3eea8cad022098582116465676d20c19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Seb35
Gerrit-Reviewer: Tpt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[wmf/1.29.0-wmf.8]: Revert "Use the parser to get each template parameter in the...
Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332897 )
Change subject: Revert "Use the parser to get each template parameter in the
Index: namespace"
..
Revert "Use the parser to get each template parameter in the Index: namespace"
This reverts commit cb081bc3c8c31152a87a4e590662b12522ca0204.
Bug: T155682
Change-Id: I662b45fe3eea8cad022098582116465676d20c19
---
M includes/index/ProofreadIndexPage.php
1 file changed, 3 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/97/332897/1
diff --git a/includes/index/ProofreadIndexPage.php
b/includes/index/ProofreadIndexPage.php
index 0554b4b..e1543f6 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -235,27 +235,14 @@
* @return array of ProofreadIndexEntry
*/
public function getIndexEntries() {
- global $wgUser, $wgContLang;
if ( $this->entries === null ) {
$text = $this->getText();
$values = [];
-
- $parser = self::getParser();
- $options = new ParserOptions( $wgUser, $wgContLang );
- $parser->startExternalParse( $this->title, $options,
Parser::OT_PLAIN, true );
-
- $dom = $parser->preprocessToDom( $text );
- $frame = $parser->getPreprocessor()->newFrame();
- $dom = $dom->getFirstChild();
- $childframe = $frame->newChild(
$dom->getChildrenOfType( 'part' ) );
-
foreach ( $this->config as $varName => $property ) {
- if ( !array_key_exists( $varName,
$childframe->namedArgs ) ) {
- continue;
+ $tagPattern = "/\n\|" . preg_quote( $varName,
'/' ) . "=(.*?)\n(\||\}\})/is";
+ if ( preg_match( $tagPattern, $text, $matches )
) {
+ $values[$varName] = $matches[1];
}
- $values[$varName] =
$parser->mStripState->unstripBoth(
$parser->getPreprocessor()->newFrame()->expand(
- $childframe->namedArgs[$varName],
PPFrame::RECOVER_ORIG
- ) );
}
$this->entries =
$this->getIndexEntriesFromIndexContent( $values );
}
--
To view, visit https://gerrit.wikimedia.org/r/332897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I662b45fe3eea8cad022098582116465676d20c19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: wmf/1.29.0-wmf.8
Gerrit-Owner: Chad
Gerrit-Reviewer: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Move mediawiki to repong
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332893 )
Change subject: Move mediawiki to repong
..
Move mediawiki to repong
* Branches feature was currently unused, not ported
* Updated force languages list: removed existing languages with only
few messages translated each. No point forcing udpates to those
when they are inactive. Only exception is rup which is at 11%
currently and not exported after this change until it reaches 13%.
Replaced with languages that are never 100%, such as informal
variants and other variants.
* Export threshold is now also applied to installer and api.
Change-Id: I9649dfc9f8bfd8b6fad8a32e6809ff24edbebee7
---
M REPOCONF
M REPOCONF.commit
M bin/REPONG-PROJECTS
M bin/repocommit
M bin/repocreate
M bin/repoexport
M bin/repoupdate
M repoconfig.commit.json
M repoconfig.json
9 files changed, 27 insertions(+), 47 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/REPOCONF b/REPOCONF
index 047828e..2826a5a 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -1,8 +1,6 @@
# If not set, will not setup l10n-bot commit stuff for MediaWiki git extensions
#REPO_RW=yes
-REPO_MEDIAWIKI=https://gerrit.wikimedia.org/r/p//mediawiki/core.git
-REPO_MEDIAWIKI_BRANCHES="master"
REPO_MWEXTGIT=https://gerrit.wikimedia.org/r/p/mediawiki/extensions
REPO_MWSKINGIT=https://gerrit.wikimedia.org/r/p/mediawiki/skins
diff --git a/REPOCONF.commit b/REPOCONF.commit
index c26734a..a96f559 100644
--- a/REPOCONF.commit
+++ b/REPOCONF.commit
@@ -9,8 +9,6 @@
fi
# MediaWiki
-REPO_MEDIAWIKI=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/core.git
-REPO_MEDIAWIKI_BRANCHES="master"
REPO_MWEXTGIT=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/extensions
REPO_MWSKINGIT=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/skins
diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS
index f17d04a..98264de 100644
--- a/bin/REPONG-PROJECTS
+++ b/bin/REPONG-PROJECTS
@@ -22,6 +22,7 @@
kiwix
lib.reviews
mantis
+mediawiki
mwgerrit
mwgithub
nfcring-control
diff --git a/bin/repocommit b/bin/repocommit
index d6cdccf..75a55ec 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -79,18 +79,6 @@
bzr commit -m "$COMMITMSG"
done
-elif [ "$PROJECT" = "mediawiki" ]
-then
- if [ -z "$REPO_MEDIAWIKI_BRANCHES" ]
- then echo "Add REPO_MEDIAWIKI_BRANCHES to REPOCONF"; exit 1
- fi
-
- for BRANCH in $REPO_MEDIAWIKI_BRANCHES
- do
- gitCommitGerrit "$DIR/$PROJECT/$BRANCH"
- done
- "$DIRSCRIPT/merge-wmgerrit-patches" "mediawiki/core"
-
elif [ "$PROJECT" = "mediawiki-extensions" ]
then
for i in `ls "$DIR/$PROJECT/extensions"`
diff --git a/bin/repocreate b/bin/repocreate
index 029b88d..0461021 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -13,12 +13,6 @@
echo "$(date --rfc-3339=seconds --utc) [$(whoami) at $DIR] $0 $@" >> ${DIRLOG}
-
-if [ "${REPO_RW:-no}" = "yes" ]
-then CLUPDATE_GERRIT="$DIRSCRIPT/clupdate-gerrit-repo";
-else CLUPDATE_GERRIT="$DIRSCRIPT/clupdate-git-repo";
-fi
-
checkVar() {
if [ -z "${!1}" ]
then echo "Add ${1} to REPOCONF"; exit 1
@@ -47,16 +41,6 @@
cd ${MODULE}
bzr pull --remember `bzr info |grep "checkout of branch" |cut
-d" " -f 6`
cd ..
- done
-
-elif [ "$PROJECT" = "mediawiki" ]
-then
- checkVar 'REPO_MEDIAWIKI'
- checkVar 'REPO_MEDIAWIKI_BRANCHES'
- mkdir -p $PROJECT
- for BRANCH in $REPO_MEDIAWIKI_BRANCHES
- do
- "$CLUPDATE_GERRIT" "$REPO_MEDIAWIKI" "$DIR/$PROJECT/$BRANCH"
$BRANCH
done
elif [ "$PROJECT" = "mediawiki-extensions" ]
diff --git a/bin/repoexport b/bin/repoexport
index 71b91bd..03088f0 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -15,8 +15,6 @@
echo "$(date --rfc-3339=seconds --utc) [$(whoami) at $DIR] $0 $@" >> ${DIRLOG}
EXPORTER=$WIKI/extensions/Translate/scripts/export.php
-SKIPLANGS="test,aeb,be-x-old,crh,dk,en,fiu-vro,gan,gom,hif,kbd,kk,kk-cn,iu,kk-kz,kk-tr,ko-kp,ku,ku-arab,no,ruq,simple,sr,tg,tp,tt,ug,zh,zh-classical,zh-cn,zh-sg,zh-hk,zh-min-nan,zh-mo,zh-my,zh-tw,zh-yue,bbc,ady"
-FORCELANGS="chy,cr,ki,nrm,rn,rup,rw,tum,tw" # Must not contain any of those
above
THRESHOLD="--threshold 35"
HOURS="--hours 200" # Somewhat over a week
@@ -50,13 +48,6 @@
then
php "$EXPORTER" --target . --group='out-mathjax-*' --lang='*' --skip
en,qqq $THRESHOLD
php "$EXPORTER" --target . --group='out-mathjax-*' --lang qqq
-
-elif [ "$PROJECT" = "mediawiki" ]
-then
- php "$EXPORTER" --target . --group 'core' --lang='*' --skip
"$SKIPLANGS" --threshold 13 $HOURS &
- php "$EXPORTER" --target . --group 'core' --lang "$FORCELANGS" $HOURS &
- php "$EXPORTER" --target . --group 'ext-installer,mediawiki-api'
--lang='*' --skip "$SKIPLANGS" $HOURS &
- wa
[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: [WIP] [DNM] Update elastica dependency to 5.0.0
EBernhardson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332896 ) Change subject: [WIP] [DNM] Update elastica dependency to 5.0.0 .. [WIP] [DNM] Update elastica dependency to 5.0.0 The elasticsearch 5.x upgrade requires a new version of the elastica dependency. This patch needs to be referred to via Depends-On for patches in the es5 branch of CirrusSearch for tests to pass. Change-Id: I208a8dbcc2cb05af69af84a8a534ca8e8e03897c --- M composer.json M composer.lock M composer/autoload_classmap.php M composer/autoload_real.php A composer/autoload_static.php M composer/installed.json D ruflin/elastica/.coveralls.yml D ruflin/elastica/.dockerignore D ruflin/elastica/.editorconfig D ruflin/elastica/.gitattributes D ruflin/elastica/.gitignore D ruflin/elastica/.php_cs D ruflin/elastica/.travis.yml M ruflin/elastica/CHANGELOG.md D ruflin/elastica/CONTRIBUTING.md D ruflin/elastica/Dockerfile M ruflin/elastica/Makefile M ruflin/elastica/README.md M ruflin/elastica/composer.json D ruflin/elastica/docker-compose.yml D ruflin/elastica/docker-entrypoint.sh D ruflin/elastica/env/data/Dockerfile D ruflin/elastica/env/data/README.md D ruflin/elastica/env/elastica/Docker54 D ruflin/elastica/env/elastica/Docker55 D ruflin/elastica/env/elastica/Docker56 D ruflin/elastica/env/elastica/Docker70 D ruflin/elastica/env/elastica/README.md D ruflin/elastica/env/elastica/composer.json D ruflin/elastica/env/elasticsearch/Dockerfile D ruflin/elastica/env/elasticsearch/README.md D ruflin/elastica/env/elasticsearch/elasticsearch.yml D ruflin/elastica/env/elasticsearch/logging.yml D ruflin/elastica/env/elasticsearch/scripts/calculate-distance.groovy D ruflin/elastica/env/nginx/Dockerfile D ruflin/elastica/env/nginx/README.md D ruflin/elastica/env/nginx/mime.types D ruflin/elastica/env/nginx/nginx.conf D ruflin/elastica/lib/Elastica/AbstractScript.php M ruflin/elastica/lib/Elastica/AbstractUpdateAction.php M ruflin/elastica/lib/Elastica/Aggregation/AbstractAggregation.php M ruflin/elastica/lib/Elastica/Aggregation/AbstractSimpleAggregation.php M ruflin/elastica/lib/Elastica/Aggregation/AbstractTermsAggregation.php M ruflin/elastica/lib/Elastica/Aggregation/Avg.php A ruflin/elastica/lib/Elastica/Aggregation/BucketScript.php M ruflin/elastica/lib/Elastica/Aggregation/Cardinality.php A ruflin/elastica/lib/Elastica/Aggregation/Children.php M ruflin/elastica/lib/Elastica/Aggregation/DateHistogram.php M ruflin/elastica/lib/Elastica/Aggregation/DateRange.php M ruflin/elastica/lib/Elastica/Aggregation/ExtendedStats.php M ruflin/elastica/lib/Elastica/Aggregation/Filter.php M ruflin/elastica/lib/Elastica/Aggregation/Filters.php A ruflin/elastica/lib/Elastica/Aggregation/GeoCentroid.php M ruflin/elastica/lib/Elastica/Aggregation/GeoDistance.php M ruflin/elastica/lib/Elastica/Aggregation/GeohashGrid.php M ruflin/elastica/lib/Elastica/Aggregation/GlobalAggregation.php M ruflin/elastica/lib/Elastica/Aggregation/Histogram.php M ruflin/elastica/lib/Elastica/Aggregation/IpRange.php M ruflin/elastica/lib/Elastica/Aggregation/Max.php M ruflin/elastica/lib/Elastica/Aggregation/Min.php M ruflin/elastica/lib/Elastica/Aggregation/Missing.php M ruflin/elastica/lib/Elastica/Aggregation/Nested.php M ruflin/elastica/lib/Elastica/Aggregation/Percentiles.php M ruflin/elastica/lib/Elastica/Aggregation/Range.php M ruflin/elastica/lib/Elastica/Aggregation/ReverseNested.php M ruflin/elastica/lib/Elastica/Aggregation/ScriptedMetric.php A ruflin/elastica/lib/Elastica/Aggregation/SerialDiff.php M ruflin/elastica/lib/Elastica/Aggregation/SignificantTerms.php M ruflin/elastica/lib/Elastica/Aggregation/Stats.php M ruflin/elastica/lib/Elastica/Aggregation/Sum.php M ruflin/elastica/lib/Elastica/Aggregation/Terms.php M ruflin/elastica/lib/Elastica/Aggregation/TopHits.php M ruflin/elastica/lib/Elastica/Aggregation/ValueCount.php M ruflin/elastica/lib/Elastica/ArrayableInterface.php M ruflin/elastica/lib/Elastica/Bulk.php M ruflin/elastica/lib/Elastica/Bulk/Action.php M ruflin/elastica/lib/Elastica/Bulk/Action/AbstractDocument.php M ruflin/elastica/lib/Elastica/Bulk/Action/CreateDocument.php M ruflin/elastica/lib/Elastica/Bulk/Action/DeleteDocument.php M ruflin/elastica/lib/Elastica/Bulk/Action/IndexDocument.php M ruflin/elastica/lib/Elastica/Bulk/Action/UpdateDocument.php M ruflin/elastica/lib/Elastica/Bulk/Response.php M ruflin/elastica/lib/Elastica/Bulk/ResponseSet.php M ruflin/elastica/lib/Elastica/Client.php M ruflin/elastica/lib/Elastica/Cluster.php M ruflin/elastica/lib/Elastica/Cluster/Health.php M ruflin/elastica/lib/Elastica/Cluster/Health/Index.php M ruflin/elastica/lib/Elastica/Cluster/Health/Shard.php M ruflin/elastica/lib/Elastica/Cluster/Settings.php M ruflin/elastica/lib/Elastica/Connection.php M ruflin/elastica/lib/Elastica/Connection/ConnectionPool.php M ruflin/elastica/lib/Elastica/Connection/Strategy/CallbackStrategy.php M ruflin/elastica/lib/Elastica/Connection/Stra
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Revert "Use the parser to get each template parameter in the...
Hello Seb35, jenkins-bot, Tpt,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/332895
to review the following change.
Change subject: Revert "Use the parser to get each template parameter in the
Index: namespace"
..
Revert "Use the parser to get each template parameter in the Index: namespace"
This reverts commit cb081bc3c8c31152a87a4e590662b12522ca0204.
Bug: T155682
Change-Id: I662b45fe3eea8cad022098582116465676d20c19
---
M includes/index/ProofreadIndexPage.php
1 file changed, 3 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/95/332895/1
diff --git a/includes/index/ProofreadIndexPage.php
b/includes/index/ProofreadIndexPage.php
index e73716b..fd6f63d 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -235,27 +235,14 @@
* @return array of ProofreadIndexEntry
*/
public function getIndexEntries() {
- global $wgUser, $wgContLang;
if ( $this->entries === null ) {
$text = $this->getText();
$values = [];
-
- $parser = self::getParser();
- $options = new ParserOptions( $wgUser, $wgContLang );
- $parser->startExternalParse( $this->title, $options,
Parser::OT_PLAIN, true );
-
- $dom = $parser->preprocessToDom( $text );
- $frame = $parser->getPreprocessor()->newFrame();
- $dom = $dom->getFirstChild();
- $childframe = $frame->newChild(
$dom->getChildrenOfType( 'part' ) );
-
foreach ( $this->config as $varName => $property ) {
- if ( !array_key_exists( $varName,
$childframe->namedArgs ) ) {
- continue;
+ $tagPattern = "/\n\|" . preg_quote( $varName,
'/' ) . "=(.*?)\n(\||\}\})/is";
+ if ( preg_match( $tagPattern, $text, $matches )
) {
+ $values[$varName] = $matches[1];
}
- $values[$varName] =
$parser->mStripState->unstripBoth(
$parser->getPreprocessor()->newFrame()->expand(
- $childframe->namedArgs[$varName],
PPFrame::RECOVER_ORIG
- ) );
}
$this->entries =
$this->getIndexEntriesFromIndexContent( $values );
}
--
To view, visit https://gerrit.wikimedia.org/r/332895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I662b45fe3eea8cad022098582116465676d20c19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Seb35
Gerrit-Reviewer: Tpt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add $wgWikibaseInterwikiSorting allowing switch for Interwik...
Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332894 )
Change subject: Add $wgWikibaseInterwikiSorting allowing switch for
InterwikiSorting
..
Add $wgWikibaseInterwikiSorting allowing switch for InterwikiSorting
This is a temporary global switch which can be used to turn
off the InterwikiSorting by Wikibase.
This will allow migration to the InterwikiSorting extension
in a single config change.
Change-Id: I5031bd892ca8d7e7dcc6f0fbbaffbd3e1464c894
---
M client/WikibaseClient.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/94/332894/1
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index 27d1376..6a95bfe 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -71,6 +71,7 @@
global $wgAPIListModules, $wgAPIMetaModules, $wgAPIPropModules,
$wgSpecialPages;
global $wgResourceModules, $wgWBClientSettings, $wgRecentChangesFlags,
$wgMessagesDirs;
global $wgJobClasses, $wgTrackingCategories, $wgWBClientDataTypes,
$wgWBClientEntityTypes;
+ global $wgWikibaseInterwikiSorting;
$wgExtensionCredits['wikibase'][] = array(
'path' => __DIR__,
@@ -112,7 +113,9 @@
$wgHooks['OutputPageParserOutput'][] =
'\Wikibase\Client\Hooks\SidebarHookHandlers::onOutputPageParserOutput';
$wgHooks['SkinTemplateGetLanguageLink'][] =
'\Wikibase\Client\Hooks\SidebarHookHandlers::onSkinTemplateGetLanguageLink';
$wgHooks['ContentAlterParserOutput'][] =
'\Wikibase\Client\Hooks\ParserOutputUpdateHookHandlers::onContentAlterParserOutput';
- $wgHooks['ContentAlterParserOutput'][] =
'\Wikibase\Client\Hooks\InterwikiSortingHookHandlers::onContentAlterParserOutput';
+ if ( !isset( $wgWikibaseInterwikiSorting ) ||
$wgWikibaseInterwikiSorting ) {
+ $wgHooks['ContentAlterParserOutput'][] =
'\Wikibase\Client\Hooks\InterwikiSortingHookHandlers::onContentAlterParserOutput';
+ }
$wgHooks['SidebarBeforeOutput'][] =
'\Wikibase\Client\Hooks\SidebarHookHandlers::onSidebarBeforeOutput';
$wgHooks['ParserFirstCallInit'][] =
'\Wikibase\ClientHooks::onParserFirstCallInit';
--
To view, visit https://gerrit.wikimedia.org/r/332894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5031bd892ca8d7e7dcc6f0fbbaffbd3e1464c894
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[wmf/1.29.0-wmf.8]: Revert "Hook no longer passes $title by reference"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332889 )
Change subject: Revert "Hook no longer passes $title by reference"
..
Revert "Hook no longer passes $title by reference"
Hook signature change was reverted
This reverts commit eb0a03e65f984c25c0660297467391b00f241b99.
Change-Id: Ica8cc91486f70560e9905b96d4f5d3211f73f7ca
---
M classes/Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/classes/Hooks.php b/classes/Hooks.php
index 660008d..18aebbc 100644
--- a/classes/Hooks.php
+++ b/classes/Hooks.php
@@ -256,7 +256,7 @@
return true;
}
- static function customiseSearchResultTitle( $title, &$text, $result,
$terms, $page ) {
+ static function customiseSearchResultTitle( &$title, &$text, $result,
$terms, $page ) {
if ( $title->getNamespace() != NS_LQT_THREAD ) {
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/332889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica8cc91486f70560e9905b96d4f5d3211f73f7ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: wmf/1.29.0-wmf.8
Gerrit-Owner: Chad
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.8]: Unbreak extensions from ShowSearchHitTitle signature change
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332888 ) Change subject: Unbreak extensions from ShowSearchHitTitle signature change .. Unbreak extensions from ShowSearchHitTitle signature change Fixes If78cb0c29ae394f16e465c15a8e8246c1b56dcea Change-Id: Ia56f2eb4a5ed98f727f924666322e1c97b3ee183 (cherry picked from commit 256a5cf1c44b9bed611a005daca53b2a28fed26d) --- M docs/hooks.txt M includes/widget/search/FullSearchResultWidget.php 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/hooks.txt b/docs/hooks.txt index 1da39cf..2f99fff 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -2877,7 +2877,7 @@ function returned false. 'ShowSearchHitTitle': Customise display of search hit title/link. -$title: Title to link to +&$title: Title to link to &$text: Text to use for the link $result: The search result $terms: The search terms entered diff --git a/includes/widget/search/FullSearchResultWidget.php b/includes/widget/search/FullSearchResultWidget.php index a93e1fc..69bfa6d 100644 --- a/includes/widget/search/FullSearchResultWidget.php +++ b/includes/widget/search/FullSearchResultWidget.php @@ -134,7 +134,7 @@ $queryString = []; Hooks::run( 'ShowSearchHitTitle', - [ $title, &$snippet, $result, $terms, $this->specialPage, &$queryString ] ); + [ &$title, &$snippet, $result, $terms, $this->specialPage, &$queryString ] ); $link = $this->linkRenderer->makeLink( $title, -- To view, visit https://gerrit.wikimedia.org/r/332888 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia56f2eb4a5ed98f727f924666322e1c97b3ee183 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.29.0-wmf.8 Gerrit-Owner: Chad Gerrit-Reviewer: Chad Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Specify the namespace when linking to Special:EntityPage
Aleksey Bekh-Ivanov (WMDE) has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330214 )
Change subject: Specify the namespace when linking to Special:EntityPage
..
Specify the namespace when linking to Special:EntityPage
Title::makeTitle docs state that page title should be provided
unprefixed.
Change-Id: Ied506ed075dfb68ddaf7c18ca00765c78b5feeeb
---
M repo/includes/Content/EntityContentFactory.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/repo/includes/Content/EntityContentFactory.php
b/repo/includes/Content/EntityContentFactory.php
index 65a655c..193623d 100644
--- a/repo/includes/Content/EntityContentFactory.php
+++ b/repo/includes/Content/EntityContentFactory.php
@@ -105,14 +105,14 @@
*/
public function getTitleForId( EntityId $id ) {
if ( $id->isForeign() ) {
- $pageName = 'Special:EntityPage/' . $id->getLocalPart();
+ $pageName = 'EntityPage/' . $id->getLocalPart();
// TODO: The interwiki prefix *should* be the same as
the repo name,
//but we have no way to know or guarantee this!
See T153496.
$interwiki = $id->getRepositoryName();
// TODO: use a TitleFactory
- return Title::makeTitle( 0, $pageName, '', $interwiki );
+ return Title::makeTitle( NS_SPECIAL, $pageName, '',
$interwiki );
} else {
$handler = $this->getContentHandlerForType(
$id->getEntityType() );
return $handler->getTitleForId( $id );
--
To view, visit https://gerrit.wikimedia.org/r/330214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied506ed075dfb68ddaf7c18ca00765c78b5feeeb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE)
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: WMDE-leszek
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Move mediawiki to repong
Nikerabbit has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332893 )
Change subject: Move mediawiki to repong
..
Move mediawiki to repong
* Branches feature was currently unused, not ported
* Updated force languages list: removed existing languages with only
few messages translated each. No point forcing udpates to those
when they are inactive. Only exception is rup which is at 11%
currently and not exported after this change until it reaches 13%.
Replaced with languages that are never 100%, such as informal
variants and other variants.
* Export threshold is now also applied to installer and api.
Change-Id: I9649dfc9f8bfd8b6fad8a32e6809ff24edbebee7
---
M REPOCONF
M REPOCONF.commit
M bin/REPONG-PROJECTS
M bin/repocommit
M bin/repocreate
M bin/repoexport
M bin/repoupdate
M repoconfig.commit.json
M repoconfig.json
9 files changed, 27 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/93/332893/1
diff --git a/REPOCONF b/REPOCONF
index 047828e..2826a5a 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -1,8 +1,6 @@
# If not set, will not setup l10n-bot commit stuff for MediaWiki git extensions
#REPO_RW=yes
-REPO_MEDIAWIKI=https://gerrit.wikimedia.org/r/p//mediawiki/core.git
-REPO_MEDIAWIKI_BRANCHES="master"
REPO_MWEXTGIT=https://gerrit.wikimedia.org/r/p/mediawiki/extensions
REPO_MWSKINGIT=https://gerrit.wikimedia.org/r/p/mediawiki/skins
diff --git a/REPOCONF.commit b/REPOCONF.commit
index c26734a..a96f559 100644
--- a/REPOCONF.commit
+++ b/REPOCONF.commit
@@ -9,8 +9,6 @@
fi
# MediaWiki
-REPO_MEDIAWIKI=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/core.git
-REPO_MEDIAWIKI_BRANCHES="master"
REPO_MWEXTGIT=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/extensions
REPO_MWSKINGIT=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/skins
diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS
index f17d04a..98264de 100644
--- a/bin/REPONG-PROJECTS
+++ b/bin/REPONG-PROJECTS
@@ -22,6 +22,7 @@
kiwix
lib.reviews
mantis
+mediawiki
mwgerrit
mwgithub
nfcring-control
diff --git a/bin/repocommit b/bin/repocommit
index d6cdccf..75a55ec 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -79,18 +79,6 @@
bzr commit -m "$COMMITMSG"
done
-elif [ "$PROJECT" = "mediawiki" ]
-then
- if [ -z "$REPO_MEDIAWIKI_BRANCHES" ]
- then echo "Add REPO_MEDIAWIKI_BRANCHES to REPOCONF"; exit 1
- fi
-
- for BRANCH in $REPO_MEDIAWIKI_BRANCHES
- do
- gitCommitGerrit "$DIR/$PROJECT/$BRANCH"
- done
- "$DIRSCRIPT/merge-wmgerrit-patches" "mediawiki/core"
-
elif [ "$PROJECT" = "mediawiki-extensions" ]
then
for i in `ls "$DIR/$PROJECT/extensions"`
diff --git a/bin/repocreate b/bin/repocreate
index 029b88d..e26cc56 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -49,16 +49,6 @@
cd ..
done
-elif [ "$PROJECT" = "mediawiki" ]
-then
- checkVar 'REPO_MEDIAWIKI'
- checkVar 'REPO_MEDIAWIKI_BRANCHES'
- mkdir -p $PROJECT
- for BRANCH in $REPO_MEDIAWIKI_BRANCHES
- do
- "$CLUPDATE_GERRIT" "$REPO_MEDIAWIKI" "$DIR/$PROJECT/$BRANCH"
$BRANCH
- done
-
elif [ "$PROJECT" = "mediawiki-extensions" ]
then
mkdir -p $PROJECT/extensions
diff --git a/bin/repoexport b/bin/repoexport
index 71b91bd..03088f0 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -15,8 +15,6 @@
echo "$(date --rfc-3339=seconds --utc) [$(whoami) at $DIR] $0 $@" >> ${DIRLOG}
EXPORTER=$WIKI/extensions/Translate/scripts/export.php
-SKIPLANGS="test,aeb,be-x-old,crh,dk,en,fiu-vro,gan,gom,hif,kbd,kk,kk-cn,iu,kk-kz,kk-tr,ko-kp,ku,ku-arab,no,ruq,simple,sr,tg,tp,tt,ug,zh,zh-classical,zh-cn,zh-sg,zh-hk,zh-min-nan,zh-mo,zh-my,zh-tw,zh-yue,bbc,ady"
-FORCELANGS="chy,cr,ki,nrm,rn,rup,rw,tum,tw" # Must not contain any of those
above
THRESHOLD="--threshold 35"
HOURS="--hours 200" # Somewhat over a week
@@ -50,13 +48,6 @@
then
php "$EXPORTER" --target . --group='out-mathjax-*' --lang='*' --skip
en,qqq $THRESHOLD
php "$EXPORTER" --target . --group='out-mathjax-*' --lang qqq
-
-elif [ "$PROJECT" = "mediawiki" ]
-then
- php "$EXPORTER" --target . --group 'core' --lang='*' --skip
"$SKIPLANGS" --threshold 13 $HOURS &
- php "$EXPORTER" --target . --group 'core' --lang "$FORCELANGS" $HOURS &
- php "$EXPORTER" --target . --group 'ext-installer,mediawiki-api'
--lang='*' --skip "$SKIPLANGS" $HOURS &
- wait
elif [ "$PROJECT" = "mediawiki-extensions" ]
then
diff --git a/bin/repoupdate b/bin/repoupdate
index b3ac698..c657a97 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -82,12 +82,6 @@
then
doUpdate "$PROJECT" "$CLUPDATE" develop
-elif [ "$PROJECT" = "mediawiki" ]
-then
- checkVar 'REPO_MEDIAWIKI_BRANCHES'
- echo "$REPO_MEDIAWIKI_BRANCHES" | tr ' ' '\n' |
- xargs -P4 -I___ "$CLUPDATE
[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Revert "Hook no longer passes $title by reference"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332887 )
Change subject: Revert "Hook no longer passes $title by reference"
..
Revert "Hook no longer passes $title by reference"
Hook signature change was reverted
This reverts commit eb0a03e65f984c25c0660297467391b00f241b99.
Change-Id: Ica8cc91486f70560e9905b96d4f5d3211f73f7ca
---
M classes/Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/classes/Hooks.php b/classes/Hooks.php
index 660008d..18aebbc 100644
--- a/classes/Hooks.php
+++ b/classes/Hooks.php
@@ -256,7 +256,7 @@
return true;
}
- static function customiseSearchResultTitle( $title, &$text, $result,
$terms, $page ) {
+ static function customiseSearchResultTitle( &$title, &$text, $result,
$terms, $page ) {
if ( $title->getNamespace() != NS_LQT_THREAD ) {
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/332887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica8cc91486f70560e9905b96d4f5d3211f73f7ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Unbreak extensions using SpecialSearchResults hook
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332884 )
Change subject: Unbreak extensions using SpecialSearchResults hook
..
Unbreak extensions using SpecialSearchResults hook
Changing hook signatures with no deprecation period is a no-no.
Fixes Ib527fc3a3c39eb2e56985e5d1e4905fc4562353c
Reverts I153a7d590faceb1e2c4fe7d95a5cb931cda0c301
Bug: T155625
Change-Id: I2b408691fc4435ef24fc62360bd7ad6114f385c7
---
M docs/hooks.txt
M includes/specials/SpecialSearch.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 4057cce..ef47218 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3148,8 +3148,8 @@
'SpecialSearchResults': Called before search result display
$term: string of search term
-$titleMatches: empty or SearchResultSet object
-$textMatches: empty or SearchResultSet object
+&$titleMatches: empty or SearchResultSet object
+&$textMatches: empty or SearchResultSet object
'SpecialSearchResultsPrepend': Called immediately before returning HTML
on the search results page. Useful for including an external search
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index 9356a3a..34620ff 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -371,7 +371,7 @@
// Show the create link ahead
$this->showCreateLink( $title, $num, $titleMatches,
$textMatches );
- Hooks::run( 'SpecialSearchResults', [ $term, $titleMatches,
$textMatches ] );
+ Hooks::run( 'SpecialSearchResults', [ $term, &$titleMatches,
&$textMatches ] );
// If we have no results and have not already displayed an
error message
if ( $num === 0 && !$hasErrors ) {
--
To view, visit https://gerrit.wikimedia.org/r/332884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b408691fc4435ef24fc62360bd7ad6114f385c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad
Gerrit-Reviewer: Florianschmidtwelzow
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...MobileFrontend[master]: WIP: Limit the width of search in tablet mode
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332892 )
Change subject: WIP: Limit the width of search in tablet mode
..
WIP: Limit the width of search in tablet mode
Problems:
* In tablet focusing input causes search to jump slightly to right
* Re-evaluate the (min-width: 62.5em) threshold with Nirzar
(below this, but above 720px rendering issues)
Change-Id: I1aaae597c5805126ed893f4de71263f6da073b8b
---
M minerva.less/minerva.variables.less
M resources/mobile.search/SearchOverlay.less
M resources/skins.minerva.base.styles/ui.less
3 files changed, 22 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/92/332892/1
diff --git a/minerva.less/minerva.variables.less
b/minerva.less/minerva.variables.less
index 9d20b40..081fe49 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -7,6 +7,9 @@
@rightDrawerWidth: 60%;
@primaryNavBackgroundColor: @colorGray14;
+// Header
+@searchBarWidth: 375px;
+
// Headings
@firstHeadingFontSize: 2.6525em; // 42px
@pageActionFontSize: 1.1em; // Icons are 24px square.
diff --git a/resources/mobile.search/SearchOverlay.less
b/resources/mobile.search/SearchOverlay.less
index 575c78c..47fd3f3 100644
--- a/resources/mobile.search/SearchOverlay.less
+++ b/resources/mobile.search/SearchOverlay.less
@@ -197,3 +197,21 @@
}
}
}
+
+@media all and ( min-width: @deviceWidthTablet ) {
+ .search-overlay {
+ .overlay-content,
+ .overlay-header {
+ width: @searchBarWidth;
+ }
+
+ .cancel {
+ position: absolute;
+ top: 15px;
+ }
+
+ .overlay-title {
+ padding-left: 0;
+ }
+ }
+}
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index eef9ac1..a575775 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -41,7 +41,7 @@
width: 0;
.search {
- width: 375px;
+ width: @searchBarWidth;
margin-left: 95px;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/332892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1aaae597c5805126ed893f4de71263f6da073b8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
