[MediaWiki-commits] [Gerrit] Found and altered the one place in the code that might expla... - change (mediawiki...DonationInterface)
Mwalker has submitted this change and it was merged.
Change subject: Found and altered the one place in the code that might explain
these infrequent and weird loglines I'm seeing sometimes in the payments.error
log (in production). If this changes things: Transactions that hit this block
get stuck until they are manually u
..
Found and altered the one place in the code that might explain
these infrequent and weird loglines I'm seeing sometimes in
the payments.error log (in production).
If this changes things: Transactions that hit this block get stuck
until they are manually unstuck. Teach orphans.php how to handle
them for real.
Change-Id: I69b252529aaa8ee075351c049fea9abd59e9174e
---
M globalcollect_gateway/globalcollect.adapter.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/globalcollect_gateway/globalcollect.adapter.php
b/globalcollect_gateway/globalcollect.adapter.php
index dcf9c75..c7a6c94 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1203,6 +1203,7 @@
} elseif ( array_key_exists( 'status', $status_result )
$status_result['status'] === false ) {
//can't communicate or internal error
$problemflag = true;
+ $problemmessage = Can't communicate or
internal error.; // /me shrugs - I think the orphan slayer is hitting this
sometimes. Confusing.
}
$order_status_results = false;
--
To view, visit https://gerrit.wikimedia.org/r/118046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69b252529aaa8ee075351c049fea9abd59e9174e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Adamw awi...@wikimedia.org
Gerrit-Reviewer: Mwalker mwal...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Massage watchdog calls and inline documentation - change (wikimedia...crm)
Mwalker has submitted this change and it was merged.
Change subject: Massage watchdog calls and inline documentation
..
Massage watchdog calls and inline documentation
Change-Id: Ic75be00ac820cc889059f815fa3b0273853ae677
---
M
sites/all/modules/oneoffs/201305_paypal_recurring/sorry_may2013_paypal_recurring.php
M sites/all/modules/wmf_communication/Job.php
M sites/all/modules/wmf_communication/Mailer.php
M sites/all/modules/wmf_communication/MailingTemplate.php
M sites/all/modules/wmf_communication/Recipient.php
M sites/all/modules/wmf_communication/Templating.php
M sites/all/modules/wmf_communication/Translation.php
7 files changed, 249 insertions(+), 24 deletions(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/sites/all/modules/oneoffs/201305_paypal_recurring/sorry_may2013_paypal_recurring.php
b/sites/all/modules/oneoffs/201305_paypal_recurring/sorry_may2013_paypal_recurring.php
index 2e5cca3..58befa3 100644
---
a/sites/all/modules/oneoffs/201305_paypal_recurring/sorry_may2013_paypal_recurring.php
+++
b/sites/all/modules/oneoffs/201305_paypal_recurring/sorry_may2013_paypal_recurring.php
@@ -11,6 +11,7 @@
function sorry_may2013_paypal_recurring_build_job() {
$dbs = module_invoke( 'wmf_civicrm', 'get_dbs' );
+// Find all contributions affected by this screwup
$dbs-push( 'civicrm' );
$result = db_query(
SELECT
@@ -67,6 +68,7 @@
function sorry_may2013_paypal_recurring_mark_thanked() {
$job_ran_date = '2013-08-14 00:00:00';
+// TODO function Job::getAllRecipientsForStatus or Recipient:getQueued...
to do exactly this
$query = db_select( 'wmf_communication_recipient', 'r' );
$query-join( 'wmf_communication_job', 'j', 'r.job_id = j.id' );
$query-addField( 'r', 'vars' );
diff --git a/sites/all/modules/wmf_communication/Job.php
b/sites/all/modules/wmf_communication/Job.php
index 0a2ed28..74aeebc 100644
--- a/sites/all/modules/wmf_communication/Job.php
+++ b/sites/all/modules/wmf_communication/Job.php
@@ -2,6 +2,23 @@
use \Exception;
+/**
+ * Entity representing a single mailing job batch run
+ *
+ * A job can be created in small, decoupled steps, and intermediate values
+ * examined in the database.
+ *
+ * For example, here is the lifecycle of a typical job:
+ *
+ * // Create an empty mailing job, which will render letters using the
+ * // specified template.
+ * $job = Job::create( 'RecurringDonationsSnafuMay2013Template' );
+ *
+ * foreach ( $recipients as $contact_id = $email ) {
+ * $job
+ * // Trigger the batch run. Execution
+ * $job-run();
+ */
class Job {
protected $id;
protected $template;
@@ -15,7 +32,11 @@
$job = new Job();
$job-id = $id;
-watchdog( 'wmf_communication', t( Retrieving mailing job :id from the
database., array( ':id' = $id ) ), WATCHDOG_INFO );
+watchdog( 'wmf_communication',
+Retrieving mailing job :id from the database.,
+array( ':id' = $id ),
+WATCHDOG_INFO
+);
$row = db_select( 'wmf_communication_job' )
-fields( 'wmf_communication_job' )
-condition( 'id', $id )
@@ -38,6 +59,13 @@
return $job;
}
+/**
+ * Reserve an empty Job record and sequence number.
+ *
+ * @param string $templateClass mailing template classname
+ *
+ * TODO: other job-wide parameters and generic storage
+ */
static function create( $templateClass ) {
$jobId = db_insert( 'wmf_communication_job' )
-fields( array(
@@ -45,6 +73,14 @@
) )
-execute();
+watchdog( 'wmf_communication',
+Created a new job id :id, of type :template_class.,
+array(
+':id' = $jobId,
+':template_class' = $templateClass,
+),
+WATCHDOG_INFO
+);
return Job::getJob( $jobId );
}
@@ -52,7 +88,11 @@
* Find all queued recipients and send letters.
*/
function run() {
-watchdog( 'wmf_communication', t( Running mailing job ID :id...,
array( ':id' = $this-id ) ), WATCHDOG_INFO );
+watchdog( 'wmf_communication',
+Running mailing job ID :id...,
+array( ':id' = $this-id ),
+WATCHDOG_INFO
+);
$mailer = Mailer::getDefault();
$successful = 0;
@@ -86,13 +126,21 @@
}
if ( ( $successful + $failed ) === 0 ) {
-watchdog( 'wmf_communication', t( The mailing job (ID :id) was
empty, or already completed., array( ':id' = $this-id ) ), WATCHDOG_WARNING
);
+watchdog( 'wmf_communication',
+The mailing job (ID :id) was empty, or already completed.,
+array( ':id' = $this-id ),
+WATCHDOG_WARNING
+);
} else {
[MediaWiki-commits] [Gerrit] Change home directory of vagrant user - change (operations/puppet)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118053
Change subject: Change home directory of vagrant user
..
Change home directory of vagrant user
The Labsvagrant module tries to create a new directory
at /home/vagrant. This does not work with the network
folder /home at the new eqiad cluster.
This change sets the home directory for the vagrant user
to /mnt/vagrant-user.
Bug: 62470
Change-Id: I08b16b7c18a6ebffa551b7f62282378cbd5b79a6
---
M modules/labs_vagrant/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/118053/1
diff --git a/modules/labs_vagrant/manifests/init.pp
b/modules/labs_vagrant/manifests/init.pp
index 6cb9920..36034d6 100644
--- a/modules/labs_vagrant/manifests/init.pp
+++ b/modules/labs_vagrant/manifests/init.pp
@@ -1,6 +1,7 @@
class labs_vagrant {
user { 'vagrant':
ensure = 'present',
+home = '/mnt/vagrant-user'
managehome = true
}
--
To view, visit https://gerrit.wikimedia.org/r/118053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08b16b7c18a6ebffa551b7f62282378cbd5b79a6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] base: remove lookupvar and replace with top scope @ var - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: base: remove lookupvar and replace with top scope @ var
..
base: remove lookupvar and replace with top scope @ var
Change-Id: Ida7e2602ae5705c1279b47e51a710fb13db8744b
---
M modules/base/templates/snmp.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/templates/snmp.conf.erb
b/modules/base/templates/snmp.conf.erb
index 6d2c2a7..fc85633 100644
--- a/modules/base/templates/snmp.conf.erb
+++ b/modules/base/templates/snmp.conf.erb
@@ -4,9 +4,9 @@
##
mibs :
% if has_variable?('::ipaddress_bond0') then %
-clientaddr %= scope.lookupvar('::ipaddress_bond0') %:0
+clientaddr %= @ipaddress_bond0 %:0
% elsif has_variable?('::ipaddress_eth0') then %
-clientaddr %= scope.lookupvar('::ipaddress_eth0') %:0
+clientaddr %= @ipaddress_eth0 %:0
% else %
clientaddr %= @ipaddress %:0
% end %
--
To view, visit https://gerrit.wikimedia.org/r/117922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida7e2602ae5705c1279b47e51a710fb13db8744b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] openstack: remove var and replace with top scope ::var - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: openstack: remove var and replace with top scope ::var
..
openstack: remove var and replace with top scope ::var
Change-Id: I73919d9c8e67c77d854eff552e708707043ceb0a
---
M manifests/openstack.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index ae6a6cb..1af3c57 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -800,7 +800,7 @@
class { openstack::repo: openstack_version = $openstack_version }
}
-if ( $realm == production ) {
+if ( $::realm == production ) {
$certname = virt-star.${site}.wmnet
install_certificate{ ${certname}: }
install_additional_key{ ${certname}: key_loc = /var/lib/nova,
owner = nova, group = libvirtd, require = Package[nova-common] }
--
To view, visit https://gerrit.wikimedia.org/r/116976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73919d9c8e67c77d854eff552e708707043ceb0a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use .equals not == for comparing strings - change (apps...wikipedia)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118054
Change subject: Use .equals not == for comparing strings
..
Use .equals not == for comparing strings
Change-Id: Ief36183409d91475eb052eae4dc18d1edfd8f54f
---
M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/54/118054/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
index b0f7013..08f2142 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
@@ -134,7 +134,7 @@
public void onCatch(Throwable caught) {
if (caught instanceof EditingException) {
EditingException ee = (EditingException) caught;
-if (app.getUserInfoStorage().isLoggedIn()
ee.getCode() == badtoken) {
+if (app.getUserInfoStorage().isLoggedIn()
ee.getCode().equals(badtoken)) {
// looks like our session expired.
app.getEditTokenStorage().clearAllTokens();
app.getCookieManager().clearAllCookies();
--
To view, visit https://gerrit.wikimedia.org/r/118054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief36183409d91475eb052eae4dc18d1edfd8f54f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introducting jQuery.Payment - change (mediawiki...DonationInterface)
Mwalker has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118055
Change subject: Introducting jQuery.Payment
..
Introducting jQuery.Payment
A library by Stripe from https://github.com/stripe/jquery.payment/
for more easily creating UIs that do intelligent things with
credit cards.
Change-Id: I6d11aa1e9ff5183f81c93bf3d824f91552f0cbb8
---
M DonationInterface.php
A modules/jquery.payment/LICENSE
A modules/jquery.payment/README.md
A modules/jquery.payment/jquery.payment.js
4 files changed, 731 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/55/118055/1
diff --git a/DonationInterface.php b/DonationInterface.php
index 4045eeb..ca46ef7 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -861,6 +861,11 @@
)
) + $wgResourceTemplate;
+$wgResourceModules['jquery.payment'] = array(
+ 'scripts' = 'jquery.payment/jquery.payment.js',
+ 'dependencies' = array( 'jquery' )
+) + $wgResourceTemplate;;
+
// load any rapidhtml related resources
require_once( $donationinterface_dir .
'gateway_forms/rapidhtml/RapidHtmlResources.php' );
diff --git a/modules/jquery.payment/LICENSE b/modules/jquery.payment/LICENSE
new file mode 100644
index 000..b685134
--- /dev/null
+++ b/modules/jquery.payment/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2012 Stripe (a...@stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+Software), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/modules/jquery.payment/README.md b/modules/jquery.payment/README.md
new file mode 100644
index 000..9e7d03c
--- /dev/null
+++ b/modules/jquery.payment/README.md
@@ -0,0 +1,209 @@
+# jQuery.payment
+
+A general purpose library for building credit card forms, validating inputs
and formatting numbers.
+
+For example, you can make a input act like a credit card field (with number
formatting, and length restriction):
+
+``` javascript
+$('input.cc-num').payment('formatCardNumber');
+```
+
+Then, when say the payment form is submitted, you can validate the card number
on the client-side like so:
+
+``` javascript
+var valid = $.payment.validateCardNumber($('input.cc-num').val());
+
+if ( !valid ) {
+ alert('Your card is not valid!');
+ return false;
+}
+```
+
+You can find a full [demo
here](http://stripe.github.com/jquery.payment/example).
+
+Supported card types are:
+
+* Visa
+* MasterCard
+* American Express
+* Discover
+* JCB
+* Diners Club
+* Maestro
+* Laster
+* UnionPay
+
+## API
+
+### $.fn.payment('formatCardNumber')
+
+Formats card numbers:
+
+* Including a space between every 4 digits
+* Restricts input to numbers
+* Limits to 16 numbers
+* American Express formatting support
+* Adds a class of the card type (i.e. 'visa') to the input
+
+Example:
+
+``` javascript
+$('input.cc-num').payment('formatCardNumber');
+```
+
+### $.fn.payment('formatCardExpiry')
+
+Formats card expiry:
+
+* Includes a `/` between the month and year
+* Restricts input to numbers
+* Restricts length
+
+Example:
+
+``` javascript
+$('input.cc-exp').payment('formatCardExpiry');
+```
+
+### $.fn.payment('formatCardCVC')
+
+Formats card CVC:
+
+* Restricts length to 4 numbers
+* Restricts input to numbers
+
+Example:
+
+``` javascript
+$('input.cc-cvc').payment('formatCardCVC');
+```
+
+### $.fn.payment('restrictNumeric')
+
+General numeric input restriction.
+
+Example:
+
+``` javascript
+$('data-numeric').payment('restrictNumeric');
+```
+
+### $.payment.validateCardNumber(number)
+
+Validates a card number:
+
+* Validates numbers
+* Validates Luhn algorithm
+* Validates length
+
+Example:
+
+``` javascript
+$.payment.validateCardNumber('4242 4242 4242 4242'); //= true
+```
+
+### $.payment.validateCardExpiry(month, year)
+
+Validates a card expiry:
+
+* Validates numbers
+* Validates in the future
+* Supports year shorthand
+
+Example:
+
+``` javascript
+$.payment.validateCardExpiry('05', '20'); //= true
[MediaWiki-commits] [Gerrit] WIP: WorldPay - change (mediawiki...DonationInterface)
Mwalker has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118056
Change subject: WIP: WorldPay
..
WIP: WorldPay
Change-Id: Ifb0b4546ff18226d78fb64195a6a6ccc06c783ee
---
M DonationInterface.php
A worldpay_gateway/worldpay.adapter.php
A worldpay_gateway/worldpay_gateway.alias.php
A worldpay_gateway/worldpay_gateway.body.php
A worldpay_gateway/worldpay_gateway.i18n.php
5 files changed, 111 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/56/118056/1
diff --git a/DonationInterface.php b/DonationInterface.php
index ca46ef7..5041f7d 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -50,6 +50,7 @@
'Amazon' = true,
'Adyen' = true,
'Paypal' = true,
+ 'WorldPay' = true,
'FormChooser' = true,
'ReferrerFilter' = false, //extra
'SourceFilter' = false, //extra
@@ -146,6 +147,12 @@
$wgAutoloadClasses['PaypalGateway'] = $donationinterface_dir .
'paypal_gateway/paypal_gateway.body.php';
$wgAutoloadClasses['PaypalGatewayResult'] = $donationinterface_dir .
'paypal_gateway/paypal_resultswitcher.body.php';
$wgAutoloadClasses['PaypalAdapter'] = $donationinterface_dir .
'paypal_gateway/paypal.adapter.php';
+}
+
+if ( $optionalParts['WorldPay'] === true ){
+ $wgDonationInterfaceClassMap['worldpay'] = 'WorldPayAdapter';
+ $wgAutoloadClasses['WorldPayGateway'] = $donationinterface_dir .
'worldpay_gateway/worldpay_gateway.body.php';
+ $wgAutoloadClasses['WorldPayAdapter'] = $donationinterface_dir .
'worldpay_gateway/worldpay.adapter.php';
}
@@ -759,6 +766,10 @@
$wgSpecialPages['PaypalGateway'] = 'PaypalGateway';
$wgSpecialPages['PaypalGatewayResult'] = 'PaypalGatewayResult';
}
+//WorldPay
+if ( $optionalParts['WorldPay'] === true ){
+ $wgSpecialPages['WorldPayGateway'] = 'WorldPayGateway';
+}
/**
* HOOKS
@@ -1003,6 +1014,11 @@
$wgExtensionMessagesFiles['PaypalGatewayAlias'] =
$donationinterface_dir . 'paypal_gateway/paypal_gateway.alias.php';
}
+if ( $optionalParts['WorldPay'] === true ){
+ $wgExtensionMessagesFiles['WorldPayGateway'] = $donationinterface_dir .
'worldpay_gateway/worldpay_gateway.i18n.php';
+ $wgExtensionMessagesFiles['WorldPayGatewayAlias'] =
$donationinterface_dir . 'worldpay_gateway/worldpay_gateway.alias.php';
+}
+
/**
* FUNCTIONS
*/
diff --git a/worldpay_gateway/worldpay.adapter.php
b/worldpay_gateway/worldpay.adapter.php
new file mode 100644
index 000..4b3579d
--- /dev/null
+++ b/worldpay_gateway/worldpay.adapter.php
@@ -0,0 +1,25 @@
+?php
+/**
+ * Wikimedia Foundation
+ *
+ * LICENSE
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+/**
+ * WorldPayAdapter
+ *
+ */
+class WorldPayAdapter extends GatewayAdapter {
+
+}
diff --git a/worldpay_gateway/worldpay_gateway.alias.php
b/worldpay_gateway/worldpay_gateway.alias.php
new file mode 100644
index 000..c5cd9ab
--- /dev/null
+++ b/worldpay_gateway/worldpay_gateway.alias.php
@@ -0,0 +1,8 @@
+?php
+
+$specialPageAliases = array();
+
+/** English */
+$specialPageAliases['en'] = array(
+ 'WorldPayGateway' = array( 'WorldPayGateway' ),
+);
\ No newline at end of file
diff --git a/worldpay_gateway/worldpay_gateway.body.php
b/worldpay_gateway/worldpay_gateway.body.php
new file mode 100644
index 000..1265e02
--- /dev/null
+++ b/worldpay_gateway/worldpay_gateway.body.php
@@ -0,0 +1,46 @@
+?php
+/**
+ * Wikimedia Foundation
+ *
+ * LICENSE
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+/**
+ * WorldPayGateway
+ *
+ */
+class WorldPayGateway extends GatewayForm {
+
+ /**
+* Constructor - set up the new special page
+*/
+ public function __construct() {
+ $this-adapter = new WorldPayAdapter();
+ parent::__construct(); //the next layer up will know who we are.
+ }
+
+ /**
+* Show the special page
[MediaWiki-commits] [Gerrit] Minor updates to readme file - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Minor updates to readme file .. Minor updates to readme file Change-Id: I53dacbaddea4870c9f8dfb5d00f63f68d0887085 --- M README.md 1 file changed, 22 insertions(+), 13 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index 46c9ab2..11eae7a 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ The easiest way to install Ruby on Linux/Unix/Mac is [RVM](https://rvm.io/) and on Windows [RubyInstaller](http://rubyinstaller.org/). -ALERT: On Windows you must use Ruby 1.9.3 for now because cucumber/gherkin -library currently doesn't work with Ruby 2.x.x. +ALERT: On Windows you must use Ruby 1.9.3 for now because Cucumber currently +doesn't work with Ruby 2. cd /tests/browser gem update --system @@ -22,7 +22,7 @@ If you're not using RVM to manage your Ruby versions, you will need to run the commands as root (using `sudo`). -Environment variables MEDIAWIKI_USER and MEDIAWIKI_PASSWORD are required for +Environment variables `MEDIAWIKI_USER` and `MEDIAWIKI_PASSWORD` are required for tests tagged `@login`. For local testing, create a test user on your local wiki and export the user and password as the values for those variables. For example: @@ -46,7 +46,9 @@ To run a single test file enter `bundle exec cucumber features/FEATURE_NAME.feature`. To run a single test scenario, put a colon and the line number (NN) on which -the scenario begins after the file name: `bundle exec cucumber features/FEATURE_NAME.feature:NN`. +the scenario begins after the file name: + +bundle exec cucumber features/FEATURE_NAME.feature:NN You can use a different browser with the `BROWSER` env variable, the fastest is probably PhantomJS, a headless browser: @@ -63,22 +65,22 @@ ## Screenshots -You can get screenshots on failures (since 0.2.1) by setting the environment -variable SCREENSHOT_FAILURES to true, screenshots will be written under the +You can get screenshots on failures by setting the environment +variable `SCREENSHOT_FAILURES` to `true`. Screenshots will be written under the `screenshots` directory relatively to working directory. The -SCREENSHOT_FAILURES_PATH environment variable (since 0.2.2) let you override +`SCREENSHOT_FAILURES_PATH` environment variable lets you override the destination path for screenshots. Example: - SCREENSHOT_FAILURES=true SCREENSHOT_FAILURES_PATH=/tmp/screenshots bundle exec cucumber +SCREENSHOT_FAILURES=true SCREENSHOT_FAILURES_PATH=/tmp/screenshots bundle exec cucumber ## Update your Gemfile -In your repository, the Gemfile specify dependencies and Gemfile.lock defines +In your repository, the `Gemfile` specifies dependencies and `Gemfile.lock` defines the whole dependency tree. To update it simply run: bundle update -It will fetch all dependencies and updates the Gemfile.lock file, you can then +It will fetch all dependencies and update the `Gemfile.lock` file, you can then commit back both files. ## Links @@ -112,12 +114,19 @@ 4. Push to the branch (`git push origin my-new-feature`) 5. Create new Pull Request -https://www.mediawiki.org/wiki/QA/Browser_testing#How_to_contribute +Also see https://www.mediawiki.org/wiki/QA/Browser_testing#How_to_contribute ## Release notes ### 0.2.8 - Enhancements +* Possibility to set BROWSER_TIMEOUT. -* Possibility to set BROWSER_TIMEOUT +### 0.2.2 + +* `SCREENSHOT_FAILURES_PATH` environment variable lets you override the destination path for screenshots. + +### 0.2.1 + +* Get screenshots on failures by setting the environment variable `SCREENSHOT_FAILURES` to `true`. + -- To view, visit https://gerrit.wikimedia.org/r/117876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I53dacbaddea4870c9f8dfb5d00f63f68d0887085 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add simple Edit Summary option to preview window - change (apps...wikipedia)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118057
Change subject: Add simple Edit Summary option to preview window
..
Add simple Edit Summary option to preview window
Change-Id: I321f8e79bab9f6684e66e76f1e300a52d68bb2e8
---
M wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
M wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
M wikipedia/res/layout/activity_edit_section.xml
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java
M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
7 files changed, 31 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/57/118057/1
diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
index 71072c0..f26c7d5 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
@@ -27,7 +27,7 @@
app.getEditTokenStorage().get(title.getSite(), new
EditTokenStorage.TokenRetreivedCallback() {
@Override
public void onTokenRetreived(String token) {
-new
DoEditTask(getInstrumentation().getTargetContext(), title, wikitext, 3, token) {
+new
DoEditTask(getInstrumentation().getTargetContext(), title, wikitext, 3, token,
) {
@Override
public void onFinish(EditingResult result) {
assertNotNull(result);
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
index c711c84..91780be 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java
@@ -23,7 +23,7 @@
runTestOnUiThread(new Runnable() {
@Override
public void run() {
-new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, +\\) {
+new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, +\\, ) {
@Override
public void onFinish(EditingResult result) {
assertNotNull(result);
@@ -45,7 +45,7 @@
runTestOnUiThread(new Runnable() {
@Override
public void run() {
-new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, +\\) {
+new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, +\\, ) {
@Override
public void onFinish(EditingResult result) {
assertNotNull(result);
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
index 35648cc..4be0494 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java
@@ -23,7 +23,7 @@
runTestOnUiThread(new Runnable() {
@Override
public void run() {
-new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, +\\) {
+new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, +\\, ) {
@Override
public void onFinish(EditingResult result) {
assertNotNull(result);
diff --git a/wikipedia/res/layout/activity_edit_section.xml
b/wikipedia/res/layout/activity_edit_section.xml
index c243235..6c959c5 100644
--- a/wikipedia/res/layout/activity_edit_section.xml
+++ b/wikipedia/res/layout/activity_edit_section.xml
@@ -78,8 +78,18 @@
/LinearLayout
/ScrollView
-fragment android:layout_width=match_parent
android:layout_height=match_parent
- android:id=@+id/edit_section_preview_fragment
- class=org.wikipedia.editing.EditPreviewFragment
-/
+LinearLayout
+android:layout_width=match_parent
+android:layout_height=match_parent
+android:id=@+id/edit_section_preview_container
+android:orientation=vertical
+
+fragment android:layout_width=match_parent
+ android:layout_height=0dp
+ android:layout_weight=1
+ android:id=@+id/edit_section_preview_fragment
+
[MediaWiki-commits] [Gerrit] Introduce stashMwGlobals method to MediaWikiTestCase - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce stashMwGlobals method to MediaWikiTestCase
..
Introduce stashMwGlobals method to MediaWikiTestCase
This method is factored out from the existing
seMwGlobals method.
The Doc from the initial method is also split and
improved and since tags has been added
Also adds tests
Change-Id: I0637194d637abf485a245b00587743f0f6dd495a
---
M tests/phpunit/MediaWikiTestCase.php
A tests/phpunit/tests/MediaWikiTestCaseTest.php
2 files changed, 105 insertions(+), 18 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/MediaWikiTestCase.php
b/tests/phpunit/MediaWikiTestCase.php
index 4d64d057..82bc0fb 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -269,13 +269,11 @@
}
/**
-* Individual test functions may override globals (either directly or
through this
-* setMwGlobals() function), however one must call this method at least
once for
-* each key within the setUp().
-* That way the key is added to the array of globals that will be reset
afterwards
-* in the tearDown(). And, equally important, that way all other tests
are executed
-* with the same settings (instead of using the unreliable local
settings for most
-* tests and fix it only for some tests).
+* Sets a global, maintaining a stashed version of the previous global
to be
+* restored in tearDown
+*
+* The key is added to the array of globals that will be reset
afterwards
+* in the tearDown().
*
* @example
* code
@@ -299,34 +297,57 @@
* of key/value pairs.
* @param mixed $value Value to set the global to (ignored
* if an array is given as first argument).
+*
+* @since 1.21
*/
protected function setMwGlobals( $pairs, $value = null ) {
-
- // Normalize (string, value) to an array
if ( is_string( $pairs ) ) {
$pairs = array( $pairs = $value );
}
+ $this-stashMwGlobals( array_keys( $pairs ) );
+
foreach ( $pairs as $key = $value ) {
+ $GLOBALS[$key] = $value;
+ }
+ }
+
+ /**
+* Stashes the global, will be restored in tearDown()
+*
+* Individual test functions may override globals through the
setMwGlobals() function
+* or directly. When directly overriding globals their keys should
first be passed to this
+* method in setUp to avoid breaking global state for other tests
+*
+* That way all other tests are executed with the same settings
(instead of using the
+* unreliable local settings for most tests and fix it only for some
tests).
+*
+* @param array|string $globalKeys Key to the global variable, or an
array of keys.
+*
+* @since 1.23
+*/
+ protected function stashMwGlobals( $globalKeys ) {
+ if ( is_string( $globalKeys ) ) {
+ $globalKeys = array( $globalKeys );
+ }
+
+ foreach ( $globalKeys as $globalKey ) {
// NOTE: make sure we only save the global once or a
second call to
// setMwGlobals() on the same global would override the
original
// value.
- if ( !array_key_exists( $key, $this-mwGlobals ) ) {
+ if ( !array_key_exists( $globalKey, $this-mwGlobals )
) {
// NOTE: we serialize then unserialize the
value in case it is an object
// this stops any objects being passed by
reference. We could use clone
// and if is_object but this does account for
objects within objects!
- try{
- $this-mwGlobals[$key] = unserialize(
serialize( $GLOBALS[$key] ) );
+ try {
+ $this-mwGlobals[$globalKey] =
unserialize( serialize( $GLOBALS[$globalKey] ) );
}
- // NOTE; some things such as Closures are not
serializable
- // in this case just set the value!
+ // NOTE; some things such as Closures
are not serializable
+ // in this case just set the value!
catch( Exception $e ) {
- $this-mwGlobals[$key] = $GLOBALS[$key];
+ $this-mwGlobals[$globalKey] =
$GLOBALS[$globalKey];
[MediaWiki-commits] [Gerrit] Throw exception when trying to stash unset globals - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Throw exception when trying to stash unset globals
..
Throw exception when trying to stash unset globals
If we are trying to stash an unset global then
throw an exception!
Also adds a test
Change-Id: I25f493a0a535201c08ca9624c2c650f61d9e256d
---
M tests/phpunit/MediaWikiTestCase.php
M tests/phpunit/tests/MediaWikiTestCaseTest.php
2 files changed, 17 insertions(+), 0 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/MediaWikiTestCase.php
b/tests/phpunit/MediaWikiTestCase.php
index 82bc0fb..3444f31 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -324,6 +324,7 @@
*
* @param array|string $globalKeys Key to the global variable, or an
array of keys.
*
+* @throws Exception when trying to stash an unset global
* @since 1.23
*/
protected function stashMwGlobals( $globalKeys ) {
@@ -336,6 +337,9 @@
// setMwGlobals() on the same global would override the
original
// value.
if ( !array_key_exists( $globalKey, $this-mwGlobals )
) {
+ if ( !array_key_exists( $globalKey, $GLOBALS )
) {
+ throw new Exception( Global with key
{$globalKey} doesn't exist and cant be stashed );
+ }
// NOTE: we serialize then unserialize the
value in case it is an object
// this stops any objects being passed by
reference. We could use clone
// and if is_object but this does account for
objects within objects!
diff --git a/tests/phpunit/tests/MediaWikiTestCaseTest.php
b/tests/phpunit/tests/MediaWikiTestCaseTest.php
index d6815a0..2846fde 100644
--- a/tests/phpunit/tests/MediaWikiTestCaseTest.php
+++ b/tests/phpunit/tests/MediaWikiTestCaseTest.php
@@ -7,6 +7,7 @@
class MediaWikiTestCaseTest extends MediaWikiTestCase {
const GLOBAL_KEY_EXISTING = 'MediaWikiTestCaseTestGLOBAL-Existing';
+ const GLOBAL_KEY_NONEXISTING =
'MediaWikiTestCaseTestGLOBAL-NONExisting';
public static function setUpBeforeClass() {
parent::setUpBeforeClass();
@@ -61,4 +62,16 @@
);
}
+ /**
+* @covers MediaWikiTestCase::stashMwGlobals
+*/
+ public function testExceptionThrownWhenStashingNonExistentGlobals() {
+ $this-setExpectedException(
+ 'Exception',
+ 'Global with key ' . self::GLOBAL_KEY_NONEXISTING . '
doesn\'t exist and cant be stashed'
+ );
+
+ $this-stashMwGlobals( self::GLOBAL_KEY_NONEXISTING );
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/117039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I25f493a0a535201c08ca9624c2c650f61d9e256d
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Mwalker mwal...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup MediawikiTestCase - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup MediawikiTestCase
..
Cleanup MediawikiTestCase
Cleans docs
Adds since tags
Fixes typos
Removes totally unused stuff
Adds scopes
Change-Id: I80d542196a0f2265aacdd8ae89f919773832c14c
---
M tests/phpunit/MediaWikiTestCase.php
1 file changed, 130 insertions(+), 82 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/MediaWikiTestCase.php
b/tests/phpunit/MediaWikiTestCase.php
index 3444f31..723f120 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1,9 +1,9 @@
?php
+/**
+ * @since 1.18
+ */
abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
- public $suite;
- public $regex = '';
- public $runDisabled = false;
/**
* $called tracks whether the setUp and tearDown method has been called.
@@ -20,14 +20,21 @@
private $called = array();
/**
-* @var Array of TestUser
+* @var TestUser[]
+* @since 1.20
*/
public static $users;
/**
* @var DatabaseBase
+* @since 1.18
*/
protected $db;
+
+ /**
+* @var array
+* @since 1.19
+*/
protected $tablesUsed = array(); // tables with data
private static $useTemporaryTables = true;
@@ -48,7 +55,7 @@
*
* @var array
*/
- private $tmpfiles = array();
+ private $tmpFiles = array();
/**
* Holds original values of MediaWiki configuration settings
@@ -64,6 +71,10 @@
const DB_PREFIX = 'unittest_';
const ORA_DB_PREFIX = 'ut_';
+ /**
+* @var array
+* @since 1.18
+*/
protected $supportedDBs = array(
'mysql',
'sqlite',
@@ -71,14 +82,14 @@
'oracle'
);
- function __construct( $name = null, array $data = array(), $dataName =
'' ) {
+ public function __construct( $name = null, array $data = array(),
$dataName = '' ) {
parent::__construct( $name, $data, $dataName );
$this-backupGlobals = false;
$this-backupStaticAttributes = false;
}
- function run( PHPUnit_Framework_TestResult $result = null ) {
+ public function run( PHPUnit_Framework_TestResult $result = null ) {
/* Some functions require some kind of caching, and will end up
using the db,
* which we can't allow, as that would open a new connection
for mysql.
* Replace with a HashBag. They would not be going to persist
anyway.
@@ -130,22 +141,29 @@
}
}
- function usesTemporaryTables() {
+ /**
+* @since 1.21
+*
+* @return bool
+*/
+ public function usesTemporaryTables() {
return self::$useTemporaryTables;
}
/**
-* obtains a new temporary file name
+* Obtains a new temporary file name
*
* The obtained filename is enlisted to be removed upon tearDown
*
-* @return string: absolute name of the temporary file
+* @since 1.20
+*
+* @return string absolute name of the temporary file
*/
protected function getNewTempFile() {
- $fname = tempnam( wfTempDir(), 'MW_PHPUnit_' . get_class( $this
) . '_' );
- $this-tmpfiles[] = $fname;
+ $fileName = tempnam( wfTempDir(), 'MW_PHPUnit_' . get_class(
$this ) . '_' );
+ $this-tmpFiles[] = $fileName;
- return $fname;
+ return $fileName;
}
/**
@@ -154,26 +172,24 @@
* The obtained directory is enlisted to be removed (recursively with
all its contained
* files) upon tearDown.
*
-* @return string: absolute name of the temporary directory
+* @since 1.20
+*
+* @return string Absolute name of the temporary directory
*/
protected function getNewTempDirectory() {
// Starting of with a temporary /file/.
- $fname = $this-getNewTempFile();
+ $fileName = $this-getNewTempFile();
// Converting the temporary /file/ to a /directory/
//
// The following is not atomic, but at least we now have a
single place,
// where temporary directory creation is bundled and can be
improved
- unlink( $fname );
- $this-assertTrue( wfMkdirParents( $fname ) );
+ unlink( $fileName );
+ $this-assertTrue( wfMkdirParents( $fileName ) );
- return $fname;
+ return $fileName;
}
- /**
-*
[MediaWiki-commits] [Gerrit] Only use the best Claims in PropertyParserFunctionRenderer - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Only use the best Claims in PropertyParserFunctionRenderer
..
Only use the best Claims in PropertyParserFunctionRenderer
Bug: 58403
Change-Id: Ie1a9a2be77a09964ab073cc62f6a36fd042fd7df
---
M client/includes/parserhooks/PropertyParserFunctionRenderer.php
M
client/tests/phpunit/includes/parserhooks/PropertyParserFunctionRendererTest.php
2 files changed, 13 insertions(+), 1 deletion(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/parserhooks/PropertyParserFunctionRenderer.php
b/client/includes/parserhooks/PropertyParserFunctionRenderer.php
index 5a89766..6138a0c 100644
--- a/client/includes/parserhooks/PropertyParserFunctionRenderer.php
+++ b/client/includes/parserhooks/PropertyParserFunctionRenderer.php
@@ -145,7 +145,9 @@
return Status::newGood( '' );
}
- $claims = $this-getClaimsForProperty( $entity, $propertyLabel
);
+ // We only want the best claims over here, so that we only show
the most
+ // relevant information.
+ $claims = $this-getClaimsForProperty( $entity, $propertyLabel
)-getBestClaims();
if ( $claims-isEmpty() ) {
wfProfileOut( __METHOD__ );
diff --git
a/client/tests/phpunit/includes/parserhooks/PropertyParserFunctionRendererTest.php
b/client/tests/phpunit/includes/parserhooks/PropertyParserFunctionRendererTest.php
index b7fd4be..2d709e4 100644
---
a/client/tests/phpunit/includes/parserhooks/PropertyParserFunctionRendererTest.php
+++
b/client/tests/phpunit/includes/parserhooks/PropertyParserFunctionRendererTest.php
@@ -5,6 +5,7 @@
use DataValues\StringValue;
use Language;
use Wikibase\Claim;
+use Wikibase\DataModel\Claim\Statement;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\Item;
@@ -62,10 +63,19 @@
) );
$claim2-setGuid( __METHOD__ . '$' . 2 );
+ // A Statement with a lower rank which should not affect the
output
+ $claim3 = new Statement( new PropertyValueSnak(
+ $propertyId,
+ new StringValue( 'really' )
+ ) );
+ $claim3-setGuid( __METHOD__ . '$' . 3 );
+ $claim3-setRank( Claim::RANK_NORMAL );
+
$item = Item::newEmpty();
$item-setId( 42 );
$item-addClaim( $claim1 );
$item-addClaim( $claim2 );
+ $item-addClaim( $claim3 );
$property = Property::newEmpty();
$property-setId( $propertyId );
--
To view, visit https://gerrit.wikimedia.org/r/117841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1a9a2be77a09964ab073cc62f6a36fd042fd7df
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move Global_JobQueue_length ganglia graph to terbium in eqiad - change (operations/puppet)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/118058 Change subject: Move Global_JobQueue_length ganglia graph to terbium in eqiad .. Move Global_JobQueue_length ganglia graph to terbium in eqiad On hume it's not working since January anyway. Change-Id: Idf779971a7b83a1efbde647edffbdaaf0429b8a8 RT: 6771 --- M manifests/site.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/58/118058/1 diff --git a/manifests/site.pp b/manifests/site.pp index 3c356d1..e9c0b3f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1230,7 +1230,6 @@ include nfs::netapp::home include nfs::upload include misc::deployment::scap_scripts -include misc::monitoring::jobqueue include admins::roots include admins::mortals include admins::restricted @@ -2510,6 +2509,7 @@ include role::db::maintenance include misc::deployment::scap_scripts include icinga::monitor::jobqueue +include misc::monitoring::jobqueue include admins::roots include admins::mortals include admins::restricted -- To view, visit https://gerrit.wikimedia.org/r/118058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf779971a7b83a1efbde647edffbdaaf0429b8a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sure section header is specified by default in edit sum... - change (apps...wikipedia)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118059
Change subject: Make sure section header is specified by default in edit summary
..
Make sure section header is specified by default in edit summary
Change-Id: I40262508e2066197fec6931e6ee84c33d84a3658
---
M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/59/118059/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
index 4d6e41f..d727653 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
@@ -120,7 +120,7 @@
@Override
public void onTokenRetreived(final String token) {
-new DoEditTask(EditSectionActivity.this, title,
sectionText.getText().toString(), section.getId(), token,
editSummaryHandler.getSummary()) {
+new DoEditTask(EditSectionActivity.this, title,
sectionText.getText().toString(), section.getId(), token,
editSummaryHandler.getSummary(section.getHeading())) {
@Override
public void onBeforeExecute() {
progressDialog.show();
--
To view, visit https://gerrit.wikimedia.org/r/118059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40262508e2066197fec6931e6ee84c33d84a3658
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Specify region-appropriate dns resolver. - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118060
Change subject: Specify region-appropriate dns resolver.
..
Specify region-appropriate dns resolver.
Why does nginx need this? I've no idea.
Change-Id: Ie0d55084ab723a241886b70955058d46593540d0
---
M manifests/role/labsproxy.pp
M modules/dynamicproxy/manifests/init.pp
M modules/dynamicproxy/templates/proxy.conf
3 files changed, 19 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/118060/1
diff --git a/manifests/role/labsproxy.pp b/manifests/role/labsproxy.pp
index 2a638d2..6042eb5 100644
--- a/manifests/role/labsproxy.pp
+++ b/manifests/role/labsproxy.pp
@@ -57,13 +57,27 @@
}
# A dynamic HTTP routing proxy, based on nginx+lua+redis
-class role::dynamicproxy {
+class role::dynamicproxy::pmtpa {
install_certificate{ 'star.wmflabs.org':
privatekey = false
}
class { '::dynamicproxy':
ssl_certificate_name = 'star.wmflabs.org',
-set_xff = true
+set_xff = true,
+resolver = '10.4.0.1'
+}
+include dynamicproxy::api
+}
+
+# A dynamic HTTP routing proxy, based on nginx+lua+redis
+class role::dynamicproxy::eqiad {
+install_certificate{ 'star.wmflabs.org':
+privatekey = false
+}
+class { '::dynamicproxy':
+ssl_certificate_name = 'star.wmflabs.org',
+set_xff = true,
+resolver = '10.68.16.1'
}
include dynamicproxy::api
}
diff --git a/modules/dynamicproxy/manifests/init.pp
b/modules/dynamicproxy/manifests/init.pp
index 1cec799..9336075 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -17,7 +17,8 @@
$ssl_certificate_name=false,
$notfound_servers=[],
$luahandler='domainproxy.lua',
-$set_xff=false
+$set_xff=false,
+$resolver='10.68.16.1',
) {
class { '::redis':
persist = 'aof',
diff --git a/modules/dynamicproxy/templates/proxy.conf
b/modules/dynamicproxy/templates/proxy.conf
index 475e137..763362b 100644
--- a/modules/dynamicproxy/templates/proxy.conf
+++ b/modules/dynamicproxy/templates/proxy.conf
@@ -28,7 +28,7 @@
%- end -%
server {
-resolver 10.4.0.1;
+resolver %= resolver %;
listen 80;
--
To view, visit https://gerrit.wikimedia.org/r/118060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0d55084ab723a241886b70955058d46593540d0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Specify region-appropriate dns resolver. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Specify region-appropriate dns resolver.
..
Specify region-appropriate dns resolver.
Why does nginx need this? I've no idea.
Change-Id: Ie0d55084ab723a241886b70955058d46593540d0
---
M manifests/role/labsproxy.pp
M modules/dynamicproxy/manifests/init.pp
M modules/dynamicproxy/templates/proxy.conf
3 files changed, 19 insertions(+), 4 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labsproxy.pp b/manifests/role/labsproxy.pp
index 2a638d2..6042eb5 100644
--- a/manifests/role/labsproxy.pp
+++ b/manifests/role/labsproxy.pp
@@ -57,13 +57,27 @@
}
# A dynamic HTTP routing proxy, based on nginx+lua+redis
-class role::dynamicproxy {
+class role::dynamicproxy::pmtpa {
install_certificate{ 'star.wmflabs.org':
privatekey = false
}
class { '::dynamicproxy':
ssl_certificate_name = 'star.wmflabs.org',
-set_xff = true
+set_xff = true,
+resolver = '10.4.0.1'
+}
+include dynamicproxy::api
+}
+
+# A dynamic HTTP routing proxy, based on nginx+lua+redis
+class role::dynamicproxy::eqiad {
+install_certificate{ 'star.wmflabs.org':
+privatekey = false
+}
+class { '::dynamicproxy':
+ssl_certificate_name = 'star.wmflabs.org',
+set_xff = true,
+resolver = '10.68.16.1'
}
include dynamicproxy::api
}
diff --git a/modules/dynamicproxy/manifests/init.pp
b/modules/dynamicproxy/manifests/init.pp
index 1cec799..5865215 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -17,7 +17,8 @@
$ssl_certificate_name=false,
$notfound_servers=[],
$luahandler='domainproxy.lua',
-$set_xff=false
+$set_xff=false,
+$resolver,
) {
class { '::redis':
persist = 'aof',
diff --git a/modules/dynamicproxy/templates/proxy.conf
b/modules/dynamicproxy/templates/proxy.conf
index 475e137..763362b 100644
--- a/modules/dynamicproxy/templates/proxy.conf
+++ b/modules/dynamicproxy/templates/proxy.conf
@@ -28,7 +28,7 @@
%- end -%
server {
-resolver 10.4.0.1;
+resolver %= resolver %;
listen 80;
--
To view, visit https://gerrit.wikimedia.org/r/118060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0d55084ab723a241886b70955058d46593540d0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move Global_JobQueue_length ganglia graph to terbium in eqiad - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Move Global_JobQueue_length ganglia graph to terbium in eqiad .. Move Global_JobQueue_length ganglia graph to terbium in eqiad On hume it's not working since January anyway. Change-Id: Idf779971a7b83a1efbde647edffbdaaf0429b8a8 RT: 6771 --- M manifests/site.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 3c356d1..e9c0b3f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1230,7 +1230,6 @@ include nfs::netapp::home include nfs::upload include misc::deployment::scap_scripts -include misc::monitoring::jobqueue include admins::roots include admins::mortals include admins::restricted @@ -2510,6 +2509,7 @@ include role::db::maintenance include misc::deployment::scap_scripts include icinga::monitor::jobqueue +include misc::monitoring::jobqueue include admins::roots include admins::mortals include admins::restricted -- To view, visit https://gerrit.wikimedia.org/r/118058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf779971a7b83a1efbde647edffbdaaf0429b8a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add final period to API module descriptions - change (mediawiki...CodeReview)
jenkins-bot has submitted this change and it was merged.
Change subject: Add final period to API module descriptions
..
Add final period to API module descriptions
Change-Id: Ibcd1004173775001fd03eb954042593895441aa1
---
M api/ApiQueryCodeComments.php
M api/ApiQueryCodePaths.php
M api/ApiQueryCodeRevisions.php
M api/ApiQueryCodeTags.php
M api/ApiRevisionUpdate.php
5 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/ApiQueryCodeComments.php b/api/ApiQueryCodeComments.php
index 76015e5..b932fc4 100644
--- a/api/ApiQueryCodeComments.php
+++ b/api/ApiQueryCodeComments.php
@@ -139,7 +139,7 @@
}
public function getDescription() {
- return 'List comments on revisions in CodeReview';
+ return 'List comments on revisions in CodeReview.';
}
public function getPossibleErrors() {
diff --git a/api/ApiQueryCodePaths.php b/api/ApiQueryCodePaths.php
index f89f5a7..73040fd 100644
--- a/api/ApiQueryCodePaths.php
+++ b/api/ApiQueryCodePaths.php
@@ -83,7 +83,7 @@
}
public function getDescription() {
- return 'Get a list of 10 paths in a given repository, based on
the input path prefix';
+ return 'Get a list of 10 paths in a given repository, based on
the input path prefix.';
}
public function getPossibleErrors() {
diff --git a/api/ApiQueryCodeRevisions.php b/api/ApiQueryCodeRevisions.php
index 8c1c340..d15a729 100644
--- a/api/ApiQueryCodeRevisions.php
+++ b/api/ApiQueryCodeRevisions.php
@@ -225,7 +225,7 @@
}
public function getDescription() {
- return 'List revisions in CodeReview';
+ return 'List revisions in CodeReview.';
}
public function getPossibleErrors() {
diff --git a/api/ApiQueryCodeTags.php b/api/ApiQueryCodeTags.php
index 8393f75..6ba78dd 100644
--- a/api/ApiQueryCodeTags.php
+++ b/api/ApiQueryCodeTags.php
@@ -65,7 +65,7 @@
}
public function getDescription() {
- return 'Get a list of tags applied to revisions in a given
repository';
+ return 'Get a list of tags applied to revisions in a given
repository.';
}
public function getPossibleErrors() {
diff --git a/api/ApiRevisionUpdate.php b/api/ApiRevisionUpdate.php
index bf979f3..81d05e8 100644
--- a/api/ApiRevisionUpdate.php
+++ b/api/ApiRevisionUpdate.php
@@ -181,7 +181,7 @@
public function getDescription() {
return array(
- 'Submit comments, new status and tags to a revision'
+ 'Submit comments, new status and tags to a revision.'
);
}
--
To view, visit https://gerrit.wikimedia.org/r/117925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcd1004173775001fd03eb954042593895441aa1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeReview
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix a typo in class instance variable - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Fix a typo in class instance variable .. Fix a typo in class instance variable Change-Id: If7ea99827c7f0671a63356ca5e8035db58f82b3a --- M includes/Data/RevisionStorage.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Matthias Mullie: Looks good to me, approved EBernhardson: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/includes/Data/RevisionStorage.php b/includes/Data/RevisionStorage.php index 93cbb53..1791b4b 100644 --- a/includes/Data/RevisionStorage.php +++ b/includes/Data/RevisionStorage.php @@ -32,7 +32,7 @@ 'rev_mod_user_text', ); - protected $externalStores; + protected $externalStore; abstract protected function joinTable(); abstract protected function relatedPk(); -- To view, visit https://gerrit.wikimedia.org/r/117023 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7ea99827c7f0671a63356ca5e8035db58f82b3a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Bsitu bs...@wikimedia.org Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing DROP SEQUENCE to postgres' tables.sql - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing DROP SEQUENCE to postgres' tables.sql .. Add missing DROP SEQUENCE to postgres' tables.sql To drop all possible existing sequences. Also add a DROP TYPE for the existing type. Change-Id: I3aad6b1c6c2b273ca4ed5fd3b448f4379984cd76 --- M maintenance/postgres/tables.sql 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Parent5446: Looks good to me, but someone else must approve Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql index e482141..266cb3b 100644 --- a/maintenance/postgres/tables.sql +++ b/maintenance/postgres/tables.sql @@ -12,18 +12,23 @@ DROP SEQUENCE IF EXISTS user_user_id_seq CASCADE; DROP SEQUENCE IF EXISTS page_page_id_seq CASCADE; DROP SEQUENCE IF EXISTS revision_rev_id_seq CASCADE; -DROP SEQUENCE IF EXISTS page_restrictions_id_seq CASCADE; +DROP SEQUENCE IF EXISTS text_old_id_seq CASCADE; +DROP SEQUENCE IF EXISTS page_restrictions_pr_id_seq CASCADE; DROP SEQUENCE IF EXISTS ipblocks_ipb_id_seq CASCADE; +DROP SEQUENCE IF EXISTS filearchive_fa_id_seq CASCADE; +DROP SEQUENCE IF EXISTS uploadstash_us_id_seq CASCADE; DROP SEQUENCE IF EXISTS recentchanges_rc_id_seq CASCADE; DROP SEQUENCE IF EXISTS logging_log_id_seq CASCADE; DROP SEQUENCE IF EXISTS job_job_id_seq CASCADE; DROP SEQUENCE IF EXISTS category_cat_id_seq CASCADE; DROP SEQUENCE IF EXISTS archive_ar_id_seq CASCADE; DROP SEQUENCE IF EXISTS externallinks_el_id_seq CASCADE; +DROP SEQUENCE IF EXISTS sites_site_id_seq CASCADE; DROP FUNCTION IF EXISTS page_deleted() CASCADE; DROP FUNCTION IF EXISTS ts2_page_title() CASCADE; DROP FUNCTION IF EXISTS ts2_page_text() CASCADE; DROP FUNCTION IF EXISTS add_interwiki(TEXT,INT,SMALLINT) CASCADE; +DROP TYPE IF EXISTS media_type CASCADE; CREATE SEQUENCE user_user_id_seq MINVALUE 0 START WITH 0; CREATE TABLE mwuser ( -- replace reserved word 'user' -- To view, visit https://gerrit.wikimedia.org/r/116166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3aad6b1c6c2b273ca4ed5fd3b448f4379984cd76 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Lethosor letho...@gmail.com Gerrit-Reviewer: MarkAHershberger m...@nichework.com Gerrit-Reviewer: Parent5446 tylerro...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove user preference noconvertlink - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove user preference noconvertlink
..
Remove user preference noconvertlink
This toggle was introduced in 8d06ad6e, but the most useful feature for
human users there (disabling h1 conversion on a per-user basis) has
been dropped due to cache fragmentation. The only remaining part is not
quite useful and can be covered by the URL parameter linkconvert=no.
Change-Id: I12f2cdc9b0d44d6e47487b14fa8ef010de5c94a7
---
M includes/DefaultSettings.php
M includes/Preferences.php
M languages/LanguageConverter.php
M languages/messages/MessagesEn.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
6 files changed, 3 insertions(+), 17 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9264947..38cf735 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3994,7 +3994,6 @@
'minordefault' = 0,
'newpageshidepatrolled' = 0,
'nickname' = '',
- 'noconvertlink' = 0,
'norollbackdiff' = 0,
'numberheadings' = 0,
'previewonfirst' = 0,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 04e9114..387125d 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -186,7 +186,7 @@
*/
static function profilePreferences( $user, IContextSource $context,
$defaultPreferences ) {
global $wgAuth, $wgContLang, $wgParser, $wgCookieExpiration,
$wgLanguageCode,
- $wgDisableTitleConversion, $wgDisableLangConversion,
$wgMaxSigChars,
+ $wgDisableLangConversion, $wgMaxSigChars,
$wgEnableEmail, $wgEmailConfirmToEdit,
$wgEnableUserEmail, $wgEmailAuthentication,
$wgEnotifWatchlist, $wgEnotifUserTalk,
$wgEnotifRevealEditorAddress,
$wgSecureLogin;
@@ -374,14 +374,6 @@
'section' = 'personal/i18n',
'help-message' =
'prefs-help-variant',
);
-
- if ( !$wgDisableTitleConversion ) {
-
$defaultPreferences['noconvertlink'] = array(
- 'type' = 'toggle',
- 'section' =
'personal/i18n',
- 'label-message' =
'tog-noconvertlink',
- );
- }
} else {
$defaultPreferences[variant-$langCode] = array(
'type' = 'api',
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index bb5b49f..57e73da 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -752,8 +752,7 @@
return;
}
- global $wgDisableLangConversion, $wgDisableTitleConversion,
$wgRequest,
- $wgUser;
+ global $wgDisableLangConversion, $wgDisableTitleConversion,
$wgRequest;
$isredir = $wgRequest-getText( 'redirect', 'yes' );
$action = $wgRequest-getText( 'action' );
$linkconvert = $wgRequest-getText( 'linkconvert', 'yes' );
@@ -768,8 +767,7 @@
( $isredir == 'no'
|| $action == 'edit'
|| $action == 'submit'
- || $linkconvert == 'no'
- || $wgUser-getOption( 'noconvertlink'
) == 1 ) ) ) {
+ || $linkconvert == 'no' ) ) ) {
return;
}
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 300792a..b9d368c 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -694,7 +694,6 @@
'tog-ccmeonemails'= 'Send me copies of emails I send to other
users',
'tog-diffonly'= 'Do not show page content below diffs',
'tog-showhiddencats' = 'Show hidden categories',
-'tog-noconvertlink' = 'Disable link title conversion', # only
translate this message to other languages if you have to change it
'tog-norollbackdiff' = 'Omit diff after performing a rollback',
'tog-useeditwarning' = 'Warn me when I leave an edit page with
unsaved changes',
'tog-prefershttps'= 'Always use a secure connection when logged
in',
[MediaWiki-commits] [Gerrit] Added the pb domain to the intuition group - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Added the pb domain to the intuition group .. Added the pb domain to the intuition group Change-Id: I61da1a38e152064774218dd39ae0735b8e985fa4 --- M groups/Intuition/intuition-textdomains.txt 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/Intuition/intuition-textdomains.txt b/groups/Intuition/intuition-textdomains.txt index 3c32ce8..64fdf44 100644 --- a/groups/Intuition/intuition-textdomains.txt +++ b/groups/Intuition/intuition-textdomains.txt @@ -25,6 +25,9 @@ OrphanTalk2 +Pb +optional = labs-name + Recent Anonymous Activity Rtrc -- To view, visit https://gerrit.wikimedia.org/r/112922 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61da1a38e152064774218dd39ae0735b8e985fa4 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Ireas m...@robin-krahl.de Gerrit-Reviewer: Ireas m...@robin-krahl.de Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Address i18n issue - change (mediawiki...CreditsSource)
jenkins-bot has submitted this change and it was merged.
Change subject: Address i18n issue
..
Address i18n issue
Raised on
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Creditssource-source-work/ksh
Change-Id: I295a9bd23fe835762a6aa41e0d20ac26e86f591b
---
M CreditsSource.i18n.php
M CreditsSource_body.php
2 files changed, 23 insertions(+), 28 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CreditsSource.i18n.php b/CreditsSource.i18n.php
index 1002c2a..4f6aed5 100644
--- a/CreditsSource.i18n.php
+++ b/CreditsSource.i18n.php
@@ -10,8 +10,7 @@
$messages['en'] = array(
'creditssource-desc'= 'Display source work credits in the
page footer',
- 'creditssource-source-work' = 'This page is derived from the page
$1 on $2 in its revision from $6 at $7 (UTC). There, it is published under the
CC BY-SA 3.0 license. More details and the full list of contributors can be
found on the associated $5. Wikitravel contributors are marked by the prefix
$4.',
- 'creditssource-historypage' = 'history page',
+ 'creditssource-credits' = 'This page is derived from the page
[$1 $2] on [$3 $4] in its revision from $8 at $9 (UTC). There, it is published
under the CC BY-SA 3.0 license. More details and the full list of contributors
can be found on the associated [[$5|history page]]. Wikitravel contributors are
marked by the prefix $6.',
'creditssource-creditpage' = 'Gives credits for sourceworks.',
);
@@ -22,20 +21,19 @@
*/
$messages['qqq'] = array(
'creditssource-desc' = '{{desc|name=Credits
Source|url=http://www.mediawiki.org/wiki/Extension:CreditsSource}}',
- 'creditssource-source-work' = 'Parameters:
-* $1 - an external link to the source. Its link text is page title.
-* $2 - an external link to the site. Its link text is site name.
-* $3 - (Unused) timestamp (time and date)
-* $4 - a short name of the site Wikitravel
-* $5 - a link to the history page. Its link text is
{{msg-mw|Creditssource-historypage}}.
-* $6 - a date
-* $7 - a time
+ 'creditssource-credits' = 'Parameters:
+* $1 - an external url to the source; can be used to construct a link like:
[$1 $2]
+* $2 - title of the external source
+* $3 - an external url to the site; can be used to construct a link like: [$3
$4]
+* $4 - title of the external site
+* $5 - a relative url that points to History page of the specified page; can
be used to construct a link [[$5|like this]]
+* $6 - a short name of the site Wikitravel
+* $7 - time and date timestamp
+* $8 - a date
+* $9 - a time
If translation around $2 depends on the morphology, you have two options:
# Do not translate in your language.
# Make a translation that does work in your language. I suggest the site
SITENAME.',
- 'creditssource-historypage' = 'Used as link anchor text.
-
-The link points to History page of the specified page.',
'creditssource-creditpage' = 'Description to be displayed on the
credits action page.',
);
diff --git a/CreditsSource_body.php b/CreditsSource_body.php
index fd1b10c..b89d867 100644
--- a/CreditsSource_body.php
+++ b/CreditsSource_body.php
@@ -48,26 +48,23 @@
$user = $this-getUser();
foreach ( $sourceWorks as $source ) {
- $sourceLink = Linker::makeExternalLink( $source-mUri,
$source-mTitle );
- $siteLink = Linker::makeExternalLink(
$source-mSiteUri, $source-mSiteName );
- $historyLink = Linker::linkKnown(
- $this-getTitle(),
- wfMessage( 'creditssource-historypage'
)-text(),
- array(),
- array( 'action' = 'history' )
- );
-
// This is safe, since we don't allow writing to the
swsite tables. If that
// changes in the future, mSiteShortName will need to
be escaped here.
- $return .= wfMessage( 'creditssource-source-work'
)-params(
- $sourceLink,
- $siteLink,
- $lang-userTimeAndDate( $source-mTs, $user ),
+ $return .= wfMessage( 'creditssource-credits' )-params(
+ // source link (absolute) url + title
+ $source-mUri,
+ $source-mTitle,
+ // site link (absolute) url + title
+ $source-mSiteUri,
+ $source-mSiteName,
+ // history link internal (relative) url
+ $this-getTitle()-getLocalURL( array( 'action'
= 'history' ) ),
+
[MediaWiki-commits] [Gerrit] Use full URL to mediawiki.org ULS page per bug 54835 - change (mediawiki...Translate)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118062
Change subject: Use full URL to mediawiki.org ULS page per bug 54835
..
Use full URL to mediawiki.org ULS page per bug 54835
Follow-up on I7fd57c092020a2d73b9241e0595f860e6aedbc48
Change-Id: I581377f8e8901490ca08df4a4a1a6a5b947da597
---
M i18n/core/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/62/118062/1
diff --git a/i18n/core/en.json b/i18n/core/en.json
index 3bcccea..3c159ff 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -390,5 +390,5 @@
translate-statsbar-tooltip-with-fuzzy: $1% translated, $2% reviewed,
$3% outdated,
translate-search-more-groups-info: $1 more {{PLURAL:$1|group|groups}},
translate-ulsdep-title: Configuration error,
-translate-ulsdep-body: Translate extension depends on the
[[mw:Extension:UniversalLanguageSelector|Universal Language Selector
extension]].
+translate-ulsdep-body: Translate extension depends on the
[https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector Universal
Language Selector extension].
}
--
To view, visit https://gerrit.wikimedia.org/r/118062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I581377f8e8901490ca08df4a4a1a6a5b947da597
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Import config generation script from Gist - change (mediawiki...GettingStarted)
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118063
Change subject: Import config generation script from Gist
..
Import config generation script from Gist
Import gettingStartedConfigGenerator.php from
https://gist.github.com/phuedx/8941767 with the following modifications:
* Convert it to a maintenance script
* The list of DB names (see $wmgUseGettingStarted in
gettingStartedConfigGenerator.php) is passed via the dbnames option -
by default the config isn't filtered
Change-Id: I708753d298c8eb04a687d07afcd5833ad8da68ba
---
A maintenance/generate_config.php
1 file changed, 106 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/63/118063/1
diff --git a/maintenance/generate_config.php b/maintenance/generate_config.php
new file mode 100644
index 000..6f78a72
--- /dev/null
+++ b/maintenance/generate_config.php
@@ -0,0 +1,106 @@
+?php
+
+/**
+ * Generates a file that contains the value for the
+ * wgGettingStartedCategoriesForTaskTypes configuration variable from specific
+ * Wikidata entities.
+ *
+ * @author Sam Smith samsm...@wikimedia.org
+ */
+
+namespace GettingStarted;
+
+use Title;
+
+$IP = getenv( 'MW_INSTALL_PATH' );
+if( $IP === false ) {
+ $IP = __DIR__ . '/../../..';
+}
+
+require_once $IP/maintenance/Maintenance.php;
+
+class GenerateConfig extends \Maintenance {
+ /**
+* @var array An associative array of which the key is the task type
+* (see $wgGettingStartedTasks) and the value is the QID of a
+* Wikidata entity.
+*/
+ private $qidsForTaskTypes = array(
+ 'copyedit' = 'Q9125773', // Category:Wikipedia articles
needing copy edit
+ 'clarify' = 'Q8235653', // Category:All Wikipedia articles
needing clarification
+ 'addlinks' = 'Q8235714', // Category:All articles with too few
wikilinks
+ );
+
+ public function __construct() {
+ $this-mDescription = 'Generates a file that contains the value
for the wgGettingStartedCategoriesForTaskTypes configuration variable from
specific Wikidata entities.';
+ $this-addOption( 'dbnames', 'Location of the list of DB names
to filter by', false, true );
+
+ // TODO (phuedx, 2014-03-10) Extend addOption to include a
+ // default value, which could be included in the output of
+ // $ php /path/to/maintenance/script.php --help.
+ $this-addOption( 'output', 'Location of the output file',
false, true );
+
+ }
+
+ public function execute() {
+ $dbnames = $this-getOption( 'dbnames' );
+ if ( $dbnames ) {
+ if ( ! is_file( $dbnames ) || ! is_readable( $dbnames )
) {
+ $this-error( {$dbnames} isn't a file or
cant't be read., 1 );
+ }
+
+ $contents = file_get_contents( $dbnames );
+ $dbnames = explode( PHP_EOL, $contents );
+ }
+
+ $config = array();
+ foreach ( $this-qidsForTaskTypes as $task = $qid ) {
+ $sitelinks = $this-getSitelinksByQID( $qid );
+ foreach ( $sitelinks as $dbname = $categoryName ) {
+ if ( $dbnames ! in_array( $dbname, $dbnames
) ) {
+ continue;
+ }
+
+ if ( ! isset( $config[ $dbname ] ) ) {
+ $config[ $dbname ] = array();
+ }
+
+ // TODO (phuedx, 2014-03-10) Create a utility
+ // class for canonicalising category names for
+ // this extension.
+
+ // Canonicalise the category name.
+ $title = Title::newFromText( $categoryName );
+
+ if ( !$title ) {
+ continue;
+ }
+
+ $config[ $dbname ][ $task ] =
$title-getDBkey();
+ }
+ }
+
+ $output = $this-getOption( 'output', 'config.out' );
+ $contents = var_export( $config, true );
+ if ( ! file_put_contents( $output, $contents ) ) {
+ $this-error( Couldn't write to {$output}., 2 );
+ }
+ }
+
+ private function getSitelinksByQID( $qid ) {
+ $url =
https://www.wikidata.org/w/api.php?format=jsonaction=wbgetentitiesprops=sitelinksids={$qid};;
+ $responseBodyRaw = file_get_contents( $url );
+ $responseBody = json_decode( $responseBodyRaw, true );
+
[MediaWiki-commits] [Gerrit] Renamed TwnMainPage Jenkins tab back to tw - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Renamed TwnMainPage Jenkins tab back to tw .. Renamed TwnMainPage Jenkins tab back to tw Change-Id: I75c9bd7ce69f257f56619d7304484a8d0cd5f639 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: KartikMistry: Looks good to me, but someone else must approve Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index 11eae7a..9d5a094 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ 4. MobileFrontend: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/MobileFrontend), [GitHub](https://github.com/wikimedia/mediawiki-extensions-MobileFrontend), [Jenkins](https://wmf.ci.cloudbees.com/view/mf/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-MobileFrontend) 5. MultimediaViewer: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/MultimediaViewer), [GitHub](https://github.com/wikimedia/mediawiki-extensions-MultimediaViewer), [Jenkins](https://wmf.ci.cloudbees.com/view/mv/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-MultimediaViewer) 6. Translate: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Translate), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Translate), [Jenkins](https://wmf.ci.cloudbees.com/view/tr/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Translate) -7. TwnMainPage: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/TwnMainPage), [GitHub](https://github.com/wikimedia/mediawiki-extensions-TwnMainPage), [Jenkins](https://wmf.ci.cloudbees.com/view/tmp/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-TwnMainPage) +7. TwnMainPage: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/TwnMainPage), [GitHub](https://github.com/wikimedia/mediawiki-extensions-TwnMainPage), [Jenkins](https://wmf.ci.cloudbees.com/view/tw/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-TwnMainPage) 8. UniversalLanguageSelector: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/UniversalLanguageSelector), [GitHub](https://github.com/wikimedia/mediawiki-extensions-UniversalLanguageSelector), [Jenkins](https://wmf.ci.cloudbees.com/view/uls/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-UniversalLanguageSelector) 9. UploadWizard: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/UploadWizard), [GitHub](https://github.com/wikimedia/mediawiki-extensions-UploadWizard), [Jenkins](https://wmf.ci.cloudbees.com/view/uw/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-UploadWizard) 10. VisualEditor: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/VisualEditor), [GitHub](https://github.com/wikimedia/mediawiki-extensions-VisualEditor), [Jenkins](https://wmf.ci.cloudbees.com/view/ve/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-VisualEditor), `/modules/ve-mw/test/browser` folder -- To view, visit https://gerrit.wikimedia.org/r/117849 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I75c9bd7ce69f257f56619d7304484a8d0cd5f639 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Autonym font browser tests refactoring - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Autonym font browser tests refactoring .. Autonym font browser tests refactoring * Tofu detection selects system fonts over Autonym font. * Interlanguage Autonym font is blacklisted. * phantomjs bug is fixed. Change-Id: I5c7433b917b8d7f79f706a4a7a97a6c6a9a6afa2 --- M tests/browser/features/autonym.feature 1 file changed, 8 insertions(+), 9 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/autonym.feature b/tests/browser/features/autonym.feature index 957ebba..177fad9 100644 --- a/tests/browser/features/autonym.feature +++ b/tests/browser/features/autonym.feature @@ -1,14 +1,7 @@ -# The tests do not normalize the font-family passed back by the browser -# Firefox/Chrome/Phantomjs handle the normalization differently. -# -# https://bugzilla.wikimedia.org/show_bug.cgi?id=57101 -@phantomjs-bug Feature: Autonym font - * Web font should always be applied to the ULS language selector's language -selection screen for display and input languages. - * Web font should always be applied to the interlanguage section of MediaWiki -when MediaWiki extension ULS is installed. + * With tofu detection in ULS, system fonts will be given preference over webfonts. + * Reference: https://upload.wikimedia.org/wikipedia/commons/7/7d/ULS-WebFonts-Workflow-Diagram.png @login Scenario: Autonym font is used in the ULS language search dialog for display language selection by logged-in users @@ -37,3 +30,9 @@ And I open Input side panel of language settings When I click the button with the ellipsis Then the language list of ULS should use Autonym font + + #Autonym is blacklisted in Interlanguage area at moment, and may whitelist in future. + Scenario: Autonym font should be used in the Interlanguage area of a page only with Interlanguage links +When I am on the main page +Then the Interlanguage links should use Autonym font + And elements that are not Interlanguage links should not use Autonym font -- To view, visit https://gerrit.wikimedia.org/r/113378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c7433b917b8d7f79f706a4a7a97a6c6a9a6afa2 Gerrit-PatchSet: 8 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add visibility to SerializerFactory constructor - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged. Change subject: add visibility to SerializerFactory constructor .. add visibility to SerializerFactory constructor (this class shall be deleted soonish, but until then fix this) Change-Id: I25ee118eab90c1f98d295f2cba12b1db3005898c --- M lib/includes/serializers/SerializerFactory.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: WikidataJenkins: Verified Addshore: Looks good to me, approved diff --git a/lib/includes/serializers/SerializerFactory.php b/lib/includes/serializers/SerializerFactory.php index f6a9cc6..cc05596 100644 --- a/lib/includes/serializers/SerializerFactory.php +++ b/lib/includes/serializers/SerializerFactory.php @@ -50,7 +50,7 @@ * * @todo: injecting the services should be required */ - function __construct( + public function __construct( SerializationOptions $defaultOptions = null, PropertyDataTypeLookup $dataTypeLookup = null, EntityFactory $entityFactory = null, -- To view, visit https://gerrit.wikimedia.org/r/117886 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25ee118eab90c1f98d295f2cba12b1db3005898c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 62210) Avoid EntityContent::save in lib tests - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged.
Change subject: (bug 62210) Avoid EntityContent::save in lib tests
..
(bug 62210) Avoid EntityContent::save in lib tests
Change-Id: Id09c77400bb25eedae45ed59c4ec41dfc4c0cf1e
---
M lib/tests/phpunit/SnakFactoryTest.php
M lib/tests/phpunit/store/TermIndexTest.php
M lib/tests/phpunit/store/WikiPageEntityLookupTest.php
M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
4 files changed, 49 insertions(+), 84 deletions(-)
Approvals:
WikidataJenkins: Verified
Addshore: Looks good to me, approved
diff --git a/lib/tests/phpunit/SnakFactoryTest.php
b/lib/tests/phpunit/SnakFactoryTest.php
index 3d56316..22b28c6 100644
--- a/lib/tests/phpunit/SnakFactoryTest.php
+++ b/lib/tests/phpunit/SnakFactoryTest.php
@@ -24,33 +24,11 @@
*/
class SnakFactoryTest extends \MediaWikiTestCase {
- public function setUp() {
- parent::setUp();
-
- static $isInitialized = false;
-
- if ( !class_exists( 'Wikibase\PropertyContent' ) ) {
- //TODO: once SnakFactory uses a PropertyDataTypeLookup,
we can get rid of this
- $this-markTestSkipped( 'Can\'t test without Wikibase
repo, need PropertyContent for fixture.' );
- }
-
- if ( !$isInitialized ) {
- $p1 = Property::newEmpty();
- $p1-setDataTypeId( 'string' );
- $p1-setId( 1 );
-
- $p1content = PropertyContent::newFromProperty( $p1 );
- $p1content-save( 'testing ' );
-
- $isInitialized = true;
- }
- }
-
public static function provideNewSnak() {
return array(
array( 1, 'somevalue', null, null,
'Wikibase\PropertySomeValueSnak', null, null, 'some value' ),
array( 1, 'novalue', null, null,
'Wikibase\PropertyNoValueSnak', null, null, 'no value' ),
- array( 1, 'value', 'string', 'foo',
'Wikibase\PropertyValueSnak', null, null, 'a value' ),
+ array( 1, 'value', 'string', 'foo',
'Wikibase\PropertyValueSnak', 'DataValues\StringValue', null, 'a value' ),
array( 1, 'kittens', null, 'foo', null, null,
'InvalidArgumentException', 'bad snak type' ),
);
}
@@ -64,7 +42,10 @@
}
if ( $valueType !== null ) {
- $dataValue =
DataValueFactory::singleton()-newDataValue( $valueType, $snakValue );
+ $dataValueFactory = new DataValueFactory();
+ $dataValueFactory-registerDataValue( $valueType,
$expectedValueClass );
+
+ $dataValue = $dataValueFactory-newDataValue(
$valueType, $snakValue );
} else {
$dataValue = null;
}
diff --git a/lib/tests/phpunit/store/TermIndexTest.php
b/lib/tests/phpunit/store/TermIndexTest.php
index 306f99b..79b5bab 100644
--- a/lib/tests/phpunit/store/TermIndexTest.php
+++ b/lib/tests/phpunit/store/TermIndexTest.php
@@ -33,25 +33,21 @@
$lookup = $this-getTermIndex();
$item0 = Item::newEmpty();
+ $item0-setId( new ItemId( 'Q10' ) );
+ $id0 = $item0-getId()-getNumericId();
$item0-setLabel( 'en', 'foobar' );
$item0-setLabel( 'de', 'foobar' );
$item0-setLabel( 'nl', 'baz' );
+ $lookup-saveTermsOfEntity( $item0 );
$item1 = $item0-copy();
+ $item1-setId( new ItemId( 'Q11' ) );
+ $id1 = $item1-getId()-getNumericId();
+
$item1-setLabel( 'nl', 'o_O' );
$item1-setDescription( 'en', 'foo bar baz' );
-
- $content0 = ItemContent::newEmpty();
- $content0-setItem( $item0 );
- $content0-save( '', null, EDIT_NEW );
- $id0 = $content0-getItem()-getId()-getNumericId();
-
- $content1 = ItemContent::newEmpty();
- $content1-setItem( $item1 );
-
- $content1-save( '', null, EDIT_NEW );
- $id1 = $content1-getItem()-getId()-getNumericId();
+ $lookup-saveTermsOfEntity( $item1 );
$ids = $lookup-getEntityIdsForLabel( 'foobar' );
$this-assertInternalType( 'array', $ids );
@@ -94,6 +90,7 @@
$lookup = $this-getTermIndex();
$item = Item::newEmpty();
+ $item-setId( new ItemId( 'Q1234' ) );
$item-setLabel( 'en', 'foobarz' );
$item-setLabel( 'de', 'foobarz' );
@@ -102,9 +99,7 @@
$item-setDescription( 'fr', 'fooz barz bazz' );
$item-setAliases( 'nl', array( 'a42', 'b42', 'c42' ) );
-
[MediaWiki-commits] [Gerrit] WIP Paragraph by paragraph translation - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118064
Change subject: WIP Paragraph by paragraph translation
..
WIP Paragraph by paragraph translation
Change-Id: I600ecc61ca2dc56b43ad7f2b3f4f9ba921fff963
---
M modules/source/ext.cx.source.js
M modules/translation/ext.cx.translation.js
M modules/translation/styles/ext.cx.translation.less
M server/segmentation/languages/en/CXParserEn.js
4 files changed, 53 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/64/118064/1
diff --git a/modules/source/ext.cx.source.js b/modules/source/ext.cx.source.js
index 037f545..927b921 100644
--- a/modules/source/ext.cx.source.js
+++ b/modules/source/ext.cx.source.js
@@ -75,12 +75,13 @@
ContentTranslationSource.prototype.load = function () {
this.$content.html( mw.cx.data.segmentedContent );
+ mw.hook( 'mw.cx.source.loaded' ).fire();
};
ContentTranslationSource.prototype.listen = function () {
mw.hook( 'mw.cx.source.ready' ).add( $.proxy( this.load, this )
);
this.$content.on( 'click', 'p, h1, h2, h3, h4, ul', function ()
{
- mw.hook( 'mw.cx.translation.add' ).fire( this.outerHTML
);
+ mw.hook( 'mw.cx.translation.add' ).fire( this.id );
} );
};
diff --git a/modules/translation/ext.cx.translation.js
b/modules/translation/ext.cx.translation.js
index fe497da..8409e50 100644
--- a/modules/translation/ext.cx.translation.js
+++ b/modules/translation/ext.cx.translation.js
@@ -64,7 +64,7 @@
}
$content = $( 'div' )
- .attr( 'contenteditable', true )
+ //.attr( 'contenteditable', true )
.addClass( 'cx-column__content' )
.html( '\n' ); // Make sure that it's visible to the
tests
@@ -76,20 +76,51 @@
ContentTranslationEditor.prototype.listen = function () {
mw.hook( 'mw.cx.translation.add' ).add( $.proxy( this.update,
this ) );
-
+ mw.hook( 'mw.cx.source.loaded' ).add( $.proxy(
this.addPlaceholders, this ) );
this.$content.on( 'input', function () {
mw.hook( 'mw.cx.translation.change' ).fire();
} );
};
- ContentTranslationEditor.prototype.update = function ( content ) {
- this.$content.append( content );
+ ContentTranslationEditor.prototype.update = function ( sourceId ) {
+ var sourceHtml = $( '#' + sourceId ).html();
+ $( '#t' + sourceId ).html( sourceHtml );
mw.hook( 'mw.cx.progress' ).fire( 100 );
mw.hook( 'mw.cx.translation.change' ).fire();
};
+ ContentTranslationEditor.prototype.addPlaceholders = function () {
+ this.$content.html( mw.cx.data.segmentedContent );
+ this.$content.find( 'p, h1, h2, h3, div, table, figure, ul'
).each( function () {
+ var $section = $( this ),
+ sectionId = $section.attr( 'id' );
+ $section.css( {
+ 'min-height': $section.height()
+ } );
+ $section.attr( {
+ 'id': 't' + sectionId,
+ 'data-source': sectionId,
+ 'contenteditable': true
+ } );
+ $section.empty();
+ $section.hover( function () {
+ $( this )
+ .addClass( 'add-translation' )
+ .html( '+ Add Translation' );
+ }, function () {
+ $( this ).removeClass( 'add-translation'
).empty();
+ } );
+ $section.click( function () {
+ $( this )
+ .removeClass( 'add-translation' )
+ .unbind( 'mouseenter mouseleave click'
);
+ mw.hook( 'mw.cx.translation.add' ).fire( $(
this ).data( 'source' ) );
+ } );
+ } );
+ };
+
$.fn.cxTranslation = function ( options ) {
return this.each( function () {
var $this = $( this ),
diff --git a/modules/translation/styles/ext.cx.translation.less
b/modules/translation/styles/ext.cx.translation.less
index 3419209..9e34acb 100644
--- a/modules/translation/styles/ext.cx.translation.less
+++ b/modules/translation/styles/ext.cx.translation.less
@@ -3,3 +3,12 @@
.cx-column--translation [contenteditable]
[MediaWiki-commits] [Gerrit] Use full URL to mediawiki.org ULS page per bug 54835 - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Use full URL to mediawiki.org ULS page per bug 54835
..
Use full URL to mediawiki.org ULS page per bug 54835
Follow-up on I7fd57c092020a2d73b9241e0595f860e6aedbc48
Change-Id: I581377f8e8901490ca08df4a4a1a6a5b947da597
---
M i18n/core/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/core/en.json b/i18n/core/en.json
index 3bcccea..3c159ff 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -390,5 +390,5 @@
translate-statsbar-tooltip-with-fuzzy: $1% translated, $2% reviewed,
$3% outdated,
translate-search-more-groups-info: $1 more {{PLURAL:$1|group|groups}},
translate-ulsdep-title: Configuration error,
-translate-ulsdep-body: Translate extension depends on the
[[mw:Extension:UniversalLanguageSelector|Universal Language Selector
extension]].
+translate-ulsdep-body: Translate extension depends on the
[https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector Universal
Language Selector extension].
}
--
To view, visit https://gerrit.wikimedia.org/r/118062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I581377f8e8901490ca08df4a4a1a6a5b947da597
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [SemanticHighcharts] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [SemanticHighcharts] Register extension .. [SemanticHighcharts] Register extension [WikibaseDatamodel] De-register extension: Read only Change-Id: I0290b7940346144b682fb848dfb53aa5e06fefd8 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index d142c5c..981c226 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -1408,6 +1408,8 @@ Semantic Glossary +Semantic Highcharts + Semantic Image Input descmsg = sii-desc @@ -1948,7 +1950,8 @@ ignored = wikibase-ui-pendingquantitycounter-nonpending, wikibase-ui-pendingquantitycounter-pending, wikibase-property-footer ignored = wikibase-shortcopyrightwarning-version -Wikibase Data Model +# Repo read only 2014-03-07 +# Wikibase Data Model # Deleted 2013-11-01 https://gerrit.wikimedia.org/r/#/c/93149/1/.gitmodules,unified # Wikibase Database -- To view, visit https://gerrit.wikimedia.org/r/118065 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0290b7940346144b682fb848dfb53aa5e06fefd8 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [SemanticHighcharts] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/118065 Change subject: [SemanticHighcharts] Register extension .. [SemanticHighcharts] Register extension [WikibaseDatamodel] De-register extension: Read only Change-Id: I0290b7940346144b682fb848dfb53aa5e06fefd8 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/65/118065/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index d142c5c..981c226 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -1408,6 +1408,8 @@ Semantic Glossary +Semantic Highcharts + Semantic Image Input descmsg = sii-desc @@ -1948,7 +1950,8 @@ ignored = wikibase-ui-pendingquantitycounter-nonpending, wikibase-ui-pendingquantitycounter-pending, wikibase-property-footer ignored = wikibase-shortcopyrightwarning-version -Wikibase Data Model +# Repo read only 2014-03-07 +# Wikibase Data Model # Deleted 2013-11-01 https://gerrit.wikimedia.org/r/#/c/93149/1/.gitmodules,unified # Wikibase Database -- To view, visit https://gerrit.wikimedia.org/r/118065 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0290b7940346144b682fb848dfb53aa5e06fefd8 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add release note for removal of preference noconvertlink - change (mediawiki/core)
Liangent has uploaded a new change for review. https://gerrit.wikimedia.org/r/118066 Change subject: Add release note for removal of preference noconvertlink .. Add release note for removal of preference noconvertlink Follow up 333bf3ae5b412fae1e4f57a62a220c941ef50536. Change-Id: I7a3e391f56d2e2839b3210d79a9f5b630f0f6fed --- M RELEASE-NOTES-1.23 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/66/118066/1 diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index 344c967..fb12acd 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -278,6 +278,7 @@ table.mw-prefixindex-list-table to avoid duplicate ids when the special page is transcluded. * (bug 62198) window.$j has been deprecated. +* Preference Disable link title conversion was removed. Removed classes * FakeMemCachedClient (deprecated in 1.18) -- To view, visit https://gerrit.wikimedia.org/r/118066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a3e391f56d2e2839b3210d79a9f5b630f0f6fed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Liangent liang...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add release note for removal of preference noconvertlink - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add release note for removal of preference noconvertlink .. Add release note for removal of preference noconvertlink Follow up 333bf3ae5b412fae1e4f57a62a220c941ef50536. Change-Id: I7a3e391f56d2e2839b3210d79a9f5b630f0f6fed --- M RELEASE-NOTES-1.23 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index 344c967..fb12acd 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -278,6 +278,7 @@ table.mw-prefixindex-list-table to avoid duplicate ids when the special page is transcluded. * (bug 62198) window.$j has been deprecated. +* Preference Disable link title conversion was removed. Removed classes * FakeMemCachedClient (deprecated in 1.18) -- To view, visit https://gerrit.wikimedia.org/r/118066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a3e391f56d2e2839b3210d79a9f5b630f0f6fed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Liangent liang...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Comply with WCAG 2.0 H44 - label form control association - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Comply with WCAG 2.0 H44 - label form control association
..
Comply with WCAG 2.0 H44 - label form control association
Applying what is said in
http://www.w3.org/TR/2012/NOTE-WCAG20-TECHS-20120103/H44
This important for visually impaired people as well as for
people who prefer clicking labels instead of inputs (like me).
Doing some clean up:
* Consistent representation of objects
* Creating elements in jQuery does not require closing tags,
if no attributes are specified.
* Removal of unused variable in constructor.
Change-Id: Iafa29d051f77411a79acc0251c355940af6971a4
---
M resources/mw.UploadWizardDeed.js
1 file changed, 35 insertions(+), 12 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mw.UploadWizardDeed.js b/resources/mw.UploadWizardDeed.js
index f82959a..8fc42ff 100644
--- a/resources/mw.UploadWizardDeed.js
+++ b/resources/mw.UploadWizardDeed.js
@@ -29,14 +29,21 @@
}
mw.UploadWizardDeed = function() {
- var _this = this;
+ mw.UploadWizardDeed.prototype.instanceCount++;
+
// prevent from instantiating directly?
return false;
};
mw.UploadWizardDeed.prototype = {
+ instanceCount: 0,
+
valid: function() {
return false;
+ },
+
+ getInstanceCount: function() {
+ return this.instanceCount;
},
setFormFields: function() { },
@@ -314,10 +321,13 @@
_this.uploadCount = uploadCount ? uploadCount : 1;
_this.sourceInput = $('textarea class=mwe-source mwe-long-textarea
name=source rows=1 cols=40/textarea' )
+ .attr( 'id', 'mwe-source-' +
_this.getInstanceCount() )
.growTextArea();
_this.authorInput = $('textarea class=mwe-author mwe-long-textarea
name=author rows=1 cols=40/textarea' )
+ .attr( 'id', 'mwe-author-' +
_this.getInstanceCount() )
.growTextArea();
licenseInputDiv = $( 'div
class=mwe-upwiz-deed-license-groups/div' );
+
_this.licenseInput = new mw.UploadWizardLicenseInput(
licenseInputDiv,
undefined,
@@ -334,38 +344,51 @@
setFormFields: function( $selector ) {
var $defaultLicense, defaultLicense, defaultLicenseNum,
defaultType,
_this = this;
- _this.$form = $( 'form /' );
+
+ _this.$form = $( 'form' );
defaultType =
mw.UploadWizard.config.licensing.defaultType;
var $formFields = $( 'div
class=mwe-upwiz-deed-form-internal /' );
if ( _this.uploadCount 1 ) {
- $formFields.append( $( 'div /' ).msg(
'mwe-upwiz-source-thirdparty-custom-multiple-intro' ) );
+ $formFields.append( $( 'div' ).msg(
'mwe-upwiz-source-thirdparty-custom-multiple-intro' ) );
}
$formFields.append (
$( 'div
class=mwe-upwiz-source-thirdparty-custom-multiple-intro /' ),
- $( 'label for=source generated=true
class=mwe-validator-error style=display:block; /' ),
+ $( 'label generated=true
class=mwe-validator-error style=display:block; /' )
+ .attr( 'for', 'mwe-source-' +
_this.getInstanceCount() ),
$( 'div class=mwe-upwiz-thirdparty-fields
/' )
- .append( $( 'label for=source /'
).text( mw.message( 'mwe-upwiz-source' ).text() ).addHint( 'source' ),
+ .append( $( 'label' )
+ .text( mw.message(
'mwe-upwiz-source' ).text() )
+ .attr( 'for',
'mwe-source-' + _this.getInstanceCount() )
+ .addHint( 'source' ),
_this.sourceInput ),
- $( 'label for=author generated=true
class=mwe-validator-error style=display:block; /' ),
+ $( 'label generated=true
class=mwe-validator-error style=display:block; /' )
+ .attr( 'for', 'mwe-author-' +
_this.getInstanceCount() ),
$( 'div class=mwe-upwiz-thirdparty-fields
/' )
- .append( $( 'label for=author /'
).text( mw.message( 'mwe-upwiz-author' ).text() ).addHint( 'author' ),
+ .append( $( 'label' )
+
[MediaWiki-commits] [Gerrit] Replacing deprecated $j.browser with $.client - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Replacing deprecated $j.browser with $.client
..
Replacing deprecated $j.browser with $.client
jQuery.browser is deprecated and already removed in the latest versions
of jQuery. Since feature detection does not work here, we still have to
rely on browser-sniffing. For this purpose, we use $.client, which is
already used in mw.UploadWizardInterface, thus no additional dependency
is required.
This also eliminates a bug in this code where the version is compared
against a string which leads to confusing and undesired results (cf. Bug
43821)
Bug: 43821
Change-Id: I223dfd7857bae9ae904dcd5b9232b64338f8cd4c
---
M resources/mw.FormDataTransport.js
1 file changed, 12 insertions(+), 5 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mw.FormDataTransport.js
b/resources/mw.FormDataTransport.js
index 70d5298..6903e96 100644
--- a/resources/mw.FormDataTransport.js
+++ b/resources/mw.FormDataTransport.js
@@ -10,10 +10,12 @@
mw.FormDataTransport = function( postUrl, formData, uploadObject, progressCb,
transportedCb ) {
+var profile = $.client.profile();
+
this.formData = formData;
this.progressCb = progressCb;
this.transportedCb = transportedCb;
- this.uploadObject = uploadObject;
+this.uploadObject = uploadObject;
this.postUrl = postUrl;
// Set chunk size to configured chunk size or max php size,
@@ -27,7 +29,12 @@
// Workaround for Firefox 7.0 sending an empty string
// as filename for Blobs in FormData requests, something PHP does not like
// https://bugzilla.mozilla.org/show_bug.cgi?id=649150
-this.gecko = $.browser.mozilla $.browser.version '7.0';
+// From version 7.0 to 22.0, Firefox sends blob as the file name
+// which seems to be accepted by the server
+// https://bugzilla.mozilla.org/show_bug.cgi?id=690659
+//
https://developer.mozilla.org/en-US/docs/Web/API/FormData#Browser_compatibility
+
+this.insufficientFormDataSupport = profile.name === 'firefox'
profile.versionNumber 7;
};
mw.FormDataTransport.prototype = {
@@ -169,7 +176,7 @@
transport.parseResponse(evt, transport.transportedCb);
}, false);
-if(this.gecko) {
+if(this.insufficientFormDataSupport) {
formData = this.geckoFormData();
} else {
formData = new FormData();
@@ -191,13 +198,13 @@
formData.append('filekey', this.filekey);
}
formData.append('filesize', bytesAvailable);
-if(this.gecko) {
+if(this.insufficientFormDataSupport) {
formData.appendBlob('chunk', chunk, 'chunk.bin');
} else {
formData.append('chunk', chunk);
}
this.xhr.open('POST', this.postUrl, true);
-if(this.gecko) {
+if(this.insufficientFormDataSupport) {
formData.send(this.xhr);
} else {
this.xhr.send(formData);
--
To view, visit https://gerrit.wikimedia.org/r/74425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I223dfd7857bae9ae904dcd5b9232b64338f8cd4c
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Rillke rainerril...@hotmail.com
Gerrit-Reviewer: Drecodeam drecod...@gmail.com
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Nischayn22 nischay...@gmail.com
Gerrit-Reviewer: Rillke rainerril...@hotmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use single query for multiple revision lookups by pk - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Use single query for multiple revision lookups by pk
..
Use single query for multiple revision lookups by pk
Change-Id: I7bf18898f8b4f91ca8fa4a85685f023106caddd9
---
M includes/Data/RevisionStorage.php
A tests/RevisionStorageTest.php
2 files changed, 163 insertions(+), 20 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Data/RevisionStorage.php
b/includes/Data/RevisionStorage.php
index 1791b4b..b4db0df 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -42,6 +42,11 @@
abstract protected function updateRelated( array $changes, array $old );
abstract protected function removeRelated( array $row );
+ /**
+* @param DbFactory $dbFactory
+* @param array|false List of externel store servers available for
insert
+* or false to disable. See $wgFlowExternalStore.
+*/
public function __construct( DbFactory $dbFactory, $externalStore ) {
parent::__construct( $dbFactory );
$this-externalStore = $externalStore;
@@ -101,29 +106,61 @@
}
protected function findMultiInternal( array $queries, array $options =
array() ) {
+ $queriedKeys = array_keys( reset( $queries ) );
// The findMulti doesn't map well to SQL, basically we are
asking to answer a bunch
// of queries. We can optimize those into a single query in a
few select instances:
- // Either
- // All queries are feature queries for a unique value
- // OR
- // queries have limit 1
- // queries have no offset
- // queries are sorted by the join field(which is time sorted)
- // query keys are all in the related table and not the
revision table
- //
+ if ( isset( $options['LIMIT'] ) $options['LIMIT'] == 1 ) {
+ // Find by primary key
+ if ( $options == array( 'LIMIT' = 1 )
+ $queriedKeys === array( 'rev_id' )
+ ) {
+ return $this-findRevId( $queries );
+ }
- $queriedKeys = array_keys( reset( $queries ) );
- if ( $options['LIMIT'] === 1
- !isset( $options['OFFSET'] )
- count( $queriedKeys ) === 1
- in_array( reset( $queriedKeys ), array( 'rev_id',
$this-joinField(), $this-relatedPk() ) )
- isset( $options['ORDER BY'] ) count( $options['ORDER
BY'] ) === 1
- in_array( reset( $options['ORDER BY'] ), array( 'rev_id
DESC', {$this-joinField()} DESC ) )
- ) {
- return $this-findMostRecent( $queries );
+ // Find most recent revision of a number of posts
+ if ( !isset( $options['OFFSET'] )
+ in_array( $queriedKeys, array(
+ array( $this-joinField() ),
+ array( $this-relatedPk() ),
+ ) )
+ isset( $options['ORDER BY'] )
+ $options['ORDER BY'] === array( 'rev_id DESC' )
+ ) {
+ return $this-findMostRecent( $queries );
+ }
}
- return $this-fallbackFindMulti( $queries, $options );
+ // Fetch a list of revisions for each post
+ // @todo this is slow and inefficient. Mildly better solution
would be if
+ // the index can ask directly for just the list of rev_id
instead of whole rows,
+ // but would still have the need to run a bunch of queries
serially.
+ if ( count( $options ) === 2
+ isset( $options['LIMIT'], $options['ORDER BY'] )
+ $options['ORDER BY'] === array( 'rev_id DESC' )
+ ) {
+ return $this-fallbackFindMulti( $queries, $options );
+ // unoptimizable query
+ } else {
+ wfDebugLog( __CLASS__, __FUNCTION__
+ . ': Unoptimizable query for keys: '
+ . implode( ',', array_keys( $queriedKeys ) )
+ . ' with options '
+ . \FormatJson::encode( $options )
+ );
+ return $this-fallbackFindMulti( $queries, $options );
+ }
+ }
+
+ protected function findRevId( array $queries ) {
+
[MediaWiki-commits] [Gerrit] Test and fix RevisionStorage partial result - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Test and fix RevisionStorage partial result
..
Test and fix RevisionStorage partial result
Change-Id: Ief0111b2e253bfa83c2d6b7d8c1d8fcd28615c6a
---
M includes/Data/RevisionStorage.php
M tests/RevisionStorageTest.php
2 files changed, 43 insertions(+), 0 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Data/RevisionStorage.php
b/includes/Data/RevisionStorage.php
index b4db0df..6278f2b 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -246,6 +246,10 @@
*/
public static function mergeExternalContent( array $cacheResult ) {
foreach ( $cacheResult as $source ) {
+ if ( $source === null ) {
+ // unanswered queries return null
+ continue;
+ }
foreach ( $source as $row ) {
$flags = explode( ',', $row['rev_flags'] );
if ( in_array( 'external', $flags ) ) {
@@ -691,6 +695,9 @@
}
$ids = array();
foreach ( $multiSource as $source ) {
+ if ( $source === null ) {
+ continue;
+ }
foreach ( $source as $row ) {
$id = $row[$fromKey];
if ( $id !== null ) {
@@ -706,6 +713,9 @@
return false;
}
foreach ( $multiSource as $i = $source ) {
+ if ( $source === null ) {
+ continue;
+ }
foreach ( $source as $j = $row ) {
$id = $row[$fromKey];
if ( $id === null ) {
diff --git a/tests/RevisionStorageTest.php b/tests/RevisionStorageTest.php
index ca5fbef..21ec8af 100644
--- a/tests/RevisionStorageTest.php
+++ b/tests/RevisionStorageTest.php
@@ -87,6 +87,39 @@
$storage-findMulti( $queries, $options );
}
+ public function testPartialResult() {
+ $treeRepo = $this-getMockBuilder(
'Flow\Repository\TreeRepository' )
+ -disableOriginalConstructor()
+ -getMock();
+ $factory = $this-mockDbFactory();
+ $factory-getDB( null )-expects( $this-once() )
+ -method( 'select' )
+ -will( $this-returnValue( array(
+ (object)array( 'rev_id' = 42, 'rev_flags' =
'' )
+ ) ) );
+
+ $storage = new PostRevisionStorage( $factory, false, $treeRepo
);
+
+ $res = $storage-findMulti(
+ array(
+ array( 'rev_id' = 12 ),
+ array( 'rev_id' = 42 ),
+ array( 'rev_id' = 17 ),
+ ),
+ array( 'LIMIT' = 1 )
+ );
+
+ $this-assertSame(
+ array(
+ null,
+ array( array( 'rev_id' = 42, 'rev_flags' =
'', 'rev_content_url' = null ) ),
+ null,
+ ),
+ $res,
+ 'Unfound items must be represented with null in the
result array'
+ );
+ }
+
protected function mockDbFactory() {
$dbw = $this-getMockBuilder( 'DatabaseMysql' )
-disableOriginalConstructor()
--
To view, visit https://gerrit.wikimedia.org/r/117233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief0111b2e253bfa83c2d6b7d8c1d8fcd28615c6a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remind user to select a license - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged. Change subject: Remind user to select a license .. Remind user to select a license Currently, it is not obvious what's wrong when forgetting to specify a license when choosing the third party origin option in UploadWizard. This presumably because someone mixed up mwe-error-head with mwe-error-main. Change-Id: I3477099d0eabd6e2fb5a90ee7e13ec6ac6396705 --- M resources/mw.UploadWizardLicenseInput.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/mw.UploadWizardLicenseInput.js b/resources/mw.UploadWizardLicenseInput.js index 86118c8..3f68f39 100644 --- a/resources/mw.UploadWizardLicenseInput.js +++ b/resources/mw.UploadWizardLicenseInput.js @@ -32,7 +32,7 @@ } _this.$selector = $( selector ); - _this.$selector.append( $( 'div class=mwe-error mwe-error-main/div' ) ); + _this.$selector.append( $( 'div class=mwe-error mwe-error-head/div' ) ); _this.type = config.type === 'or' ? 'radio' : 'checkbox'; -- To view, visit https://gerrit.wikimedia.org/r/117428 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3477099d0eabd6e2fb5a90ee7e13ec6ac6396705 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: Rillke rainerril...@hotmail.com Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Rillke rainerril...@hotmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow extension of post interaction links - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow extension of post interaction links
..
Allow extension of post interaction links
Allow other extensions to add additional interaction links for each Flow
comment. Used by Flow Thanks.
Bug: 61930
Change-Id: Iab4ac2889a3e630a9c98241e4a93c71e4c1bd377
Co-authored-by: Bencmq bencmqw...@gmail.com
---
A hooks.txt
M includes/View.php
M includes/View/Post.php
M modules/mediawiki.ui/styles/agora-override-buttons.less
M modules/mediawiki.ui/styles/mixins/buttons.less
5 files changed, 24 insertions(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hooks.txt b/hooks.txt
new file mode 100644
index 000..f70c0ec
--- /dev/null
+++ b/hooks.txt
@@ -0,0 +1,16 @@
+This document describes how event hooks work in the Flow extension.
+
+== Events and parameters ==
+
+This is a list of known events and parameters; please add to it if you're going
+to add events to the Flow extension.
+
+'FlowAddPostInteractionLinks': Called when a post is rendered, allow other
+extensions to add interaction links to the post besides 'Edit' and other links.
+$rev: Flow PostRevision object that the links belong to
+$user: User object to display the link for
+$links: array of interaction links to be displayed, caller should append the
+ link element to the array
+
+'FlowAddModules': Allows other extensions to add relevant modules.
+$output: OutputPage object
diff --git a/includes/View.php b/includes/View.php
index dce0c95..11c2438 100644
--- a/includes/View.php
+++ b/includes/View.php
@@ -23,6 +23,9 @@
$out-addModuleStyles( array( 'mediawiki.ui',
'mediawiki.ui.button', 'ext.flow.base' ) );
$out-addModules( array( 'ext.flow.base', 'ext.flow.editor' ) );
+ // Allow other extensions to add modules
+ wfRunHooks( 'FlowAddModules', array( $out ) );
+
$workflow = $loader-getWorkflow();
$title = $workflow-getArticleTitle();
diff --git a/includes/View/Post.php b/includes/View/Post.php
index 9a4e26d..eb045ff 100644
--- a/includes/View/Post.php
+++ b/includes/View/Post.php
@@ -75,6 +75,9 @@
$items[] = $editButton;
}
+ wfRunHooks( 'FlowAddPostInteractionLinks',
+ array( $this-post, $this-user, $items ) );
+
return implode(
Html::element(
'span',
diff --git a/modules/mediawiki.ui/styles/agora-override-buttons.less
b/modules/mediawiki.ui/styles/agora-override-buttons.less
index 22d7598..0eaccf0 100644
--- a/modules/mediawiki.ui/styles/agora-override-buttons.less
+++ b/modules/mediawiki.ui/styles/agora-override-buttons.less
@@ -48,7 +48,7 @@
// disabled
@neutral-base,
- #898989
+ #bbb // a choice based on
https://trello.com/c/BJgrJCyX/59-thank-user
);
.mw-ui-constructive {
diff --git a/modules/mediawiki.ui/styles/mixins/buttons.less
b/modules/mediawiki.ui/styles/mixins/buttons.less
index b3161f3..1ac7e23 100644
--- a/modules/mediawiki.ui/styles/mixins/buttons.less
+++ b/modules/mediawiki.ui/styles/mixins/buttons.less
@@ -41,6 +41,7 @@
.mw-ui-disabled {
color: @inactive-primary-contrast-color !important;
background: @inactive-primary-color;
+ cursor: default;
}
--
To view, visit https://gerrit.wikimedia.org/r/115552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab4ac2889a3e630a9c98241e4a93c71e4c1bd377
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Wctaiwan wctai...@gmail.com
Gerrit-Reviewer: Bencmq bencmqw...@gmail.com
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Spage sp...@wikimedia.org
Gerrit-Reviewer: Wctaiwan wctai...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implement security for public reports - change (analytics/wikimetrics)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118068
Change subject: Implement security for public reports
..
Implement security for public reports
Card: analytics 1377
Change-Id: Iff3d77d73ec53a4e6eb27b4877b7ab6fc1cf383b
---
M tests/test_controllers/test_reports.py
1 file changed, 29 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/68/118068/1
diff --git a/tests/test_controllers/test_reports.py
b/tests/test_controllers/test_reports.py
index 7cad1b2..17e9498 100644
--- a/tests/test_controllers/test_reports.py
+++ b/tests/test_controllers/test_reports.py
@@ -5,7 +5,7 @@
import os.path
from nose.tools import assert_true, assert_equal, assert_false
from tests.fixtures import WebTest
-from wikimetrics.models import PersistentReport
+from wikimetrics.models import PersistentReport, User
from wikimetrics.controllers.reports import (
get_celery_task,
get_celery_task_result,
@@ -339,7 +339,34 @@
response = self.app.post('/reports/remove/{}'.format(report.id))
assert_true(response.status_code == 200)
assert_false(os.path.isfile(path))
-
+
+def test_public_report_security(self):
+try:
+not_me = User()
+self.session.add(not_me)
+self.session.commit()
+
+not_my_report = PersistentReport(user_id=not_me.id)
+self.session.add(not_my_report)
+self.session.commit()
+
+path = get_saved_report_path(not_my_report.id)
+if os.path.isfile(path):
+os.remove(path)
+response =
self.app.post('/reports/save/{}'.format(not_my_report.id))
+assert_true(response.status_code == 403)
+assert_true(not os.path.isfile(path))
+
+with open(path, 'w') as saved_file:
+saved_file.write('hello world')
+
+assert_true(os.path.isfile(path))
+response =
self.app.post('/reports/remove/{}'.format(not_my_report.id))
+assert_true(response.status_code == 403)
+assert_true(os.path.isfile(path))
+finally:
+os.remove(path)
+
def test_report_result_timeseries_csv(self):
# Make the request
desired_responses = [{
--
To view, visit https://gerrit.wikimedia.org/r/118068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff3d77d73ec53a4e6eb27b4877b7ab6fc1cf383b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove remnants of old CA RC2UDP config - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove remnants of old CA RC2UDP config
..
Remove remnants of old CA RC2UDP config
Bug: 56284
Change-Id: I208d51b5db031d35518453e2b9de096f7f53f7a0
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 64cf9c1..6498ec5 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1194,11 +1194,6 @@
'formatter' = 'IRCColourfulCARCFeedFormatter',
'uri' =
udp://$wmgRC2UDPAddress:$wmgRC2UDPPort/#central\t,
);
-
- // Temp. Should be removed when new CA is fully deployed
- $wgRC2UDPPort = $wmgRC2UDPPort;
- $wgCentralAuthUDPAddress = $wmgRC2UDPAddress;
- $wgCentralAuthNew2UDPPrefix = #central\t;
}
switch ( $wmfRealm ) {
--
To view, visit https://gerrit.wikimedia.org/r/117667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I208d51b5db031d35518453e2b9de096f7f53f7a0
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add logo for legalteamwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add logo for legalteamwiki .. Add logo for legalteamwiki stdlogo does not appear to work for private wikis for multiple reasons bug: 61222 Change-Id: Id8832871a98bd3f2801c89e05122d969733a0a31 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5868764..7ecd2c5 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -965,7 +965,7 @@ 'iegcomwiki' = '//upload.wikimedia.org/wikipedia/commons/5/5e/Wikimedia_IEG_committee_logo.png', // bug 48379 'incubatorwiki' = '$stdlogo', 'internalwiki' = '//upload.wikimedia.org/wikipedia/meta/a/a2/Wikimediainernal-logo135px.png', - 'legalteamwiki' = '$stdlogo', + 'legalteamwiki' = '//upload.wikimedia.org/wikipedia/commons/thumb/4/4c/Rory_sketch_-_sword_and_shield.png/135px-Rory_sketch_-_sword_and_shield.png', 'loginwiki' = '//upload.wikimedia.org/wikipedia/commons/e/ed/Wikimedia_logo-scaled-down.png', // bug 48236 'mediawikiwiki' = '$stdlogo', 'metawiki' = '$stdlogo', -- To view, visit https://gerrit.wikimedia.org/r/117377 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8832871a98bd3f2801c89e05122d969733a0a31 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jalexander jalexan...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set wmgBabelCategoryNames for Chinese Wikivoyage - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Set wmgBabelCategoryNames for Chinese Wikivoyage .. Set wmgBabelCategoryNames for Chinese Wikivoyage Doing just that; also setting $wmgBabelMainCategory per community request. Bug: 61819 Change-Id: I247d6e7932a6febb1c38271db24b148c07e866cf --- M wmf-config/InitialiseSettings.php 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7ecd2c5..6cbaaff 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11773,6 +11773,15 @@ '5' = false, 'N' = '%code%_母语使用者', ), + 'zhwikivoyage' = array( // bug 61819 + '0' = '%code%-0_使用者', + '1' = '%code%-1_使用者', + '2' = '%code%-2_使用者', + '3' = '%code%-3_使用者', + '4' = '%code%-4_使用者', + '5' = false, + 'N' = '%code%_母语使用者', + ), ), 'wmgBabelMainCategory' = array( @@ -11837,6 +11846,7 @@ 'zhwikinews' = '%code%_使用者', 'zhwikiquote' = '%code%_使用者', 'zhwikisource' = '%code%_使用者', + 'zhwikivoyage' = '%code%_使用者', // bug 61819 ), 'wmgBabelDefaultLevel' = array( 'default' = 'N', -- To view, visit https://gerrit.wikimedia.org/r/114970 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I247d6e7932a6febb1c38271db24b148c07e866cf Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder tom...@twkozlowski.net Gerrit-Reviewer: Gabrielchihonglee chihonglee...@gmail.com Gerrit-Reviewer: Liuxinyu970226 541329...@qq.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: Ricordisamoa ricordisa...@live.it Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable VisualEditor by default on French Wikiversity - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable VisualEditor by default on French Wikiversity .. Enable VisualEditor by default on French Wikiversity Bug: 62045 Change-Id: I1e7950347cbdac0674e698462eabecef36b715b2 --- M visualeditor-default.dblist 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/visualeditor-default.dblist b/visualeditor-default.dblist index 6066813..522131e 100644 --- a/visualeditor-default.dblist +++ b/visualeditor-default.dblist @@ -161,6 +161,7 @@ zeawiki zuwiki ptwikibooks +frwikiversity boardwiki collabwiki legalteamwiki -- To view, visit https://gerrit.wikimedia.org/r/117238 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e7950347cbdac0674e698462eabecef36b715b2 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] 'Markbotedits' user right for rollbackers on shwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: 'Markbotedits' user right for rollbackers on shwiki .. 'Markbotedits' user right for rollbackers on shwiki Doing just that. Bug: 62462 Change-Id: I1a438ccd295475444319027629201dc08f7d8c88 --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 6cbaaff..ec46935 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7402,7 +7402,10 @@ 'patrolmarks' = true, // bug 60818 ), 'confirmed' = array( 'patrolmarks' = true, ), - 'rollbacker' = array( 'rollback' = true ), + 'rollbacker' = array( + 'rollback' = true, + 'markbotedits' = true, // bug 62462 + ), 'filemover' = array( 'movefile' = true, 'suppressredirect' = true ), 'flood' = array( 'bot' = true ), ), -- To view, visit https://gerrit.wikimedia.org/r/117807 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a438ccd295475444319027629201dc08f7d8c88 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder tom...@twkozlowski.net Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Kolega2357 kolega2...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add dependency on sax module - change (mediawiki...ContentTranslation)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118069
Change subject: Add dependency on sax module
..
Add dependency on sax module
This patch is dependency of: https://gerrit.wikimedia.org/r/#/c/117406/
Change-Id: Ib226d1b6af8d1d6423e860c37ffcc590babbf88e
---
M server/package.json
1 file changed, 1 insertion(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/69/118069/1
diff --git a/server/package.json b/server/package.json
index 03727be..7807577 100644
--- a/server/package.json
+++ b/server/package.json
@@ -9,6 +9,7 @@
q: *,
redis: 0.10,
request: *,
+ sax: 0.6.0,
socket.io: 0.9.x
},
devDependencies: {
--
To view, visit https://gerrit.wikimedia.org/r/118069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib226d1b6af8d1d6423e860c37ffcc590babbf88e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Wikimedia CH domain to wgCopyUploadsDomains - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add Wikimedia CH domain to wgCopyUploadsDomains .. Add Wikimedia CH domain to wgCopyUploadsDomains Requested by Emmanuel Engelhart (Kelson), who is apparently somehow involved with Wikimedia CH, but I couldn't find any information who exactly they are. Bug: 62108 Change-Id: Ia97d54540b4e1f8ac10da3438a9818ad9d5a6b4c --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ec46935..646221a 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10375,6 +10375,7 @@ '*.rijksmuseum.nl', // Rijksmuseum '*.llgc.org.uk', // National Library of Wales '*.tounoki.org', // Musées de la Haute-Saône + '*.wikimedia.ch',// Wikimedia CH ), ), -- To view, visit https://gerrit.wikimedia.org/r/116263 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia97d54540b4e1f8ac10da3438a9818ad9d5a6b4c Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder tom...@twkozlowski.net Gerrit-Reviewer: Kelson kel...@kiwix.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow more upload file types for sewikimedia sysops - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Allow more upload file types for sewikimedia sysops .. Allow more upload file types for sewikimedia sysops Restricting uploads to sysops and allowing a whole lot of useful file types by setting wmgPrivateWikiUploads to true for this wiki. Bug: 61947 Change-Id: I5106d20b4e277af3d0ca91aba33f366c524971bd --- M wmf-config/InitialiseSettings.php 1 file changed, 14 insertions(+), 4 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 646221a..2de2b37 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7364,10 +7364,22 @@ ), 'user' = array( 'upload' = false, + 'reupload' = false, + 'reupload-own' = false, + 'reupload-shared' = false, 'editallpages' = true, // Bug 39671 ), - 'sysop' = array( + 'autoconfirmed' = array( 'upload' = false, + 'reupload' = false, + 'reupload-own' = false, + 'reupload-shared' = false, + ), + 'sysop' = array( + 'upload' = true, // bug 61947 + 'reupload' = true, + 'reupload-own' = true, + 'reupload-shared' = true, 'editallpages' = true, ), 'medlem' = array( @@ -7377,9 +7389,6 @@ 'edit' = true, 'createpage' = true, 'createtalk' = true, - 'upload' = true, - 'reupload' = true, - 'reupload-shared' = true, 'minoredit' = true, 'purge' = true, 'editallpages' = true, @@ -9245,6 +9254,7 @@ 'private' = true, 'donatewiki' = true, // whee restricted site 'foundationwiki' = true, // whee restricted site + 'sewikimedia' = true, // chapter site, only sysops can upload, bug 61947 ), // Note that changing this for wikis with CirrusSearch will remove pages in the -- To view, visit https://gerrit.wikimedia.org/r/116057 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5106d20b4e277af3d0ca91aba33f366c524971bd Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: TTO at.li...@live.com.au Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] localize wmgBabelCategoryNames and wmgBabelMainCategory for ... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: localize wmgBabelCategoryNames and wmgBabelMainCategory for oswiki .. localize wmgBabelCategoryNames and wmgBabelMainCategory for oswiki for consistency purposes: see also https://www.mediawiki.org/wiki/Thread:Extension_talk:Babel/Problem_with_local_categories Change-Id: I97a13b5577b51f112f1cdfa359a17dd40ee8893e --- M wmf-config/InitialiseSettings.php 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2de2b37..bf55034 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11563,13 +11563,13 @@ 'N' = 'Bruker %code%-N', ), 'oswiki' = array( - '0' = 'User %code%-0', - '1' = 'User %code%-1', - '2' = 'User %code%-2', - '3' = 'User %code%-3', - '4' = 'User %code%-4', - '5' = 'User %code%-5', - 'N' = 'User %code%-N', + '0' = 'Архайджытæ %code%-0', + '1' = 'Архайджытæ %code%-1', + '2' = 'Архайджытæ %code%-2', + '3' = 'Архайджытæ %code%-3', + '4' = 'Архайджытæ %code%-4', + '5' = 'Архайджытæ %code%-5', + 'N' = 'Архайджытæ %code%-N', ), 'plwiki' = array( '0' = false, @@ -11836,7 +11836,7 @@ 'metawiki' = 'User %code%', 'minwiki' = 'Pengguna %code%', 'nowiki' = 'Bruker %code%', - 'oswiki' = 'User %code%', + 'oswiki' = 'Архайджытæ %code%', 'otrs_wikiwiki' = 'User %code%', 'plwiki' = 'User %code%', 'plwikisource' = 'User %code%', // Bug 39225 -- To view, visit https://gerrit.wikimedia.org/r/115181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I97a13b5577b51f112f1cdfa359a17dd40ee8893e Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ricordisamoa ricordisa...@live.it Gerrit-Reviewer: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Crats should not add users to import on frwiktionary - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Crats should not add users to import on frwiktionary .. Crats should not add users to import on frwiktionary This patch removes the ability to add users to, and remove from, the 'import' group from bureaucrats on the French Wiktionary. This ability was granted to bureaucrats in bug 23545, apparently by mistake. Removal requested by steward Quentinv57; see bug for more information. Bug: 61829 Change-Id: Ic17196c5699c5200ea2a6bdbf0470d41a63b9306 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index bf55034..542eaf0 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7873,7 +7873,7 @@ 'sysop' = array( 'patroller' ), ), '+frwiktionary' = array( - 'bureaucrat' = array( 'accountcreator', 'import', 'patroller', 'transwiki', 'autopatrolled', 'confirmed', 'abusefilter', 'botadmin' ), + 'bureaucrat' = array( 'accountcreator', 'patroller', 'transwiki', 'autopatrolled', 'confirmed', 'abusefilter', 'botadmin' ), ), '+gawiki' = array( 'sysop' = array( 'rollbacker' ), @@ -8359,7 +8359,7 @@ 'sysop' = array( 'patroller' ), ), '+frwiktionary' = array( - 'bureaucrat' = array( 'accountcreator', 'import', 'patroller', 'transwiki', 'autopatrolled', 'confirmed', 'abusefilter', 'botadmin' ), + 'bureaucrat' = array( 'accountcreator', 'patroller', 'transwiki', 'autopatrolled', 'confirmed', 'abusefilter', 'botadmin' ), ), '+gawiki' = array( 'sysop' = array( 'rollbacker' ), -- To view, visit https://gerrit.wikimedia.org/r/115152 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic17196c5699c5200ea2a6bdbf0470d41a63b9306 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder tom...@twkozlowski.net Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Quentinv57 quentin...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding dhcpd entries for db1061-63 - change (operations/puppet)
Cmjohnson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118070
Change subject: Adding dhcpd entries for db1061-63
..
Adding dhcpd entries for db1061-63
Change-Id: I3dc4a8fb27895b495a80bd17808357a0883605eb
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/118070/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 1b233ae..21fe3d3 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1081,6 +1081,20 @@
hardware ethernet 90:B1:1C:2A:D3:BA;
fixed-address db1060.eqiad.wmnet;
}
+host db1061 {
+ hardware ethernet C8:1F:66:B8:1B:38;
+ fixed-address db1061.eqiad.wmnet;
+}
+
+host db1062 {
+ hardware ethernet C8:1F:66:B8:1D:F4;
+ fixed-address db1062.eqiad.wmnet;
+}
+
+host db1063 {
+ hardware ethernet C8:1F:66:B8:1A:40;
+ fixed-address db1063.eqiad.wmnet;
+}
host dickson {
hardware ethernet 78:2b:cb:09:0c:5a;
--
To view, visit https://gerrit.wikimedia.org/r/118070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dc4a8fb27895b495a80bd17808357a0883605eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] More Jenkins fixes - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: More Jenkins fixes
..
More Jenkins fixes
1. Fix some incorrect @tags.
2. Add a script to nuke indexes before running tests so Jenkins'
Elasticsearch doesn't end up full.
3. Add integration test only setting to speed up periodic job queue tasks
so delayed jobs resolve more quickly.
4. Drop a flaky test that doesn't really provide any value.
5. Add some more Templates:Nobel Pipe pages to make sure that is suggested.
6. Hopefully fix some more tags.
Change-Id: Ifc6a05b63b555388a0220aa52d109a4f77d2c9de
---
M maintenance/updateOneSearchIndexConfig.php
M tests/browser/features/full_text.feature
M tests/browser/features/prefer_recent.feature
M tests/browser/features/support/hooks.rb
M tests/jenkins/Jenkins.php
A tests/jenkins/nukeAllIndexes.php
6 files changed, 62 insertions(+), 12 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 601b745..0c2f9a3 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -222,7 +222,7 @@
$result = $result-getData();
$result = $result[ 'version' ][ 'number' ];
$this-output( $result... );
- if ( strpos( $result, '1.' ) !== 0 ) {
+ if ( !preg_match( '/^(1|2)./', $result ) ) {
$this-output( Not supported!\n );
$this-error( Only Elasticsearch 1.x is supported.
Your version: $result., 1 );
} else {
diff --git a/tests/browser/features/full_text.feature
b/tests/browser/features/full_text.feature
index cdd94fc..ab3280e 100644
--- a/tests/browser/features/full_text.feature
+++ b/tests/browser/features/full_text.feature
@@ -3,7 +3,7 @@
Background:
Given I am at a random page
- @setup_main
+ @setup_main @setup_namespaces
Scenario Outline: Query string search
When I search for term
Then I am on a page titled Search results
@@ -52,7 +52,7 @@
Then TestWeight Larger is the first search result
And TestWeight Smaller is the second search result
- @setup_main
+ @headings
Scenario: Pages can be found by their headings
When I search for incategory:HeadingsTest I am a heading
Then HasHeadings is the first search result
diff --git a/tests/browser/features/prefer_recent.feature
b/tests/browser/features/prefer_recent.feature
index aa5c4f0..ae105d8 100644
--- a/tests/browser/features/prefer_recent.feature
+++ b/tests/browser/features/prefer_recent.feature
@@ -18,7 +18,6 @@
| .99,.0001 |
| .99,.001|
| .8,.0001|
-| .7,.0001|
@prefer_recent
Scenario Outline: You can specify prefer-recent: in such a way that being
super recent isn't enough
diff --git a/tests/browser/features/support/hooks.rb
b/tests/browser/features/support/hooks.rb
index 5e358c6..c21d3d7 100644
--- a/tests/browser/features/support/hooks.rb
+++ b/tests/browser/features/support/hooks.rb
@@ -107,7 +107,9 @@
And a page named Noble Somethingelse5 exists with contents noble
somethingelse
And a page named Noble Somethingelse6 exists with contents noble
somethingelse
And a page named Noble Somethingelse7 exists with contents noble
somethingelse
- And a page named Template:Noble Pipe exists with contents pipes are so
noble
+ And a page named Template:Noble Pipe 1 exists with contents pipes are so
noble
+ And a page named Template:Noble Pipe 2 exists with contents pipes are so
noble
+ And a page named Template:Noble Pipe 3 exists with contents pipes are so
noble
And a page named Rrr Word 1 exists with contents #REDIRECT [[Popular
Culture]]
And a page named Rrr Word 2 exists with contents #REDIRECT [[Popular
Culture]]
And a page named Rrr Word 3 exists with contents #REDIRECT [[Noble
Somethingelse3]]
@@ -299,11 +301,12 @@
$go_options = true
end
-Before(@go, @prefix, @redirect) do
+Before(@redirect) do
if !$go_options
steps %Q{
- Given a page named Seo Redirecttest exists
- And a page named SEO Redirecttest exists with contents #REDIRECT
[[Search Engine Optimization Redirecttest]]
+ Given a page named SEO Redirecttest exists with contents #REDIRECT
[[Search Engine Optimization Redirecttest]]
+ And wait 3 seconds
+ And a page named Seo Redirecttest exists
And a page named Search Engine Optimization Redirecttest exists
}
end
diff --git a/tests/jenkins/Jenkins.php b/tests/jenkins/Jenkins.php
index e4b0517..6b24b96 100644
--- a/tests/jenkins/Jenkins.php
+++ b/tests/jenkins/Jenkins.php
@@ -31,7 +31,8 @@
// Extra Cirrus stuff for Jenkins
$wgAutoloadClasses[ 'CirrusSearch\Jenkins\CleanSetup' ] = __DIR__ .
'/cleanSetup.php';
-$wgHooks[
[MediaWiki-commits] [Gerrit] Adding dhcpd entries for db1061-63 - change (operations/puppet)
Cmjohnson has submitted this change and it was merged.
Change subject: Adding dhcpd entries for db1061-63
..
Adding dhcpd entries for db1061-63
Change-Id: I3dc4a8fb27895b495a80bd17808357a0883605eb
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 14 insertions(+), 0 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
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 1b233ae..21fe3d3 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1081,6 +1081,20 @@
hardware ethernet 90:B1:1C:2A:D3:BA;
fixed-address db1060.eqiad.wmnet;
}
+host db1061 {
+ hardware ethernet C8:1F:66:B8:1B:38;
+ fixed-address db1061.eqiad.wmnet;
+}
+
+host db1062 {
+ hardware ethernet C8:1F:66:B8:1D:F4;
+ fixed-address db1062.eqiad.wmnet;
+}
+
+host db1063 {
+ hardware ethernet C8:1F:66:B8:1A:40;
+ fixed-address db1063.eqiad.wmnet;
+}
host dickson {
hardware ethernet 78:2b:cb:09:0c:5a;
--
To view, visit https://gerrit.wikimedia.org/r/118070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3dc4a8fb27895b495a80bd17808357a0883605eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix mismatched parentheses - change (mediawiki...Thanks)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix mismatched parentheses
..
Fix mismatched parentheses
I have no idea how this ever worked properly, but it did.
Change-Id: I82efd5054c4f497cc28e06c88d33c654ecb7933a
---
M Thanks.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Thanks.hooks.php b/Thanks.hooks.php
index 4180c03..be5381a 100644
--- a/Thanks.hooks.php
+++ b/Thanks.hooks.php
@@ -25,8 +25,8 @@
!$wgUser-isAnon()
$rev-getUser() !== $wgUser-getId()
!$wgUser-isBlocked()
-!$rev-isDeleted( Revision::DELETED_TEXT
-( !$oldRev || $rev-getParentId() ==
$oldRev-getId() ) )
+!$rev-isDeleted( Revision::DELETED_TEXT )
+( !$oldRev || $rev-getParentId() ==
$oldRev-getId() )
) {
$recipient = User::newFromId( $rev-getUser() );
$recipientAllowed = true;
--
To view, visit https://gerrit.wikimedia.org/r/115817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82efd5054c4f497cc28e06c88d33c654ecb7933a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...Thanks)
jenkins-bot has submitted this change and it was merged. Change subject: Add COPYING .. Add COPYING Change-Id: I2b43d906b091a16c2b0b627ce0efdc49239cf7c6 --- A COPYING 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..96d3f68 --- /dev/null +++ b/COPYING @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the Software), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. -- To view, visit https://gerrit.wikimedia.org/r/116254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b43d906b091a16c2b0b627ce0efdc49239cf7c6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Thanks Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tweak l10nupdate user/group creations for beta cluster - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118071
Change subject: Tweak l10nupdate user/group creations for beta cluster
..
Tweak l10nupdate user/group creations for beta cluster
Refer to l10nupdate group by its name instead of uid
The l10nupdate group is created with gid 10002 in groups::l10nupdate
which is required just before generic::systemuser, hence we do not have
to hardcode the gid when creating the user.
I have created on wikitech a l10nupdate user which has the UID 4716,
make mediawiki::user::l10nupdate use that UID whenever it is being run
on labs. Production still assigning per server UIDs.
Bug: 62529
Change-Id: I005953dd65579893980a80f3e3341520a0281d18
---
M modules/generic/manifests/systemuser.pp
M modules/mediawiki/manifests/users/l10nupdate.pp
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/118071/1
diff --git a/modules/generic/manifests/systemuser.pp
b/modules/generic/manifests/systemuser.pp
index a3da93c..b2ba971 100644
--- a/modules/generic/manifests/systemuser.pp
+++ b/modules/generic/manifests/systemuser.pp
@@ -1,5 +1,5 @@
# Creates a system username with associated group, random uid/gid, and
/bin/false as shell
-define generic::systemuser($name, $home=undef, $managehome=true,
$shell='/bin/false', $groups=undef, $default_group=$name, $ensure=present) {
+define generic::systemuser($name, $home=undef, $managehome=true,
$shell='/bin/false', $groups=undef, $uid=undef, $default_group=$name,
$ensure=present) {
# FIXME: deprecate $name parameter in favor of just using $title
if $default_group == $name {
@@ -24,5 +24,6 @@
shell = $shell,
groups = $groups,
system = true,
+uid= $uid,
}
}
diff --git a/modules/mediawiki/manifests/users/l10nupdate.pp
b/modules/mediawiki/manifests/users/l10nupdate.pp
index cdb113d..f2f4dbb 100644
--- a/modules/mediawiki/manifests/users/l10nupdate.pp
+++ b/modules/mediawiki/manifests/users/l10nupdate.pp
@@ -5,7 +5,12 @@
require groups::l10nupdate
- generic::systemuser { 'l10nupdate': name = 'l10nupdate', home =
'/home/l10nupdate', default_group = 10002, shell = '/bin/bash' }
+ $uid = $::realm ? {
+ 'labs' = 4716, # LDAP user created via Wikitech
+ default = undef,
+ }
+
+ generic::systemuser { 'l10nupdate': name = 'l10nupdate', home =
'/home/l10nupdate', uid = $uid, default_group = 'l10nupdate', shell =
'/bin/bash' }
file {
/home/l10nupdate/.ssh:
--
To view, visit https://gerrit.wikimedia.org/r/118071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I005953dd65579893980a80f3e3341520a0281d18
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add tarignore - change (mediawiki...release)
MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/118072 Change subject: add tarignore .. add tarignore Change-Id: Ifc6d26d0e54dec646d397a83f034aea0729e77cd --- M make-release/make-release.py A make-release/tarignore 2 files changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/72/118072/1 diff --git a/make-release/make-release.py b/make-release/make-release.py index 9d91da2..6e80706 100755 --- a/make-release/make-release.py +++ b/make-release/make-release.py @@ -459,7 +459,9 @@ tar = self.options.tar_command tarignore = self.options.destDir + '/tarignore' -if not os.path.isfile(tarignore): +if not os.path.isfile(tarignore) and os.path.isfile(../tarignore): +tarignore = ../tarignore +elif not os.path.isfile(tarignore): Tarignore %s not found, IGNORING. % tarignore tarignore = None diff --git a/make-release/tarignore b/make-release/tarignore new file mode 100644 index 000..405bfdc --- /dev/null +++ b/make-release/tarignore @@ -0,0 +1,12 @@ +.git +.gitignore +.gitreview +.jshintignore +.jshintrc +.tarignore +testsuite +tests +*.xcf +*~ +#*# +.#* -- To view, visit https://gerrit.wikimedia.org/r/118072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc6d26d0e54dec646d397a83f034aea0729e77cd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: MarkAHershberger m...@nichework.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove SimpleAntiSpam from recent versions - change (mediawiki...release)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118073
Change subject: Remove SimpleAntiSpam from recent versions
..
Remove SimpleAntiSpam from recent versions
Change-Id: I1ad1debf48bbc730dfcb545b57b6f1999f87cee4
---
M make-release/make-release.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/73/118073/1
diff --git a/make-release/make-release.py b/make-release/make-release.py
index 6e80706..9681148 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -66,6 +66,7 @@
if version '1.22':
extensions.remove('Vector')
+extensions.remove('SimpleAntiSpam')
# Return uniq elements (order not preserved)
return list(set(extensions))
--
To view, visit https://gerrit.wikimedia.org/r/118073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ad1debf48bbc730dfcb545b57b6f1999f87cee4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger m...@nichework.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix make-release script to use branches instead of tags - change (mediawiki...release)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118074
Change subject: Fix make-release script to use branches instead of tags
..
Fix make-release script to use branches instead of tags
* Also allow easy changing of root url for downloads
(url still needs to be fixed, though)
* Fix diff production by storing cwd before changing dir and making
sure dir is right before starting diffs.
* Put git checkout in separate function that both core and extensions
can use.
Change-Id: I80ec9bba1db834dba1578aebcf55931a07061dc2
---
M make-release/make-release.py
1 file changed, 50 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/74/118074/1
diff --git a/make-release/make-release.py b/make-release/make-release.py
index 9681148..e77da6d 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -72,7 +72,7 @@
return list(set(extensions))
-def versionToBranch(version):
+def versionToTag(version):
return 'tags/' + version
@@ -178,8 +178,9 @@
self.raw = version
self.major = decomposed.get('major', None)
self.branch = decomposed.get('branch', None)
+self.tag = decomposed.get('tag', None)
self.prev_version = decomposed.get('prevVersion', None)
-self.prev_branch = decomposed.get('prevBranch', None)
+self.prev_tag = decomposed.get('prevTag', None)
# alpha / beta / rc ..
self.phase = decomposed.get('phase', None)
@@ -189,10 +190,11 @@
if self.raw is None:
return MwVersion Null (snapshot?)
-return MwVersion %s major: %s (prev: %s), branch: %s (prev: %s) % (
+return MwVersion %s major: %s (prev: %s), tag: %s (prev: %s),
branch: %s % (
self.raw,
self.major, self.prev_version,
-self.branch, self.prev_branch)
+self.tag, self.prev_tag,
+self.branch)
def decomposeVersion(self, version):
'''Split a version number to branch / major
@@ -201,8 +203,9 @@
- major (ie 1.22)
- minor
- branch
+- tag
- prevVersion
-- prevBranch
+- prevTag
When one or more letters are found after the minor version we consider
it a software development phase (ex: alpha, beta, rc) with incremental
@@ -218,7 +221,7 @@
return ret
m = re.compile(r
-(?Pmajor\d+\.\d+)
+(?Pmajor(?Pmajor1\d+)\.(?Pmajor2\d+))
\.
(?Pminor\d+)
(?:
@@ -234,7 +237,14 @@
ret = dict((k, v) for k, v in m.groupdict().iteritems()
if v is not None)
-ret['branch'] = 'tags/%s.%s%s%s' % (
+ret['branch'] = 'REL%s_%s' % (
+ret['major1'],
+ret['major2'],
+)
+del ret['major1']
+del ret['major2']
+
+ret['tag'] = 'tags/%s.%s%s%s' % (
ret['major'],
ret['minor'],
ret.get('phase', ''),
@@ -246,11 +256,13 @@
ret['prevVersion'] = None
return ret
-bits = [d if d is not None else '' for d in m.groups()]
+bits = [d for d in m.groups('')]
bits[m.lastindex - 1] = str(int(bits[m.lastindex - 1]) - 1)
+del bits[1]
+del bits[1]
ret['prevVersion'] = '%s.%s%s%s' % tuple(bits)
-ret['prevBranch'] = 'tags/' + ret['prevVersion']
+ret['prevTag'] = 'tags/' + ret['prevVersion']
return ret
@@ -346,7 +358,8 @@
return False
print 'Please type y for yes or n for no'
-def getGit(self, repo, dir, label):
+def getGit(self, repo, dir, label, branch):
+oldDir = os.getcwd()
if os.path.exists(repo):
print Updating local %s % repo
proc = subprocess.Popen(['git', 'remote', 'update'],
@@ -367,8 +380,20 @@
print git clone failed, exiting
sys.exit(1)
-def patchExport(self, patch, dir):
+os.chdir(dir)
+if branch != 'trunk':
+print Checking out %s... % (branch)
+proc = subprocess.Popen(['git', 'checkout', branch])
+
+if proc.wait() != 0:
+print git checkout failed, exiting
+sys.exit(1)
+
+os.chdir(oldDir)
+
+def patchExport(self, patch, dir):
+oldDir = os.getcwd()
gitRoot = self.options.gitroot
os.chdir(dir)
@@ -382,27 +407,16 @@
print git patch failed, exiting
sys.exit(1)
-os.chdir('..')
+os.chdir(oldDir)
print Done
-def export(self, tag, module, exportDir):
+def export(self, branch, module, exportDir):
gitRoot = self.options.gitroot
dir = exportDir + '/' + module
-
[MediaWiki-commits] [Gerrit] mediawiki::sync one file{} statement per file - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118076
Change subject: mediawiki::sync one file{} statement per file
..
mediawiki::sync one file{} statement per file
Puppet style guide recommand having one file{} statement per file. That
gives a better hint whenever something fails since the error message
will reference the last line number.
Change-Id: I2524afa2319c8a6bb98f19df52fe844fd96a4de6
---
M modules/mediawiki/manifests/sync.pp
1 file changed, 29 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/118076/1
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index 803d449..79dc885 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -17,31 +17,35 @@
$scriptpath = /usr/local/bin
- file {
- ${scriptpath}/mwversionsinuse:
- ensure = link,
- target = '/srv/scap/bin/mwversionsinuse',
- require = Git::Clone['mediawiki/tools/scap'];
- ${scriptpath}/scap-rebuild-cdbs:
- ensure = link,
- target = '/srv/scap/bin/scap-rebuild-cdbs',
- require = Git::Clone['mediawiki/tools/scap'];
- ${scriptpath}/scap-recompile:
- ensure = link,
- target = '/srv/scap/bin/scap-recompile',
- require = Git::Clone['mediawiki/tools/scap'];
- ${scriptpath}/sync-common:
- ensure = link,
- target = '/srv/scap/bin/sync-common',
- require = Git::Clone['mediawiki/tools/scap'];
- ${scriptpath}/mergeCdbFileUpdates:
- ensure = link,
- target = '/srv/scap/bin/mergeCdbFileUpdates',
- require = Git::Clone['mediawiki/tools/scap'];
- ${scriptpath}/refreshCdbJsonFiles:
- ensure = link,
- target = '/srv/scap/bin/refreshCdbJsonFiles',
- require = Git::Clone['mediawiki/tools/scap'];
+ file { ${scriptpath}/mwversionsinuse:
+ ensure = link,
+ target = '/srv/scap/bin/mwversionsinuse',
+ require = Git::Clone['mediawiki/tools/scap'],
+ }
+ file { ${scriptpath}/scap-rebuild-cdbs:
+ ensure = link,
+ target = '/srv/scap/bin/scap-rebuild-cdbs',
+ require = Git::Clone['mediawiki/tools/scap'],
+ }
+ file { ${scriptpath}/scap-recompile:
+ ensure = link,
+ target = '/srv/scap/bin/scap-recompile',
+ require = Git::Clone['mediawiki/tools/scap'],
+ }
+ file { ${scriptpath}/sync-common:
+ ensure = link,
+ target = '/srv/scap/bin/sync-common',
+ require = Git::Clone['mediawiki/tools/scap'],
+ }
+ file { ${scriptpath}/mergeCdbFileUpdates:
+ ensure = link,
+ target = '/srv/scap/bin/mergeCdbFileUpdates',
+ require = Git::Clone['mediawiki/tools/scap'],
+ }
+ file { ${scriptpath}/refreshCdbJsonFiles:
+ ensure = link,
+ target = '/srv/scap/bin/refreshCdbJsonFiles',
+ require = Git::Clone['mediawiki/tools/scap'],
}
exec { 'mw-sync':
@@ -56,4 +60,3 @@
logoutput = on_failure;
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/118076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2524afa2319c8a6bb98f19df52fe844fd96a4de6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the ReferenceView have a ListView, instead of being one - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118077
Change subject: Make the ReferenceView have a ListView, instead of being one
..
Make the ReferenceView have a ListView, instead of being one
ReferenceView was the only widget which inherited from ListView, instead of
having an instance of ListView.
Switching to the latter makes the codebase more uniform. Also, it's
conceptually more correct since the reference view actually consists of more
than just a list -- it also has a heading (and a toolbar).
This change is a prerequisite for the patch addressing bug 62527.
Change-Id: Id51603ae20c83175cdda78a5f2fa51eca887c367
---
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/templates.php
2 files changed, 26 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/77/118077/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index ce15462..0051299 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -6,7 +6,7 @@
( function( mw, wb, $ ) {
'use strict';
- var PARENT = $.wikibase.listview;
+ var PARENT = $.TemplatedWidget;
/**
* View for displaying and editing Wikibase Statements.
@@ -57,7 +57,7 @@
*the current error state is resolved.
*
* @since 0.4
- * @extends jQuery.wikibase.listview
+ * @extends jQuery.TemplatedWidget
*/
$.widget( 'wikibase.referenceview', PARENT, {
widgetBaseClass: 'wb-referenceview',
@@ -72,6 +72,9 @@
'', // additional css classes
'' // snaklistview widget
],
+ templateShortCuts: {
+ '$listview': '.wb-referenceview-listview'
+ },
statementGuid: null,
entityStore: null,
index: null,
@@ -112,6 +115,8 @@
throw new Error( 'Statement GUID required to initialize
a reference view.' );
}
+ PARENT.prototype._create.call( this );
+
if ( this.option( 'value' ) ) {
this._reference = this.option( 'value' );
// Overwrite the value since listItemAdapter is the
snakview prototype which requires a
@@ -140,7 +145,11 @@
} );
}
- PARENT.prototype._create.call( this );
+ this.$listview.listview( {
+ listItemAdapter: this.options.listItemAdapter
+ } );
+
+ this._listview = this.$listview.data( 'listview' );
// Whenever entering a new referenceview item, a single
snaklistview needs to be created
// along. This creates a snakview ready to edit.
@@ -191,7 +200,7 @@
'listviewitemremoved.' + this.widgetName
];
- this.element
+ this.$listview
.on( changeEvents.join( ' ' ), function( event ) {
if( event.type === 'listviewitemremoved' ) {
// Check if last snaklistview item (snakview)
has been removed and remove the
@@ -200,7 +209,7 @@
snaklistview = $snaklistview.data(
'snaklistview' );
if( snaklistview !snaklistview.value() ) {
- self.removeItem( snaklistview.element );
+ self._listview.removeItem(
snaklistview.element );
}
}
@@ -227,7 +236,7 @@
'listviewitemremoved.' + this.widgetName,
this.options.listItemAdapter.prefixedEvent(
'stopediting.' + this.widgetName )
];
- this.element.off( events.join( ' ' ) );
+ this.$listview.off( events.join( ' ' ) );
},
/**
@@ -264,7 +273,7 @@
this._reference = reference;
return this._reference;
} else {
- var snaklistviews = this.items(),
+ var snaklistviews = this._listview.items(),
snakList = new wb.SnakList();
for( var i = 0; i snaklistviews.length; i++ ) {
@@ -298,7 +307,7 @@
}
},
natively: function( e ) {
- var $snaklistviews = this.items();
+ var $snaklistviews = this._listview.items();
for( var i = 0; i $snaklistviews.length; i++ ) {
[MediaWiki-commits] [Gerrit] Remove nasty redirect juggling added for 1.0 - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118078
Change subject: Remove nasty redirect juggling added for 1.0
..
Remove nasty redirect juggling added for 1.0
This also kills an errant debug statement that is too frequent
Change-Id: I9b8c0d5c95977d8cd7ba1af2eebc61092257634c
---
M includes/Result.php
1 file changed, 5 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/78/118078/1
diff --git a/includes/Result.php b/includes/Result.php
index 7343e35..0c1c37e 100644
--- a/includes/Result.php
+++ b/includes/Result.php
@@ -72,21 +72,7 @@
if ( !isset( $highlights[ 'title' ] ) isset( $highlights[
'redirect.title' ] ) ) {
// Make sure to find the redirect title before escaping
because escaping breaks it
-
- // This odd juggling is the second half of the script
fields hack to get redirect loaded.
- // It'll go away when we switch to source filtering.
$redirects = $result-redirect;
- if ( $redirects !== null ) {
- // I not null it'll always be an array.
- // In Elasticsearch 0.90 it'll be an array of
arrays which is what we need.
- // In Elasticsearch 1.0 it'll be an array of
arrays of arrays where the outer most array
- // has only a single element which is exactly
what would come back from 0.90.
- if ( count( $redirects ) !== 0
!array_key_exists( 'title', $redirects[ 0 ] ) ) {
- wfDebugLog( 'CirrusSearch', 1.0);
- // Since the first entry doesn't have a
title we assume we're in 1.0
- $redirects = $redirects[ 0 ];
- }
- }
$this-redirectTitle = $this-findRedirectTitle(
$highlights[ 'redirect.title' ][ 0 ], $redirects );
$this-redirectSnipppet = $this-escapeHighlightedText(
$highlights[ 'redirect.title' ][ 0 ] );
}
@@ -173,9 +159,11 @@
// Grab the redirect that matches the highlighted title with
the lowest namespace.
// That is pretty arbitrary but it prioritizes 0 over others.
$best = null;
- foreach ( $redirects as $redirect ) {
- if ( $redirect[ 'title' ] === $title ( $best ===
null || $best[ 'namespace' ] $redirect ) ) {
- $best = $redirect;
+ if ( $redirects !== null ) {
+ foreach ( $redirects as $redirect ) {
+ if ( $redirect[ 'title' ] === $title ( $best
=== null || $best[ 'namespace' ] $redirect ) ) {
+ $best = $redirect;
+ }
}
}
if ( $best === null ) {
--
To view, visit https://gerrit.wikimedia.org/r/118078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b8c0d5c95977d8cd7ba1af2eebc61092257634c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make mw.wikibase.getEntityObject() actually return non-Legac... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Make mw.wikibase.getEntityObject() actually return non-Legacy
data
..
Make mw.wikibase.getEntityObject() actually return non-Legacy data
Also fixed the module to no longer guard against this, so that
the integration tests will catch this in the future.
On top of that, we now disallow the creation of mw.wikibase.entity
objects with legacy / invalid data.
Change-Id: Ie52d887b9a2dda98187cc23ce400614ca1bf2fac
---
M client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
M client/includes/scribunto/WikibaseLuaBindings.php
M client/includes/scribunto/mw.wikibase.entity.lua
M client/includes/scribunto/mw.wikibase.lua
M client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua
M client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
M client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTest.php
M client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
8 files changed, 45 insertions(+), 16 deletions(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
index 68d2e05..c4e9719 100644
--- a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
+++ b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -75,7 +75,7 @@
* @throws ScribuntoException
* @return array
*/
- public function getEntity( $prefixedEntityId = null, $legacyStyle =
true ) {
+ public function getEntity( $prefixedEntityId, $legacyStyle ) {
$this-checkType( 'getEntity', 1, $prefixedEntityId, 'string' );
$this-checkType( 'getEntity', 2, $legacyStyle, 'boolean' );
try {
diff --git a/client/includes/scribunto/WikibaseLuaBindings.php
b/client/includes/scribunto/WikibaseLuaBindings.php
index 65f7c44..74f0894 100644
--- a/client/includes/scribunto/WikibaseLuaBindings.php
+++ b/client/includes/scribunto/WikibaseLuaBindings.php
@@ -116,9 +116,13 @@
$entityArr = $serializer-getSerialized( $entityObject );
- if ( !$legacyStyle ) {
+ if ( $legacyStyle ) {
+ // Mark the output as Legacy so that we can easily
distinguish the styles in Lua
+ $entityArr['schemaVersion'] = 1;
+ } else {
// Renumber the entity as Lua uses 1-based array
indexing
$this-renumber( $entityArr );
+ $entityArr['schemaVersion'] = 2;
}
return $entityArr;
diff --git a/client/includes/scribunto/mw.wikibase.entity.lua
b/client/includes/scribunto/mw.wikibase.entity.lua
index e53467b..8889ab5 100644
--- a/client/includes/scribunto/mw.wikibase.entity.lua
+++ b/client/includes/scribunto/mw.wikibase.entity.lua
@@ -24,8 +24,12 @@
--
-- @param data
entity.create = function( data )
- if type( data ) ~= 'table' then
- error( 'The entity data must be a table' )
+ if type( data ) ~= 'table' or type( data.schemaVersion ) ~= 'number'
then
+ error( 'The entity data must be a table obtained via
mw.wikibase.getEntityObject' )
+ end
+
+ if data.schemaVersion 2 then
+ error( 'mw.wikibase.entity must not be constructed using legacy
data' )
end
local entity = data
@@ -95,10 +99,8 @@
local n = 0
for k, v in pairs( entity.claims ) do
- if string.match( k, '^%u%d+' ) ~= nil then
- n = n + 1
- properties[n] = k
- end
+ n = n + 1
+ properties[n] = k
end
return properties
diff --git a/client/includes/scribunto/mw.wikibase.lua
b/client/includes/scribunto/mw.wikibase.lua
index 1e93e70..d72c1e9 100644
--- a/client/includes/scribunto/mw.wikibase.lua
+++ b/client/includes/scribunto/mw.wikibase.lua
@@ -19,7 +19,7 @@
local entity = false
local getEntityObject = function( id )
- local entity = php.getEntity( id )
+ local entity = php.getEntity( id, false )
if type( entity ) ~= 'table' then
return nil
end
diff --git
a/client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua
b/client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua
index a53ea9d..dd977e3 100644
--- a/client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua
+++ b/client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua
@@ -10,6 +10,7 @@
-- A test item (the structure isn't complete... but good enough for tests)
local testItem = {
id = Q123,
+ schemaVersion
[MediaWiki-commits] [Gerrit] Add count to references heading - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/118079 Change subject: Add count to references heading .. Add count to references heading This is a prerequisite for bug 62527. Change-Id: Iea22c221b125417a9b95eadc0bb5d66c8616b9d8 --- M repo/includes/ClaimHtmlGenerator.php 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/79/118079/1 diff --git a/repo/includes/ClaimHtmlGenerator.php b/repo/includes/ClaimHtmlGenerator.php index 3e7e254..06e1e9c 100644 --- a/repo/includes/ClaimHtmlGenerator.php +++ b/repo/includes/ClaimHtmlGenerator.php @@ -110,11 +110,10 @@ ); $referenceList = $claim-getReferences(); - - $referencesHeading = wfMessage( + $referencesHeading = wfMessage( 'wikibase-ui-pendingquantitycounter-nonpending', wfMessage( 'wikibase-statementview-referencesheading-pendingcountersubject', count( $referenceList ) - )-text(); + )-text(), count( $referenceList ) )-text(); $referencesHtml = $this-getHtmlForReferences( $claim-getReferences() ); } -- To view, visit https://gerrit.wikimedia.org/r/118079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea22c221b125417a9b95eadc0bb5d66c8616b9d8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use different widths for metadata columns - change (mediawiki...MultimediaViewer)
Pginer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118075
Change subject: Use different widths for metadata columns
..
Use different widths for metadata columns
This change makes the columns on the matadata panel to use
a different width (2/3 and 1/3) to emphazize the description
with respect to the more advanced technical details.
Change-Id: I246e3496dd01649f360c1f80b859e2260bb1d87f
---
M resources/mmv/mmv.less
M resources/mmv/ui/mmv.ui.metadataPanel.js
M resources/mmv/ui/mmv.ui.metadataPanel.less
3 files changed, 13 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/75/118075/1
diff --git a/resources/mmv/mmv.less b/resources/mmv/mmv.less
index b8d5290..813042f 100644
--- a/resources/mmv/mmv.less
+++ b/resources/mmv/mmv.less
@@ -183,11 +183,12 @@
margin-bottom: 15px;
}
-@littlefont: 0.9em;
+@littlefont: 0.8em;
+@mediumfont: 1em;
.mw-mlb-caption,
.mw-mlb-image-desc {
- font-size: @littlefont;
+ font-size: @mediumfont;
color: #55;
}
diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index 913825b..45f0bff 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -193,11 +193,11 @@
.appendTo( this.$container );
this.$imageMetadataLeft = $( 'div' )
- .addClass( 'mw-mlb-image-metadata-column' )
+ .addClass( 'mw-mlb-image-metadata-column
mw-mlb-image-metadata-desc-column' )
.appendTo( this.$imageMetadata );
this.$imageMetadataRight = $( 'div' )
- .addClass( 'mw-mlb-image-metadata-column' )
+ .addClass( 'mw-mlb-image-metadata-column
mw-mlb-image-metadata-links-column' )
.appendTo( this.$imageMetadata );
this.description = new mw.mmv.ui.Description(
this.$imageMetadataLeft );
diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.less
b/resources/mmv/ui/mmv.ui.metadataPanel.less
index 93c3ef0..0029bc4 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.less
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.less
@@ -14,7 +14,14 @@
.mw-mlb-image-metadata-column {
float: left;
- width: 50%;
+}
+
+.mw-mlb-image-metadata-desc-column {
+ width: 66.5%;
+}
+
+.mw-mlb-image-metadata-links-column {
+ width: 33.5%;
}
.mw-mlb-permission-link {
--
To view, visit https://gerrit.wikimedia.org/r/118075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I246e3496dd01649f360c1f80b859e2260bb1d87f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust description of ApiWikiLoveImageLog - change (mediawiki...WikiLove)
jenkins-bot has submitted this change and it was merged.
Change subject: Adjust description of ApiWikiLoveImageLog
..
Adjust description of ApiWikiLoveImageLog
This API is not a good start for a description.
Change-Id: I39b3f28e32f354a27be8d72302681a29dca16237
---
M ApiWikiLoveImageLog.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiWikiLoveImageLog.php b/ApiWikiLoveImageLog.php
index 6a14ede..d9f5298 100644
--- a/ApiWikiLoveImageLog.php
+++ b/ApiWikiLoveImageLog.php
@@ -40,7 +40,7 @@
public function getDescription() {
return array(
- 'This API is for logging each time a user attempts to
use a custom image via WikiLove.',
+ 'Log user attempts to use a custom image via WikiLove.',
);
}
--
To view, visit https://gerrit.wikimedia.org/r/117914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39b3f28e32f354a27be8d72302681a29dca16237
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiLove
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 62210) Use EntityStore for maintenance scripts - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged.
Change subject: (bug 62210) Use EntityStore for maintenance scripts
..
(bug 62210) Use EntityStore for maintenance scripts
Change-Id: I82dbb8d7254c0a604a20376c7618ab3b022c0093
---
M repo/maintenance/createBlacklistedItems.php
M repo/maintenance/importInterlang.php
M repo/maintenance/importProperties.php
3 files changed, 49 insertions(+), 22 deletions(-)
Approvals:
WikidataJenkins: Verified
Addshore: Looks good to me, approved
diff --git a/repo/maintenance/createBlacklistedItems.php
b/repo/maintenance/createBlacklistedItems.php
index cdce3d0..c8a4838 100644
--- a/repo/maintenance/createBlacklistedItems.php
+++ b/repo/maintenance/createBlacklistedItems.php
@@ -3,6 +3,7 @@
namespace Wikibase;
use Wikibase\DataModel\SimpleSiteLink;
+use Wikibase\Repo\WikibaseRepo;
$basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH'
) : __DIR__ . '/../../../..';
@@ -25,6 +26,11 @@
}
public function execute() {
+ global $wgUser;
+
+ $user = $wgUser;
+ $store = WikibaseRepo::getDefaultInstance()-getEntityStore();
+
if ( !defined( 'WB_VERSION' ) ) {
$this-output( You need to have Wikibase enabled in
order to use this maintenance script!\n\n );
exit;
@@ -35,7 +41,7 @@
};
$items = array(
- 0 = 'Off-by-one error',
+ //0 = 'Off-by-one error',
1 = 'Universe',
2 = 'Earth',
3 = 'Life',
@@ -67,8 +73,7 @@
$item-setLabel( 'en', $name );
$item-addSiteLink( new SimpleSiteLink( 'enwiki', $name
) );
- $itemContent = ItemContent::newFromItem( $item );
- $itemContent-save( 'Import' );
+ $store-saveEntity( $item, 'Import', $user, EDIT_NEW );
}
$report( 'Import completed.' );
diff --git a/repo/maintenance/importInterlang.php
b/repo/maintenance/importInterlang.php
index 96e3482..ca3925b 100644
--- a/repo/maintenance/importInterlang.php
+++ b/repo/maintenance/importInterlang.php
@@ -15,6 +15,8 @@
*/
use Wikibase\DataModel\SimpleSiteLink;
+use Wikibase\Repo\WikibaseRepo;
+use Wikibase\store\EntityStore;
$basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH'
) : __DIR__ . '/../../../..';
@@ -26,6 +28,16 @@
protected $ignore_errors = false;
protected $skip = 0;
protected $only = 0;
+
+ /**
+* @var User
+*/
+ protected $user = null;
+
+ /**
+* @var EntityStore
+*/
+ protected $store = null;
public function __construct() {
$this-mDescription = Import interlanguage links in
Wikidata.\n\nThe links may be created by extractInterlang.sql;
@@ -41,10 +53,15 @@
}
public function execute() {
+ global $wgUser;
+
if ( !defined( 'WB_VERSION' ) ) {
$this-output( You need to have Wikibase enabled in
order to use this maintenance script!\n\n );
exit;
}
+
+ $this-user = $wgUser;
+ $this-store =
WikibaseRepo::getDefaultInstance()-getEntityStore();
$this-verbose = (bool)$this-getOption( 'verbose' );
$this-ignore_errors = (bool)$this-getOption( 'ignore-errors'
);
@@ -128,17 +145,11 @@
$item-addSiteLink( new SimpleSiteLink( $lang . 'wiki',
$name ) );
}
- $content = \Wikibase\ItemContent::newFromItem( $item );
-
try {
- $status = $content-save( imported, null, EDIT_NEW );
+ $this-store-saveEntity( $item, 'imported',
$this-user, EDIT_NEW );
- if ( $status-isOK() ) {
- return true;
- }
-
- $this-doPrint( ERROR: . strtr(
$status-getMessage(), \n, ) );
- } catch ( MWException $ex ) {
+ return true;
+ } catch ( Exception $ex ) {
$this-doPrint( ERROR: . strtr( $ex-getMessage(),
\n, ) );
}
diff --git a/repo/maintenance/importProperties.php
b/repo/maintenance/importProperties.php
index c5dbcd6..3d3945e 100644
--- a/repo/maintenance/importProperties.php
+++ b/repo/maintenance/importProperties.php
@@ -1,4 +1,5 @@
?php
+use Wikibase\store\EntityStore;
/**
* Maintenance script for importing properties in Wikidata.
@@ -27,6 +28,16 @@
protected $skip = 0;
protected $only = 0;
+ /**
+* @var User
+*/
+ protected $user = null;
+
[MediaWiki-commits] [Gerrit] Couple of minor code updates - change (mediawiki...VipsScaler)
jenkins-bot has submitted this change and it was merged.
Change subject: Couple of minor code updates
..
Couple of minor code updates
gunzip license.gz to license (GPL)
Change-Id: If9351627d0bc454f62ffe76a68171b0155bbf790
---
M VipsScaler.php
M VipsTest.php
A modules/jquery.ucompare/license
D modules/jquery.ucompare/license.gz
4 files changed, 683 insertions(+), 6 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VipsScaler.php b/VipsScaler.php
index 0630338..725d801 100644
--- a/VipsScaler.php
+++ b/VipsScaler.php
@@ -28,7 +28,7 @@
'url' = '//www.mediawiki.org/wiki/Extension:VipsScaler',
);
-$dir = dirname( __FILE__ );
+$dir = __DIR__;
$wgAutoloadClasses['VipsScaler'] = $dir/VipsScaler_body.php;
$wgAutoloadClasses['VipsCommand'] = $dir/VipsScaler_body.php;
@@ -43,7 +43,8 @@
# Download vips from http://www.vips.ecs.soton.ac.uk/
$wgVipsCommand = 'vips';
-/* Options and conditions for images to be scaled with this scaler.
+/**
+ * Options and conditions for images to be scaled with this scaler.
* Set to an array of arrays. The inner array contains a condition array, which
* contains a list of conditions that the image should pass for it to be scaled
* with vips. Conditions are mimeType, minArea, maxArea, minShrinkFactor,
@@ -92,7 +93,7 @@
'jquery.ucompare',
),
- 'localBasePath' = dirname( __FILE__ ) . '/modules/ext.vipsScaler',
+ 'localBasePath' = __DIR__ . '/modules/ext.vipsScaler',
'remoteExtPath' = 'VipsScaler/modules/ext.vipsScaler',
);
@@ -101,7 +102,7 @@
'scripts' = array( 'js/jquery.ucompare.js', ),
'styles' = array( 'css/jquery.ucompare.css' ),
- 'localBasePath' = dirname( __FILE__ ) . '/modules/jquery.ucompare',
+ 'localBasePath' = __DIR__ . '/modules/jquery.ucompare',
'remoteExtPath' = 'VipsScaler/modules/jquery.ucompare'
);
diff --git a/VipsTest.php b/VipsTest.php
index c479d7e..79ab1b2 100644
--- a/VipsTest.php
+++ b/VipsTest.php
@@ -5,7 +5,9 @@
* must be enabled.
*/
-if ( !defined( 'MEDIAWIKI' ) ) exit( 1 );
+if ( !defined( 'MEDIAWIKI' ) ) {
+ exit( 1 );
+}
/**
* The host to send the request to when doing the scaling remotely. Set this to
@@ -18,7 +20,7 @@
*/
$wgVipsTestExpiry = 3600;
-$dir = dirname( __FILE__ );
+$dir = __DIR__;
/** Registration */
$wgAutoloadClasses['SpecialVipsTest'] = $dir/SpecialVipsTest.php;
diff --git a/modules/jquery.ucompare/license b/modules/jquery.ucompare/license
new file mode 100644
index 000..94a9ed0
--- /dev/null
+++ b/modules/jquery.ucompare/license
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there
[MediaWiki-commits] [Gerrit] 1.19.13 release notes and version update - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/118080 Change subject: 1.19.13 release notes and version update .. 1.19.13 release notes and version update Change-Id: I758aae3ec9d3698d604b15f505ab0b8c3b563f44 --- M RELEASE-NOTES-1.19 M includes/DefaultSettings.php 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/80/118080/1 diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index 4340f6d..75357a2c 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -3,6 +3,15 @@ Security reminder: MediaWiki does not require PHP's register_globals setting since version 1.2.0. If you have it on, turn it '''off''' if you can. +== MediaWiki 1.19.13 == + +This is a security and maintenance release of the MediaWiki 1.19 branch. + +=== Changes since 1.19.12 === + +* (bug 61362) SECURITY: API: Don't find links in the middle of api.php links. +* Use the correct branch of the extensions' git repositories. + == MediaWiki 1.19.12 == This is a security release of the MediaWiki 1.19 branch. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 44b2c18..9ab8b3a 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -33,7 +33,7 @@ /** @endcond */ /** MediaWiki version number */ -$wgVersion = '1.19.12'; +$wgVersion = '1.19.13'; /** Name of the site. It must be changed in LocalSettings.php */ $wgSitename = 'MediaWiki'; @@ -4228,7 +4228,7 @@ * ); */ $wgParserTestRemote = false; - + /** * Allow running of javascript test suites via [[Special:JavaScriptTest]] (such as QUnit). */ -- To view, visit https://gerrit.wikimedia.org/r/118080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I758aae3ec9d3698d604b15f505ab0b8c3b563f44 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_19 Gerrit-Owner: MarkAHershberger m...@nichework.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix fatal, $settingsObject got lost in refactoring - change (mediawiki...CirrusSearch)
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118081
Change subject: Fix fatal, $settingsObject got lost in refactoring
..
Fix fatal, $settingsObject got lost in refactoring
Change-Id: I5394f0750be7b4363d36efb9861ee15f42f75e7c
---
M maintenance/updateOneSearchIndexConfig.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/81/118081/1
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 601b745..5ac89fa 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -294,7 +294,7 @@
if ( $this-closeOk ) {
$this-getIndex()-close();
$this-closed = true;
- $settingsObject-set( $requiredAnalyzers );
+ $this-getIndex()-getSettings()-set(
$requiredAnalyzers );
$this-output( corrected\n );
} else {
$this-output( cannot correct\n );
--
To view, visit https://gerrit.wikimedia.org/r/118081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5394f0750be7b4363d36efb9861ee15f42f75e7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make RankSelector a TemplatedWidget - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118083
Change subject: Make RankSelector a TemplatedWidget
..
Make RankSelector a TemplatedWidget
Another prerequisite for bug 62527. The RankSelector is a widget based on a
template, so it should be a TemplatedWidget. Also, this makes the template much
cleaner.
Change-Id: I1c0acaf043563b967bfba276e71367627ae02df8
---
M lib/resources/Resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
M lib/resources/templates.php
3 files changed, 18 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/83/118083/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 55870c0..d4dcaeb 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -747,6 +747,7 @@
'jquery.wikibase/themes/default/jquery.wikibase.statementview.RankSelector.css',
),
'dependencies' = array(
+ 'jquery.ui.TemplatedWidget',
'jquery.ui.position',
'jquery.ui.toggler',
'util.inherit',
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
index d07c0c6..9ef1d7a 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
@@ -5,7 +5,7 @@
( function( mw, wb, $, util ) {
'use strict';
- var PARENT = $.Widget;
+ var PARENT = $.TemplatedWidget;
/**
* The node of the rank selector menu to select a rank from.
@@ -36,6 +36,16 @@
* @type {Object}
*/
options: {
+ template: 'wb-rankselector',
+ templateParams: [
+ '',
+ ''
+ ],
+
+ templateShortCuts: {
+ '$icon': '.ui-icon-rankselector'
+ },
+
rank: wb.Statement.RANK.NORMAL,
isRtl: undefined
},
@@ -48,16 +58,12 @@
_rank: null,
/**
-* Icon node.
-* @type {jQuery}
-*/
- $icon: null,
-
- /**
* @see jQuery.Widget._create
*/
_create: function() {
var self = this;
+
+ PARENT.prototype._create.call( this );
if( !$menu ) {
$menu = this._buildMenu().appendTo( 'body'
).hide();
@@ -110,8 +116,6 @@
$( document ).on( 'mouseup.' + self.widgetName,
degrade );
$( window ).on( 'resize.' + self.widgetName,
degrade );
} );
-
- this.$icon = mw.template( 'wb-rankselector', '', ''
).appendTo( this.element );
this._setRank( this.options.rank );
},
diff --git a/lib/resources/templates.php b/lib/resources/templates.php
index a6e3181..3edbbf2 100644
--- a/lib/resources/templates.php
+++ b/lib/resources/templates.php
@@ -122,7 +122,7 @@
$templates['wb-statement'] =
HTML
div class=wb-statement wb-statementview $1
- div class=wb-statement-rank wb-rankselector
ui-state-disabled$2/div
+ div class=wb-statement-rank$2/div
div class=wb-claim wb-claim-$3
div class=wb-claim-mainsnak dir=auto
$4 !-- wb-snak (Main Snak) --
@@ -139,7 +139,9 @@
$templates['wb-rankselector'] =
HTML
-span class=ui-icon ui-icon-rankselector $1 title=$2/span
+div class=wb-rankselector ui-state-disabled
+ span class=ui-icon ui-icon-rankselector $1 title=$2/span
+/div
HTML;
$templates['wb-referenceview'] =
--
To view, visit https://gerrit.wikimedia.org/r/118083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c0acaf043563b967bfba276e71367627ae02df8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] 1.19.13 release notes and version update - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: 1.19.13 release notes and version update .. 1.19.13 release notes and version update Change-Id: I758aae3ec9d3698d604b15f505ab0b8c3b563f44 --- M RELEASE-NOTES-1.19 M includes/DefaultSettings.php 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: MarkAHershberger: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index 4340f6d..75357a2c 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -3,6 +3,15 @@ Security reminder: MediaWiki does not require PHP's register_globals setting since version 1.2.0. If you have it on, turn it '''off''' if you can. +== MediaWiki 1.19.13 == + +This is a security and maintenance release of the MediaWiki 1.19 branch. + +=== Changes since 1.19.12 === + +* (bug 61362) SECURITY: API: Don't find links in the middle of api.php links. +* Use the correct branch of the extensions' git repositories. + == MediaWiki 1.19.12 == This is a security release of the MediaWiki 1.19 branch. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 44b2c18..9ab8b3a 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -33,7 +33,7 @@ /** @endcond */ /** MediaWiki version number */ -$wgVersion = '1.19.12'; +$wgVersion = '1.19.13'; /** Name of the site. It must be changed in LocalSettings.php */ $wgSitename = 'MediaWiki'; @@ -4228,7 +4228,7 @@ * ); */ $wgParserTestRemote = false; - + /** * Allow running of javascript test suites via [[Special:JavaScriptTest]] (such as QUnit). */ -- To view, visit https://gerrit.wikimedia.org/r/118080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I758aae3ec9d3698d604b15f505ab0b8c3b563f44 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_19 Gerrit-Owner: MarkAHershberger m...@nichework.com Gerrit-Reviewer: MarkAHershberger m...@nichework.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] 1.22.4 release notes and version update - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/118084 Change subject: 1.22.4 release notes and version update .. 1.22.4 release notes and version update Change-Id: Ib9ef58a076902307be94ea34ff74049b95452fc2 --- M RELEASE-NOTES-1.22 M includes/DefaultSettings.php 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/84/118084/1 diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22 index 9862e5eb..284ef1f 100644 --- a/RELEASE-NOTES-1.22 +++ b/RELEASE-NOTES-1.22 @@ -3,6 +3,14 @@ Security reminder: MediaWiki does not require PHP's register_globals. If you have it on, turn it '''off''' if you can. +== MediaWiki 1.22.4 == + +This is a maintenance release of the MediaWiki 1.22 branch. + +=== Changes since 1.22.3 === + +* Use the correct branch of the extensions' git repositories. + == MediaWiki 1.22.3 == This is a security and bugfix release of the MediaWiki 1.22 branch. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 820d609..2aa5b09 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -63,7 +63,7 @@ * MediaWiki version number * @since 1.2 */ -$wgVersion = '1.22.3'; +$wgVersion = '1.22.4'; /** * Name of the site. It must be changed in LocalSettings.php -- To view, visit https://gerrit.wikimedia.org/r/118084 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9ef58a076902307be94ea34ff74049b95452fc2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_22 Gerrit-Owner: MarkAHershberger m...@nichework.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Point the navigation E2E test to the right image - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/118085 Change subject: Point the navigation E2E test to the right image .. Point the navigation E2E test to the right image Since we shuffled content around on Lightbox_demo, the test was trying to read the wrong image. Change-Id: I4ccaa0a1ab354aa4c19bc3870fb54b0ea11ff086 --- M tests/browser/features/support/pages/lightbox_demo_page.rb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/85/118085/1 diff --git a/tests/browser/features/support/pages/lightbox_demo_page.rb b/tests/browser/features/support/pages/lightbox_demo_page.rb index de48a07..fb6454e 100644 --- a/tests/browser/features/support/pages/lightbox_demo_page.rb +++ b/tests/browser/features/support/pages/lightbox_demo_page.rb @@ -7,7 +7,7 @@ # Tag page elements that we will need. # First image in lightbox demo page - a(:image1_in_article, href: /\.jpg$/) + a(:image1_in_article, href: /Kerala\.jpg$/) # Wrapper div for all mmv elements div(:mmv_wrapper, class: mlb-wrapper) -- To view, visit https://gerrit.wikimedia.org/r/118085 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ccaa0a1ab354aa4c19bc3870fb54b0ea11ff086 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use different widths for metadata columns - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Use different widths for metadata columns
..
Use different widths for metadata columns
This change makes the columns on the matadata panel use
a different width (2/3 and 1/3) to emphazize the description
with respect to the more advanced technical details.
Change-Id: I246e3496dd01649f360c1f80b859e2260bb1d87f
---
M resources/mmv/mmv.less
M resources/mmv/ui/mmv.ui.metadataPanel.js
M resources/mmv/ui/mmv.ui.metadataPanel.less
3 files changed, 13 insertions(+), 5 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/mmv.less b/resources/mmv/mmv.less
index b8d5290..813042f 100644
--- a/resources/mmv/mmv.less
+++ b/resources/mmv/mmv.less
@@ -183,11 +183,12 @@
margin-bottom: 15px;
}
-@littlefont: 0.9em;
+@littlefont: 0.8em;
+@mediumfont: 1em;
.mw-mlb-caption,
.mw-mlb-image-desc {
- font-size: @littlefont;
+ font-size: @mediumfont;
color: #55;
}
diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index 913825b..45f0bff 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -193,11 +193,11 @@
.appendTo( this.$container );
this.$imageMetadataLeft = $( 'div' )
- .addClass( 'mw-mlb-image-metadata-column' )
+ .addClass( 'mw-mlb-image-metadata-column
mw-mlb-image-metadata-desc-column' )
.appendTo( this.$imageMetadata );
this.$imageMetadataRight = $( 'div' )
- .addClass( 'mw-mlb-image-metadata-column' )
+ .addClass( 'mw-mlb-image-metadata-column
mw-mlb-image-metadata-links-column' )
.appendTo( this.$imageMetadata );
this.description = new mw.mmv.ui.Description(
this.$imageMetadataLeft );
diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.less
b/resources/mmv/ui/mmv.ui.metadataPanel.less
index 93c3ef0..0029bc4 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.less
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.less
@@ -14,7 +14,14 @@
.mw-mlb-image-metadata-column {
float: left;
- width: 50%;
+}
+
+.mw-mlb-image-metadata-desc-column {
+ width: 66.5%;
+}
+
+.mw-mlb-image-metadata-links-column {
+ width: 33.5%;
}
.mw-mlb-permission-link {
--
To view, visit https://gerrit.wikimedia.org/r/118075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I246e3496dd01649f360c1f80b859e2260bb1d87f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...PoolCounter)
jenkins-bot has submitted this change and it was merged. Change subject: Add COPYING .. Add COPYING Change-Id: Ifc3dfb17767180dc0874707fa53167c23cb9b4fe --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The Program, below, +refers to any such program or work, and a work based on the Program +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term modification.) Each licensee is addressed as you. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...UserDailyContribs)
jenkins-bot has submitted this change and it was merged. Change subject: Add COPYING .. Add COPYING Change-Id: Icaea2e8d3b53ea5c7028853f0bd116a9b50ac2c8 --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The Program, below, +refers to any such program or work, and a work based on the Program +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term modification.) Each licensee is addressed as you. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...Collection)
jenkins-bot has submitted this change and it was merged. Change subject: Add COPYING .. Add COPYING Change-Id: Ica902d104a2c040436a6124f958efb5f95a05c9d --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The Program, below, +refers to any such program or work, and a work based on the Program +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term modification.) Each licensee is addressed as you. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...GlobalUsage)
jenkins-bot has submitted this change and it was merged. Change subject: Add COPYING .. Add COPYING Change-Id: I784b28ca9d977fcda906cc8a2b312a5c8980a278 --- A COPYING 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..96d3f68 --- /dev/null +++ b/COPYING @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the Software), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. -- To view, visit https://gerrit.wikimedia.org/r/116239 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I784b28ca9d977fcda906cc8a2b312a5c8980a278 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalUsage Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...CharInsert)
jenkins-bot has submitted this change and it was merged. Change subject: Add COPYING .. Add COPYING Change-Id: Ib5470ae988de1ac94ce59fe0e0d7e801d13f3977 --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The Program, below, +refers to any such program or work, and a work based on the Program +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term modification.) Each licensee is addressed as you. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...TorBlock)
jenkins-bot has submitted this change and it was merged. Change subject: Add COPYING .. Add COPYING Change-Id: If9fb8e413343f9fec3aaa4cb880b4553ced2cf66 --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The Program, below, +refers to any such program or work, and a work based on the Program +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term modification.) Each licensee is addressed as you. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...Disambiguator)
jenkins-bot has submitted this change and it was merged. Change subject: Add COPYING .. Add COPYING Change-Id: I55c920b79f0ef5b1fdb08cc1063fea22817ab1a4 --- A COPYING 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..96d3f68 --- /dev/null +++ b/COPYING @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the Software), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. -- To view, visit https://gerrit.wikimedia.org/r/116249 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I55c920b79f0ef5b1fdb08cc1063fea22817ab1a4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Disambiguator Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...CodeEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Add COPYING .. Add COPYING Change-Id: I9db9af4ad29641e66e71876002d56f5aa5462c58 --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The Program, below, +refers to any such program or work, and a work based on the Program +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term modification.) Each licensee is addressed as you. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the
[MediaWiki-commits] [Gerrit] Experiment multiple git repos for Chad - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/118086 Change subject: Experiment multiple git repos for Chad .. Experiment multiple git repos for Chad Creates: https://integration.wikimedia.org/ci/job/chad-multigit Change-Id: I9b7be1a8d125f0d3e183723e595549fc7c632fc0 --- A chad.yaml 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/86/118086/1 diff --git a/chad.yaml b/chad.yaml new file mode 100644 index 000..0a82d0b --- /dev/null +++ b/chad.yaml @@ -0,0 +1,14 @@ +- project: +name: 'chad-multigit' +jobs: + - chad-multigit + +- job: +name: chad-multigit +scm: +- git: +url: 'https://gerrit.wikimedia.org/r/p/integration/zuul-config.git' +basedir: 'zuul-config' +- git: +url: 'https://gerrit.wikimedia.org/r/p/integration/jenkins-job-builder-config.git' +basedir: 'jenkins-job-builder-config' -- To view, visit https://gerrit.wikimedia.org/r/118086 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b7be1a8d125f0d3e183723e595549fc7c632fc0 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] 1.22.4 release notes and version update - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: 1.22.4 release notes and version update .. 1.22.4 release notes and version update Change-Id: Ib9ef58a076902307be94ea34ff74049b95452fc2 --- M RELEASE-NOTES-1.22 M includes/DefaultSettings.php 2 files changed, 9 insertions(+), 1 deletion(-) Approvals: MarkAHershberger: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22 index 9862e5eb..284ef1f 100644 --- a/RELEASE-NOTES-1.22 +++ b/RELEASE-NOTES-1.22 @@ -3,6 +3,14 @@ Security reminder: MediaWiki does not require PHP's register_globals. If you have it on, turn it '''off''' if you can. +== MediaWiki 1.22.4 == + +This is a maintenance release of the MediaWiki 1.22 branch. + +=== Changes since 1.22.3 === + +* Use the correct branch of the extensions' git repositories. + == MediaWiki 1.22.3 == This is a security and bugfix release of the MediaWiki 1.22 branch. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 820d609..2aa5b09 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -63,7 +63,7 @@ * MediaWiki version number * @since 1.2 */ -$wgVersion = '1.22.3'; +$wgVersion = '1.22.4'; /** * Name of the site. It must be changed in LocalSettings.php -- To view, visit https://gerrit.wikimedia.org/r/118084 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9ef58a076902307be94ea34ff74049b95452fc2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_22 Gerrit-Owner: MarkAHershberger m...@nichework.com Gerrit-Reviewer: MarkAHershberger m...@nichework.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed random page - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Removed random page .. Removed random page Using a dedicated page instead of a random page. Paired with Amir Aharoni. Bug: 62479 Change-Id: I3750ecf972f52f205fd30855455ef6259b9c911d --- M tests/browser/features/accept_language.feature M tests/browser/features/autonym.feature M tests/browser/features/ime.feature M tests/browser/features/live_preview_of_display_language.feature M tests/browser/features/persistent_settings.feature M tests/browser/features/settings_panel.feature M tests/browser/features/step_definitions/accept_language_steps.rb M tests/browser/features/step_definitions/common_steps.rb M tests/browser/features/step_definitions/ime_steps.rb M tests/browser/features/step_definitions/live_preview_of_display_language_steps.rb M tests/browser/features/support/pages/main_page.rb D tests/browser/features/support/pages/random_page.rb M tests/browser/features/triggers.feature 13 files changed, 35 insertions(+), 47 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/accept_language.feature b/tests/browser/features/accept_language.feature index 38d960d..f8c982d 100644 --- a/tests/browser/features/accept_language.feature +++ b/tests/browser/features/accept_language.feature @@ -3,7 +3,7 @@ Scenario Outline: Accept-Language Given that my browser's accept language is language -When I visit a random page +When I am at the preferences page Then link to the main page has text text Examples: diff --git a/tests/browser/features/autonym.feature b/tests/browser/features/autonym.feature index 177fad9..0c4b43d 100644 --- a/tests/browser/features/autonym.feature +++ b/tests/browser/features/autonym.feature @@ -25,7 +25,7 @@ And elements that are not Interlanguage links should not use Autonym font Scenario: Autonym font is used in the ULS language search dialog for input language selection by anonymous users -Given I am at random page +Given I am at the main page And I open the Universal Language Selector And I open Input side panel of language settings When I click the button with the ellipsis diff --git a/tests/browser/features/ime.feature b/tests/browser/features/ime.feature index 2590fb9..319b412 100644 --- a/tests/browser/features/ime.feature +++ b/tests/browser/features/ime.feature @@ -10,7 +10,7 @@ The input method indicator is shown when input field gets a focus. -Given I am at random page +Given I am at the main page When I click on an input box Then I should see the input method indicator @@ -19,7 +19,7 @@ Input method menu is shown when user clicks the input method indicator. -Given I am at random page +Given I am at the main page When I click on an input box And I click on the input method indicator Then I should see input methods for English @@ -41,13 +41,13 @@ Chosen input method selection persists across page loads. -Given I am at random page +Given I am at the main page When I open the input method menu And I choose ml as the input language And I open the input method menu And I click on the Malayalam InScript 2 menu item And I press Control-M - And I go to another random page + And I reload the page And I click on an input box And I press Control-M Then I should see the input method indicator diff --git a/tests/browser/features/live_preview_of_display_language.feature b/tests/browser/features/live_preview_of_display_language.feature index 1df3e37..1c5a57f 100644 --- a/tests/browser/features/live_preview_of_display_language.feature +++ b/tests/browser/features/live_preview_of_display_language.feature @@ -4,7 +4,7 @@ Background: Given I am logged in And I have reset my preferences - And I am at random page + And I am at the main page @needs-custom-setup @commons.wikimedia.beta.wmflabs.org Scenario: Display language change is previewed immediately diff --git a/tests/browser/features/persistent_settings.feature b/tests/browser/features/persistent_settings.feature index ce48ccc..d987616 100644 --- a/tests/browser/features/persistent_settings.feature +++ b/tests/browser/features/persistent_settings.feature @@ -15,12 +15,12 @@ Scenario: Interface font sticks to another page When I apply the changes - And I visit a random page + And I am at the main page Then the selected interface font must be OpenDyslexic Scenario: Discarding a live preview of a font keeps the previous font When I close the panel to discard the changes - And I visit a random page + And I am at the main page Then the selected interface font must be Systemschriftart Scenario: Changing both a font and an input method is saved @@ -30,6
[MediaWiki-commits] [Gerrit] 1.21.7 release notes and version update - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: 1.21.7 release notes and version update .. 1.21.7 release notes and version update Change-Id: Ibaf890a55e5beb8827b36fc2c05b12b3f4f6d624 --- M RELEASE-NOTES-1.21 M includes/DefaultSettings.php 2 files changed, 9 insertions(+), 1 deletion(-) Approvals: MarkAHershberger: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21 index 3bf87fc..8a01074 100644 --- a/RELEASE-NOTES-1.21 +++ b/RELEASE-NOTES-1.21 @@ -3,6 +3,14 @@ Security reminder: MediaWiki does not require PHP's register_globals. If you have it on, turn it '''off''' if you can. +== MediaWiki 1.21.7 == + +This is a maintenance release of the MediaWiki 1.21 branch. + +=== Changes since 1.21.6 === + +* Use the correct branch of the extensions' git repositories. + == MediaWiki 1.21.6 == This is a security release of the MediaWiki 1.21 branch. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 045252a..37156cc 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -63,7 +63,7 @@ * MediaWiki version number * @since 1.2 */ -$wgVersion = '1.21.6'; +$wgVersion = '1.21.7'; /** * Name of the site. It must be changed in LocalSettings.php -- To view, visit https://gerrit.wikimedia.org/r/118082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibaf890a55e5beb8827b36fc2c05b12b3f4f6d624 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_21 Gerrit-Owner: MarkAHershberger m...@nichework.com Gerrit-Reviewer: MarkAHershberger m...@nichework.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] 1.21.7 release notes and version update - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/118082 Change subject: 1.21.7 release notes and version update .. 1.21.7 release notes and version update Change-Id: Ibaf890a55e5beb8827b36fc2c05b12b3f4f6d624 --- M RELEASE-NOTES-1.21 M includes/DefaultSettings.php 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/82/118082/1 diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21 index 3bf87fc..8a01074 100644 --- a/RELEASE-NOTES-1.21 +++ b/RELEASE-NOTES-1.21 @@ -3,6 +3,14 @@ Security reminder: MediaWiki does not require PHP's register_globals. If you have it on, turn it '''off''' if you can. +== MediaWiki 1.21.7 == + +This is a maintenance release of the MediaWiki 1.21 branch. + +=== Changes since 1.21.6 === + +* Use the correct branch of the extensions' git repositories. + == MediaWiki 1.21.6 == This is a security release of the MediaWiki 1.21 branch. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 045252a..37156cc 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -63,7 +63,7 @@ * MediaWiki version number * @since 1.2 */ -$wgVersion = '1.21.6'; +$wgVersion = '1.21.7'; /** * Name of the site. It must be changed in LocalSettings.php -- To view, visit https://gerrit.wikimedia.org/r/118082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibaf890a55e5beb8827b36fc2c05b12b3f4f6d624 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_21 Gerrit-Owner: MarkAHershberger m...@nichework.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 62379) Use tables for value details in diffs. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118087
Change subject: (bug 62379) Use tables for value details in diffs.
..
(bug 62379) Use tables for value details in diffs.
This changes time, geo and quantity values to use a HTML table
for the detail view in diffs.
Change-Id: Ia4b2ec829c99086a08f6d555a89af479ef5e558d
---
M lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
M lib/includes/formatters/QuantityDetailsFormatter.php
M lib/includes/formatters/TimeDetailsFormatter.php
M lib/resources/wikibase.css
M lib/tests/phpunit/formatters/GlobeCoordinateDetailsFormatterTest.php
M lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
M lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php
7 files changed, 109 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/87/118087/1
diff --git a/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
b/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
index 20c18a4..df0f02e 100644
--- a/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
+++ b/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
@@ -7,6 +7,8 @@
use InvalidArgumentException;
use Message;
use ValueFormatters\FormatterOptions;
+use ValueFormatters\GeoCoordinateFormatter;
+use ValueFormatters\GlobeCoordinateFormatter;
use ValueFormatters\ValueFormatter;
use ValueFormatters\ValueFormatterBase;
@@ -21,10 +23,22 @@
class GlobeCoordinateDetailsFormatter extends ValueFormatterBase {
/**
+* @var GlobeCoordinateFormatter
+*/
+ protected $coordinateFormatter;
+
+ /**
* @param FormatterOptions $options
*/
public function __construct( FormatterOptions $options ) {
parent::__construct( $options );
+
+ if ( !$options-hasOption( GeoCoordinateFormatter::OPT_FORMAT )
) {
+ //TODO: what'S a good default? Should this be locale
dependant? Configurable?
+ $options-setOption(
GeoCoordinateFormatter::OPT_FORMAT, GeoCoordinateFormatter::TYPE_DMS );
+ }
+
+ $this-coordinateFormatter = new GlobeCoordinateFormatter(
$options );
}
/**
@@ -44,8 +58,13 @@
}
$html = '';
- $html .= Html::openElement( 'dl',
- array( 'class' = 'wikibase-details
wikibase-globe-details' ) );
+ $html .= Html::element( 'h4',
+ array( 'class' = 'wb-details wb-globe-details
wb-globe-rendered' ),
+ $this-coordinateFormatter-format( $value )
+ );
+
+ $html .= Html::openElement( 'table',
+ array( 'class' = 'wb-details wb-globe-details' ) );
//TODO: nicer formatting and localization of numbers.
$html .= $this-renderLabelValuePair( 'latitude',
@@ -57,7 +76,7 @@
$html .= $this-renderLabelValuePair( 'globe',
htmlspecialchars( $value-getGlobe() ) );
- $html .= Html::closeElement( 'dl' );
+ $html .= Html::closeElement( 'table' );
return $html;
}
@@ -69,12 +88,14 @@
* @return string HTML for the label/value pair
*/
protected function renderLabelValuePair( $fieldName, $valueHtml ) {
- $html = '';
- $html .= Html::element( 'dt', array( 'class' =
'wikibase-globe-' . $fieldName ),
+ $html = Html::openElement( 'tr' );
+
+ $html .= Html::element( 'th', array( 'class' = 'wb-globe-' .
$fieldName ),
$this-getFieldLabel( $fieldName )-text() );
- $html .= Html::element( 'dd', array( 'class' =
'wikibase-globe-' . $fieldName ),
+ $html .= Html::element( 'td', array( 'class' = 'wb-globe-' .
$fieldName ),
$valueHtml );
+ $html .= Html::closeElement( 'tr' );
return $html;
}
@@ -86,8 +107,8 @@
protected function getFieldLabel( $fieldName ) {
$lang = $this-getOption( ValueFormatter::OPT_LANG );
- // Messages: wikibase-globedetails-amount,
wikibase-globedetails-upperbound,
- // wikibase-globedetails-lowerbound, wikibase-globedetails-unit
+ // Messages: wb-globedetails-amount, wb-globedetails-upperbound,
+ // wb-globedetails-lowerbound, wb-globedetails-unit
$key = 'wikibase-globedetails-' . strtolower( $fieldName );
$msg = wfMessage( $key )-inLanguage( $lang );
diff --git a/lib/includes/formatters/QuantityDetailsFormatter.php
b/lib/includes/formatters/QuantityDetailsFormatter.php
index 09962ee..7f2ca99 100644
---
[MediaWiki-commits] [Gerrit] Flag changed diffs in rt-server results views - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Flag changed diffs in rt-server results views
..
Flag changed diffs in rt-server results views
* This patch adds new views; previous result views are still available.
* The new commit link in the regressions/fixes view now takes you to
a results view that flags skips/fails occuring in the new commit
but not in the old commit. And the old commit link takes you to a
results view that flags skips/fails no longer in the new commit.
* Overflagging (eg flagging too many diffs as new) is possible.
Say a page edit changes lines in a way that we would think of the
same diff occurring in different lines. Then it's technically a
new line-based diff, and will be flagged as such. This does not seem
to occur too much in practice (and won't happen at all if, in the
future, results are pinned to a specific page edit across test runs).
Change-Id: I95dafb77e83ad63b7f46de25d48f78ba19fd0704
---
M lib/mediawiki.Util.js
A tests/server/diff.js
M tests/server/package.json
M tests/server/server.js
M tests/server/static/result.css
5 files changed, 241 insertions(+), 17 deletions(-)
Approvals:
Marcoil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.Util.js b/lib/mediawiki.Util.js
index f04ed86..8066754 100644
--- a/lib/mediawiki.Util.js
+++ b/lib/mediawiki.Util.js
@@ -1293,6 +1293,14 @@
return pairs;
};
+var diffTokens = function(oldString, newString, tokenize) {
+ if (oldString === newString) {
+ return [['=', [newString]]];
+ } else {
+ return simpleDiff.diff(tokenize(oldString),
tokenize(newString));
+ }
+};
+
var diffLines = function(oldString, newString) {
var lineTokenize = function(value) {
var retLines = [],
@@ -1306,17 +1314,11 @@
} else if (line) {
retLines.push(line);
}
- }
+ }
return retLines;
};
-
- if (oldString === newString) {
- return [['=', [newString]]];
- } else {
- return simpleDiff.diff(lineTokenize(oldString),
lineTokenize(newString));
- }
+ return diffTokens(oldString, newString, lineTokenize);
};
-
Util.convertDiffToOffsetPairs = convertDiffToOffsetPairs;
Util.diffLines = diffLines;
diff --git a/tests/server/diff.js b/tests/server/diff.js
new file mode 100644
index 000..b532dcc
--- /dev/null
+++ b/tests/server/diff.js
@@ -0,0 +1,98 @@
+/*
+* This file contains diff related functions for use in tests/server,
+* to compare test results for a given page from different revisions.
+*/
+
+use strict;
+var simpleDiff = require('simplediff');
+
+var Diff = {};
+( function (exports) {
+
+ var diffTokens = function(oldString, newString, tokenize) {
+ if (oldString === newString) {
+ return [['=', [newString]]];
+ } else {
+ return simpleDiff.diff(tokenize(oldString),
tokenize(newString));
+ }
+ };
+
+ var diffResults = function(oldString, newString) {
+ var testcaseTokenize = function(resultString) {
+ var testcases =
resultString.split(/\/skipped|\/failure/);
+ // Omit everything that's not part of a skipped or
failure element,
+ // as this can contain info we're not interested in
diffing
+ // (eg character number within original text,
perfstats).
+ testcases = testcases.slice(0, -1);
+ testcases = testcases.map(function(testcase) {
+ var skipTagIndex = testcase.indexOf('skipped');
+ if (skipTagIndex !== -1) {
+ return testcase.slice(skipTagIndex);
+ } else {
+ return
testcase.slice(testcase.indexOf('failure'));
+ }
+ });
+ return testcases;
+ };
+
+ return diffTokens(oldString, newString, testcaseTokenize);
+ };
+
+ var testcaseStatus = function(diff, flag) {
+ // Returns an array of 0's and 1's, where, supposing flag is
'+', 1 in the nth position
+ // means that the n'th token of the newer diffed item isn't a
token of the older item.
+ // (And symmetrically for '-', interchanging roles of 'newer'
and 'older'.)
+ var array = [];
+ for (var i = 0, l = diff.length; i l; i++) {
+ var change = diff[i];
+ if (change[0] === flag) {
+ for (var j = 0; j change[1].length;
[MediaWiki-commits] [Gerrit] Fix undefined variable - change (mediawiki...BookManagerv2)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix undefined variable
..
Fix undefined variable
Change-Id: I4a10f3355d2e76f6f50b9970056db8831ce26005
---
M includes/JsonContent.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Helder.wiki: Looks good to me, but someone else must approve
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/JsonContent.php b/includes/JsonContent.php
index 5095dbb..82096d5 100644
--- a/includes/JsonContent.php
+++ b/includes/JsonContent.php
@@ -142,7 +142,7 @@
* @return string: HTML representation
*/
function getHighlightHtml() {
- $schema = $this-getJsonData();
+ $block = $this-getJsonData();
return is_array( $block ) ? self::objectTable( $block ) : '';
}
}
--
To view, visit https://gerrit.wikimedia.org/r/112152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a10f3355d2e76f6f50b9970056db8831ce26005
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BookManagerv2
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Helder.wiki helder.w...@gmail.com
Gerrit-Reviewer: Mollywhite molly.whi...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...ConfirmEdit)
jenkins-bot has submitted this change and it was merged. Change subject: Add COPYING .. Add COPYING Change-Id: I3591a9ced5d6b1866123d6dbcf11b0f3e6529229 --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The Program, below, +refers to any such program or work, and a work based on the Program +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term modification.) Each licensee is addressed as you. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the
[MediaWiki-commits] [Gerrit] Change spaces to tabs - change (mediawiki...OAuth)
jenkins-bot has submitted this change and it was merged. Change subject: Change spaces to tabs .. Change spaces to tabs Per Siebrand's comment on https://gerrit.wikimedia.org/r/#/c/107205/1/frontend/language/MWOAuth.i18n.php Change-Id: I2dfd39a4a05adb9aabc4f80c4ea856e087a6046e --- M frontend/language/MWOAuth.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/frontend/language/MWOAuth.i18n.php b/frontend/language/MWOAuth.i18n.php index 33a3179..1ea5ed3 100644 --- a/frontend/language/MWOAuth.i18n.php +++ b/frontend/language/MWOAuth.i18n.php @@ -298,7 +298,7 @@ 'mwoauth-grant-delete' = 'Delete pages, revisions, and log entries', 'mwoauth-grant-editinterface' = 'Edit the MediaWiki namespace and user CSS/JavaScript', 'mwoauth-grant-editmycssjs' = 'Edit your own user CSS/JavaScript', -'mwoauth-grant-editmyoptions' = 'Edit your own user preferences', + 'mwoauth-grant-editmyoptions' = 'Edit your own user preferences', 'mwoauth-grant-editmywatchlist' = 'Edit your watchlist', 'mwoauth-grant-editpage' = 'Edit existing pages', 'mwoauth-grant-editprotected' = 'Edit protected pages', -- To view, visit https://gerrit.wikimedia.org/r/112055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2dfd39a4a05adb9aabc4f80c4ea856e087a6046e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch: master Gerrit-Owner: CSteipp cste...@wikimedia.org Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the modal expand to fit its contents - change (mediawiki...GettingStarted)
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118088
Change subject: Make the modal expand to fit its contents
..
Make the modal expand to fit its contents
Make the modal expand to fit its contents in non-IE and IE8+ so that the
buttons are displayed on one line in all languages. Maintain the current
behaviour in IE6/7.
Bug: 61922
Change-Id: I6069e8e7139aabde432ff2dc8d5b902dbd17e2ae
---
M resources/ext.gettingstarted.return.less
1 file changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/88/118088/1
diff --git a/resources/ext.gettingstarted.return.less
b/resources/ext.gettingstarted.return.less
index baab872..2e3b5ed 100644
--- a/resources/ext.gettingstarted.return.less
+++ b/resources/ext.gettingstarted.return.less
@@ -2,7 +2,7 @@
/* Specific elements */
#mw-gettingstarted-cta-editable-main-page {
- width: 510px;
+ width: 510px !ie;
}
#mw-gettingstarted-cta-other-page {
@@ -64,9 +64,11 @@
.mw-gettingstarted-cta-container {
display: table-cell;
vertical-align: middle;
+ text-align: center;
display: block !ie;
position: absolute !ie;
top: 50% !ie;
+ left: 50% !ie;
}
/*
@@ -82,13 +84,17 @@
overflow: auto;
/* One z-index above overlay above */
z-index: 10007;
+ display: inline-block;
+ text-align: left;
+ display: block !ie;
position: relative !ie;
top: -50% !ie;
+ left: -50% !ie;
.mw-ui-button {
- display: table;
- float: left;
- text-align: left;
+ display: inline-block;
+ vertical-align: top;
+ text-align: inherit;
margin-right: 20px;
margin-bottom: 0px;
margin-top: 15px;
@@ -159,8 +165,7 @@
}
.mw-gettingstarted-cta-leave-link {
- float: left;
- clear: both;
margin-top: 20px;
font-size: 0.8em;
+ display: block;
}
--
To view, visit https://gerrit.wikimedia.org/r/118088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6069e8e7139aabde432ff2dc8d5b902dbd17e2ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Modify Drafts::display to return HTML instead of a count - change (mediawiki...Drafts)
jenkins-bot has submitted this change and it was merged.
Change subject: Modify Drafts::display to return HTML instead of a count
..
Modify Drafts::display to return HTML instead of a count
Change-Id: I4464cc41e89bda872eb1ef5ec4ba8503772dc6c8
---
M Drafts.classes.php
M Drafts.hooks.php
M SpecialDrafts.php
3 files changed, 63 insertions(+), 78 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Drafts.classes.php b/Drafts.classes.php
index 8c03932..28383cd 100644
--- a/Drafts.classes.php
+++ b/Drafts.classes.php
@@ -169,44 +169,39 @@
*
* @param $title Title [optional] Title of article, defaults to all
articles
* @param $userID Integer: [optional] ID of user, defaults to current
user
-* @return int Number of drafts in the table
+* @return string HTML to be shown to the user
*/
public static function display( $title = null, $userID = null ) {
- global $wgOut, $wgRequest, $wgUser, $wgLang;
+ global $wgRequest, $wgUser, $wgLang;
// Gets draftID
$currentDraft = Draft::newFromID( $wgRequest-getIntOrNull(
'draft' ) );
// Output HTML for list of drafts
$drafts = Drafts::get( $title, $userID );
if ( count( $drafts ) 0 ) {
- // Internationalization
+ $html = '';
// Build XML
- $wgOut-addHTML(
- Xml::openElement( 'table',
- array(
- 'cellpadding' = 5,
- 'cellspacing' = 0,
- 'width' = '100%',
- 'border' = 0,
- 'id' = 'drafts-list-table'
- )
+ $html .= Xml::openElement( 'table',
+ array(
+ 'cellpadding' = 5,
+ 'cellspacing' = 0,
+ 'width' = '100%',
+ 'border' = 0,
+ 'id' = 'drafts-list-table'
)
);
- $wgOut-addHTML( Xml::openElement( 'tr' ) );
- $wgOut-addHTML(
- Xml::element( 'th',
- array( 'width' = '75%', 'nowrap' =
'nowrap' ),
- wfMessage( 'drafts-view-article'
)-text()
- )
+
+ $html .= Xml::openElement( 'tr' );
+ $html .= Xml::element( 'th',
+ array( 'width' = '75%', 'nowrap' = 'nowrap' ),
+ wfMessage( 'drafts-view-article' )-text()
);
- $wgOut-addHTML(
- Xml::element( 'th',
- null,
- wfMessage( 'drafts-view-saved' )-text()
- )
+ $html .= Xml::element( 'th',
+ null,
+ wfMessage( 'drafts-view-saved' )-text()
);
- $wgOut-addHTML( Xml::element( 'th' ) );
- $wgOut-addHTML( Xml::closeElement( 'tr' ) );
+ $html .= Xml::element( 'th' );
+ $html .= Xml::closeElement( 'tr' );
// Add existing drafts for this page and user
/**
* @var $draft Draft
@@ -249,54 +244,44 @@
urlencode( $draft-getSection()
);
}
// Build XML
- $wgOut-addHTML( Xml::openElement( 'tr' ) );
- $wgOut-addHTML(
- Xml::openElement( 'td' )
+ $html .= Xml::openElement( 'tr' );
+ $html .= Xml::openElement( 'td' );
+ $html .= Xml::element( 'a',
+ array(
+ 'href' = $urlLoad,
+ 'style' = 'font-weight:' .
+ (
+
$currentDraft-getID() == $draft-getID() ?
+
[MediaWiki-commits] [Gerrit] Split up some long lines in tests - change (mediawiki...Math)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118089
Change subject: Split up some long lines in tests
..
Split up some long lines in tests
Change-Id: I45be8ea1b9a9a974614354c0199e3107a5cdc23e
---
M tests/MathCoverageTest.php
M tests/MathDatabaseTest.php
M tests/MathInputCheckTest.php
M tests/MathInputCheckTexvcTest.php
M tests/MathLaTeXMLTest.php
M tests/MathRendererTest.php
M tests/MathSourceTest.php
7 files changed, 49 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/89/118089/1
diff --git a/tests/MathCoverageTest.php b/tests/MathCoverageTest.php
index 61f027e..884ea0d 100644
--- a/tests/MathCoverageTest.php
+++ b/tests/MathCoverageTest.php
@@ -68,7 +68,11 @@
// TODO: Make rendering mode configurable
// TODO: Provide test-ids
// TODO: Link to the wikipage that contains the reference
rendering
- $this-assertEquals( $this-normalize( $output ),
$this-normalize( MathRenderer::renderMath( $input , array(), MW_MATH_PNG ) ),
Failed to render $input );
+ $this-assertEquals(
+ $this-normalize( $output ),
+ $this-normalize( MathRenderer::renderMath( $input,
array(), MW_MATH_PNG ) ),
+ Failed to render $input
+ );
}
/**
diff --git a/tests/MathDatabaseTest.php b/tests/MathDatabaseTest.php
index 907eb1c..2b8453f 100644
--- a/tests/MathDatabaseTest.php
+++ b/tests/MathDatabaseTest.php
@@ -98,7 +98,7 @@
$this-renderer-writeToDatabase();
$res = $this-db-select( math, * );
$row = $res-fetchRow();
- $this-assertEquals( sizeof( $row ), 2 * self::NUM_BASIC_FIELDS
);
+ $this-assertEquals( count( $row ), 2 * self::NUM_BASIC_FIELDS
);
}
}
diff --git a/tests/MathInputCheckTest.php b/tests/MathInputCheckTest.php
index 3a76dc5..13d2699 100644
--- a/tests/MathInputCheckTest.php
+++ b/tests/MathInputCheckTest.php
@@ -9,7 +9,7 @@
*/
public function testIsValid() {
$InputCheck = $this-getMockBuilder( 'MathInputCheck'
)-getMock();
- $this-assertEquals( $InputCheck-IsValid() , false );
+ $this-assertEquals( $InputCheck-IsValid(), false );
}
/**
diff --git a/tests/MathInputCheckTexvcTest.php
b/tests/MathInputCheckTexvcTest.php
index b1c9654..4c3a582 100644
--- a/tests/MathInputCheckTexvcTest.php
+++ b/tests/MathInputCheckTexvcTest.php
@@ -76,7 +76,10 @@
}
$time = microtime( true ) - $tstart;
- $this-assertTrue( $time $maxAvgTime * $numberOfRuns,
'function is_executable consumes too much time' );
+ $this-assertTrue(
+ $time $maxAvgTime * $numberOfRuns,
+ 'function is_executable consumes too much time'
+ );
}
/**
@@ -118,7 +121,7 @@
$this-assertNull( $this-BadObject-getValidTex() );
// Be aware of the additional brackets and spaces inserted here
- $this-assertEquals( $this-GoodObject-getValidTex() , \\sin
\\left({\\frac 12}x\\right) );
+ $this-assertEquals( $this-GoodObject-getValidTex(), \\sin
\\left({\\frac 12}x\\right) );
}
/**
diff --git a/tests/MathLaTeXMLTest.php b/tests/MathLaTeXMLTest.php
index e6cb5b6..e2d6f8e 100644
--- a/tests/MathLaTeXMLTest.php
+++ b/tests/MathLaTeXMLTest.php
@@ -97,8 +97,14 @@
public function testisValidXML() {
$validSample = 'mathcontent/math';
$invalidSample = 'notmath /';
- $this-assertTrue( MathLaTeXML::isValidMathML( $validSample ),
'test if math expression is valid mathml sample' );
- $this-assertFalse( MathLaTeXML::isValidMathML( $invalidSample
), 'test if math expression is invalid mathml sample' );
+ $this-assertTrue(
+ MathLaTeXML::isValidMathML( $validSample ),
+ 'test if math expression is valid mathml sample'
+ );
+ $this-assertFalse(
+ MathLaTeXML::isValidMathML( $invalidSample ),
+ 'test if math expression is invalid mathml sample'
+ );
}
/**
@@ -117,8 +123,16 @@
'v3A', 'v3b'
) );
$expected =
'k1=v1k2%26%3D=v2+%2B+%26+%2A%C3%BC%C3%B6k3=v3Ak3=v3b';
- $this-assertEquals( $expected, $renderer-serializeSettings(
$sampleSettings ), 'test serialization of array settings' );
- $this-assertEquals( $expected, $renderer-serializeSettings(
$expected ), 'test serialization of a string setting' );
+ $this-assertEquals(
+
