[MediaWiki-commits] [Gerrit] profiler: Use User::quickIsAnon in wfLogProfilingData() - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/201424 Change subject: profiler: Use User::quickIsAnon in wfLogProfilingData() .. profiler: Use User::quickIsAnon in wfLogProfilingData() Follows-up I7e07e22ea and I78696709f. Change-Id: Ib70b89d8102c105f2e46b369455c01bfcc2809c9 --- M includes/GlobalFunctions.php 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/24/201424/1 diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 24a3c33..41bac30 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -1287,11 +1287,8 @@ $ctx['proxy'] = $_SERVER['REMOTE_ADDR']; } - // Don't load $wgUser at this late stage just for statistics purposes - // @todo FIXME: We can detect some anons even if it is not loaded. - // See User::getId() $user = $context-getUser(); - $ctx['anon'] = $user-isItemLoaded( 'id' ) $user-isAnon(); + $ctx['anon'] = $user-quickIsAnon(); // Command line script uses a FauxRequest object which does not have // any knowledge about an URL and throw an exception instead. -- To view, visit https://gerrit.wikimedia.org/r/201424 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib70b89d8102c105f2e46b369455c01bfcc2809c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add optional per-request hash prefix to debug log entries - change (mediawiki/core)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201431
Change subject: Add optional per-request hash prefix to debug log entries
..
Add optional per-request hash prefix to debug log entries
Bug: T94812
Change-Id: I8ee2c2c314c63458f77c6a95306e36b96bc6e2cb
---
M includes/DefaultSettings.php
M includes/GlobalFunctions.php
2 files changed, 23 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/31/201431/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5ab557e..f44a9b6 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5227,6 +5227,15 @@
$wgDebugLogPrefix = '';
/**
+ * Adds a small hash to the beginning of each debug log entry. This hash is
+ * specific to the current request and is computed on-demand. This lets one
+ * differentiate overlapping requests in the logs.
+ *
+ * @since 1.25
+ */
+$wgDebugLogPerRequestPrefix = false;
+
+/**
* If true, instead of redirecting, show a page with a link to the redirect
* destination. This allows for the inspection of PHP error messages, and easy
* resubmission of form data. For developer use only.
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index bc3a46b..b7a9628 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1026,7 +1026,7 @@
* @param array $context Additional logging context data
*/
function wfDebug( $text, $dest = 'all', array $context = array() ) {
- global $wgDebugRawPage, $wgDebugLogPrefix;
+ global $wgDebugRawPage, $wgDebugLogPrefix, $wgDebugLogPerRequestPrefix;
global $wgDebugTimestamps, $wgRequestTime;
if ( !$wgDebugRawPage wfIsDebugRawPage() ) {
@@ -1047,8 +1047,20 @@
);
}
+ $context['prefix'] = '';
+
+ if ( $wgDebugLogPerRequestPrefix === true ) {
+ // Compute it on-demand, because it would be wasteful to
generate it in the config
+ // when debugging is turned off.
+ $wgDebugLogPerRequestPrefix = '[' . bin2hex(
openssl_random_pseudo_bytes( 3 ) ) . '] ';
+ }
+
+ if ( $wgDebugLogPerRequestPrefix ) {
+ $context['prefix'] .= $wgDebugLogPerRequestPrefix;
+ }
+
if ( $wgDebugLogPrefix !== '' ) {
- $context['prefix'] = $wgDebugLogPrefix;
+ $context['prefix'] .= $wgDebugLogPrefix;
}
$logger = MWLoggerFactory::getInstance( 'wfDebug' );
--
To view, visit https://gerrit.wikimedia.org/r/201431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ee2c2c314c63458f77c6a95306e36b96bc6e2cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] BsBaseTemplate: Restored custom sidebar icon mechanism - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201432
Change subject: BsBaseTemplate: Restored custom sidebar icon mechanism
..
BsBaseTemplate: Restored custom sidebar icon mechanism
The custom icons in MediaWiki:Sidebar mechanism was broken with 2.23
relaese. This change restores the general machanism. It also makes icons
clickable.
THERE IS ANOTHER CHANGE IN BlueSpiceSkin REPO THAT BELONGS TO THIS ONE!
Needs merge to REL1_23.
Change-Id: I6b11073fc89dcd93457da320f4c553125c715f01
---
M includes/BsBaseTemplate.php
1 file changed, 23 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/32/201432/1
diff --git a/includes/BsBaseTemplate.php b/includes/BsBaseTemplate.php
index 4540761..82faa3f 100644
--- a/includes/BsBaseTemplate.php
+++ b/includes/BsBaseTemplate.php
@@ -435,6 +435,16 @@
$aOut[] = ' h5' . $sTitle . '/h5';
$aOut[] = ' ul';
foreach ($cont as $key = $val) {
+ /* $val is created in
Skin::addToSidebarPlain and contains
+* the following:
+* 'id' - ID for list item
+* 'active' - Flag for list item class
'active'
+* 'text' - Text for anchor
+* 'href' - Href for anchot
+* 'rel' - Rel for anchor
+* 'target' - Target for anchor
+*/
+
if ( strpos( $val['text'], | ) !==
false ) {
$aVal = explode( '|',
$val['text'] );
$val['id'] = 'n-' . $aVal[0];
@@ -443,12 +453,20 @@
$sCssClass = (!isset($val['active']) )
? ' class=active' : '';
$sTarget = ( isset($val['target']) ) ?
' target=' . $val['target'] . '' : '';
$sRel = ( isset($val['rel']) ) ? '
rel=' . $val['rel'] . '' : '';
+
$aOut[] = 'li id=' .
Sanitizer::escapeId($val['id']) . '' . $sCssClass . ' class=clearfix';
+
+ $sTitle =
htmlspecialchars($val['text']);
+ $sText = htmlspecialchars($val['text']);
+ $sHref = htmlspecialchars($val['href']);
+ $sIcon = 'span class=icon24/span';
if ( !empty( $aVal ) ) {
$oFile = wfFindFile( $aVal[1] );
if ( strpos( $lang =
$this-translator-translate( $aVal[0] ), lt; ) === false ) {
$aVal[0] = $lang;
}
+ $sTitle =
htmlspecialchars($aVal[0]);
+ $sText =
htmlspecialchars($aVal[0]);
if ( is_object( $oFile )
$oFile-exists() ) {
if (
BsExtensionManager::isContextActive( 'MW::SecureFileStore::Active' ) ) {
@@ -456,16 +474,13 @@
} else {
$sUrl =
$oFile-getUrl();
}
- $aOut[] = 'div
style=background:url(' . $sUrl . ') center no-repeat; width:24px;
height:24px; class=left_navigation_icon /div';
- } else {
- //default
- $aOut[] = 'div
class=left_navigation_icon/div';
+ $sIcon = 'span
class=icon24 style=background-image:url(' . $sUrl . ')/span';
}
- $aOut[] = 'a href=' .
htmlspecialchars($val['href']) . ' title=' . htmlspecialchars($aVal[0]) .' '
. $sTarget . $sRel . '' . htmlspecialchars($aVal[0]) . '/a';
- } else {
- $aOut[] = 'div
class=left_navigation_icon/div';
- $aOut[] = 'a href=' .
htmlspecialchars($val['href']) . ' title=' .
[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Change default property to InterfaceText - change (mediawiki...TemplateData)
jenkins-bot has submitted this change and it was merged.
Change subject: [BREAKING CHANGE] Change default property to InterfaceText
..
[BREAKING CHANGE] Change default property to InterfaceText
Default should be InterfaceText and support languages.
Bug: T54966
Change-Id: I7be3a8be72df3e5d80300bd72fcd7197e43155aa
---
M Specification.md
M TemplateDataBlob.php
M i18n/en.json
M i18n/qqq.json
M modules/ext.templateDataGenerator.data.js
M tests/TemplateDataBlobTest.php
M tests/ext.templateData.tests.js
7 files changed, 80 insertions(+), 28 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Specification.md b/Specification.md
index 7330233..28842cd 100644
--- a/Specification.md
+++ b/Specification.md
@@ -180,7 +180,7 @@
Consumers MUST insert a parameter's autovalue by default if this parameter is
used in a transclusion, and SHOULD indicate this value to the user and give
them the opportunity to change the value.
3.2.10 `default`
-* Value: `string`
+* Value: `null` or `InterfaceText`
The default value in wikitext (or description thereof) of a parameter as
assumed by the template when the parameter is not present in a transclusion.
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index 68cd1c2..e737e79 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -275,15 +275,17 @@
// Param.default
if ( isset( $paramObj-default ) ) {
- if ( !is_string( $paramObj-default ) ) {
+ if ( !is_object( $paramObj-default )
!is_string( $paramObj-default ) ) {
+ // TODO: Also validate that the keys
are valid lang codes and the values strings.
return Status::newFatal(
'templatedata-invalid-type',
params.{$paramName}.default,
- 'string'
+ 'string|object'
);
}
+ $paramObj-default =
self::normaliseInterfaceText( $paramObj-default );
} else {
- $paramObj-default = '';
+ $paramObj-default = null;
}
// Param.type
@@ -594,6 +596,11 @@
if ( $paramObj-description !== null ) {
$paramObj-description =
self::getInterfaceTextInLanguage( $paramObj-description, $langCode );
}
+
+ // Param.default
+ if ( $paramObj-default !== null ) {
+ $paramObj-default =
self::getInterfaceTextInLanguage( $paramObj-default, $langCode );
+ }
}
foreach ( $data-sets as $setObj ) {
@@ -753,10 +760,10 @@
// Default
. Html::element( 'td', array(
'class' = array(
- 'mw-templatedata-doc-muted' =
$paramObj-default === ''
+ 'mw-templatedata-doc-muted' =
$paramObj-default === null
)
),
- $paramObj-default !== '' ?
+ $paramObj-default !== null ?
$paramObj-default :
wfMessage(
'templatedata-doc-param-default-empty' )-inLanguage( $lang )-text()
)
diff --git a/i18n/en.json b/i18n/en.json
index fdbdd17..8aaf763 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -63,7 +63,7 @@
templatedata-modal-table-param-actions: Actions,
templatedata-modal-table-param-aliases: Aliases (comma separated),
templatedata-modal-table-param-autovalue: Auto value,
- templatedata-modal-table-param-default: Default,
+ templatedata-modal-table-param-default: Default ($1),
templatedata-modal-table-param-deprecated: Deprecated,
templatedata-modal-table-param-deprecatedValue: Deprecated guidance,
templatedata-modal-table-param-description: Description ($1),
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1771d98..7334134 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -70,7 +70,7 @@
templatedata-modal-table-param-actions: Label for a parameter
property input: Parameter actions in the table\n{{Identical|Action}},
templatedata-modal-table-param-aliases: Label for a parameter
property input: Aliases of the parameter, instruct the user to separate aliases
[MediaWiki-commits] [Gerrit] Add a script to check for git changes and rebuild the deps i... - change (mediawiki...mobileapps)
Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201429
Change subject: Add a script to check for git changes and rebuild the deps if
needed
..
Add a script to check for git changes and rebuild the deps if needed
The script checks for new, committed changes and pulls them in. If
package.json changes as well, the node dependencies are rebuilt and the
service is restarted.
The script is meant to be run by cron every couple of minutes, so keep
the git tree in labs clean!
Change-Id: Ic0897cce30aef1d450fc975d96389e5983756657
---
A scripts/puller.sh
1 file changed, 38 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/29/201429/1
diff --git a/scripts/puller.sh b/scripts/puller.sh
new file mode 100755
index 000..c8f496f
--- /dev/null
+++ b/scripts/puller.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+
+# ensure we are in the right dir
+cd $(dirname $0)/..;
+
+# check for a git dir
+if [[ ! -e .git ]]; then
+echo No .git directory here, exiting 2;
+exit 1;
+fi
+
+# be on master and get the updates
+git checkout master;
+git fetch origin;
+
+# inspect what has changed
+flist=$(git diff --name-only origin/master);
+
+if [[ -z ${flist} ]]; then
+# no changes, we are done
+exit 0;
+fi
+
+# there are updates, do them
+git pull;
+
+if echo -e ${flist} | grep -i package.json /dev/null; then
+# package.json has been changed, need to rebuild the modules
+rm -rf node_modules;
+npm install;
+fi
+
+# now, restart the service
+systemctl restart mobileapps;
+
+exit $?;
+
--
To view, visit https://gerrit.wikimedia.org/r/201429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0897cce30aef1d450fc975d96389e5983756657
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mobrovac mobro...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a script to check for git changes and rebuild the deps i... - change (mediawiki...mobileapps)
Mobrovac has submitted this change and it was merged.
Change subject: Add a script to check for git changes and rebuild the deps if
needed
..
Add a script to check for git changes and rebuild the deps if needed
The script checks for new, committed changes and pulls them in. If
package.json changes as well, the node dependencies are rebuilt and the
service is restarted.
The script is meant to be run by cron every couple of minutes, so keep
the git tree in labs clean!
Change-Id: Ic0897cce30aef1d450fc975d96389e5983756657
---
A scripts/puller.sh
1 file changed, 38 insertions(+), 0 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/scripts/puller.sh b/scripts/puller.sh
new file mode 100755
index 000..c8f496f
--- /dev/null
+++ b/scripts/puller.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+
+# ensure we are in the right dir
+cd $(dirname $0)/..;
+
+# check for a git dir
+if [[ ! -e .git ]]; then
+echo No .git directory here, exiting 2;
+exit 1;
+fi
+
+# be on master and get the updates
+git checkout master;
+git fetch origin;
+
+# inspect what has changed
+flist=$(git diff --name-only origin/master);
+
+if [[ -z ${flist} ]]; then
+# no changes, we are done
+exit 0;
+fi
+
+# there are updates, do them
+git pull;
+
+if echo -e ${flist} | grep -i package.json /dev/null; then
+# package.json has been changed, need to rebuild the modules
+rm -rf node_modules;
+npm install;
+fi
+
+# now, restart the service
+systemctl restart mobileapps;
+
+exit $?;
+
--
To view, visit https://gerrit.wikimedia.org/r/201429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0897cce30aef1d450fc975d96389e5983756657
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP General donations import - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201427
Change subject: WIP General donations import
..
WIP General donations import
Bug: T88836
Change-Id: Id6b5f2dd6b3ba8c61dca17cbfb20cb76e39f661b
---
R sites/all/modules/offline2civicrm/AbstractDonationsFile.php
M sites/all/modules/offline2civicrm/CoinbaseFile.php
M sites/all/modules/offline2civicrm/ForeignChecksFile.php
R sites/all/modules/offline2civicrm/GeneralChecksFile.php
M sites/all/modules/offline2civicrm/JpMorganFile.php
M sites/all/modules/offline2civicrm/PayPalChecksFile.php
6 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/27/201427/1
diff --git a/sites/all/modules/offline2civicrm/ChecksFile.php
b/sites/all/modules/offline2civicrm/AbstractDonationsFile.php
similarity index 97%
rename from sites/all/modules/offline2civicrm/ChecksFile.php
rename to sites/all/modules/offline2civicrm/AbstractDonationsFile.php
index 07231e6..535f788 100644
--- a/sites/all/modules/offline2civicrm/ChecksFile.php
+++ b/sites/all/modules/offline2civicrm/AbstractDonationsFile.php
@@ -3,7 +3,7 @@
/**
* CSV batch format for manually-keyed donation checks
*/
-abstract class ChecksFile {
+abstract class AbstractDonationsFile {
protected $numSkippedRows = 0;
/**
@@ -159,6 +159,12 @@
$msg['gateway'] = arizonalockbox;
break;
+case 'Engage':
+case 'Engage Direct Mail':
+$msg['contribution_type'] = 'Engage';
+$msg['gateway'] = 'engage';
+break;
+
case Cash:
$msg['contribution_type'] = cash;
break;
diff --git a/sites/all/modules/offline2civicrm/CoinbaseFile.php
b/sites/all/modules/offline2civicrm/CoinbaseFile.php
index 9dd0a9b..c81c88f 100644
--- a/sites/all/modules/offline2civicrm/CoinbaseFile.php
+++ b/sites/all/modules/offline2civicrm/CoinbaseFile.php
@@ -5,7 +5,7 @@
*
* See https://coinbase.com/reports
*/
-class CoinbaseFile extends ChecksFile {
+class CoinbaseFile extends AbstractDonationsFile {
protected $refundLastTransaction = false;
protected function getRequiredColumns() {
diff --git a/sites/all/modules/offline2civicrm/ForeignChecksFile.php
b/sites/all/modules/offline2civicrm/ForeignChecksFile.php
index e4e4658..9da7793 100644
--- a/sites/all/modules/offline2civicrm/ForeignChecksFile.php
+++ b/sites/all/modules/offline2civicrm/ForeignChecksFile.php
@@ -1,6 +1,6 @@
?php
-class ForeignChecksFile extends ChecksFile {
+class ForeignChecksFile extends AbstractDonationsFile {
protected function getRequiredColumns() {
return array(
'Check Number',
diff --git a/sites/all/modules/offline2civicrm/AzlChecksFile.php
b/sites/all/modules/offline2civicrm/GeneralChecksFile.php
similarity index 94%
rename from sites/all/modules/offline2civicrm/AzlChecksFile.php
rename to sites/all/modules/offline2civicrm/GeneralChecksFile.php
index ae93026..9dc6b6d 100644
--- a/sites/all/modules/offline2civicrm/AzlChecksFile.php
+++ b/sites/all/modules/offline2civicrm/GeneralChecksFile.php
@@ -1,6 +1,6 @@
?php
-class AzlChecksFile extends ChecksFile {
+class DonationsFile extends AbstractDonationsFile {
function getRequiredColumns() {
return array(
'Batch',
diff --git a/sites/all/modules/offline2civicrm/JpMorganFile.php
b/sites/all/modules/offline2civicrm/JpMorganFile.php
index c1802dd..9662be0 100644
--- a/sites/all/modules/offline2civicrm/JpMorganFile.php
+++ b/sites/all/modules/offline2civicrm/JpMorganFile.php
@@ -1,6 +1,6 @@
?php
-class JpMorganFile extends ChecksFile {
+class JpMorganFile extends AbstractDonationsFile {
protected function getRequiredColumns() {
return array(
'ACCOUNT NAME',
diff --git a/sites/all/modules/offline2civicrm/PayPalChecksFile.php
b/sites/all/modules/offline2civicrm/PayPalChecksFile.php
index 45fbfc2..1335359 100644
--- a/sites/all/modules/offline2civicrm/PayPalChecksFile.php
+++ b/sites/all/modules/offline2civicrm/PayPalChecksFile.php
@@ -1,6 +1,6 @@
?php
-class PayPalChecksFile extends ChecksFile {
+class PayPalChecksFile extends AbstractDonationsFile {
protected function getRequiredColumns() {
return array(
--
To view, visit https://gerrit.wikimedia.org/r/201427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6b5f2dd6b3ba8c61dca17cbfb20cb76e39f661b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] admin: add pcoombe to statistics-users - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/201430 Change subject: admin: add pcoombe to statistics-users .. admin: add pcoombe to statistics-users Bug: T94466 Change-Id: Ifc03132d0a892615913a08235ded5c5cdb448799 --- M modules/admin/data/data.yaml 1 file changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/30/201430/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 2af9371..8d23fc5 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -61,7 +61,8 @@ haithams, mhurd, dbrant, mglaser, kleduc, bsitzmann, deskana, jzerebecki, declerambaul, ellery, dduvall, nettrom, mforns, jkatz, bmansurov, west1, jhernandez, smalyshev, ananthrk, tbayer, zfilipin, - joal, thcipriani, daisy, ashwinpp, mvolz, jhobs, tomasz, lpintscher] + joal, thcipriani, daisy, ashwinpp, mvolz, jhobs, tomasz, lpintscher, + pcoombe] cassandra-test-roots: gid: 708 description: users with root on cassandra hosts @@ -176,7 +177,7 @@ qchris, tnegrin, marktraceur, msyed, nuria, leila, gilles, haithams, dbrant, tgr, haithams, handrade, dr0ptp4kt, brion, bsitzmann, deskana, jzerebecki, dduvall, nettrom, mforns, jkatz, ebernhardson, - mlitn, tbayer, ananthrk, joal, tomasz, kartik, nikerabbit] + mlitn, tbayer, ananthrk, joal, tomasz, kartik, nikerabbit, pcoombe] statistics-admins: posix_name: stats description: access files created by stats user cron jobs @@ -1384,4 +1385,10 @@ realname: Moritz Muehlenhoff ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDZnM4K3crGB7rmCfrDbUgivp+lUlOTBQfW++9igVSbV1b7RYzzWri/LDLkfi4cstEccGIV+4s/V9P7UoV++EWH6+qoUZk6pkSwZS5sqjN1DE41kskzuA07G0w1xot/Wf4JzBSJRvZrQ/9VLTe2/OUaFTnZYzoMT+1gRSkEEt7SaEFPIQ2Vh0Hc0Y3vORfYj4IG6gC7qA4vqb/LqvhpfFIj9MlgMIgTfv94sqnAlXyrWydsrVdUvqiB2pdAyfX1XKa5Ysa4abbE2pzduy/UfQmxMbEJUQDfU+N5WhFzyfsVdtv0ZEHcZFkCaJSnEM7UeDBz623FTqhrop3pUMNg5r1v Moritz Muehlenhoff production key] uid: 11984 - + pcoombe: +ensure: present +gid: 500 +name: pcoombe +realname: Peter Coombe +ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQCmw1FPftHdsd15oLtKOEcqgZY/pHPvkb1UJQT5vwIRdBvEPOMHB/KNNHpx6YcSSXLWjptiI4BwrotavvFCWtLKSKm8Qx2b76aDpW52i0zjcItQsf+SY+nYwYOtRFmHAiMthBc4FnFK+d+T9HCM1w03nsYhYKuYE2Z/p3u754VyClBI/QxBMCBeaq1bkj4OtUmLnHW1bifcsGVW8pvQIFVEIFXoPg/rZQHM6IiiorDI3VHbZxQI5fUcdQtdLF+IE8xiU+1dNUa1p+rGAkoMo3viwVZVOtK0qAaN/+nsKvBb/dZt/srkWwcnzvkPNIn8SJXiDFV7OIfd33dSqUm9UmtX pe...@peters-mbp.home] +uid: 3428 -- To view, visit https://gerrit.wikimedia.org/r/201430 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc03132d0a892615913a08235ded5c5cdb448799 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopt dumpwikidatajson.sh to the new naming pattern - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: Adopt dumpwikidatajson.sh to the new naming pattern
..
Adopt dumpwikidatajson.sh to the new naming pattern
Also some code style changes.
Bug: T72385
Change-Id: I5df824839e09c5237e22e1b8f4bea54aa6b9a255
---
M modules/snapshot/files/dumpwikidatajson.sh
1 file changed, 33 insertions(+), 9 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/files/dumpwikidatajson.sh
b/modules/snapshot/files/dumpwikidatajson.sh
index e83c963..0ca7ed8 100644
--- a/modules/snapshot/files/dumpwikidatajson.sh
+++ b/modules/snapshot/files/dumpwikidatajson.sh
@@ -1,19 +1,31 @@
#!/bin/bash
#
# Generate a json dump for Wikidata and remove old ones.
+# To be run weekly.
#
# @author Marius Hoch h...@online.de
-
configfile=/srv/dumps/confs/wikidump.conf
-apacheDir=`egrep ^dir= $configfile | mawk -Fdir= '{ print $2 }'`
-targetDir=`egrep ^public= $configfile | mawk -Fpublic= '{ print $2
}'`/other/wikidata
-tempDir=`egrep ^temp= $configfile | mawk -Ftemp= '{ print $2 }'`
+today=`date +'%Y%m%d'`
+apacheDir=`awk -Fdir= '/^dir=/ { print $2 }' $configfile`
+targetDirBase=`awk -Fpublic= '/^public=/ { print $2 }'
$configfile`/other/wikibase/wikidatawiki
+targetDir=$targetDirBase/$today
+legacyDirectory=`awk -Fpublic= '/^public=/ { print $2 }'
$configfile`/other/wikidata
+tempDir=`awk -Ftemp= '/^temp=/ { print $2 }' $configfile`
+daysToKeep=70
+
+if [ -z $targetDirBase ]; then
+ echo Empty \$targetDirBase
+ exit 1
+fi
+
+# Create the dir for the day: This may or may not already exist, we don't care
+mkdir -p $targetDir
multiversionscript=${apacheDir}/multiversion/MWScript.php
-filename=`date +'%Y%m%d'`
+filename=wikidata-$today-all
targetFile=$targetDir/$filename.json.gz
i=0
@@ -26,11 +38,10 @@
wait
-i=0
-
# Open the json list
echo '[' | gzip -f $targetFile
+i=0
while [ $i -lt $shards ]; do
cat $tempDir/wikidataJson.$i.gz $targetFile
rm $tempDir/wikidataJson.$i.gz
@@ -44,8 +55,21 @@
# Close the json list
echo -e '\n]' | gzip -f $targetFile
-# Remove dumps we no longer need (keep 10 = last 70 days)
-find $targetDir -name '20*.gz' -mtime +71 -delete
+# Remove dump-folders we no longer need (keep $daysToKeep days)
+cutOff=$(( `date +%s` - `expr $daysToKeep + 1` * 24 * 3600)) # Timestamp from
$daysToKeep + 1 days ago
+foldersToDelete=`ls -d -r $targetDirBase/*` # $targetDirBase is known to be
non-empty
+for folder in $foldersToDelete; do
+ # Try to get the unix time from the folder name, if this fails we'll
just
+ # keep the folder (as it's not a valid date, thus hasn't been created
by this script).
+ creationTime=$(date --utc --date=$(basename $folder) +%s 2/dev/null)
+ if [ -n $creationTime ] [ $cutOff -gt $creationTime ]; then
+ rm -rf $folder
+ fi
+done
+
+# Legacy directory (with legacy naming scheme)
+ln -s $targetFile $legacyDirectory/$today.json
+find $legacyDirectory -name '*.json.gz' -mtime +`expr $daysToKeep + 1` -delete
# Remove old logs (keep 5 = last 35 days)
find /var/log/wikidatadump/ -name 'dumpwikidatajson-*-*.log' -mtime +36 -delete
--
To view, visit https://gerrit.wikimedia.org/r/201238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5df824839e09c5237e22e1b8f4bea54aa6b9a255
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Smalyshev smalys...@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] Icons: Added hover state for sidebar icons - change (mediawiki...BlueSpiceSkin)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201433
Change subject: Icons: Added hover state for sidebar icons
..
Icons: Added hover state for sidebar icons
Little rewrite of the sidebar icon CSS using LESS functions. It now also
supports hover state for Icons
THIS CHANGE BELONGS TO https://gerrit.wikimedia.org/r/201432
Needs merge to REL1_23
Change-Id: I45415f0e42e190bc18a041e94ed9f7dbf416e945
---
M resources/components/skin.icons.less
M resources/images/desktop/bs-nav-icon-sprite.png
2 files changed, 54 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/33/201433/1
diff --git a/resources/components/skin.icons.less
b/resources/components/skin.icons.less
index 0df56c1..0d105f0 100644
--- a/resources/components/skin.icons.less
+++ b/resources/components/skin.icons.less
@@ -18,47 +18,78 @@
color: @bs-color-primary;
}
+.icon24 {
+ display: inline-block;
+ height: 24px;
+ width: 24px;
+ margin-right: 4px;
+}
+
+.icon-mixin() {
+ a .icon24 {
+ background-position: 0 @bg-pos-top;
+ }
+ a:hover .icon24 {
+ background-position: -24px @bg-pos-top;
+ }
+}
+
#bs-nav-sections {
- #p-help, #p-navigation {
- li a {
- display: table-cell;
- vertical-align: middle;
- height: 24px;
- padding-left: 32px;
- box-sizing: border-box;
+ .bs-nav-links {
+ .icon24 {
/*@embed*/
background-image:
url(@{bs-skin-path}images/desktop/bs-nav-icon-sprite.png);
- background-repeat: no-repeat;
- background-position: 0 -144px;
+ display: block;
+ float: left;
+ }
+ li a {
+ display: block;
+ min-height: 24px;
+ }
+
+ @bg-pos-top: -144px;
+ li {
+ .icon-mixin();
+ }
+
+ .bs-nav-item-text {
+ line-height: 22px; /* Has to be lower than icon height.
Otherwise the text may break ugly */
}
}
- li#n-mainpage a {
- background-position: 0 -72px;
+ li#n-mainpage {
+ @bg-pos-top: -72px;
+ .icon-mixin();
}
- li#n-special-allpages a {
- background-position: 0 -24px;
+ li#n-special-allpages {
+ @bg-pos-top: -24px;
+ .icon-mixin();
}
- li#n-special-categories a {
- background-position: 0 0;
+ li#n-special-categories {
+ @bg-pos-top: 0;
+ .icon-mixin();
}
- li#n-special-recentchanges a {
- background-position: 0 -120px;
+ li#n-special-recentchanges {
+ @bg-pos-top: -120px;
+ .icon-mixin();
}
- li#n-external-manuals a {
- background-position: 0 -48px;
+ li#n-external-manuals {
+ @bg-pos-top: -48px;
+ .icon-mixin();
}
- li#n-external-support a {
- background-position: 0 -168px;
+ li#n-external-support {
+ @bg-pos-top: -168px;
+ .icon-mixin();
}
- li#n-external-contact a {
- background-position: 0 -96px;
+ li#n-external-contact {
+ @bg-pos-top: -96px;
+ .icon-mixin();
}
#bs-nav-tabs a{
font-size: 210%;
diff --git a/resources/images/desktop/bs-nav-icon-sprite.png
b/resources/images/desktop/bs-nav-icon-sprite.png
index ed7353a..ee93c31 100644
--- a/resources/images/desktop/bs-nav-icon-sprite.png
+++ b/resources/images/desktop/bs-nav-icon-sprite.png
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/201433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45415f0e42e190bc18a041e94ed9f7dbf416e945
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up to Icf644ad34: Introduce ProfilerOutputStats - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Follow-up to Icf644ad34: Introduce ProfilerOutputStats .. Follow-up to Icf644ad34: Introduce ProfilerOutputStats Change-Id: Ib3585303b75899c4cd7c9c88fb3473b441e52c23 --- M includes/profiler/Profiler.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php index 0718875..924bb03 100644 --- a/includes/profiler/Profiler.php +++ b/includes/profiler/Profiler.php @@ -49,7 +49,7 @@ 'text' = 'ProfilerOutputText', 'udp' = 'ProfilerOutputUdp', 'dump' = 'ProfilerOutputDump', - 'context' = 'ProfilerOutputStats', + 'stats' = 'ProfilerOutputStats', ); /** @var Profiler */ -- To view, visit https://gerrit.wikimedia.org/r/201413 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib3585303b75899c4cd7c9c88fb3473b441e52c23 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org 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] Revert Revert Drain esams of all traffic v2 (scheduled out... - change (operations/dns)
BBlack has submitted this change and it was merged. Change subject: Revert Revert Drain esams of all traffic v2 (scheduled outage) .. Revert Revert Drain esams of all traffic v2 (scheduled outage) This reverts commit da11f050c80a0b9895dfb643fd973185788eb2d6. Change-Id: Ic6980e9bfc282678a227d65c6d7cf2d8d75b30e5 --- M admin_state 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/admin_state b/admin_state index 6ce67fb..5393605 100644 --- a/admin_state +++ b/admin_state @@ -69,3 +69,5 @@ # geoip/bits-*/ulsfo = UP # ... this overrides the line above completely # ## + +geoip/generic-map/esams = DOWN -- To view, visit https://gerrit.wikimedia.org/r/201420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6980e9bfc282678a227d65c6d7cf2d8d75b30e5 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Revert Drain esams of all traffic v2 (scheduled out... - change (operations/dns)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/201420 Change subject: Revert Revert Drain esams of all traffic v2 (scheduled outage) .. Revert Revert Drain esams of all traffic v2 (scheduled outage) This reverts commit da11f050c80a0b9895dfb643fd973185788eb2d6. Change-Id: Ic6980e9bfc282678a227d65c6d7cf2d8d75b30e5 --- M admin_state 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/20/201420/1 diff --git a/admin_state b/admin_state index 6ce67fb..5393605 100644 --- a/admin_state +++ b/admin_state @@ -69,3 +69,5 @@ # geoip/bits-*/ulsfo = UP # ... this overrides the line above completely # ## + +geoip/generic-map/esams = DOWN -- To view, visit https://gerrit.wikimedia.org/r/201420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6980e9bfc282678a227d65c6d7cf2d8d75b30e5 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added comment to viewxls message - change (mediawiki...Cargo)
AdSvS has uploaded a new change for review. https://gerrit.wikimedia.org/r/201423 Change subject: Added comment to viewxls message .. Added comment to viewxls message Change-Id: I8df361552a2570699d332079da42e322d71513a3 --- M i18n/qqq.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/23/201423/1 diff --git a/i18n/qqq.json b/i18n/qqq.json index 089969a..d6a5c42 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -40,6 +40,7 @@ cargo-drilldown-novalues: This is an informational message on [[Special:Drildown]]., cargo-drilldown-toomanyvalues: This is an informational message on [[Special:Drildown]]., cargo-viewcsv: The text of a link., + cargo-viewxls: The text of a link., cargo-viewjson: The text of a link., cargo-purgecache: The name of a tab; the \cache\ is the MediaWiki page cache., specialpages-group-cargo: Used for name of Special Page group -- To view, visit https://gerrit.wikimedia.org/r/201423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8df361552a2570699d332079da42e322d71513a3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: AdSvS a...@wikibase.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Message: Clean up unit tests and improve test coverage - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201422
Change subject: Message: Clean up unit tests and improve test coverage
..
Message: Clean up unit tests and improve test coverage
* Remove unnecessary use of ReflectionClass. It was testing
internal properties that aren't part of the API. Using the
getters instead.
* Remove need for func_get_args that was making the test more
complex and the data provider hard to read. Simply maintain
it as array of expected params and array of variadic arguments.
* Rename tests to more closely match tested methods.
* Rename data providers to provide*, and make them static.
* Reorder tests to more closely match logical order of the class.
* Improve test coverage from 31% to 67% line coverage.
Also:
* Remove testParams (dupes testConstructorParams).
* Add tests for RawMessage class.
* Add tests for transformation and parsing.
* Add tests for wfMessage().
* Add tests for Message::newFrom*.
* Add tests for $* replacement.
* Add tests for __toString.
Change-Id: I2b183a66f9e9f51bd800088e174b1ae4d3284d8d
---
M includes/Message.php
M tests/phpunit/includes/MessageTest.php
2 files changed, 244 insertions(+), 116 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/22/201422/1
diff --git a/includes/Message.php b/includes/Message.php
index 49437f4..134af0e 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -249,7 +249,7 @@
$this-key = reset( $this-keysToTry );
$this-parameters = array_values( $params );
- $this-language = $language ? $language : $wgLang;
+ $this-language = $language ?: $wgLang;
}
/**
diff --git a/tests/phpunit/includes/MessageTest.php
b/tests/phpunit/includes/MessageTest.php
index 4c5424c..3b9e3cc 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -16,22 +16,11 @@
* @dataProvider provideConstructor
*/
public function testConstructor( $expectedLang, $key, $params,
$language ) {
- $reflection = new ReflectionClass( 'Message' );
-
- $keyProperty = $reflection-getProperty( 'key' );
- $keyProperty-setAccessible( true );
-
- $paramsProperty = $reflection-getProperty( 'parameters' );
- $paramsProperty-setAccessible( true );
-
- $langProperty = $reflection-getProperty( 'language' );
- $langProperty-setAccessible( true );
-
$message = new Message( $key, $params, $language );
- $this-assertEquals( $key, $keyProperty-getValue( $message ) );
- $this-assertEquals( $params, $paramsProperty-getValue(
$message ) );
- $this-assertEquals( $expectedLang, $langProperty-getValue(
$message ) );
+ $this-assertEquals( $key, $message-getKey() );
+ $this-assertEquals( $params, $message-getParams() );
+ $this-assertEquals( $expectedLang, $message-getLanguage() );
}
public static function provideConstructor() {
@@ -45,21 +34,62 @@
);
}
- public static function provideTestParams() {
+ public static function provideConstructorParams() {
return array(
- array( array() ),
- array( array( 'foo' ), 'foo' ),
- array( array( 'foo', 'bar' ), 'foo', 'bar' ),
- array( array( 'baz' ), array( 'baz' ) ),
- array( array( 'baz', 'foo' ), array( 'baz', 'foo' ) ),
- array( array( 'baz', 'foo' ), array( 'baz', 'foo' ),
'hhh' ),
- array( array( 'baz', 'foo' ), array( 'baz', 'foo' ),
'hhh', array( 'ahahahahha' ) ),
- array( array( 'baz', 'foo' ), array( 'baz', 'foo' ),
array( 'ahahahahha' ) ),
- array( array( 'baz' ), array( 'baz' ), array(
'ahahahahha' ) ),
+ array(
+ array(),
+ array(),
+ ),
+ array(
+ array( 'foo' ),
+ array( 'foo' ),
+ ),
+ array(
+ array( 'foo', 'bar' ),
+ array( 'foo', 'bar' ),
+ ),
+ array(
+ array( 'baz' ),
+ array( array( 'baz' ) ),
+ ),
+ array(
+ array( 'baz', 'foo' ),
+ array( array( 'baz', 'foo' ) ),
+ ),
+ array(
+ array( 'baz', 'foo'
[MediaWiki-commits] [Gerrit] Replace deprecated Property::newEmpty - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201428
Change subject: Replace deprecated Property::newEmpty
..
Replace deprecated Property::newEmpty
Change-Id: Ic7abc8e4c351c7b5182ad9984b08249822d722b2
---
M repo/includes/content/PropertyHandler.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/28/201428/1
diff --git a/repo/includes/content/PropertyHandler.php
b/repo/includes/content/PropertyHandler.php
index bcf730e..e363913 100644
--- a/repo/includes/content/PropertyHandler.php
+++ b/repo/includes/content/PropertyHandler.php
@@ -199,7 +199,7 @@
* @return EntityContent
*/
public function makeEmptyEntity() {
- return Property::newEmpty();
+ return new Property( null, null, '' );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/201428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7abc8e4c351c7b5182ad9984b08249822d722b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only display upload size limit differentiation message if th... - change (mediawiki/core)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201434
Change subject: Only display upload size limit differentiation message if there
are 2 upload methods
..
Only display upload size limit differentiation message if there are 2 upload
methods
Bug: T94727
Change-Id: I23c5a5c5e7a30484c242005db831eec5c8c1f4a7
---
M includes/specials/SpecialUpload.php
1 file changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/34/201434/1
diff --git a/includes/specials/SpecialUpload.php
b/includes/specials/SpecialUpload.php
index 72d02e0..6f9254b 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -885,6 +885,17 @@
);
}
+ $help = $this-msg( 'upload-maxfilesize',
+ $this-getContext()-getLanguage()-formatSize(
$this-mMaxUploadSize['file'] )
+ )-parse();
+
+ // If the user can also upload by URL, there are 2 different
file size limits.
+ // This extra message helps stress which limit corresponds to
what.
+ if ( $canUploadByUrl ) {
+ $help .= $this-msg( 'word-separator' )-escaped();
+ $help .= $this-msg( 'upload_source_file' )-parse();
+ }
+
$descriptor['UploadFile'] = array(
'class' = 'UploadSourceField',
'section' = 'source',
@@ -894,11 +905,7 @@
'label-message' = 'sourcefilename',
'upload-type' = 'File',
'radio' = $radio,
- 'help' = $this-msg( 'upload-maxfilesize',
- $this-getContext()-getLanguage()-formatSize(
$this-mMaxUploadSize['file'] )
- )-parse() .
- $this-msg( 'word-separator' )-escaped() .
- $this-msg( 'upload_source_file' )-escaped(),
+ 'help' = $help,
'checked' = $selectedSourceType == 'file',
);
--
To view, visit https://gerrit.wikimedia.org/r/201434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23c5a5c5e7a30484c242005db831eec5c8c1f4a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Improve script documentation - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Improve script documentation .. Improve script documentation Change-Id: If64b3a676cc88041fe79217ac31d50c62f0d9c81 --- M scripts/create_categories.py 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/create_categories.py b/scripts/create_categories.py index 90f2536..b3d0f59 100755 --- a/scripts/create_categories.py +++ b/scripts/create_categories.py @@ -2,8 +2,8 @@ Program to batch create categories. -The program expects a generator containing a list of page titles to be used as -base. +The program expects a generator of page titles to be used as +suffix for creating new categories with a different base. The following command line parameters are supported: @@ -23,6 +23,10 @@ -parent:Cultural heritage monuments in Wallonia -basename:Cultural heritage monuments in +The page 'User:Multichill/Wallonia' on commons contains +page links like [[Category:Hensies]], causing this script +to create [[Category:Cultural heritage monuments in Hensies]]. + __version__ = '$Id$' # -- To view, visit https://gerrit.wikimedia.org/r/201408 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If64b3a676cc88041fe79217ac31d50c62f0d9c81 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.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] Improve automatic adding of reference list - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Improve automatic adding of reference list
..
Improve automatic adding of reference list
* Handle the case of multiple reference lists in the page.
For example, Notes and References
Example: en:Hydrogen
* The reference list itself may not be the CX translation section
if wrapped inside a section tag like divs
Example: en:Emily_Warren_Roebling has reference list as section
while en:Hydrogen has it wrapped
Bug: T94139
Change-Id: I807ba3510a76b7c186a1738f0b78d3cdd8eaa7e2
---
M modules/tools/ext.cx.tools.reference.js
1 file changed, 20 insertions(+), 6 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.reference.js
b/modules/tools/ext.cx.tools.reference.js
index 13b34fc..3360de5 100644
--- a/modules/tools/ext.cx.tools.reference.js
+++ b/modules/tools/ext.cx.tools.reference.js
@@ -109,18 +109,32 @@
};
/**
-* Add the reference list, usually at the end of translation
+* Add the reference list(s), usually at the end of translation
*/
ReferenceCard.prototype.addReferenceList = function () {
- var $referenceList;
+ var $referenceLists, $parentSection;
- $referenceList = $( '[typeof*=mw:Extension/references]' );
+ // There can be multiple reference lists grouped for notes and
references
+ // For example see enwiki:Hydrogen
+ $referenceLists = $( '[typeof*=mw:Extension/references]' );
- if ( $referenceList.length === 1 ) {
- // Only one reference list - means the target reference
list not added yet.
- mw.hook( 'mw.cx.translation.add' ).fire(
$referenceList.parent().attr( 'id' ), 'click' );
+ if ( !$( '.cx-column--translation
[typeof*=mw:Extension/references]' ).length ) {
+ // Target reference list not added yet.
+ $referenceLists.each( function ( key, referenceList ) {
+ var $referenceList = $( referenceList );
+
+ if ( $referenceList.parent().is(
'.cx-column__content' ) ) {
+ // Reference list is the section,
+ $parentSection = $referenceList;
+ } else {
+ // Reference list not the section, it
is wrapped inside.
+ $parentSection =
$referenceList.parent();
+ }
+ mw.hook( 'mw.cx.translation.add' ).fire(
$parentSection.attr( 'id' ), 'click' );
+ } );
}
};
+
/**
* Start presenting the reference card
* @param {string} referenceId The reference element Identifier.
--
To view, visit https://gerrit.wikimedia.org/r/201105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I807ba3510a76b7c186a1738f0b78d3cdd8eaa7e2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1027 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/201426 Change subject: repool db1027 .. repool db1027 Change-Id: I9f7efe86e0c578332eb6e8a7e6640feeb93e --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/26/201426/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 3dbcf22..d6e69e8 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -108,9 +108,9 @@ ), /* s3 */ 'DEFAULT' = array( 'db1038' = 0, # 1.4TB 64GB - 'db1019' = 50, # 1.4TB 64GB, vslow, dump - 'db1015' = 50, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager - # clone db1035 'db1027' = 400, # 1.4TB 64GB + 'db1019' = 0, # 1.4TB 64GB, vslow, dump + 'db1015' = 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager + 'db1027' = 400, # 1.4TB 64GB # upgrade 'db1035' = 400, # 1.4TB 64GB 'db1044' = 400, # 1.4TB 64GB ), -- To view, visit https://gerrit.wikimedia.org/r/201426 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f7efe86e0c578332eb6e8a7e6640feeb93e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1027 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: repool db1027 .. repool db1027 Change-Id: I9f7efe86e0c578332eb6e8a7e6640feeb93e --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 3dbcf22..d6e69e8 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -108,9 +108,9 @@ ), /* s3 */ 'DEFAULT' = array( 'db1038' = 0, # 1.4TB 64GB - 'db1019' = 50, # 1.4TB 64GB, vslow, dump - 'db1015' = 50, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager - # clone db1035 'db1027' = 400, # 1.4TB 64GB + 'db1019' = 0, # 1.4TB 64GB, vslow, dump + 'db1015' = 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager + 'db1027' = 400, # 1.4TB 64GB # upgrade 'db1035' = 400, # 1.4TB 64GB 'db1044' = 400, # 1.4TB 64GB ), -- To view, visit https://gerrit.wikimedia.org/r/201426 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9f7efe86e0c578332eb6e8a7e6640feeb93e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@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] Revert Drain esams of all traffic v2 (scheduled outage) - change (operations/dns)
BBlack has submitted this change and it was merged. Change subject: Revert Drain esams of all traffic v2 (scheduled outage) .. Revert Drain esams of all traffic v2 (scheduled outage) This reverts commit a59a7ca0e351b1f8de2ba126dbcc5da1f37afc54. Change-Id: If6aea771df34da9cac5c8cad130b4ac2bd748d53 --- M admin_state 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/admin_state b/admin_state index 5393605..6ce67fb 100644 --- a/admin_state +++ b/admin_state @@ -69,5 +69,3 @@ # geoip/bits-*/ulsfo = UP # ... this overrides the line above completely # ## - -geoip/generic-map/esams = DOWN -- To view, visit https://gerrit.wikimedia.org/r/201418 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If6aea771df34da9cac5c8cad130b4ac2bd748d53 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@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] Revert Drain esams of all traffic v2 (scheduled outage) - change (operations/dns)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/201418 Change subject: Revert Drain esams of all traffic v2 (scheduled outage) .. Revert Drain esams of all traffic v2 (scheduled outage) This reverts commit a59a7ca0e351b1f8de2ba126dbcc5da1f37afc54. Change-Id: If6aea771df34da9cac5c8cad130b4ac2bd748d53 --- M admin_state 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/18/201418/1 diff --git a/admin_state b/admin_state index 5393605..6ce67fb 100644 --- a/admin_state +++ b/admin_state @@ -69,5 +69,3 @@ # geoip/bits-*/ulsfo = UP # ... this overrides the line above completely # ## - -geoip/generic-map/esams = DOWN -- To view, visit https://gerrit.wikimedia.org/r/201418 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If6aea771df34da9cac5c8cad130b4ac2bd748d53 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] webservice2: EAFP, not LBYL - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/201421 Change subject: webservice2: EAFP, not LBYL .. webservice2: EAFP, not LBYL https://docs.python.org/2/glossary.html#term-lbyl https://docs.python.org/2/glossary.html#term-eafp Change-Id: I6a2d0549326129aa048bcc6620eacb231a4c47ee --- M modules/toollabs/files/webservice2 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/201421/1 diff --git a/modules/toollabs/files/webservice2 b/modules/toollabs/files/webservice2 index a705739..810a22e 100644 --- a/modules/toollabs/files/webservice2 +++ b/modules/toollabs/files/webservice2 @@ -6,6 +6,7 @@ import time import subprocess import argparse +import errno import xml.etree.ElementTree as ET @@ -29,10 +30,13 @@ :param default: Value to return if the file does not exist :return: String containing either contents of the file, or default value -if os.path.exists(path): +try: with open(path) as f: return f.read() -return default +except IOError as e: +if e.errno == errno.ENOENT: +return default +raise def start_web_job(server, release): -- To view, visit https://gerrit.wikimedia.org/r/201421 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a2d0549326129aa048bcc6620eacb231a4c47ee Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove obsolete '{name}-{ext-name}-phpcs-HEAD' template - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove obsolete '{name}-{ext-name}-phpcs-HEAD' template
..
Remove obsolete '{name}-{ext-name}-phpcs-HEAD' template
Use '{name}-phpcs-HEAD' instead.
As side-effect, synchronises the out of date implementation:
* No submodules.
* Enable checkstyle publisher.
Change-Id: I40140c5ab6fa585a1447a37138035735094e9052
---
M jjb/mediawiki-extensions.yaml
1 file changed, 22 insertions(+), 37 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 9feb225..1da75d4 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -55,20 +55,6 @@
- mw-teardown
- archive-log-dir
-# Deprecated, extensions should be converted
-# to use a composer entry point instead
-- job-template:
-name: '{name}-{ext-name}-phpcs-HEAD'
-node: hasSlaveScripts UbuntuPrecise
-defaults: use-remote-zuul
-concurrent: true
-triggers:
- - zuul
-builders:
- - phpcs-HEAD
-publishers:
- - phpcs
-
- builder:
name: 'zuul-cloner-extdeps'
builders:
@@ -,32 +1097,31 @@
ext-name: WikibaseJavaScriptApi
-# Deprecated, legacy, phpcs-HEAD jobs.
-# Should be replaced with a composer test
-# entry point.
+
+# Deprecated, extensions should be converted
+# to use a composer entry point instead.
- project:
name: legacy-phpcs-HEAD
jobs:
- - '{name}-{ext-name}-phpcs-HEAD':
-name: mwext
-ext-name:
- - cldr
- - Interwiki
- - Mantle
- - AutomaticBoardWelcome
- - JSBreadCrumbs
- - OnlineStatus
- - WhitelistPages
- - Sentry
- - SyntaxHighlight_GeSHi
- - Translate
- - TranslationNotifications
- - TwnMainPage
- - UniversalLanguageSelector
- - UploadWizard
- - Vector
- - WebFonts
- - WikiGrok
+ - '{name}-phpcs-HEAD':
+name:
+ - mwext-cldr
+ - mwext-Interwiki
+ - mwext-Mantle
+ - mwext-AutomaticBoardWelcome
+ - mwext-JSBreadCrumbs
+ - mwext-OnlineStatus
+ - mwext-WhitelistPages
+ - mwext-Sentry
+ - mwext-SyntaxHighlight_GeSHi
+ - mwext-Translate
+ - mwext-TranslationNotifications
+ - mwext-TwnMainPage
+ - mwext-UniversalLanguageSelector
+ - mwext-UploadWizard
+ - mwext-Vector
+ - mwext-WebFonts
+ - mwext-WikiGrok
- project:
name: 'mwext-BlameMaps'
--
To view, visit https://gerrit.wikimedia.org/r/201414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40140c5ab6fa585a1447a37138035735094e9052
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@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] User: Add unit tests for getId, isAnon and isLoggedIn - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: User: Add unit tests for getId, isAnon and isLoggedIn
..
User: Add unit tests for getId, isAnon and isLoggedIn
Change-Id: Ie007d9da47df871f99ca19c4d7364f46f71c255b
---
M tests/phpunit/includes/UserTest.php
1 file changed, 28 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/UserTest.php
b/tests/phpunit/includes/UserTest.php
index 73e5051..b74a7ea 100644
--- a/tests/phpunit/includes/UserTest.php
+++ b/tests/phpunit/includes/UserTest.php
@@ -397,4 +397,32 @@
$sixth = User::newFromName( 'EqualUnitTestUser' );
$this-assertTrue( $fifth-equals( $sixth ) );
}
+
+ /**
+* @covers User::getId
+*/
+ public function testGetId() {
+ $user = User::newFromName( 'UTSysop' );
+ $this-assertTrue( $user-getId() 0 );
+
+ }
+
+ /**
+* @covers User::isLoggedIn
+* @covers User::isAnon
+*/
+ public function testLoggedIn() {
+ $user = User::newFromName( 'UTSysop' );
+ $this-assertTrue( $user-isLoggedIn() );
+ $this-assertFalse( $user-isAnon() );
+
+ // Non-existent users are perceived as anonymous
+ $user = User::newFromName( 'UTNonexistent' );
+ $this-assertFalse( $user-isLoggedIn() );
+ $this-assertTrue( $user-isAnon() );
+
+ $user = new User;
+ $this-assertFalse( $user-isLoggedIn() );
+ $this-assertTrue( $user-isAnon() );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/201406
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie007d9da47df871f99ca19c4d7364f46f71c255b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@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 $wgPopupsSurveyLink if $wmgUsePopups is true - change (operations/mediawiki-config)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201419
Change subject: Add $wgPopupsSurveyLink if $wmgUsePopups is true
..
Add $wgPopupsSurveyLink if $wmgUsePopups is true
Follows up I24bfd5fd622d1afc4372dbd4bfca3879927b0c17
Bug: T1005
Change-Id: Ic445732197e6abeba459b40b1416d8a71bc23bd6
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/19/201419/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 149b5ef..702a727 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1959,6 +1959,7 @@
if ( $wmgUsePopups ) {
require_once( $IP/extensions/Popups/Popups.php );
+ $wgPopupsSurveyLink =
'https://wikimedia.qualtrics.com/SE/?SID=SV_d1irF0VbOxZREvr';
}
if ( $wmgUseVectorBeta ) {
--
To view, visit https://gerrit.wikimedia.org/r/201419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic445732197e6abeba459b40b1416d8a71bc23bd6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix CACHE_TIME* constants, and a few cleanups (v1.6.1) - change (mediawiki...PhpTagsWiki)
JoelKP has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201425
Change subject: Fix CACHE_TIME* constants, and a few cleanups (v1.6.1)
..
Fix CACHE_TIME* constants, and a few cleanups (v1.6.1)
Changes:
* cacheTime - CACHE_TIME and
cacheTimeString - CACHE_TIME_STRING in PhpTagsWiki.json, to
match constant definitions in WikiWCache.php.
* Correct reference to q_CACHE_TIME_STRING() in WikiWCache.php.
* s_AddCategory - s_addCategory in WikiWPage.php, just to make it
look nicer.
* Remove the deprecated static properties which were not listed in
PhpTagsWiki.json.
* Improve a few descriptions in PhpTagsWiki.json.
Change-Id: Ie910a493665d8f24ed1072d83a24a127f7dab58e
---
M PhpTagsWiki.json
M PhpTagsWiki.php
M includes/WikiWCache.php
M includes/WikiWPage.php
M includes/WikiWStats.php
5 files changed, 11 insertions(+), 77 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTagsWiki
refs/changes/25/201425/1
diff --git a/PhpTagsWiki.json b/PhpTagsWiki.json
index 2776e54..e640c6c 100644
--- a/PhpTagsWiki.json
+++ b/PhpTagsWiki.json
@@ -56,15 +56,13 @@
}
},
CONSTANTS: {
- cacheTime: {
+ CACHE_TIME: {
type: DateTime,
desc: Time when current page was
generated,
- readonly: 1
},
- cacheTimeString: {
+ CACHE_TIME_STRING: {
type: string,
desc: Time when current page was
generated,
- readonly: 1
}
}
},
@@ -137,7 +135,7 @@
},
DEFAULT_SORT_KEY: {
type: string,
- desc: Depricated, pliase use
defaultSortKey static property!!!
+ desc: Deprecated, please use
defaultSortKey static property!!!
}
},
CONSTANTS: {
@@ -276,7 +274,7 @@
},
isMainPage: {
type: bool,
- desc: Is this the mainpage?,
+ desc: Is this the main page?,
readonly: 1
}
},
@@ -344,7 +342,7 @@
},
IS_MAIN_PAGE: {
type: bool,
- desc: Is current the mainpage?
+ desc: Is current page the main page?
}
}
}
diff --git a/PhpTagsWiki.php b/PhpTagsWiki.php
index 7a155a4..cde8bbd 100644
--- a/PhpTagsWiki.php
+++ b/PhpTagsWiki.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-define( 'PHPTAGS_WIKI_VERSION' , '1.6.0' );
+define( 'PHPTAGS_WIKI_VERSION' , '1.6.1' );
// Register this extension on Special:Version
$wgExtensionCredits['phptags'][] = array(
@@ -25,6 +25,7 @@
'url' =
'https://www.mediawiki.org/wiki/Extension:PhpTags_Wiki',
'author'=
'[https://www.mediawiki.org/wiki/User:Pastakhov Pavel Astakhov]',
'descriptionmsg'= 'phptagswiki-desc'
+ 'license-name' = 'GPL-2.0+'
);
// Allow translations for this extension
diff --git a/includes/WikiWCache.php b/includes/WikiWCache.php
index b9cc864..d132298 100644
--- a/includes/WikiWCache.php
+++ b/includes/WikiWCache.php
@@ -46,7 +46,7 @@
public static function c_CACHE_TIME() {
return \PhpTags\Hooks::getObjectWithValue(
'DateTime',
- new \DateTime( self::q_CACHE_TIME_STRING() )
+ new \DateTime( self::c_CACHE_TIME_STRING() )
);
}
diff --git a/includes/WikiWPage.php b/includes/WikiWPage.php
index 4cfb57a..ed662be 100644
--- a/includes/WikiWPage.php
+++ b/includes/WikiWPage.php
@@ -49,7 +49,7 @@
\PhpTags\Runtime::$parser-setDefaultSort( $value );
}
- public static function s_AddCategory( $category, $sortkey = '' ) {
+ public static function s_addCategory( $category, $sortkey = '' ) {
if ( is_array( $category ) ) {
[MediaWiki-commits] [Gerrit] Fix CACHE_TIME* constants, and a few cleanups (v1.6.1) - change (mediawiki...PhpTagsWiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix CACHE_TIME* constants, and a few cleanups (v1.6.1)
..
Fix CACHE_TIME* constants, and a few cleanups (v1.6.1)
Changes:
* cacheTime - CACHE_TIME and
cacheTimeString - CACHE_TIME_STRING in PhpTagsWiki.json, to
match constant definitions in WikiWCache.php.
* Correct reference to q_CACHE_TIME_STRING() in WikiWCache.php.
* s_AddCategory - s_addCategory in WikiWPage.php, just to make it
look nicer.
* Remove the deprecated static properties which were not listed in
PhpTagsWiki.json.
* Improve a few descriptions in PhpTagsWiki.json.
Change-Id: Ie910a493665d8f24ed1072d83a24a127f7dab58e
---
M PhpTagsWiki.json
M PhpTagsWiki.php
M includes/WikiWCache.php
M includes/WikiWPage.php
M includes/WikiWStats.php
5 files changed, 15 insertions(+), 81 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PhpTagsWiki.json b/PhpTagsWiki.json
index 2776e54..6aeed29 100644
--- a/PhpTagsWiki.json
+++ b/PhpTagsWiki.json
@@ -56,15 +56,13 @@
}
},
CONSTANTS: {
- cacheTime: {
+ CACHE_TIME: {
type: DateTime,
- desc: Time when current page was
generated,
- readonly: 1
+ desc: Time when current page was
generated
},
- cacheTimeString: {
+ CACHE_TIME_STRING: {
type: string,
- desc: Time when current page was
generated,
- readonly: 1
+ desc: Time when current page was
generated
}
}
},
@@ -137,7 +135,7 @@
},
DEFAULT_SORT_KEY: {
type: string,
- desc: Depricated, pliase use
defaultSortKey static property!!!
+ desc: Deprecated, please use
defaultSortKey static property!!!
}
},
CONSTANTS: {
@@ -276,7 +274,7 @@
},
isMainPage: {
type: bool,
- desc: Is this the mainpage?,
+ desc: Is this the main page?,
readonly: 1
}
},
@@ -344,7 +342,7 @@
},
IS_MAIN_PAGE: {
type: bool,
- desc: Is current the mainpage?
+ desc: Is current page the main page?
}
}
}
diff --git a/PhpTagsWiki.php b/PhpTagsWiki.php
index 7a155a4..11def50 100644
--- a/PhpTagsWiki.php
+++ b/PhpTagsWiki.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-define( 'PHPTAGS_WIKI_VERSION' , '1.6.0' );
+define( 'PHPTAGS_WIKI_VERSION' , '1.6.1' );
// Register this extension on Special:Version
$wgExtensionCredits['phptags'][] = array(
@@ -24,7 +24,8 @@
'version' = PHPTAGS_WIKI_VERSION,
'url' =
'https://www.mediawiki.org/wiki/Extension:PhpTags_Wiki',
'author'=
'[https://www.mediawiki.org/wiki/User:Pastakhov Pavel Astakhov]',
- 'descriptionmsg'= 'phptagswiki-desc'
+ 'descriptionmsg'= 'phptagswiki-desc',
+ 'license-name' = 'GPL-2.0+',
);
// Allow translations for this extension
diff --git a/includes/WikiWCache.php b/includes/WikiWCache.php
index b9cc864..d132298 100644
--- a/includes/WikiWCache.php
+++ b/includes/WikiWCache.php
@@ -46,7 +46,7 @@
public static function c_CACHE_TIME() {
return \PhpTags\Hooks::getObjectWithValue(
'DateTime',
- new \DateTime( self::q_CACHE_TIME_STRING() )
+ new \DateTime( self::c_CACHE_TIME_STRING() )
);
}
diff --git a/includes/WikiWPage.php b/includes/WikiWPage.php
index 4cfb57a..7d329ec 100644
--- a/includes/WikiWPage.php
+++ b/includes/WikiWPage.php
@@ -49,11 +49,11 @@
\PhpTags\Runtime::$parser-setDefaultSort(
[MediaWiki-commits] [Gerrit] Notify Collaboration team of failing browser tests - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Notify Collaboration team of failing browser tests .. Notify Collaboration team of failing browser tests This is part of the work to have developers take care of the browser test jobs. By notifying people writing code, we should get the failures taken care of. Bug: T94152 Bug: T94153 Change-Id: Ie682a7aebbed7252ef485d6d1c113d5ec72c9652 --- M jjb/browsertests.yaml 1 file changed, 7 insertions(+), 4 deletions(-) Approvals: Hashar: Looks good to me, approved Zfilipin: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml index df64103..669b4f6 100644 --- a/jjb/browsertests.yaml +++ b/jjb/browsertests.yaml @@ -5,6 +5,9 @@ - CirrusSearch: emails-CirrusSearch never...@wikimedia.org qa-ale...@lists.wikimedia.org + - Collaboration: emails-collaboration +qa-ale...@lists.wikimedia.org ebernhard...@wikimedia.org mflasc...@wikimedia.org mmul...@wikimedia.org + - Growth: emails-growth mflasc...@wikimedia.org qa-ale...@lists.wikimedia.org rm...@wikimedia.org samsm...@wikimedia.org @@ -144,7 +147,7 @@ folder: tests headless: 'false' platform: linux -recipients: *emails-qa +recipients: *emails-collaboration repository: mediawiki/extensions/Echo jobs: @@ -165,7 +168,7 @@ folder: tests headless: 'false' platform: linux -recipients: *emails-qa +recipients: *emails-collaboration repository: mediawiki/extensions/Flow jobs: @@ -334,7 +337,7 @@ mediawiki_credentials_id: Selenium_user-at-beta.wmflabs.org mediawiki_url: en.wikipedia.beta.wmflabs.org platform: linux -recipients: *emails-qa +recipients: *emails-collaboration repository: mediawiki/extensions/PageTriage jobs: @@ -490,7 +493,7 @@ mediawiki_credentials_id: Selenium_user-at-beta.wmflabs.org mediawiki_url: en.wikipedia.beta.wmflabs.org platform: linux -recipients: *emails-qa +recipients: *emails-collaboration repository: mediawiki/extensions/WikiLove jobs: -- To view, visit https://gerrit.wikimedia.org/r/201083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie682a7aebbed7252ef485d6d1c113d5ec72c9652 Gerrit-PatchSet: 6 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: Quiddity nwil...@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] Update VisualEditor for Id3ee4dfb for the Collaboration team - change (mediawiki/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/201588 Change subject: Update VisualEditor for Id3ee4dfb for the Collaboration team .. Update VisualEditor for Id3ee4dfb for the Collaboration team Change-Id: I1552a214b7ec1d0df17ee5c577f4b880632644a9 --- M extensions/VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/88/201588/1 diff --git a/extensions/VisualEditor b/extensions/VisualEditor index 931a4c4..c6ea5d4 16 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit 931a4c4e895b34a94a6750a1a3e13dcdcafb0d44 +Subproject commit c6ea5d44a7a77ecdd4e75e6d3c7eb4f990884cf9 -- To view, visit https://gerrit.wikimedia.org/r/201588 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1552a214b7ec1d0df17ee5c577f4b880632644a9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf24 Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't trigger MessageBlobStore during tests - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't trigger MessageBlobStore during tests
..
Don't trigger MessageBlobStore during tests
The test for OutputPage::makeResourceLoaderLink was triggering database
queries through MessageBlobStore even though it doesn't use any
messages.
In bb03d1a8e08 I had made MessageBlobStore a singleton instead of static
functions, however there's no need for it to be one since the class is
stateless. Callers can just create a new MessageBlobStore instance and
call functions upon it. Using getInstance() is now deprecated.
ResourceLoader now has a setMessageBlobStore setter to allow overriding
which MessageBlobStore instance will be used. OutputPageTest uses this
to set a NullMessageBlobStore, which makes no database queries.
Change-Id: Ica7436fb6f1ea59bd445b02527829ab0742c0842
---
M includes/MessageBlobStore.php
M includes/cache/LocalisationCache.php
M includes/cache/MessageCache.php
M includes/installer/DatabaseUpdater.php
M includes/resourceloader/ResourceLoader.php
M tests/phpunit/includes/OutputPageTest.php
6 files changed, 48 insertions(+), 10 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MessageBlobStore.php b/includes/MessageBlobStore.php
index c384188..011cae6 100644
--- a/includes/MessageBlobStore.php
+++ b/includes/MessageBlobStore.php
@@ -36,15 +36,12 @@
* Get the singleton instance
*
* @since 1.24
+* @deprecated since 1.25
* @return MessageBlobStore
*/
public static function getInstance() {
- static $instance = null;
- if ( $instance === null ) {
- $instance = new self;
- }
-
- return $instance;
+ wfDeprecated( __METHOD__, '1.25' );
+ return new self;
}
/**
diff --git a/includes/cache/LocalisationCache.php
b/includes/cache/LocalisationCache.php
index e270f5f..dc5a2eb 100644
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -1020,7 +1020,8 @@
# HACK: If using a null (i.e. disabled) storage backend, we
# can't write to the MessageBlobStore either
if ( $purgeBlobs !$this-store instanceof LCStoreNull ) {
- MessageBlobStore::getInstance()-clear();
+ $blobStore = new MessageBlobStore();
+ $blobStore-clear();
}
}
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 04f5887..82919c7 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -562,7 +562,8 @@
// Update the message in the message blob store
global $wgContLang;
- MessageBlobStore::getInstance()-updateMessage(
$wgContLang-lcfirst( $msg ) );
+ $blobStore = new MessageBlobStore();
+ $blobStore-updateMessage( $wgContLang-lcfirst( $msg ) );
Hooks::run( 'MessageCacheReplace', array( $title, $text ) );
diff --git a/includes/installer/DatabaseUpdater.php
b/includes/installer/DatabaseUpdater.php
index b676f45..12ef91a 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -932,7 +932,8 @@
if ( $wgLocalisationCacheConf['manualRecache'] ) {
$this-rebuildLocalisationCache();
}
- MessageBlobStore::getInstance()-clear();
+ $blobStore = new MessageBlobStore();
+ $blobStore-clear();
$this-output( done.\n );
}
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 5eab3cb..b9d1b2b 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -73,6 +73,11 @@
protected $errors = array();
/**
+* @var MessageBlobStore
+*/
+ protected $blobStore;
+
+ /**
* Load information stored in the database about modules.
*
* This method grabs modules dependencies from the database and updates
modules
@@ -250,6 +255,7 @@
$this-registerTestModules();
}
+ $this-setMessageBlobStore( new MessageBlobStore() );
}
/**
@@ -257,6 +263,14 @@
*/
public function getConfig() {
return $this-config;
+ }
+
+ /**
+* @param MessageBlobStore $blobStore
+* @since 1.25
+*/
+ public function setMessageBlobStore( MessageBlobStore $blobStore ) {
+ $this-blobStore = $blobStore;
}
/**
@@ -885,7 +899,7 @@
// Pre-fetch blobs
if (
[MediaWiki-commits] [Gerrit] Allow moving flow boards - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201596
Change subject: Allow moving flow boards
..
Allow moving flow boards
* move added back to board menu, still removed from topic pages
* moves all related topics to the new location as well
* performs null edit to header with flow talkpage manager
* Requires flow-create-board to move to a place that was not a flow board
previously
Bug: T90063
Change-Id: I4bdc665e21b16e4048c3c78c7083add803491dc7
---
M Flow.php
M Hooks.php
M autoload.php
M container.php
M i18n/en.json
M i18n/qqq.json
A includes/BoardMover.php
M includes/Model/Workflow.php
M includes/WorkflowLoaderFactory.php
9 files changed, 233 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/96/201596/1
diff --git a/Flow.php b/Flow.php
index e66bd23..487dd06 100644
--- a/Flow.php
+++ b/Flow.php
@@ -132,6 +132,8 @@
$wgHooks['CanonicalNamespaces'][] = 'FlowHooks::onCanonicalNamespaces';
$wgHooks['MovePageIsValidMove'][] = 'FlowHooks::onMovePageIsValidMove';
$wgHooks['AbortMove'][] = 'FlowHooks::onAbortMove';
+$wgHooks['TitleMove'][] = 'FlowHooks::onTitleMove';
+$wgHooks['TitleMoveComplete'][] = 'FlowHooks::onTitleMoveComplete';
$wgHooks['TitleSquidURLs'][] = 'FlowHooks::onTitleSquidURLs';
$wgHooks['WatchlistEditorBuildRemoveLine'][] =
'FlowHooks::onWatchlistEditorBuildRemoveLine';
$wgHooks['WatchlistEditorBeforeFormRender'][] =
'FlowHooks::onWatchlistEditorBeforeFormRender';
@@ -343,7 +345,7 @@
$wgFlowAbuseFilterEmergencyDisableAge = 86400; // One day.
// Actions that must pass through to MediaWiki on flow enabled pages
-$wgFlowCoreActionWhitelist = array( 'info', 'protect', 'unprotect', 'unwatch',
'watch', 'history', 'wikilove' );
+$wgFlowCoreActionWhitelist = array( 'info', 'protect', 'unprotect', 'unwatch',
'watch', 'history', 'wikilove', 'move' );
// When set to true Flow will compile templates into their intermediate forms
// on every run. When set to false Flow will use the versions already written
diff --git a/Hooks.php b/Hooks.php
index 8151b58..1b0cf4f 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1041,8 +1041,28 @@
}
public static function onMovePageIsValidMove( Title $oldTitle, Title
$newTitle, Status $status ) {
- if ( self::$occupationController-isTalkpageOccupied( $oldTitle
) ) {
+ global $wgFlowOccupyNamespaces, $wgUser;
+
+ // We only care about moving flow boards
+ if ( $oldTitle-getContentModel() !== CONTENT_MODEL_FLOW_BOARD
) {
+ return true;
+ }
+
+ // pages within the Topic namespace are not movable
+ if ( $oldTitle-getNamespace() === NS_TOPIC ) {
$status-fatal( 'flow-error-move' );
+ return false;
+ }
+
+ $occupationController = Container::get( 'occupation_controller'
);
+ if (
+ // If the destination is not already a valid flow
location
+ !$occupationController-isTalkpageOccupied( $newTitle,
false )
+
+ // and the user is not allowed to create new flow boards
+ !$wgUser-isAllowed( 'flow-create-board' )
+ ) {
+ $status-fatal( 'flow-error-move-no-create-permissions'
);
return false;
}
@@ -1328,4 +1348,29 @@
return true;
}
+
+ /**
+* Occurs at the begining of the MovePage process. Perhaps ContentModel
should be
+* extended to be notified about moves explicitly.
+*/
+ public static function onTitleMove( Title $oldTitle, Title $newTitle,
User $user ) {
+ if ( $oldTitle-getContentModel() === CONTENT_MODEL_FLOW_BOARD
) {
+ // complete hack to make sure that when the page is
saved to new
+ // location and rendered it doesn't throw an error
about the wrong title
+ Container::get( 'factory.loader.workflow'
)-pageMoveInProgress();
+ // open a database transaction and prepare everything
for the move, but
+ // don't commit yet. That is done below in
self::onTitleMoveComplete
+ Container::get( 'board_mover' )-prepareMove(
$oldTitle, $newTitle );
+ }
+
+ return true;
+ }
+
+ public static function onTitleMoveComplete( Title $oldTitle, Title
$newTitle, User $user, $pageid, $redirid, $reason ) {
+ if ( $newTitle-getContentModel() === CONTENT_MODEL_FLOW_BOARD
) {
+ Container::get( 'board_mover' )-commit();
+ }
+
+ return true;
+ }
}
diff --git a/autoload.php b/autoload.php
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: be9847c..66944ca - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: be9847c..66944ca .. Syncronize VisualEditor: be9847c..66944ca Change-Id: I48230cf763f9f462e5349ddb5bcbff8edf367d68 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index be9847c..66944ca 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit be9847c24f23bdd90255cfb7352c24d42168e3c4 +Subproject commit 66944cac44e6cda2e24d71f5b3d769297ff646a6 -- To view, visit https://gerrit.wikimedia.org/r/201566 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I48230cf763f9f462e5349ddb5bcbff8edf367d68 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: be9847c..66944ca - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/201566 Change subject: Syncronize VisualEditor: be9847c..66944ca .. Syncronize VisualEditor: be9847c..66944ca Change-Id: I48230cf763f9f462e5349ddb5bcbff8edf367d68 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/66/201566/1 diff --git a/VisualEditor b/VisualEditor index be9847c..66944ca 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit be9847c24f23bdd90255cfb7352c24d42168e3c4 +Subproject commit 66944cac44e6cda2e24d71f5b3d769297ff646a6 -- To view, visit https://gerrit.wikimedia.org/r/201566 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48230cf763f9f462e5349ddb5bcbff8edf367d68 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge PR#9 - change (apps...wikipedia)
Bgerstle has uploaded a new change for review. https://gerrit.wikimedia.org/r/201579 Change subject: Merge PR#9 .. Merge PR#9 fastlane project refinements Bug: T94769 Change-Id: I58b903cda4f55c9f6d8be72a1d5a7cdce70a83af --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/79/201579/1 -- To view, visit https://gerrit.wikimedia.org/r/201579 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58b903cda4f55c9f6d8be72a1d5a7cdce70a83af Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Bgerstle bgers...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] makefile: fix clean goal - change (apps...wikipedia)
Bgerstle has uploaded a new change for review. https://gerrit.wikimedia.org/r/201578 Change subject: makefile: fix clean goal .. makefile: fix clean goal Change-Id: I8d3538f76f96502cd1237e795479919890d40d32 --- M Makefile 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/78/201578/1 diff --git a/Makefile b/Makefile index 1cdc793..744cf5d 100644 --- a/Makefile +++ b/Makefile @@ -1,31 +1,32 @@ XCODE_VERSION = $(shell xcodebuild -version 2/dev/null) XC_WORKSPACE = Wikipedia.xcworkspace XCODEBUILD_BASE_ARGS = -workspace $(XC_WORKSPACE) +XC_DEFAULT_SCHEME = Wikipedia help: ##Show this help @fgrep -h ## $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' clean: ##Clean the Xcode workspace - xcodebuild clean $(XCODEBUILD_BASE_ARGS) + xcodebuild clean $(XCODEBUILD_BASE_ARGS) -scheme $(XC_DEFAULT_SCHEME) build: ##Fetch code dependencies and build the app for release build: get-deps xcodebuild build $(XCODEBUILD_BASE_ARGS) \ - -scheme Wikipedia \ + -scheme $(XC_DEFAULT_SCHEME) \ -sdk iphoneos \ -configuration Release build-sim: ##Fetch code dependencies and build the app for debugging in the simulator build-sim: get-deps xcodebuild build $(XCODEBUILD_BASE_ARGS) \ - -scheme Wikipedia \ + -scheme $(XC_DEFAULT_SCHEME) \ -sdk iphonesimulator \ -configuration Debug test: ##Fetch code dependencies and run tests test: get-deps xcodebuild test $(XCODEBUILD_BASE_ARGS) \ - -scheme Wikipedia \ + -scheme $(XC_DEFAULT_SCHEME) \ -sdk iphonesimulator lint: ##Lint the native code, requires uncrustify -- To view, visit https://gerrit.wikimedia.org/r/201578 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d3538f76f96502cd1237e795479919890d40d32 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Bgerstle bgers...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ignore mobileprovision and fix early return - change (apps...wikipedia)
Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201577
Change subject: ignore mobileprovision and fix early return
..
ignore mobileprovision and fix early return
Change-Id: I032d8a327c4f023611b0a83708bd0fc1e5cdf70a
---
M .gitignore
M fastlane/Appfile
M fastlane/Fastfile
3 files changed, 29 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/77/201577/1
diff --git a/.gitignore b/.gitignore
index 8ecf4da..8e079ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@
# Fastlane
fastlane/report.xml
fastlane/Error*.png
+*.mobileprovision
# Ignore baselines, which we'll eventually maintain in CI to prevent false
negatives due to dev machine discrepancies
xcbaselines/
diff --git a/fastlane/Appfile b/fastlane/Appfile
index ae8ac0d..17c8caa 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -7,7 +7,7 @@
apple_id cfl...@wikimedia.org
# Set the app identifier for each build (used to look up the app in itunes
connect)
-app_identifier org.wikimedia.wikipedia.tfalpha
+#app_identifier org.wikimedia.wikipedia.tfalpha
# for_lane :alpha do
# app_identifier org.wikimedia.wikipedia.tfbeta
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 4aca246..f4304e4 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -16,14 +16,14 @@
xcbuild({
scheme: 'Wikipedia',
-analyze: true
+analyze: nil
})
xctest({
scheme: 'Wikipedia',
destination: platform=iOS Simulator,name=iPhone 5s,OS=8.2,
report_formats: [ html, junit ],
-clean: true
+clean: nil
})
end
@@ -57,22 +57,22 @@
# Create and sign the IPA (and DSYM)
ipa({
scheme: 'Wikipedia Alpha',
-clean: true,
+clean: nil,
archive: nil
})
- return if ENV['NO_DEPLOY']
+ unless ENV['NO_DEPLOY']
+# Upload the DSYM to Hockey
+hockey({
+ api_token: 'c881c19fd8d0401682c4640b7948ef5e',
+ notes: Changelog,
+ notify: 0,
+ status: 1, #Means do not make available for download
+})
- # Upload the DSYM to Hockey
- hockey({
-api_token: 'c881c19fd8d0401682c4640b7948ef5e',
-notes: Changelog,
-notify: 0,
-status: 1, #Means do not make available for download
- })
-
- # Upload the IPA and DSYM to iTunes Connect
- deliver :testflight, :beta, :skip_deploy, :force
+# Upload the IPA and DSYM to iTunes Connect
+deliver :testflight, :beta, :skip_deploy, :force
+ end
end
lane :beta do
@@ -105,24 +105,25 @@
archive: nil
})
- return if ENV['NO_DEPLOY']
+ unless ENV['NO_DEPLOY']
+# Upload the DSYM to Hockey
+hockey({
+ api_token: 'c881c19fd8d0401682c4640b7948ef5e',
+ notes: Changelog,
+ notify: 0,
+ status: 1,
+})
- # Upload the DSYM to Hockey
- hockey({
-api_token: 'c881c19fd8d0401682c4640b7948ef5e',
-notes: Changelog,
-notify: 0,
-status: 1,
- })
-
- deliver :testflight, :beta, :force
+deliver :testflight, :beta, :force
+ end
end
lane :appstore do
snapshot
frameit
- return if ENV['NO_DEPLOY']
- deliver :skip_deploy, :force
+ unless ENV['NO_DEPLOY']
+deliver :skip_deploy, :force
+ end
end
after_all do |lane|
--
To view, visit https://gerrit.wikimedia.org/r/201577
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I032d8a327c4f023611b0a83708bd0fc1e5cdf70a
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Bgerstle bgers...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] re-add schemes - change (apps...wikipedia)
Bgerstle has uploaded a new change for review. https://gerrit.wikimedia.org/r/201576 Change subject: re-add schemes .. re-add schemes Change-Id: Ic7a33d9a52ffc9b4d24671034706422d2ff78ed0 --- A Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Alpha.xcscheme A Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Beta.xcscheme M fastlane/Fastfile 3 files changed, 185 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/76/201576/1 diff --git a/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Alpha.xcscheme b/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Alpha.xcscheme new file mode 100644 index 000..f361d0d --- /dev/null +++ b/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Alpha.xcscheme @@ -0,0 +1,88 @@ +?xml version=1.0 encoding=UTF-8? +Scheme + LastUpgradeVersion = 0620 + version = 1.3 + BuildAction + parallelizeBuildables = YES + buildImplicitDependencies = YES + BuildActionEntries + BuildActionEntry +buildForTesting = YES +buildForRunning = YES +buildForProfiling = YES +buildForArchiving = YES +buildForAnalyzing = YES +BuildableReference + BuildableIdentifier = primary + BlueprintIdentifier = D4991434181D51DE00E6073C + BuildableName = Wikipedia.app + BlueprintName = Wikipedia + ReferencedContainer = container:Wikipedia.xcodeproj +/BuildableReference + /BuildActionEntry + /BuildActionEntries + /BuildAction + TestAction + selectedDebuggerIdentifier = Xcode.DebuggerFoundation.Debugger.LLDB + selectedLauncherIdentifier = Xcode.DebuggerFoundation.Launcher.LLDB + shouldUseLaunchSchemeArgsEnv = YES + buildConfiguration = Debug + Testables + /Testables + MacroExpansion + BuildableReference +BuildableIdentifier = primary +BlueprintIdentifier = D4991434181D51DE00E6073C +BuildableName = Wikipedia.app +BlueprintName = Wikipedia +ReferencedContainer = container:Wikipedia.xcodeproj + /BuildableReference + /MacroExpansion + /TestAction + LaunchAction + selectedDebuggerIdentifier = Xcode.DebuggerFoundation.Debugger.LLDB + selectedLauncherIdentifier = Xcode.DebuggerFoundation.Launcher.LLDB + launchStyle = 0 + useCustomWorkingDirectory = NO + buildConfiguration = Debug + ignoresPersistentStateOnLaunch = NO + debugDocumentVersioning = YES + allowLocationSimulation = YES + BuildableProductRunnable + runnableDebuggingMode = 0 + BuildableReference +BuildableIdentifier = primary +BlueprintIdentifier = D4991434181D51DE00E6073C +BuildableName = Wikipedia.app +BlueprintName = Wikipedia +ReferencedContainer = container:Wikipedia.xcodeproj + /BuildableReference + /BuildableProductRunnable + AdditionalOptions + /AdditionalOptions + /LaunchAction + ProfileAction + shouldUseLaunchSchemeArgsEnv = YES + savedToolIdentifier = + useCustomWorkingDirectory = NO + buildConfiguration = Release + debugDocumentVersioning = YES + BuildableProductRunnable + runnableDebuggingMode = 0 + BuildableReference +BuildableIdentifier = primary +BlueprintIdentifier = D4991434181D51DE00E6073C +BuildableName = Wikipedia.app +BlueprintName = Wikipedia +ReferencedContainer = container:Wikipedia.xcodeproj + /BuildableReference + /BuildableProductRunnable + /ProfileAction + AnalyzeAction + buildConfiguration = Debug + /AnalyzeAction + ArchiveAction + buildConfiguration = Release + revealArchiveInOrganizer = YES + /ArchiveAction +/Scheme diff --git a/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Beta.xcscheme b/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Beta.xcscheme new file mode 100644 index 000..f361d0d --- /dev/null +++ b/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Beta.xcscheme @@ -0,0 +1,88 @@ +?xml version=1.0 encoding=UTF-8? +Scheme + LastUpgradeVersion = 0620 + version = 1.3 + BuildAction + parallelizeBuildables = YES + buildImplicitDependencies = YES + BuildActionEntries + BuildActionEntry +buildForTesting = YES +buildForRunning = YES +buildForProfiling = YES +buildForArchiving = YES +buildForAnalyzing = YES +BuildableReference + BuildableIdentifier = primary + BlueprintIdentifier = D4991434181D51DE00E6073C + BuildableName = Wikipedia.app + BlueprintName = Wikipedia + ReferencedContainer =
[MediaWiki-commits] [Gerrit] Added cross-wiki Special:Import support in core. - change (pywikibot/core)
Prianka has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201582
Change subject: Added cross-wiki Special:Import support in core.
..
Added cross-wiki Special:Import support in core.
Added pageimport feature in pywikibot-core/pywikibot/page.py so that it
may be directly used by core scripts transferbot.py / replicate_wiki.py.
Please guide me how the expected implementation may be done.
Bug:T66877
Change-Id: I2d65154c5f3c37257b9d720e7681645d48d59da4
---
M pywikibot/page.py
1 file changed, 65 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/82/201582/1
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 5607ace..69d5b0d 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -3345,6 +3345,71 @@
self.editEntity(data, **kwargs)
+class Importer(pywikibot.Page):
+
+def __init__(self, site):
+self.importsite = site
+pywikibot.Page.__init__(self, site, 'Special:Import', None, 0)
+
+def Import(self, target, project='w', crono='1', namespace='',
prompt=True):
+Import the page from the wiki. Requires administrator status.
+If prompt is True, asks the user if he wants to delete the page.
+
+
+if project == 'w':
+site = pywikibot.Site(fam='wikipedia')
+elif project == 'b':
+site = pywikibot.Site(fam='wikibooks')
+elif project == 'wikt':
+site = pywikibot.Site(fam='wiktionary')
+elif project == 's':
+site = pywikibot.Site(fam='wikisource')
+elif project == 'q':
+site = pywikibot.Site(fam='wikiquote')
+else:
+site = pywikibot.Site()
+# Fixing the crono value...
+if crono:
+crono = '1'
+else:
+crono = '0'
+# Fixing namespace's value.
+if namespace == '0':
+namespace == ''
+answer = 'y'
+if prompt:
+answer = pywikibot.input_yn(u'Do you want to import %s?',
default=False, automatic_quit=False)
+if answer:
+host = self.site.hostname()
+address = self.site().path() + '?title=%saction=submit' %
self.urlname()
+# You need to be a sysop for the import.
+pywikibot.login.LoginManager(sysop=True, site=self.site())
+# Getting the token.
+token = self.site.tokens
+# Defing the predata.
+predata = {
+'action': 'submit',
+'source': 'interwiki',
+# from what project do you want to import the page?
+'interwiki': project,
+# What is the page that you want to import?
+'frompage': target,
+# The entire history... or not?
+'interwikiHistory': crono,
+# What namespace do you want?
+'namespace': '',
+}
+data = self.site.getUrl(address, data=predata, sysop=True)
+if data:
+pywikibot.output(u'Page imported, checking...')
+if pywikibot.Page(self.importsite, target).exists():
+pywikibot.output(u'Import success!')
+return True
+else:
+pywikibot.output(u'Import failed!')
+return False
+
+
class ItemPage(WikibasePage):
Wikibase entity of type 'item'.
--
To view, visit https://gerrit.wikimedia.org/r/201582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d65154c5f3c37257b9d720e7681645d48d59da4
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Prianka priyankajayaswal...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make colorize-svg.js actually work more often - change (oojs/ui)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201587
Change subject: Make colorize-svg.js actually work more often
..
Make colorize-svg.js actually work more often
Follow-up to e4358fdba586dd6266e1c800a71375614c7510fa.
We allow the following formats:
* { file: foo.svg }
* { file: { default: foo.svg } }
* { file: { ltr: foo.svg, rtl: foo.svg } }
But the second didn't work at all.
Also simplified how we handle images without LTR/RTL variants.
Change-Id: I00e992ec692957a60d4e23a427774251903457f8
---
M build/tasks/colorize-svg.js
1 file changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/87/201587/1
diff --git a/build/tasks/colorize-svg.js b/build/tasks/colorize-svg.js
index 0328b34..15de4c8 100644
--- a/build/tasks/colorize-svg.js
+++ b/build/tasks/colorize-svg.js
@@ -173,8 +173,8 @@
var selector, declarations, direction, lang, langSelector,
deferred = Q.defer(),
file = typeof this.file === 'string' ?
- { default: this.file } :
- { ltr: this.file.ltr, rtl: this.file.rtl },
+ { ltr: this.file, rtl: this.file } :
+ { ltr: this.file.ltr || this.file.default, rtl:
this.file.rtl || this.file.default },
moreLangs = this.file.lang || {},
name = this.name,
sourcePath = this.list.getPath(),
@@ -185,7 +185,6 @@
cssPrependPath = this.list.options.cssPrependPath,
originalSvg = {},
rules = {
- default: [],
ltr: [],
rtl: []
},
@@ -319,9 +318,6 @@
}
deferred.reject( 'Failed to generate some images' );
} else {
- rules.ltr = rules.ltr.concat( rules.default );
- rules.rtl = rules.rtl.concat( rules.default );
- delete rules.default;
deferred.resolve( {
rules: rules,
files: files
--
To view, visit https://gerrit.wikimedia.org/r/201587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00e992ec692957a60d4e23a427774251903457f8
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Doxyfile: Suppress warnings for invalid @codingStandardsIgno... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Doxyfile: Suppress warnings for invalid @codingStandardsIgnoreStart .. Doxyfile: Suppress warnings for invalid @codingStandardsIgnoreStart This phpcs annotation is not relevant for Doxygen. Preprocessor_DOM.php:24: warning: Found unknown command `\codingStandardsIgnoreStart' Preprocessor_Hash.php:760: warning: Found unknown command `\codingStandardsIgnoreStart' Change-Id: I91ea668486a87fff0193a3cccb97f96943d4bf33 --- M maintenance/Doxyfile 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/maintenance/Doxyfile b/maintenance/Doxyfile index 0589009..a2f7e35 100644 --- a/maintenance/Doxyfile +++ b/maintenance/Doxyfile @@ -65,7 +65,8 @@ public=\access public \ copyright=\note \ license=\note \ - codeCoverageIgnore= + codeCoverageIgnore= \ + codingStandardsIgnoreStart= TCL_SUBST = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO -- To view, visit https://gerrit.wikimedia.org/r/201081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I91ea668486a87fff0193a3cccb97f96943d4bf33 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Parent5446 tylerro...@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] Doxyfile: Suppress warnings for phpunit @ annotations - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Doxyfile: Suppress warnings for phpunit @ annotations .. Doxyfile: Suppress warnings for phpunit @ annotations This annotations are not relevant for Doxygen. Examples: parserTest.inc:320: warning: Found unknown command `\group' ActionTest.php:3: warning: Found unknown command `\covers' ActionTest.php:128: warning: Found unknown command `\dataProvider' ApiBlockTest.php:67: warning: Found unknown command `\expectedException' ApiBlockTest.php:68: warning: Found unknown command `\expectedExceptionMessage' Change-Id: I1d2d617ee6c15d51943bec3563ea4ffd353baec4 --- M maintenance/Doxyfile 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/maintenance/Doxyfile b/maintenance/Doxyfile index a2f7e35..1f70f45 100644 --- a/maintenance/Doxyfile +++ b/maintenance/Doxyfile @@ -66,7 +66,12 @@ copyright=\note \ license=\note \ codeCoverageIgnore= \ - codingStandardsIgnoreStart= + codingStandardsIgnoreStart= \ + group= \ + covers= \ + dataProvider= \ + expectedException= \ + expectedExceptionMessage= TCL_SUBST = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO -- To view, visit https://gerrit.wikimedia.org/r/201082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d2d617ee6c15d51943bec3563ea4ffd353baec4 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Parent5446 tylerro...@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] mwdocgen: Exclude node_modules from Doxygen - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: mwdocgen: Exclude node_modules from Doxygen .. mwdocgen: Exclude node_modules from Doxygen So that local runs don't take forever and won't recurse into unrelated php files in some npm package. Change-Id: Ic8068fa048075584c9334d0c21fb4efd87eade02 --- M maintenance/mwdocgen.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/maintenance/mwdocgen.php b/maintenance/mwdocgen.php index ee0ff01..49eae4a 100644 --- a/maintenance/mwdocgen.php +++ b/maintenance/mwdocgen.php @@ -91,6 +91,7 @@ $this-template = $IP . '/maintenance/Doxyfile'; $this-excludes = array( 'vendor', + 'node_modules', 'images', 'static', ); -- To view, visit https://gerrit.wikimedia.org/r/201074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8068fa048075584c9334d0c21fb4efd87eade02 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Parent5446 tylerro...@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] DefaultSettings: Fix doxygen warning for missing @endcond - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: DefaultSettings: Fix doxygen warning for missing @endcond .. DefaultSettings: Fix doxygen warning for missing @endcond Follows-up r67733 which fixed this, but it got lost in the meantime. /includes/DefaultSettings.php:46: warning: Conditional section with label file_level_code does not have a corresponding @endcond command within this file. Change-Id: If7cfe278c50e1639ef2662ba87c85426a964c22f --- M includes/DefaultSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 5ab557e..99acd3f 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -52,6 +52,8 @@ die( 1 ); } +/** @endcond */ + /** * wgConf hold the site configuration. * Not used for much in a default install. -- To view, visit https://gerrit.wikimedia.org/r/201073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7cfe278c50e1639ef2662ba87c85426a964c22f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: TTO at.li...@live.com.au Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Made rollbackMasterChanges catch exceptions, throwing the la... - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201567
Change subject: Made rollbackMasterChanges catch exceptions, throwing the last
one
..
Made rollbackMasterChanges catch exceptions, throwing the last one
Change-Id: Ida36a302b35434d1af464cb77a0084ec441d038a
---
M includes/db/LoadBalancer.php
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/67/201567/1
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 48c636e..9b6f078 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -1004,12 +1004,20 @@
if ( empty( $conns2[$masterIndex] ) ) {
continue;
}
+ $exception = null;
/** @var DatabaseBase $conn */
foreach ( $conns2[$masterIndex] as $conn ) {
if ( $conn-trxLevel()
$conn-writesOrCallbacksPending() ) {
- $conn-rollback( __METHOD__, 'flush' );
+ try {
+ $conn-rollback( __METHOD__,
'flush' );
+ } catch ( DBError $exception ) {
+ // failed; try the others
+ }
}
}
+ if ( $exception ) {
+ throw $exception; // throw the last error
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/201567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida36a302b35434d1af464cb77a0084ec441d038a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add option to disable CodeMirror frontend - change (mediawiki...CodeMirror)
jenkins-bot has submitted this change and it was merged.
Change subject: Add option to disable CodeMirror frontend
..
Add option to disable CodeMirror frontend
So CodeMirror only provides it's libraries to use in other code.
Change-Id: I6832f4d82ae0497b92ba210ac7960052e4e12143
---
M CodeMirror.hooks.php
M CodeMirror.php
2 files changed, 21 insertions(+), 8 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index 5683ce7..cde1824 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -66,13 +66,16 @@
* @return boolean
*/
private static function isCodeMirrorEnabled( IContextSource $context ) {
+ global $wgCodeMirrorEnableFrontend;
+
// Check, if we already checked, if page action is editing, if
not, do it now
if ( is_null( self::$isEnabled ) ) {
// edit can be 'edit' and 'submit'
- self::$isEnabled = in_array(
- Action::getActionName( $context ),
- array( 'edit', 'submit' )
- );
+ self::$isEnabled = $wgCodeMirrorEnableFrontend
+ in_array(
+ Action::getActionName( $context ),
+ array( 'edit', 'submit' )
+ );
}
return self::$isEnabled;
@@ -176,10 +179,12 @@
* @return bool Always true
*/
public static function onGetPreferences( User $user,
$defaultPreferences ) {
- $defaultPreferences['usecodemirror'] = array(
- 'type' = 'api',
- 'default' = '1',
- );
+ if ( self::isCodeMirrorEnabled( RequestContext::getMain() ) ) {
+ $defaultPreferences['usecodemirror'] = array(
+ 'type' = 'api',
+ 'default' = '1',
+ );
+ }
return true;
}
}
diff --git a/CodeMirror.php b/CodeMirror.php
index 3e5d0f0..9e4b64e 100644
--- a/CodeMirror.php
+++ b/CodeMirror.php
@@ -71,3 +71,11 @@
'group' = 'ext.CodeMirror',
'targets' = array( 'mobile', 'desktop' ),
);
+
+// Configuration options
+
+/**
+ * Specify, if CodeMirror extension should integrate CodeMirror in MediaWiki's
editor (or WikiEditor), or if
+ * it should work as a library provider for other extensions.
+ */
+$wgCodeMirrorEnableFrontend = true;
--
To view, visit https://gerrit.wikimedia.org/r/199941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6832f4d82ae0497b92ba210ac7960052e4e12143
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: Jdlrobson jrob...@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] Trim leading and trailing whitespace from annotations - change (VisualEditor/VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201583
Change subject: Trim leading and trailing whitespace from annotations
..
Trim leading and trailing whitespace from annotations
This means that even if you do try to create a Foo /abar in
the editor (and you have to try pretty hard to do that in the first place),
it'll serialize to aFoo/a bar.
For VE-MW, this prevents ugly wikitext output like [[Foo|Foo ]]nowiki/bar.
Bug: T54037
Change-Id: I0b734651a5b39e16142cb0edc28a594ca3d60231
---
M src/dm/ve.dm.Converter.js
1 file changed, 50 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/83/201583/1
diff --git a/src/dm/ve.dm.Converter.js b/src/dm/ve.dm.Converter.js
index f8c9915..4b2ce79 100644
--- a/src/dm/ve.dm.Converter.js
+++ b/src/dm/ve.dm.Converter.js
@@ -1114,7 +1114,11 @@
}
function closeAnnotation( annotation ) {
- var i, len, annotationElement, annotatedChildDomElements;
+ var i, len, annotationElement, annotatedChildDomElements,
+ matches, first, last,
+ leading = '',
+ trailing = '',
+ origElement = annotation.getOriginalDomElements()[0];
// Add text if needed
if ( text.length 0 ) {
@@ -1124,9 +1128,51 @@
annotatedChildDomElements = annotatedDomElementStack.pop();
annotatedDomElements =
annotatedDomElementStack[annotatedDomElementStack.length - 1];
+
+ // HACK: Move any leading and trailing whitespace out of the
annotation, but only if the
+ // annotation didn't originally have leading/trailing whitespace
+ first = annotatedChildDomElements[0];
+ while (
+ first.nodeType === Node.TEXT_NODE
+ ( matches = first.data.match( /^\s+/ ) )
+ ( !origElement || !origElement.textContent.match( /^\s/
) )
+ ) {
+ leading += matches[0];
+ first.deleteData( 0, matches[0].length );
+ if ( first.data.length === 0 ) {
+ // Remove empty text node
+ annotatedChildDomElements.shift();
+ // Process next text node to see if it also has
whitespace
+ first = annotatedChildDomElements[0];
+ } else {
+ break;
+ }
+ }
+ last =
annotatedChildDomElements[annotatedChildDomElements.length - 1];
+ while (
+ last.nodeType === Node.TEXT_NODE
+ ( matches = last.data.match( /\s+$/ ) )
+ ( !origElement || !origElement.textContent.match( /\s$/
) )
+ ) {
+ trailing += matches[0];
+ last.deleteData( last.data.length - matches[0].length,
matches[0].length );
+ if ( last.data.length === 0 ) {
+ // Remove empty text node
+ annotatedChildDomElements.pop();
+ // Process next text node to see if it also has
whitespace
+ last =
annotatedChildDomElements[annotatedChildDomElements.length - 1];
+ } else {
+ break;
+ }
+ }
+
annotationElement = conv.getDomElementsFromDataElement(
annotation.getElement(), doc, annotatedChildDomElements
)[0];
+
+ if ( leading ) {
+ annotatedDomElements.push( doc.createTextNode( leading
) );
+ }
if ( annotationElement ) {
for ( i = 0, len = annotatedChildDomElements.length; i
len; i++ ) {
annotationElement.appendChild(
annotatedChildDomElements[i] );
@@ -1137,6 +1183,9 @@
annotatedDomElements.push(
annotatedChildDomElements[i] );
}
}
+ if ( trailing ) {
+ annotatedDomElements.push( doc.createTextNode( trailing
) );
+ }
}
function findEndOfNode( i ) {
--
To view, visit https://gerrit.wikimedia.org/r/201583
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b734651a5b39e16142cb0edc28a594ca3d60231
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
___
[MediaWiki-commits] [Gerrit] Hygiene: Remove empty anchor tag - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201589
Change subject: Hygiene: Remove empty anchor tag
..
Hygiene: Remove empty anchor tag
Change-Id: Id2b8016c83101f7f3d05b423ecbf39a16268b9c4
---
M includes/views/CollectionItemCard.php
1 file changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/89/201589/1
diff --git a/includes/views/CollectionItemCard.php
b/includes/views/CollectionItemCard.php
index 303f7cd..9966389 100644
--- a/includes/views/CollectionItemCard.php
+++ b/includes/views/CollectionItemCard.php
@@ -47,10 +47,14 @@
protected function getHtml() {
$item = $this-item;
$title = $item-getTitle();
+ $img = $this-image-getHtml();
+ if ( $img ) {
+ $img = Html::openElement( 'a', array( 'href' =
$title-getLocalUrl() ) ) .
+ $img .
+ Html::closeElement( 'a' );
+ }
$html = Html::openElement( 'div', array( 'class' =
'collection-item' ) ) .
- Html::openElement( 'a', array( 'href' =
$title-getLocalUrl() ) ) .
- $this-image-getHtml() .
- Html::closeElement( 'a' ) .
+ $img .
Html::openElement( 'h2', array( 'class' =
'collection-item-title' ) ) .
Linker::link( $title ) .
Html::closeElement( 'h2' );
--
To view, visit https://gerrit.wikimedia.org/r/201589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2b8016c83101f7f3d05b423ecbf39a16268b9c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganglia: remove class ganglia::logtailer - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: ganglia: remove class ganglia::logtailer
..
ganglia: remove class ganglia::logtailer
The ganglia::logtailer class is not used anywhere.
manifests/misc/udp2log.pp installs package ganglia-logtailer separately
manifests/swift.pp ensures ganglia-logtailer package is absent
and those 2 seem to be all hits for it across the repo.
so as part of cleaning up old ganglia in favor of ganglia_new, remove it
Bug:T93776
Change-Id: I7c48f1e4a5161c50725c4c4b75301a37d36ce280
---
M manifests/ganglia.pp
1 file changed, 0 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index f653d4e..17dafeb 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -173,16 +173,6 @@
}
}
-# == Class ganglia::logtailer
-#
-# The class pulls in everything necessary to get a ganglia-logtailer instance
-# on a machine.
-class ganglia::logtailer {
-package { 'ganglia-logtailer':
-ensure = latest,
-}
-}
-
# == Define ganglia::plugin::python
#
--
To view, visit https://gerrit.wikimedia.org/r/199943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c48f1e4a5161c50725c4c4b75301a37d36ce280
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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 structured logging/MWLoggerFactory for TransactionProfiler - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Use structured logging/MWLoggerFactory for TransactionProfiler
..
Use structured logging/MWLoggerFactory for TransactionProfiler
Change-Id: Id78c41623641562abe57546dfeb027fd0f437a15
---
M includes/MediaWiki.php
M includes/profiler/TransactionProfiler.php
2 files changed, 25 insertions(+), 8 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index c086a39..c4af16d 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -478,6 +478,7 @@
$wgTitle = $title;
$trxProfiler = Profiler::instance()-getTransactionProfiler();
+ $trxProfiler-setLogger( MWLoggerFactory::getInstance(
'DBPerformance' ) );
// Aside from rollback, master queries should not happen on GET
requests.
// Periodic or in passing updates on GET should use the job
queue.
diff --git a/includes/profiler/TransactionProfiler.php
b/includes/profiler/TransactionProfiler.php
index b313558..baec181 100644
--- a/includes/profiler/TransactionProfiler.php
+++ b/includes/profiler/TransactionProfiler.php
@@ -22,6 +22,9 @@
* @author Aaron Schulz
*/
+use Psr\Log\LoggerInterface;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\NullLogger;
/**
* Helper class that detects high-contention DB queries via profiling calls
*
@@ -29,7 +32,7 @@
*
* @since 1.24
*/
-class TransactionProfiler {
+class TransactionProfiler implements LoggerAwareInterface {
/** @var float Seconds */
protected $dbLockThreshold = 3.0;
/** @var float Seconds */
@@ -57,6 +60,19 @@
);
/** @var array */
protected $expectBy = array();
+
+ /**
+* @var LoggerInterface
+*/
+ private $logger;
+
+ public function __construct() {
+ $this-setLogger( new NullLogger() );
+ }
+
+ public function setLogger( LoggerInterface $logger ) {
+ $this-logger = $logger;
+ }
/**
* Set performance expectations
@@ -125,7 +141,7 @@
public function transactionWritingIn( $server, $db, $id ) {
$name = {$server} ({$db}) (TRX#$id);
if ( isset( $this-dbTrxHoldingLocks[$name] ) ) {
- wfDebugLog( 'DBPerformance', Nested transaction for
'$name' - out of sync. );
+ $this-logger-info( Nested transaction for '$name' -
out of sync. );
}
$this-dbTrxHoldingLocks[$name] = array(
'start' = microtime( true ),
@@ -154,8 +170,7 @@
$elapsed = ( $eTime - $sTime );
if ( $isWrite $n $this-expect['maxAffected'] ) {
- wfDebugLog( 'DBPerformance',
- Query affected $n row(s):\n . $query . \n .
wfBacktrace( true ) );
+ $this-logger-info( Query affected $n row(s):\n .
$query . \n . wfBacktrace( true ) );
}
// Report when too many writes/queries happen...
@@ -209,7 +224,7 @@
public function transactionWritingOut( $server, $db, $id ) {
$name = {$server} ({$db}) (TRX#$id);
if ( !isset( $this-dbTrxMethodTimes[$name] ) ) {
- wfDebugLog( 'DBPerformance', Detected no transaction
for '$name' - out of sync. );
+ $this-logger-info( Detected no transaction for
'$name' - out of sync. );
return;
}
// Fill in the last non-query period...
@@ -237,7 +252,7 @@
list( $query, $sTime, $end ) = $info;
$msg .= sprintf( %d\t%.6f\t%s\n, $i, ( $end -
$sTime ), $query );
}
- wfDebugLog( 'DBPerformance', $msg );
+ $this-logger-info( $msg );
}
unset( $this-dbTrxHoldingLocks[$name] );
unset( $this-dbTrxMethodTimes[$name] );
@@ -250,7 +265,8 @@
protected function reportExpectationViolated( $expect, $query ) {
$n = $this-expect[$expect];
$by = $this-expectBy[$expect];
- wfDebugLog( 'DBPerformance',
- Expectation ($expect = $n) by $by not met:\n$query\n
. wfBacktrace( true ) );
+ $this-logger-info(
+ Expectation ($expect = $n) by $by not met:\n$query\n
. wfBacktrace( true )
+ );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/200288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id78c41623641562abe57546dfeb027fd0f437a15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch:
[MediaWiki-commits] [Gerrit] Use firstChild after hoisting to determine hN spacing - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Use firstChild after hoisting to determine hN spacing
..
Use firstChild after hoisting to determine hN spacing
Change-Id: I2f4fa6d9305a18a9b7f73cbb64a6da20d8d7527e
---
M lib/wts.TagHandlers.js
1 file changed, 10 insertions(+), 10 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/wts.TagHandlers.js b/lib/wts.TagHandlers.js
index 62dfe50..e93d879 100644
--- a/lib/wts.TagHandlers.js
+++ b/lib/wts.TagHandlers.js
@@ -76,16 +76,6 @@
function buildHeadingHandler(headingWT) {
return {
handle: function(node, state, cb) {
- // For new elements, for prettier wikitext
serialization,
- // emit a space after the last '=' char.
- var space = '';
- if (DU.isNewElt(node)) {
- var fc = node.firstChild;
- if (fc (!DU.isText(fc) ||
!fc.nodeValue.match(/^\s/))) {
- space = ' ';
- }
- }
-
// Force SOL transparent links to serialize
before/after heading
var beforeFragment, afterFragment;
if ( node.childNodes.length ) {
@@ -96,7 +86,17 @@
}
}
+ // For new elements, for prettier wikitext
serialization,
+ // emit a space after the last '=' char.
+ var space = '';
+ if (DU.isNewElt(node)) {
+ var fc = node.firstChild;
+ if (fc (!DU.isText(fc) ||
!fc.nodeValue.match(/^\s/))) {
+ space = ' ';
+ }
+ }
cb(headingWT + space, node);
+
if (node.childNodes.length) {
var headingHandler = state.serializer
.wteHandlers.headingHandler.bind(state.serializer.wteHandlers, node);
--
To view, visit https://gerrit.wikimedia.org/r/201570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2f4fa6d9305a18a9b7f73cbb64a6da20d8d7527e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Marcoil marc...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@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] Abuse the hook to add all icons to Minerva - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201592
Change subject: Abuse the hook to add all icons to Minerva
..
Abuse the hook to add all icons to Minerva
The collection icon needs to be on all pages, not just the special
pages
Bug: T93813
Change-Id: I052fa66e836efbfc60205a43ba385b32de59364f
---
M includes/Gather.hooks.php
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/92/201592/1
diff --git a/includes/Gather.hooks.php b/includes/Gather.hooks.php
index 564e399..24732f0 100644
--- a/includes/Gather.hooks.php
+++ b/includes/Gather.hooks.php
@@ -84,6 +84,8 @@
if ( MobileContext::singleton()-isBetaGroupMember() ) {
$modules['watch'] = array( 'ext.gather.watchstar' );
}
+ // FIXME: abuse of the hook.
+ $skin-getOutput()-addModuleStyles( 'ext.gather.icons' );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/201592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I052fa66e836efbfc60205a43ba385b32de59364f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reuse the same WebView for article navigation. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Reuse the same WebView for article navigation.
..
Reuse the same WebView for article navigation.
The plan so far:
- PageViewFragmentInternal shall now become a true Fragment (and
I've deleted the old PageViewFragment class). Once this patch
is merged, we can rename it back to PageViewFragment. I'm not
renaming it yet, to better keep track of what is changing.
- The new fragment structure of the main activity shall be: a single
PageViewFragment (to display n pages), and at most one other fragment
on top of it (History, Saved Pages, Nearby) for selecting pages to
navigate to.
- Added additional sequencing logic to async tasks that fetch page
content, so that they correctly invalidate themselves when a new page is
loaded.
TODO: Perform some additional profiling, and see if there are any
remaining resource leaks.
Change-Id: I40ac4c6f1a0351e7fec7b462d5b950c12fd09122
---
M wikipedia/assets/bundle.js
M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
M wikipedia/src/main/java/org/wikipedia/analytics/SuggestedPagesFunnel.java
M wikipedia/src/main/java/org/wikipedia/editing/EditHandler.java
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
A wikipedia/src/main/java/org/wikipedia/page/PageBackStackItem.java
M wikipedia/src/main/java/org/wikipedia/page/PageCache.java
M wikipedia/src/main/java/org/wikipedia/page/PageInfoHandler.java
D wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandlerOld.java
M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M www/js/sections.js
16 files changed, 539 insertions(+), 456 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index 3f1add0..a17d6a6 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -398,6 +398,17 @@
document.getElementById( content ).style.paddingBottom =
payload.paddingBottom + px;
});
+bridge.registerListener( beginNewPage, function( payload ) {
+clearContents();
+// fire an event back to the app, but with a slight timeout, which should
+// have the effect of waiting until the page contents have cleared
before sending the
+// event, allowing synchronization of sorts between the WebView and the
app.
+// (If we find a better way to synchronize the two, it can be done here,
as well)
+setTimeout( function() {
+bridge.sendMessage( onBeginNewPage, payload );
+}, 10);
+});
+
bridge.registerListener( displayLeadSection, function( payload ) {
// This might be a refresh! Clear out all contents!
clearContents();
@@ -518,7 +529,7 @@
scrolledOnLoad = true;
}
document.getElementById( loading_sections).className = ;
-bridge.sendMessage( pageLoadComplete, { } );
+bridge.sendMessage( pageLoadComplete, { sequence: payload.sequence
} );
} else {
var contentWrapper = document.getElementById( content );
elementsForSection(payload.section).forEach(function (element) {
@@ -533,7 +544,7 @@
if ( typeof payload.fragment === string payload.fragment.length
0 payload.section.anchor === payload.fragment) {
scrollToSection( payload.fragment );
}
-bridge.sendMessage( requestSection, { index: payload.section.id +
1 });
+bridge.sendMessage( requestSection, { sequence: payload.sequence,
index: payload.section.id + 1 });
}
});
diff --git a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
index fd3a948..fba6da3 100644
--- a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
@@ -20,7 +20,7 @@
import org.wikipedia.login.LoginActivity;
import org.wikipedia.nearby.NearbyFragment;
import org.wikipedia.page.PageActivity;
-import org.wikipedia.page.PageViewFragment;
+import org.wikipedia.page.PageViewFragmentInternal;
import org.wikipedia.random.RandomHandler;
import org.wikipedia.savedpages.SavedPagesFragment;
import org.wikipedia.settings.SettingsActivity;
@@ -138,12 +138,14 @@
highlightItem = R.id.nav_item_saved_pages;
} else if (activity.getTopFragment() instanceof NearbyFragment) {
highlightItem = R.id.nav_item_nearby;
-} else if (activity.getTopFragment() instanceof PageViewFragment) {
-
[MediaWiki-commits] [Gerrit] LogFormatter: Indent code to fix Doxygen parse error - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: LogFormatter: Indent code to fix Doxygen parse error
..
LogFormatter: Indent code to fix Doxygen parse error
This file was not being indexed due to a parse error.
/includes/logging/LogFormatter.php:844:
warning: Reached end of file while still inside a (nested) comment.
Nesting level 2 (probable line reference: 48, 26)
Change-Id: Ie34ae644d06e705991b934d4389e8c41bb7f77a7
---
M includes/logging/LogFormatter.php
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/logging/LogFormatter.php
b/includes/logging/LogFormatter.php
index 267a319..cf9fb53 100644
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -25,9 +25,12 @@
/**
* Implements the default log formatting.
- * Can be overridden by subclassing and setting
- * $wgLogActionsHandlers['type/subtype'] = 'class'; or
- * $wgLogActionsHandlers['type/*'] = 'class';
+ *
+ * Can be overridden by subclassing and setting:
+ *
+ * $wgLogActionsHandlers['type/subtype'] = 'class'; or
+ * $wgLogActionsHandlers['type/*'] = 'class';
+ *
* @since 1.19
*/
class LogFormatter {
--
To view, visit https://gerrit.wikimedia.org/r/201075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie34ae644d06e705991b934d4389e8c41bb7f77a7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce size of face detection image copies for performance - change (apps...wikipedia)
Dbrant has submitted this change and it was merged.
Change subject: Reduce size of face detection image copies for performance
..
Reduce size of face detection image copies for performance
Bug: T94702
Change-Id: Ib152d4f1231fc64b0e3db2e20f3d9cd54967e6da
---
M wikipedia/src/main/java/org/wikipedia/page/leadimages/ImageViewWithFace.java
1 file changed, 18 insertions(+), 5 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/ImageViewWithFace.java
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/ImageViewWithFace.java
index 84f50f1..63ba0e4 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/ImageViewWithFace.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/ImageViewWithFace.java
@@ -6,6 +6,7 @@
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.PointF;
+import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.media.FaceDetector;
import android.util.AttributeSet;
@@ -19,6 +20,13 @@
public class ImageViewWithFace extends ImageView implements Target {
private static final String TAG = ImageViewWithFace;
+
+// Width to which to reduce image copy on which face detection is
performed in onBitMapLoaded()
+// (with height reduced proportionally there). Performing face detection
on a scaled-down
+// image copy improves speed and memory use.
+//
+// Also, note that the face detector requires that the image width be even.
+private static final int BITMAP_COPY_WIDTH = 200;
public ImageViewWithFace(Context context) {
super(context);
@@ -51,13 +59,15 @@
long millis = System.currentTimeMillis();
// create a new bitmap onto which we'll draw the original
bitmap,
// because the FaceDetector requires it to be a 565 bitmap,
and it
-// must also be even width.
-Bitmap tempbmp = Bitmap.createBitmap(bitmap.getWidth() -
(bitmap.getWidth() % 2),
-bitmap.getHeight(), Bitmap.Config.RGB_565);
+// must also be even width. Reduce size of copy for
performance.
+Bitmap tempbmp = Bitmap.createBitmap(BITMAP_COPY_WIDTH,
+((bitmap.getHeight() * BITMAP_COPY_WIDTH) /
bitmap.getWidth()), Bitmap.Config.RGB_565);
Canvas canvas = new Canvas(tempbmp);
+Rect srcRect = new Rect(0, 0, bitmap.getWidth(),
bitmap.getHeight());
+Rect destRect = new Rect(0, 0, BITMAP_COPY_WIDTH,
tempbmp.getHeight());
Paint paint = new Paint();
paint.setColor(Color.BLACK);
-canvas.drawBitmap(bitmap, 0, 0, paint);
+canvas.drawBitmap(bitmap, srcRect, destRect, paint);
// initialize the face detector, and look for only one face...
FaceDetector fd = new FaceDetector(tempbmp.getWidth(),
tempbmp.getHeight(), 1);
@@ -67,7 +77,10 @@
if (numFound 0) {
faces[0].getMidPoint(facePos);
-android.util.Log.d(TAG, Found face at + facePos.x + ,
+ facePos.y);
+// scale back to proportions of original image
+facePos.x = (facePos.x * bitmap.getWidth() /
BITMAP_COPY_WIDTH);
+facePos.y = (facePos.y * bitmap.getHeight() /
tempbmp.getHeight());
+Log.d(TAG, Found face at + facePos.x + , +
facePos.y);
}
// free our temporary bitmap
tempbmp.recycle();
--
To view, visit https://gerrit.wikimedia.org/r/201463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib152d4f1231fc64b0e3db2e20f3d9cd54967e6da
Gerrit-PatchSet: 5
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway mhollo...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Mholloway mhollo...@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 overriding of vector styles in resources definition - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/201581 Change subject: Fix overriding of vector styles in resources definition .. Fix overriding of vector styles in resources definition This is breaking stuff like Special:Preferences on enwiki, and interfering with styling on beta.wikidata, among other issues. Bug: T93050 Change-Id: I24cb928c1c77696002930d183b0955a32a724a62 (cherry picked from commit 9088ae67edf862968e1f5eec771812d8a910e005) --- M resources/Resources.php 1 file changed, 3 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/81/201581/1 diff --git a/resources/Resources.php b/resources/Resources.php index bd74619..42c4a12 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -64,6 +64,9 @@ 'ext.gather.styles/collections.less', 'ext.gather.styles/lists.less', ), + 'skinStyles' = array( + 'vector' = 'ext.gather.styles/vector.less' + ), ), 'ext.gather.watchstar.icons' = $wgGatherResourceFileModuleBoilerplate + array( @@ -235,13 +238,6 @@ 'scripts' = array( 'ext.gather.lists/init.js', ), - ) - -); - -$wgResourceModuleSkinStyles['vector'] = $wgGatherMobileSpecialPageResourceBoilerplate + array( - 'ext.gather.styles' = array( - 'ext.gather.styles/vector.less', ), ); -- To view, visit https://gerrit.wikimedia.org/r/201581 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24cb928c1c77696002930d183b0955a32a724a62 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: wmf/1.25wmf24 Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix flow_moderate_post.handlebars not found - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Fix flow_moderate_post.handlebars not found .. Fix flow_moderate_post.handlebars not found Caused by I1b8d92f2 which we knew was a bit dangerous, but decided to do it anyways to get things consistent everywhere. Hopefully this is that last partial error. Bug: T94800 Change-Id: I321b24d559e908fcd140cc0ca21e7d33c6b070a0 --- M includes/Formatter/Contributions.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mattflaschen: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Formatter/Contributions.php b/includes/Formatter/Contributions.php index 0d7ecc0..bd98466 100644 --- a/includes/Formatter/Contributions.php +++ b/includes/Formatter/Contributions.php @@ -104,7 +104,7 @@ array( 'href' = $anchor-getFullURL(), 'data-flow-interactive-handler' = 'moderationDialog', - 'data-flow-template' = flow_moderate_$type, + 'data-flow-template' = flow_moderate_$type.partial, 'data-role' = $key, 'class' = 'flow-history-moderation-action flow-click-interactive', ), -- To view, visit https://gerrit.wikimedia.org/r/201580 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I321b24d559e908fcd140cc0ca21e7d33c6b070a0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: Mattflaschen mflasc...@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 flow_moderate_post.handlebars not found - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Fix flow_moderate_post.handlebars not found .. Fix flow_moderate_post.handlebars not found Caused by I1b8d92f2 which we knew was a bit dangerous, but decided to do it anyways to get things consistent everywhere. Hopefully this is that last partial error. Bug: T94800 Change-Id: I321b24d559e908fcd140cc0ca21e7d33c6b070a0 (cherry picked from commit 5331a3862280c6dd2e386c7c4ecb2b1ef25d7d1e) --- M includes/Formatter/Contributions.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Formatter/Contributions.php b/includes/Formatter/Contributions.php index 0d7ecc0..bd98466 100644 --- a/includes/Formatter/Contributions.php +++ b/includes/Formatter/Contributions.php @@ -104,7 +104,7 @@ array( 'href' = $anchor-getFullURL(), 'data-flow-interactive-handler' = 'moderationDialog', - 'data-flow-template' = flow_moderate_$type, + 'data-flow-template' = flow_moderate_$type.partial, 'data-role' = $key, 'class' = 'flow-history-moderation-action flow-click-interactive', ), -- To view, visit https://gerrit.wikimedia.org/r/201584 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I321b24d559e908fcd140cc0ca21e7d33c6b070a0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: wmf/1.25wmf23 Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: EBernhardson ebernhard...@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] Turn of strict javadoc in java 8 - change (wikidata...rdf)
jenkins-bot has submitted this change and it was merged.
Change subject: Turn of strict javadoc in java 8
..
Turn of strict javadoc in java 8
Java 8 has a way too strict checker for Javadoc. And the command to turn it
off isn't available in older versions of Java. So we turn it off in just
java 8 using a careful trick borrowed from dropwizard.
Change-Id: I76fadc45969549929b77d76e5b22e74e1170110c
---
M pom.xml
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pom.xml b/pom.xml
index 469f10a..b0e17a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,6 +202,9 @@
/goals
configuration
quiettrue/quiet
+!-- We don't want Java 8's strict javadoc checking so we use
this trick borrowed from dropwizard to turn
+ it off --
+additionalparam${javadoc.doclint.none}/additionalparam
/configuration
/execution
/executions
@@ -360,5 +363,14 @@
/pluginManagement
/build
/profile
+profile
+ idjava-8/id
+ activation
+jdk[1.8,)/jdk
+ /activation
+ properties
+javadoc.doclint.none-Xdoclint:none/javadoc.doclint.none
+ /properties
+/profile
/profiles
/project
--
To view, visit https://gerrit.wikimedia.org/r/201585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I76fadc45969549929b77d76e5b22e74e1170110c
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Jdouglas jdoug...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Smalyshev smalys...@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 duplicate Package[gdb] declaration - change (operations/puppet)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201598
Change subject: Fix duplicate Package[gdb] declaration
..
Fix duplicate Package[gdb] declaration
Bug: T94917
Change-Id: Ifd1e6b90683ad3aee73f7757a533e96815fa4925
---
M modules/base/manifests/standard-packages.pp
M modules/java/manifests/tools.pp
2 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/201598/1
diff --git a/modules/base/manifests/standard-packages.pp
b/modules/base/manifests/standard-packages.pp
index b10f605..9a38ff8 100644
--- a/modules/base/manifests/standard-packages.pp
+++ b/modules/base/manifests/standard-packages.pp
@@ -14,7 +14,6 @@
'zsh-beta',
'xfsprogs',
'screen',
-'gdb',
'iperf',
'atop',
'htop',
@@ -37,6 +36,13 @@
ensure = latest,
}
+# Can clash with java::tools class
+if ! defined ( Package['gdb'] ) {
+package { 'gdb':
+ensure = latest
+}
+}
+
# This should be in $packages, but moved here temporarily because it's
# currently broken on jessie hosts...
if ! os_version('debian = jessie') {
diff --git a/modules/java/manifests/tools.pp b/modules/java/manifests/tools.pp
index 61c6273..d40e26c 100644
--- a/modules/java/manifests/tools.pp
+++ b/modules/java/manifests/tools.pp
@@ -4,6 +4,8 @@
# java (JRE or JDK) is installed.
class java::tools {
+
+# Can clash with base::standard-packages class
if ! defined ( Package['gdb'] ) {
package { 'gdb':
ensure = present
--
To view, visit https://gerrit.wikimedia.org/r/201598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd1e6b90683ad3aee73f7757a533e96815fa4925
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set $wgLogoHD for enwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Set $wgLogoHD for enwiki
..
Set $wgLogoHD for enwiki
Declare high-resolution alternates for project logo for enwiki, matching the
values currently set in https://en.wikipedia.org/wiki/MediaWiki:Common.css.
See T37337 and Iee3e73c1f for context.
Change-Id: I3bbf2418dda52c6a2c84ee6453df8b341cdea648
---
M wmf-config/InitialiseSettings.php
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Isarra: Looks good to me, but someone else must approve
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 009427f..2df2f2c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1073,6 +1073,16 @@
),
# @} end of wgLogo
+# wgLogoHD @{
+// Alternate logos for high-resolution displays.
+'wgLogoHD' = array(
+ 'enwiki' = array(
+ '1.5x' =
'//upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/204px-Wikipedia-logo-v2-en.svg.png',
+ '2x' =
'//upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/270px-Wikipedia-logo-v2-en.svg.png',
+ ),
+),
+# @} end of wgLogoHD
+
# wgEnableUploads @{
// Wikis which have uploading disabled
// If you list a wiki as false here, make sure to make an entry for
$wgUploadNavigationUrl as well
--
To view, visit https://gerrit.wikimedia.org/r/201050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3bbf2418dda52c6a2c84ee6453df8b341cdea648
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@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 firstChild after hoisting to determine hN spacing - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201570
Change subject: Use firstChild after hoisting to determine hN spacing
..
Use firstChild after hoisting to determine hN spacing
Change-Id: I2f4fa6d9305a18a9b7f73cbb64a6da20d8d7527e
---
M lib/wts.TagHandlers.js
1 file changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/70/201570/1
diff --git a/lib/wts.TagHandlers.js b/lib/wts.TagHandlers.js
index 62dfe50..e93d879 100644
--- a/lib/wts.TagHandlers.js
+++ b/lib/wts.TagHandlers.js
@@ -76,16 +76,6 @@
function buildHeadingHandler(headingWT) {
return {
handle: function(node, state, cb) {
- // For new elements, for prettier wikitext
serialization,
- // emit a space after the last '=' char.
- var space = '';
- if (DU.isNewElt(node)) {
- var fc = node.firstChild;
- if (fc (!DU.isText(fc) ||
!fc.nodeValue.match(/^\s/))) {
- space = ' ';
- }
- }
-
// Force SOL transparent links to serialize
before/after heading
var beforeFragment, afterFragment;
if ( node.childNodes.length ) {
@@ -96,7 +86,17 @@
}
}
+ // For new elements, for prettier wikitext
serialization,
+ // emit a space after the last '=' char.
+ var space = '';
+ if (DU.isNewElt(node)) {
+ var fc = node.firstChild;
+ if (fc (!DU.isText(fc) ||
!fc.nodeValue.match(/^\s/))) {
+ space = ' ';
+ }
+ }
cb(headingWT + space, node);
+
if (node.childNodes.length) {
var headingHandler = state.serializer
.wteHandlers.headingHandler.bind(state.serializer.wteHandlers, node);
--
To view, visit https://gerrit.wikimedia.org/r/201570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f4fa6d9305a18a9b7f73cbb64a6da20d8d7527e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix flow_moderate_post.handlebars not found - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review. https://gerrit.wikimedia.org/r/201580 Change subject: Fix flow_moderate_post.handlebars not found .. Fix flow_moderate_post.handlebars not found Caused by I1b8d92f2 which we knew was a bit dangerous, but decided to do it anyways to get things consistent everywhere. Hopefully this is that last partial error. Bug: T94800 Change-Id: I321b24d559e908fcd140cc0ca21e7d33c6b070a0 --- M includes/Formatter/Contributions.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/80/201580/1 diff --git a/includes/Formatter/Contributions.php b/includes/Formatter/Contributions.php index 0d7ecc0..bd98466 100644 --- a/includes/Formatter/Contributions.php +++ b/includes/Formatter/Contributions.php @@ -104,7 +104,7 @@ array( 'href' = $anchor-getFullURL(), 'data-flow-interactive-handler' = 'moderationDialog', - 'data-flow-template' = flow_moderate_$type, + 'data-flow-template' = flow_moderate_$type.partial, 'data-role' = $key, 'class' = 'flow-history-moderation-action flow-click-interactive', ), -- To view, visit https://gerrit.wikimedia.org/r/201580 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I321b24d559e908fcd140cc0ca21e7d33c6b070a0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] icinga: give Moritz permissions to run commands - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: icinga: give Moritz permissions to run commands .. icinga: give Moritz permissions to run commands Let Moritz run commands on Icinga (this is separate from the LDAP login), permissions in Icinga itself to schedule downtimes, ACK things etc. Bug:T94717 Bug:T94729 Change-Id: I9d16c67408d68b2bd0b496611271f871e1063e87 --- M modules/icinga/files/cgi.cfg 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/icinga/files/cgi.cfg b/modules/icinga/files/cgi.cfg index 3028275..6da6f6d 100644 --- a/modules/icinga/files/cgi.cfg +++ b/modules/icinga/files/cgi.cfg @@ -131,7 +131,7 @@ # not use authorization. You may use an asterisk (*) to # authorize any user who has authenticated to the web server. -authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda +authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Moritz Mühlenhoff # CONFIGURATION INFORMATION ACCESS @@ -142,7 +142,7 @@ # an asterisk (*) to authorize any user who has authenticated # to the web server. -authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda +authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Moritz Mühlenhoff @@ -155,7 +155,7 @@ # You may use an asterisk (*) to authorize any user who has # authenticated to the web server. -authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda +authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Moritz Mühlenhoff # GLOBAL HOST/SERVICE VIEW ACCESS @@ -181,8 +181,8 @@ # authorization). You may use an asterisk (*) to authorize any # user who has authenticated to the web server. -authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda -authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda +authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Moritz Mühlenhoff +authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Moritz Mühlenhoff -- To view, visit https://gerrit.wikimedia.org/r/201251 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d16c67408d68b2bd0b496611271f871e1063e87 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi
[MediaWiki-commits] [Gerrit] Turn of strict javadoc in java 8 - change (wikidata...rdf)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201585
Change subject: Turn of strict javadoc in java 8
..
Turn of strict javadoc in java 8
Java 8 has a way too strict checker for Javadoc. And the command to turn it
off isn't available in older versions of Java. So we turn it off in just
java 8 using a careful trick borrowed from dropwizard.
Change-Id: I76fadc45969549929b77d76e5b22e74e1170110c
---
M pom.xml
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/85/201585/1
diff --git a/pom.xml b/pom.xml
index 469f10a..f4dd10d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,6 +202,9 @@
/goals
configuration
quiettrue/quiet
+!-- We don't want Java 8's strict javadoc checking so we use
this trick borrowed from dropwizard to turn
+ it off --
+additionalparam${javadoc.doclint.none}/additionalparam
/configuration
/execution
/executions
@@ -360,5 +363,14 @@
/pluginManagement
/build
/profile
+profile
+ idjava-8/id
+ activation
+jdk[1.8,)/jdk
+ /activation
+ properties
+javadoc.doclint.none-Xdoclint.none/javadoc.doclint.none
+ /properties
+/profile
/profiles
/project
--
To view, visit https://gerrit.wikimedia.org/r/201585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76fadc45969549929b77d76e5b22e74e1170110c
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
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] Tag v0.9.5 - change (oojs/ui)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201586
Change subject: Tag v0.9.5
..
Tag v0.9.5
Change-Id: Ic873b94ad848149c1b12bdfa309415d7d5a3020b
---
M History.md
M README.md
M package.json
3 files changed, 35 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/86/201586/1
diff --git a/History.md b/History.md
index aa2ef62..7a33200 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,38 @@
# OOjs UI Release History
+## v0.9.5 / 2015-04-02
+* ActionFieldLayout: Add description and example (Kirsten Menger-Anderson)
+* Add vertical spacing to RadioSelectWidget in MW theme (Ed Sanders)
+* Allow rejecting Process with single Error (Matthew Flaschen)
+* Apex theme: Tweak 'check.svg' syntax (Bartosz Dziewoński)
+* Balance padding now that focus highlight is balanced (Ed Sanders)
+* BookletLayout: Add description and example (Kirsten Menger-Anderson)
+* Choose can't emit with a null item (Ed Sanders)
+* Deprecate search widget event re-emission (Ed Sanders)
+* Fix opacity of icons/indicators in disabled DecoratedOptionWidget (Ed
Sanders)
+* IconWidget: Mix in FlaggedElement (Bartosz Dziewoński)
+* Increase specificity of ButtonElement icon and indicator styles (Bartosz
Dziewoński)
+* MediaWiki theme: Allow intention flags for non-buttons (Andrew Garrett)
+* MediaWiki theme: Fix icon opacity for disabled ButtonOptionWidgets (Bartosz
Dziewoński)
+* MediaWiki theme: Use checkbox icon per mockups (Bartosz Dziewoński)
+* MediaWiki, Apex: Provide an RTL variant for the help icon (James D.
Forrester)
+* MenuLayout: Correct documentation (Bartosz Dziewoński)
+* OutlineOption: Add description (Kirsten Menger-Anderson)
+* PageLayout: Add description (Kirsten Menger-Anderson)
+* Process: Add description (Kirsten Menger-Anderson)
+* Properly support LTR/RTL icon versions in colorize-svg.js (Bartosz
Dziewoński)
+* Refactor icon handling again (Bartosz Dziewoński)
+* Remove line height reset for windows (Ed Sanders)
+* Restore font family definitions to form elements (Ed Sanders)
+* Revert Button styles between OOJS and MW (Bartosz Dziewoński)
+* StackLayout: Add description and example (Kirsten Menger-Anderson)
+* build: Add a 'generated automatically' banner to demo.rtl.css (Bartosz
Dziewoński)
+* build: Generate prettier task names for 'colorizeSvg' (Bartosz Dziewoński)
+* build: Have separate 'cssjanus' target for demo.rtl.css (Bartosz Dziewoński)
+* build: Simplify 'fileExists' task configuration (Bartosz Dziewoński)
+* build: Support (poorly) per-language icon versions in colorize-svg.js
(Bartosz Dziewoński)
+* build: Update grunt-banana-checker to v0.2.1 (James D. Forrester)
+
## v0.9.4 / 2015-03-25
* ButtonElement: Clarify description (Kirsten Menger-Anderson)
* ButtonElement: Disable line wrapping on buttons (Ed Sanders)
diff --git a/README.md b/README.md
index 4a28179..e537752 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@
# Update release notes
# Copy the resulting list into a new section on History.md
-$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e
'console.log(require(./package.json).version);')...HEAD | grep -v
Localisation updates from
+$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e
'console.log(require(./package.json).version);')...HEAD | grep -v
Localisation updates from | sort
$ edit History.md
# Update the version number
diff --git a/package.json b/package.json
index e4ed215..fdf1c57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
name: oojs-ui,
- version: 0.9.4,
+ version: 0.9.5,
description: User interface classes built on the OOjs framework.,
keywords: [
oojs-plugin,
--
To view, visit https://gerrit.wikimedia.org/r/201586
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic873b94ad848149c1b12bdfa309415d7d5a3020b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs: Add monitoring for high iowait on labstore instances - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201591
Change subject: labs: Add monitoring for high iowait on labstore instances
..
labs: Add monitoring for high iowait on labstore instances
Bug: T94606
Change-Id: I67ae83fbca719f16730e21af102d7446e1148503
---
M manifests/role/labsnfs.pp
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/201591/1
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index dd3ab9b..d326433 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -71,4 +71,13 @@
percentage = '10',# smooth over peaks
}
+monitoring::graphite_threshold { 'high_iowait_stalling':
+description = 'Persistent high iowait',
+metric = servers.${::hostname}.cpu.total.iowait.value,
+from= '10min',
+warning = '40',
+critical= '50',
+percentage = '50', # Spikes shouldn't last long at all
+}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/201591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67ae83fbca719f16730e21af102d7446e1148503
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] Collapse image gallery description whitespace. - change (apps...wikipedia)
Dr0ptp4kt has submitted this change and it was merged.
Change subject: Collapse image gallery description whitespace.
..
Collapse image gallery description whitespace.
Does so in punctuation aware manner. ie btest/b. is
collapsed to test. not test .
Bug: T93662
Change-Id: I25146301cbe5c319a53af2945e8037c0c3eb985d
---
M WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
M wikipedia/Categories/NSString+WMFHTMLParsing.h
M wikipedia/Categories/NSString+WMFHTMLParsing.m
M wikipedia/Networking/Serializers/MWKImageInfoResponseSerializer.m
4 files changed, 53 insertions(+), 2 deletions(-)
Approvals:
Dr0ptp4kt: Looks good to me, approved
Fjalapeno: Looks good to me, but someone else must approve
Bgerstle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
b/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
index 82de594..3527355 100644
--- a/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
+++ b/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
@@ -81,4 +81,25 @@
@Syncopation);
}
+- (void)testPunctuationAwareWhitespaceCollapsingCommasSemicolonsAndPeriods {
+NSString *string = @trim space before commas , semicolons ; and periods
.;
+XCTAssertEqualObjects([string
wmf_getCollapsedWhitespaceStringAdjustedForTerminalPunctuation], @trim space
before commas, semicolons; and periods.);
+}
+
+- (void)testPunctuationAwareWhitespaceCollapsingLeadingAndTrailingWhitespace {
+NSString *string = @ \t trim leading and trailing whitespace ok? \n \t;
+XCTAssertEqualObjects([string
wmf_getCollapsedWhitespaceStringAdjustedForTerminalPunctuation], @trim leading
and trailing whitespace ok?);
+}
+
+-
(void)testPunctuationAwareWhitespaceCollapsingReduceWhitespaceAroundParenthesisOrBrackets
{
+NSString *string = @collapse but do not ( no! ) completely remove
space around parenthesis or brackets [ \t brackets!\t];
+XCTAssertEqualObjects([string
wmf_getCollapsedWhitespaceStringAdjustedForTerminalPunctuation], @collapse but
do not ( no! ) completely remove space around parenthesis or brackets [
brackets! ]);
+}
+
+- (void)testAllWhitepacesCollapsing {
+NSString *string = @ \t \n This should \t\t not have \t\n so much
space! \n\n\t;
+XCTAssertEqualObjects([string
wmf_stringByCollapsingAllWhitespaceToSingleSpaces],
+ @ This should not have so much space! );
+}
+
@end
diff --git a/wikipedia/Categories/NSString+WMFHTMLParsing.h
b/wikipedia/Categories/NSString+WMFHTMLParsing.h
index 742406c..94169f0 100644
--- a/wikipedia/Categories/NSString+WMFHTMLParsing.h
+++ b/wikipedia/Categories/NSString+WMFHTMLParsing.h
@@ -27,6 +27,13 @@
*/
- (NSString*)wmf_getStringSnippetWithoutHTML;
+/**
+ *
+ *
+ * @return Return string with internal whitespace segments reduced to single
space. Accounts for end of sentence punctuation like commas, semicolons and
periods. Trims leading and trailing whitespace as well.
+ */
+- (NSString*)wmf_getCollapsedWhitespaceStringAdjustedForTerminalPunctuation;
+
- (NSString*)wmf_stringByCollapsingConsecutiveNewlines;
- (NSString*)wmf_stringByRecursivelyRemovingParenthesizedContent;
- (NSString*)wmf_stringByRemovingBracketedContent;
@@ -34,5 +41,6 @@
- (NSString*)wmf_stringByRemovingWhiteSpaceBeforePeriod;
- (NSString*)wmf_stringByCollapsingConsecutiveSpaces;
- (NSString*)wmf_stringByRemovingLeadingOrTrailingSpacesNewlinesOrColons;
+- (NSString*)wmf_stringByCollapsingAllWhitespaceToSingleSpaces;
@end
diff --git a/wikipedia/Categories/NSString+WMFHTMLParsing.m
b/wikipedia/Categories/NSString+WMFHTMLParsing.m
index 33acdc9..f48ba4c 100644
--- a/wikipedia/Categories/NSString+WMFHTMLParsing.m
+++ b/wikipedia/Categories/NSString+WMFHTMLParsing.m
@@ -14,6 +14,14 @@
valueForKey:WMF_SAFE_KEYPATH([TFHppleElement new], content)];
}
+- (NSString*)wmf_getCollapsedWhitespaceStringAdjustedForTerminalPunctuation {
+NSString* result = [self
wmf_stringByCollapsingAllWhitespaceToSingleSpaces];
+result = [result wmf_stringByRemovingWhiteSpaceBeforeCommasAndSemicolons];
+result = [result wmf_stringByRemovingWhiteSpaceBeforePeriod];
+result = [result stringByTrimmingCharactersInSet:[NSCharacterSet
whitespaceCharacterSet]];
+return result;
+}
+
- (NSString*)wmf_joinedHtmlTextNodes {
return [self wmf_joinedHtmlTextNodesWithDelimiter:@ ];
}
@@ -157,6 +165,20 @@
withTemplate:@ ];
}
+- (NSString*)wmf_stringByCollapsingAllWhitespaceToSingleSpaces {
+static NSRegularExpression* whitespaceRegex;
+if (!whitespaceRegex) {
+whitespaceRegex = [NSRegularExpression
+ regularExpressionWithPattern:@\\s+
+options:0
+ error:nil];
+}
+return [whitespaceRegex
[MediaWiki-commits] [Gerrit] Make colorize-svg.js actually work more often - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Make colorize-svg.js actually work more often
..
Make colorize-svg.js actually work more often
Follow-up to e4358fdba586dd6266e1c800a71375614c7510fa.
We allow the following formats:
* { file: foo.svg }
* { file: { default: foo.svg } }
* { file: { ltr: foo.svg, rtl: foo.svg } }
But the second didn't work at all.
Also simplified how we handle images without LTR/RTL variants.
Change-Id: I00e992ec692957a60d4e23a427774251903457f8
---
M build/tasks/colorize-svg.js
1 file changed, 2 insertions(+), 6 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/build/tasks/colorize-svg.js b/build/tasks/colorize-svg.js
index 0328b34..15de4c8 100644
--- a/build/tasks/colorize-svg.js
+++ b/build/tasks/colorize-svg.js
@@ -173,8 +173,8 @@
var selector, declarations, direction, lang, langSelector,
deferred = Q.defer(),
file = typeof this.file === 'string' ?
- { default: this.file } :
- { ltr: this.file.ltr, rtl: this.file.rtl },
+ { ltr: this.file, rtl: this.file } :
+ { ltr: this.file.ltr || this.file.default, rtl:
this.file.rtl || this.file.default },
moreLangs = this.file.lang || {},
name = this.name,
sourcePath = this.list.getPath(),
@@ -185,7 +185,6 @@
cssPrependPath = this.list.options.cssPrependPath,
originalSvg = {},
rules = {
- default: [],
ltr: [],
rtl: []
},
@@ -319,9 +318,6 @@
}
deferred.reject( 'Failed to generate some images' );
} else {
- rules.ltr = rules.ltr.concat( rules.default );
- rules.rtl = rules.rtl.concat( rules.default );
- delete rules.default;
deferred.resolve( {
rules: rules,
files: files
--
To view, visit https://gerrit.wikimedia.org/r/201587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00e992ec692957a60d4e23a427774251903457f8
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@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] README Changed - change (mediawiki...WikidataPageBanner)
Jdlrobson has submitted this change and it was merged. Change subject: README Changed .. README Changed Bug: T93127 Change-Id: If985231679a47897307ec37019efccc15061db33 --- M README 1 file changed, 3 insertions(+), 6 deletions(-) Approvals: Jdlrobson: Verified; Looks good to me, approved diff --git a/README b/README index 2831f44..df5883f 100644 --- a/README +++ b/README @@ -1,8 +1,5 @@ Wikidata PageBanner Extension = -This is an initial repository for developing Wikidata PageBanner Extension as -per the proposal at https://phabricator.wikimedia.org/T93106 -for the tracking bug at https://phabricator.wikimedia.org/T77925 - -After the initial setup of the boilerplate extension, the code will be moved to gerrit for development. -The tracking bug for repository migration to gerrit is at https://phabricator.wikimedia.org/T93127 +This is a repository for Wikidata PageBanner Extension for Wikivoyage as +per the proposal at https://phabricator.wikimedia.org/T93106. +The tracking bug for the extension is at https://phabricator.wikimedia.org/T77925 -- To view, visit https://gerrit.wikimedia.org/r/201270 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If985231679a47897307ec37019efccc15061db33 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataPageBanner Gerrit-Branch: master Gerrit-Owner: Sumit asthana.sumi...@gmail.com Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove triangle callout in TWN Main page - change (mediawiki...TwnMainPage)
Phoenix303 has uploaded a new change for review. https://gerrit.wikimedia.org/r/201595 Change subject: Remove triangle callout in TWN Main page .. Remove triangle callout in TWN Main page Added 'removecallout' class to override group selector css. Change-Id: I9f34091a48aedbbbddce84709e267d13bb700125 --- M resources/js/ext.translate.mainpage.js 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage refs/changes/95/201595/1 diff --git a/resources/js/ext.translate.mainpage.js b/resources/js/ext.translate.mainpage.js index 32c4598..078d855 100644 --- a/resources/js/ext.translate.mainpage.js +++ b/resources/js/ext.translate.mainpage.js @@ -183,6 +183,9 @@ // Replace the last shown tile with group selector. // Users without JavaScript will just see the original one. $tiles.eq( maxProjectTiles - 1 ).replaceWith( $selector ); + + // Add class to remove the triangle callout in the TWN Main Page. + $( this ).find( '.tux-groupselector' ).addClass( 'removecallout' ); } $( document ).ready( setupStatsTiles ); -- To view, visit https://gerrit.wikimedia.org/r/201595 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f34091a48aedbbbddce84709e267d13bb700125 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Phoenix303 divyalife...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added class to remove group selector triangle callout. - change (mediawiki...Translate)
Phoenix303 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201597
Change subject: Added class to remove group selector triangle callout.
..
Added class to remove group selector triangle callout.
Change-Id: Ic789fc767eacb0243e748fc2c77b95a2ab49bc7b
---
M resources/css/ext.translate.groupselector.css
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/97/201597/1
diff --git a/resources/css/ext.translate.groupselector.css
b/resources/css/ext.translate.groupselector.css
index 74f0514..d3fdca5 100644
--- a/resources/css/ext.translate.groupselector.css
+++ b/resources/css/ext.translate.groupselector.css
@@ -90,6 +90,12 @@
top: -6px;
}
+/* Remove the triangle shaped callout */
+.tux-groupselector.removecallout:before,
+.tux-groupselector.removecallout:after {
+ content: none;
+}
+
.grid .tux-groupselector__title {
border: none;
color: #55;
--
To view, visit https://gerrit.wikimedia.org/r/201597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic789fc767eacb0243e748fc2c77b95a2ab49bc7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Phoenix303 divyalife...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix unstyled edit links when page has noexternallanglinks - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201569
Change subject: Fix unstyled edit links when page has noexternallanglinks
..
Fix unstyled edit links when page has noexternallanglinks
If a page was connected to wikibase and had links,
then we were not properly checking noexternallanglinks.
RepoItemLinkGeneratorTest wasn't properly testing this.
Fixed and added more test cases.
Also, having edit links when noexternallanglinks suppresses
only some links and not all was not handled consistently.
Bug: T94889
Change-Id: I4877e62b71ed2027762627d8228617d9ba6a47f9
---
M client/includes/Hooks/BeforePageDisplayHandler.php
M client/includes/RepoItemLinkGenerator.php
M client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
M client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
4 files changed, 52 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/69/201569/1
diff --git a/client/includes/Hooks/BeforePageDisplayHandler.php
b/client/includes/Hooks/BeforePageDisplayHandler.php
index b3e0d44..68b2336 100644
--- a/client/includes/Hooks/BeforePageDisplayHandler.php
+++ b/client/includes/Hooks/BeforePageDisplayHandler.php
@@ -67,8 +67,8 @@
private function hasEditOrAddLinks( OutputPage $out, Title $title,
$actionName ) {
if (
- $out-getProperty( 'noexternallanglinks' ) ||
!in_array( $actionName, array( 'view', 'submit' ) ) ||
+ $this-allLinksAreSuppressed( $out ) ||
!$title-exists()
) {
return false;
@@ -77,6 +77,16 @@
return true;
}
+ private function allLinksAreSuppressed( OutputPage $out ) {
+ $noexternallanglinks = $out-getProperty( 'noexternallanglinks'
);
+
+ if ( $noexternallanglinks !== null ) {
+ return in_array( '*', $noexternallanglinks );
+ }
+
+ return false;
+ }
+
private function hasLinkItemWidget( User $user, OutputPage $out, Title
$title, $actionName ) {
if (
$out-getLanguageLinks() !== array() ||
!$user-isLoggedIn()
diff --git a/client/includes/RepoItemLinkGenerator.php
b/client/includes/RepoItemLinkGenerator.php
index 90bac80..1e765cc 100644
--- a/client/includes/RepoItemLinkGenerator.php
+++ b/client/includes/RepoItemLinkGenerator.php
@@ -77,16 +77,17 @@
* @return string|null HTML or null for no link
*/
public function getLink( Title $title, $action, $hasLangLinks, array
$noExternalLangLinks = null, $prefixedId ) {
- $entityId = null;
- if ( is_string( $prefixedId ) ) {
- $entityId = $this-entityIdParser-parse( $prefixedId );
- }
-
- if ( $entityId $hasLangLinks ) {
- return $this-getEditLinksLink( $entityId );
- }
-
if ( $this-canHaveLink( $title, $action, $noExternalLangLinks
) ) {
+ $entityId = null;
+
+ if ( is_string( $prefixedId ) ) {
+ $entityId = $this-entityIdParser-parse(
$prefixedId );
+ }
+
+ if ( $entityId $hasLangLinks ) {
+ return $this-getEditLinksLink( $entityId );
+ }
+
return $this-getAddLinksLink( $title, $entityId );
}
diff --git
a/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
b/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
index 6d91360..9932a60 100644
--- a/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
+++ b/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
@@ -89,6 +89,20 @@
);
}
+ public function testHandlePageConnectedToWikibase_noexternallinklinks()
{
+ $skin = $this-getSkin( true, true ); // user logged in
+
+ // page connected, has links and noexternallanglinks
+ $output = $this-getOutputPage( $skin, array( 'de:Rom' ), 'Q4',
array( '*' ) );
+ $namespaceChecker = $this-getNamespaceChecker( true );
+
+ $handler = new BeforePageDisplayHandler( $namespaceChecker );
+ $handler-addModules( $output, 'view' );
+
+ $this-assertEquals( array(), $output-getModules(), 'js
modules' );
+ $this-assertEquals( array(), $output-getModuleStyles(), 'css
modules' );
+ }
+
/**
* @dataProvider pageNotConnectedToWikibaseProvider
*/
@@ -261,7 +275,9 @@
return $namespaceChecker;
}
- private function getOutputPage( Skin
[MediaWiki-commits] [Gerrit] Fix error handling for edit workflow - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201594
Change subject: Fix error handling for edit workflow
..
Fix error handling for edit workflow
Using this in wrong context
Bug: T94106
Change-Id: I01873f279b3d06d2069d7445ccdd375b2299e2b7
---
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/94/201594/1
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index 482f6da..8ec63f8 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -58,6 +58,7 @@
*/
onSaveClick: function () {
var title = this.$( '.title' ).val(),
+ self = this,
description = this.$( '.description' ).val();
if ( this.isTitleValid( title )
this.isDescriptionValid( description ) ) {
@@ -74,7 +75,7 @@
window.location.reload();
} );
} ).fail( function ( errMsg ) {
- toast.show(
this.options.editFailedError, 'toast error' );
+ toast.show(
self.options.editFailedError, 'toast error' );
// Make it possible to try again.
this.$( '.mw-ui-input, .save' ).prop(
'disabled', false );
schema.log( {
@@ -83,7 +84,7 @@
} );
} );
} else {
- toast.show( this.options.editFailedError,
'toast error' );
+ toast.show( this.options.gr, 'toast error' );
}
},
--
To view, visit https://gerrit.wikimedia.org/r/201594
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01873f279b3d06d2069d7445ccdd375b2299e2b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consolidate tests spec'ing wikitext serialization norms - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review. https://gerrit.wikimedia.org/r/201593 Change subject: Consolidate tests spec'ing wikitext serialization norms .. Consolidate tests spec'ing wikitext serialization norms Change-Id: I067f4ac056fe4cf44721f5acfe396a1102d08bb6 --- M tests/parserTests.txt 1 file changed, 43 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/93/201593/1 diff --git a/tests/parserTests.txt b/tests/parserTests.txt index dc63a94..1ffe3aa 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -23442,22 +23442,6 @@ !! end !! test -Lists: Add space after bullets -!! options -parsoid=html2wt -!! html -ul -lifoo/li -li bar/li -lispan baz/span/li -/ul -!! wikitext -* foo -* bar -* span baz/span -!! end - -!! test Lists: Dont insert newlines in a serialized list item. !! options parsoid=html2wt @@ -23466,25 +23450,6 @@ !! wikitext * abrb * c -!! end - -!! test -Headings: Add space before/after == (Bug 51744) -!! options -parsoid=html2wt -!! html -h2foo/h2 -h2 bar/h2 -h2baz /h2 -h2span baz/span/h2 -!! wikitext -== foo == - -== bar == - -== baz == - -== span baz/span == !! end !! test @@ -23992,6 +23957,49 @@ [http://boo.org http://boohoo.org] !! end +# +# Tests spec'ing wikitext serialization norms | +# + +!! test +Lists: Add space after bullets +!! options +parsoid=html2wt +!! html +ul +lifoo/li +li bar/li +lispan baz/span/li +/ul +!! wikitext +* foo +* bar +* span baz/span +!! end + +!! test +Headings: Add space before/after == (Bug 51744) +!! options +parsoid=html2wt +!! html +h2foo/h2 +h2 bar/h2 +h2baz /h2 +h2span baz/span/h2 +!! wikitext +== foo == + +== bar == + +== baz == + +== span baz/span == +!! end + +# --- +# End of tests spec'ing wikitext serialization norms | +# --- + # - # End of section for Parsoid-only html2wt tests for serialization # of new content -- To view, visit https://gerrit.wikimedia.org/r/201593 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I067f4ac056fe4cf44721f5acfe396a1102d08bb6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra abrea...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove dependency on mobile.templates where hogan i... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Remove dependency on mobile.templates where hogan is used .. Hygiene: Remove dependency on mobile.templates where hogan is used Drop use of mobile.templates everywhere as the addition of mediawiki.template.hogan is now handled by ResourceLoaderFileModule Change-Id: Icde3730e77e5adb611a8c9ddef80f1d600ea6f34 --- M includes/Resources.php 1 file changed, 2 insertions(+), 22 deletions(-) Approvals: Kaldari: Looks good to me, approved Jdlrobson: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 1060e89..f3edb96 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -162,7 +162,6 @@ 'mobile.view' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mobile.oo', - 'mobile.templates', ), 'scripts' = array( 'javascripts/View.js', @@ -222,8 +221,8 @@ ), ), - // Back-compat alias - // FIXME: Remove when templates in core. + // Backwards compability for Zero and other extensions that may still use this + // FIXME: Remove when https://phabricator.wikimedia.org/T94462 resolved. 'mobile.templates' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mediawiki.template.hogan', @@ -268,7 +267,6 @@ 'mobile.toc' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mobile.startup', - 'mobile.templates', 'mobile.loggingSchemas', 'mobile.toggling', ), @@ -308,7 +306,6 @@ 'mobile.startup' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mobile.head', - 'mobile.templates', 'mobile.user', 'mediawiki.api', 'mobile.redlinks', @@ -419,7 +416,6 @@ 'dependencies' = array( 'mobile.overlays', 'mobile.startup', - 'mobile.templates', ), 'templates' = array( 'Overlay.hogan' = 'templates/modules/editor/AbuseFilterOverlay.hogan', @@ -453,7 +449,6 @@ 'dependencies' = array( 'oojs-ui', 'mobile.stable', - 'mobile.templates', 'mobile.editor.api', 'mobile.settings', 'mobile.drawers', @@ -526,7 +521,6 @@ 'mobile.uploads' = $wgMFResourceParsedMessageModuleBoilerplate + array( 'dependencies' = array( 'mobile.stable', - 'mobile.templates', 'mobile.editor.api', 'mobile.contentOverlays', 'mobile.foreignApi', @@ -619,7 +613,6 @@ 'dependencies' = array( 'mobile.pagelist.scripts', 'mobile.overlays', - 'mobile.templates', 'mobile.loggingSchemas', 'mediawiki.Title', ), @@ -646,7 +639,6 @@ 'mobile.talk.overlays' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mobile.talk', - 'mobile.templates', 'mediawiki.ui.anchor', ), 'scripts' = array( @@ -699,7 +691,6 @@ 'mobile.overlays', // for Api.js 'mobile.startup', - 'mobile.templates', ), 'styles' = array( 'less/modules/mediaViewer.less', @@ -734,7 +725,6 @@ 'dependencies' = array( 'mediawiki.Title', 'mobile.overlays', - 'mobile.templates', 'mobile.loggingSchemas', 'mobile.toast', 'mobile.search', @@ -777,7 +767,6 @@ 'mobile.overlays' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( - 'mobile.templates', 'mobile.startup', 'mobile.ajax', ), @@ -943,7 +932,6 @@ 'mobile.newusers' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( - 'mobile.templates',
[MediaWiki-commits] [Gerrit] Fix a couple issues with single WebView. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix a couple issues with single WebView.
..
Fix a couple issues with single WebView.
- Properly remember the y-scroll offset of the previous page.
- Improve our WebView's custom onClick handler so that it gets
consumed properly if it's handled by the Lead Image or Bottom
Content container.
Change-Id: Iafcbfadb9fcfac6d86841e2094808adb6c662848
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandlerOld.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M wikipedia/src/main/java/org/wikipedia/views/ObservableWebView.java
5 files changed, 38 insertions(+), 11 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 608d5af..777f0bd 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -485,10 +485,9 @@
return;
}
PageBackStackItem item = backStack.get(backStack.size() - 1);
-// display the page based on the backstack item...
-displayNewPage(item.getTitle(), item.getHistoryEntry(), true, false);
-// and stage the scrollY position based on the backstack item.
-stagedScrollY = item.getScrollY();
+// display the page based on the backstack item, stage the scrollY
position based on
+// the backstack item.
+displayNewPage(item.getTitle(), item.getHistoryEntry(), true, false,
item.getScrollY());
}
/**
@@ -504,6 +503,22 @@
*/
public void displayNewPage(PageTitle title, HistoryEntry entry, boolean
tryFromCache,
boolean pushBackStack) {
+displayNewPage(title, entry, tryFromCache, pushBackStack, 0);
+}
+
+/**
+ * Load a new page into the WebView in this fragment.
+ * This shall be the single point of entry for loading content into the
WebView, whether it's
+ * loading an entirely new page, refreshing the current page, retrying a
failed network
+ * request, etc.
+ * @param title Title of the new page to load.
+ * @param entry HistoryEntry associated with the new page.
+ * @param tryFromCache Whether to try loading the page from cache
(otherwise load directly
+ * from network).
+ * @param pushBackStack Whether to push the new page onto the backstack.
+ */
+public void displayNewPage(PageTitle title, HistoryEntry entry, boolean
tryFromCache,
+ boolean pushBackStack, int stagedScrollY) {
if (pushBackStack) {
// update the topmost entry in the backstack, before we start
overwriting things.
updateBackStackItem();
@@ -538,6 +553,7 @@
// whatever we pass to this event will be passed back to us by the
WebView!
wrapper.put(sequence, pageSequenceNum);
wrapper.put(tryFromCache, tryFromCache);
+wrapper.put(stagedScrollY, stagedScrollY);
bridge.sendMessage(beginNewPage, wrapper);
} catch (JSONException e) {
//nope
@@ -545,9 +561,6 @@
}
private void loadPageOnWebViewReady(boolean tryFromCache) {
-// reset staged scroll position to the top.
-stagedScrollY = 0;
-
// stage any section-specific link target from the title, since the
title may be
// replaced (normalized)
sectionTargetFromTitle = title.getFragment();
@@ -647,6 +660,7 @@
if (messagePayload.getInt(sequence) != pageSequenceNum) {
return;
}
+stagedScrollY = messagePayload.getInt(stagedScrollY);
loadPageOnWebViewReady(messagePayload.getBoolean(tryFromCache));
} catch (JSONException e) {
//nope
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index f55caba..58fab03 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -91,7 +91,10 @@
webview.addOnClickListener(new ObservableWebView.OnClickListener() {
@Override
-public void onClick(float x, float y) {
+public boolean onClick(float x, float y) {
+if
[MediaWiki-commits] [Gerrit] Consolidate tests spec'ing wikitext serialization norms - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: Consolidate tests spec'ing wikitext serialization norms .. Consolidate tests spec'ing wikitext serialization norms * Updates a test to catch the bug fixed in 1d7409cda185bc87. Change-Id: I067f4ac056fe4cf44721f5acfe396a1102d08bb6 --- M tests/parserTests.txt 1 file changed, 50 insertions(+), 35 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/parserTests.txt b/tests/parserTests.txt index dc63a94..f936161 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -23442,22 +23442,6 @@ !! end !! test -Lists: Add space after bullets -!! options -parsoid=html2wt -!! html -ul -lifoo/li -li bar/li -lispan baz/span/li -/ul -!! wikitext -* foo -* bar -* span baz/span -!! end - -!! test Lists: Dont insert newlines in a serialized list item. !! options parsoid=html2wt @@ -23466,25 +23450,6 @@ !! wikitext * abrb * c -!! end - -!! test -Headings: Add space before/after == (Bug 51744) -!! options -parsoid=html2wt -!! html -h2foo/h2 -h2 bar/h2 -h2baz /h2 -h2span baz/span/h2 -!! wikitext -== foo == - -== bar == - -== baz == - -== span baz/span == !! end !! test @@ -23992,6 +23957,56 @@ [http://boo.org http://boohoo.org] !! end +# +# Tests spec'ing wikitext serialization norms | +# + +!! test +Lists: Add space after bullets +!! options +parsoid=html2wt +!! html +ul +lifoo/li +li bar/li +lispan baz/span/li +/ul +!! wikitext +* foo +* bar +* span baz/span +!! end + +!! test +Headings: Add space before/after == (T53744) +!! options +parsoid=html2wt +!! html +h2foo/h2 +h2 bar/h2 +h2baz /h2 +h2span baz/span/h2 + +!-- Even after hoisted content -- +h2 link href=Category:A2 rel=mw:PageProp/Category /ok/h2 +!! wikitext +== foo == + +== bar == + +== baz == + +== span baz/span == + +!-- Even after hoisted content -- + [[Category:A2]] +== ok == +!! end + +# --- +# End of tests spec'ing wikitext serialization norms | +# --- + # - # End of section for Parsoid-only html2wt tests for serialization # of new content -- To view, visit https://gerrit.wikimedia.org/r/201593 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I067f4ac056fe4cf44721f5acfe396a1102d08bb6 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra abrea...@wikimedia.org Gerrit-Reviewer: Cscott canan...@wikimedia.org Gerrit-Reviewer: Marcoil marc...@wikimedia.org Gerrit-Reviewer: Subramanya Sastry ssas...@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 flow_moderate_post.handlebars not found - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Fix flow_moderate_post.handlebars not found .. Fix flow_moderate_post.handlebars not found Caused by I1b8d92f2 which we knew was a bit dangerous, but decided to do it anyways to get things consistent everywhere. Hopefully this is that last partial error. Bug: T94800 Change-Id: I321b24d559e908fcd140cc0ca21e7d33c6b070a0 (cherry picked from commit 5331a3862280c6dd2e386c7c4ecb2b1ef25d7d1e) --- M includes/Formatter/Contributions.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Formatter/Contributions.php b/includes/Formatter/Contributions.php index 0d7ecc0..bd98466 100644 --- a/includes/Formatter/Contributions.php +++ b/includes/Formatter/Contributions.php @@ -104,7 +104,7 @@ array( 'href' = $anchor-getFullURL(), 'data-flow-interactive-handler' = 'moderationDialog', - 'data-flow-template' = flow_moderate_$type, + 'data-flow-template' = flow_moderate_$type.partial, 'data-role' = $key, 'class' = 'flow-history-moderation-action flow-click-interactive', ), -- To view, visit https://gerrit.wikimedia.org/r/201485 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I321b24d559e908fcd140cc0ca21e7d33c6b070a0 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: wmf/1.25wmf24 Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: EBernhardson ebernhard...@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 QQQ codes - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201601
Change subject: Add missing QQQ codes
..
Add missing QQQ codes
Bug: T94545
Change-Id: Ie8bfa71543dba6dd01cd7a1898af8b67a75d327f
---
M i18n/qqq.json
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/01/201601/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c700eb4..327bd6b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -13,6 +13,8 @@
Florian Schmidt
]
},
+ gather: Title of special page shown on Special:SpecialPages for
viewing your own lists.,
+ gatherlists: Title of special page shown on Special:SpecialPages
that allows you to view all publicly created lists.,
gather-lists-showhidden: Link title to show hidden lists on
[[Special:GatherLists]].,
gather-lists-showvisible: Link title to show visible lists on
[[Special:GatherLists]].,
gather-lists-collection-owner: Table column header in a list of all
collections. The column will list usernames of people who own
collection.\n{{Identical|Owner}},
--
To view, visit https://gerrit.wikimedia.org/r/201601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8bfa71543dba6dd01cd7a1898af8b67a75d327f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump VE submodule in 1.25wmf24 - change (mediawiki/core)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/201602 Change subject: Bump VE submodule in 1.25wmf24 .. Bump VE submodule in 1.25wmf24 Change-Id: Ib195f841552d4be99c5f78e3bb5919cb1e9f98eb --- M extensions/VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/02/201602/1 diff --git a/extensions/VisualEditor b/extensions/VisualEditor index 931a4c4..c6ea5d4 16 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit 931a4c4e895b34a94a6750a1a3e13dcdcafb0d44 +Subproject commit c6ea5d44a7a77ecdd4e75e6d3c7eb4f990884cf9 -- To view, visit https://gerrit.wikimedia.org/r/201602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib195f841552d4be99c5f78e3bb5919cb1e9f98eb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf24 Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cleanup project fastfile - change (apps...wikipedia)
Bgerstle has uploaded a new change for review. https://gerrit.wikimedia.org/r/201608 Change subject: cleanup project fastfile .. cleanup project fastfile Bug: T94769 Change-Id: I301d72138ed4ffbf710df5840368581f2a26b3c6 --- M .gitignore D BetaConfig.xcconfig M Gemfile M Gemfile.lock M Makefile M OldDataSchema/Categories/NSManagedObjectModel+OldDataSchema.m M Podfile M Wikipedia.xcodeproj/project.pbxproj A Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Alpha.xcscheme A Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Beta.xcscheme R Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia.xcscheme D Wikipedia.xcodeproj/xcshareddata/xcschemes/WikipediaAlpha.xcscheme D Wikipedia.xcodeproj/xcshareddata/xcschemes/WikipediaBeta.xcscheme D Wikipedia.xcodeproj/xcshareddata/xcschemes/WikipediaRelease.xcscheme M WikipediaUnitTests/OldDataSchemaMigratorTests.m M fastlane/Appfile M fastlane/Deliverfile M fastlane/Fastfile 18 files changed, 440 insertions(+), 620 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/08/201608/1 diff --git a/.gitignore b/.gitignore index 86d9482..8e079ca 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,11 @@ *.ipa *.xcuserstate +# Fastlane +fastlane/report.xml +fastlane/Error*.png +*.mobileprovision + # Ignore baselines, which we'll eventually maintain in CI to prevent false negatives due to dev machine discrepancies xcbaselines/ diff --git a/BetaConfig.xcconfig b/BetaConfig.xcconfig deleted file mode 100644 index 3b81135..000 --- a/BetaConfig.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ - -APP_ID_SUFFIX = .tfbeta diff --git a/Gemfile b/Gemfile index 0b7a460..ed0858b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ source https://rubygems.org; -gem 'cocoapods', '~ 0.36' +gem 'cocoapods', '~ 0.36.1' +gem 'fastlane', '~ 0.4.2' diff --git a/Gemfile.lock b/Gemfile.lock index ba6fa34..48aa94b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,23 @@ minitest (~ 5.1) thread_safe (~ 0.3, = 0.3.4) tzinfo (~ 1.1) +addressable (2.3.8) +aws-sdk (1.63.0) + aws-sdk-v1 (= 1.63.0) +aws-sdk-v1 (1.63.0) + json (~ 1.4) + nokogiri (= 1.4.4) +babosa (1.0.2) +capybara (2.4.4) + mime-types (= 1.16) + nokogiri (= 1.3.3) + rack (= 1.0.0) + rack-test (= 0.5.4) + xpath (~ 2.0) +cert (0.1.3) + fastlane_core (= 0.2.0) claide (0.8.1) +cliver (0.3.2) cocoapods (0.36.1) activesupport (= 3.2.15) claide (~ 0.8.1) @@ -34,24 +50,140 @@ netrc (= 0.7.8) cocoapods-try (0.4.3) colored (1.2) +commander (4.3.2) + highline (~ 1.7.1) +credentials_manager (0.1.3) + colored + highline + security +deliver (0.8.1) + excon + fastimage (~ 1.6.3) + fastlane_core (= 0.2.0) + nokogiri (~ 1.6.5) + plist (~ 3.1.0) + prawn + rubyzip (~ 1.1.6) +dotenv (0.11.1) + dotenv-deployment (~ 0.0.2) +dotenv-deployment (0.0.2) escape (0.0.4) +excon (0.45.1) +faraday (0.8.9) + multipart-post (~ 1.2.0) +faraday_middleware (0.9.1) + faraday (= 0.7.4, 0.10) +fastimage (1.6.8) + addressable (~ 2.3, = 2.3.5) +fastlane (0.4.2) + aws-sdk (~ 1.0) + cert (= 0.1.3) + deliver (= 0.7.13) + fastlane_core (= 0.3.4) + frameit (= 0.2.3) + nokogiri (~ 1.6.5) + pem (= 0.3.8) + produce (= 0.1.6) + shenzhen (~ 0.12.1) + sigh (= 0.4.5) + slack-notifier (~ 1.0) + snapshot (= 0.4.0) + terminal-notifier (~ 1.6.2) + xcodeproj (~ 0.20) + xcpretty (~ 0.1) +fastlane_core (0.3.4) + babosa + capybara (~ 2.4.3) + colored + commander (= 4.1.0) + credentials_manager (= 0.1.3) + highline + json + multi_json + phantomjs (~ 1.9.8) + poltergeist (~ 1.5.1) +frameit (0.2.3) + deliver ( 0.3) + fastimage (~ 1.6.3) + fastlane_core (= 0.2.0) + mini_magick (~ 4.0.2) fuzzy_match (2.0.4) +highline (1.7.1) i18n (0.7.0) json (1.8.2) +mime-types (2.4.3) +mini_magick (4.0.4) +mini_portile (0.6.2) minitest (5.5.1) molinillo (0.2.3) +multi_json (1.11.0) +multipart-post (1.2.0) nap (0.8.0) +net-sftp (2.1.2) + net-ssh (= 2.6.5) +net-ssh (2.9.2) netrc (0.7.8) +nokogiri (1.6.6.2) + mini_portile (~ 0.6.0) open4 (1.3.4) +pdf-core (0.5.1) +pem (0.3.8) + fastlane_core (= 0.3.1) +phantomjs (1.9.8.0) +plist (3.1.0) +poltergeist (1.5.1) + capybara (~ 2.1) + cliver (~ 0.3.1) + multi_json (~ 1.0) + websocket-driver (= 0.2.0) +prawn (2.0.1) + pdf-core (~ 0.5.1) + ttfunk (~ 1.4.0) +produce (0.1.6) + fastlane_core (= 0.2.0) +rack (1.6.0) +rack-test (0.6.3) + rack (= 1.0) +rubyzip (1.1.7) +security (0.1.3) +
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 66944ca..f15ba5b - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 66944ca..f15ba5b .. Syncronize VisualEditor: 66944ca..f15ba5b Change-Id: Ib4e0005a36ec2eaf5f3a03c395a56089c61b5adb --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 66944ca..f15ba5b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 66944cac44e6cda2e24d71f5b3d769297ff646a6 +Subproject commit f15ba5bf4553984844e6c92501de11570fd361de -- To view, visit https://gerrit.wikimedia.org/r/201607 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4e0005a36ec2eaf5f3a03c395a56089c61b5adb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 66944ca..f15ba5b - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/201607 Change subject: Syncronize VisualEditor: 66944ca..f15ba5b .. Syncronize VisualEditor: 66944ca..f15ba5b Change-Id: Ib4e0005a36ec2eaf5f3a03c395a56089c61b5adb --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/07/201607/1 diff --git a/VisualEditor b/VisualEditor index 66944ca..f15ba5b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 66944cac44e6cda2e24d71f5b3d769297ff646a6 +Subproject commit f15ba5bf4553984844e6c92501de11570fd361de -- To view, visit https://gerrit.wikimedia.org/r/201607 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4e0005a36ec2eaf5f3a03c395a56089c61b5adb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (ce9bde4) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (ce9bde4) .. Update VE core submodule to master (ce9bde4) New changes: 83db372 Localisation updates from https://translatewiki.net. f208642 [BREAKING CHANGE] Split setupSlugs in to setup(Block|Inline)Slugs 0132318 Localisation updates from https://translatewiki.net. facbde5 Re-apply selection when ContentBranchNode changes Change-Id: I4bd4aac1bcd846b4a7c3e73d3c2bdf2de9b3cd14 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 248fc5d..ce9bde4 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 248fc5da8571a13c8a15fd00bc5c053be61fc0bd +Subproject commit ce9bde489e01f6b2c166a2fc0df616b0315dc8c3 -- To view, visit https://gerrit.wikimedia.org/r/201605 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4bd4aac1bcd846b4a7c3e73d3c2bdf2de9b3cd14 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@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] Revert Getting rid of some globals - change (mediawiki...ConfirmEdit)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201609
Change subject: Revert Getting rid of some globals
..
Revert Getting rid of some globals
This broke account creation for apps.
anomiebd808: Very likely $wgRequest !==
$loginForm-getContext()-getRequest() in
SimpleCaptcha::addNewAccountApiForm(), so when it
uses $wgRequest to check later on it doesn't see the parameter
renames made by that hook
function.
This reverts commit 23c6f2f04fe7616e057a3c7533e269f1800a84b3.
Change-Id: I793e7a987944d14c3be0eba4c4361793183a62b9
---
M Captcha.php
M ConfirmEditHooks.php
M FancyCaptcha.class.php
M QuestyCaptcha.class.php
4 files changed, 65 insertions(+), 81 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit
refs/changes/09/201609/1
diff --git a/Captcha.php b/Captcha.php
index 825fc5a..68da0e6 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -100,7 +100,7 @@
$out = $context-getOutput();
if ( isset( $page-ConfirmEdit_ActivateCaptcha ) ||
$this-showEditCaptcha ||
- $this-shouldCheck( $page, '', '', $context, false )
+ $this-shouldCheck( $page, '', '', false )
) {
$out-addWikiText( $this-getMessage( $this-action ) );
$out-addHTML( $this-getForm() );
@@ -130,20 +130,16 @@
* @return bool true to keep running callbacks
*/
function injectEmailUser( $form ) {
- global $wgCaptchaTriggers;
-
- $user = $form-getUser();
- $out = $form-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['sendemail'] ) {
$this-action = 'sendemail';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on email sending\n );
return true;
}
$form-addFooterText(
div class='captcha' .
- $out-parse( $this-getMessage( 'sendemail' ) )
.
+ $wgOut-parse( $this-getMessage( 'sendemail' )
) .
$this-getForm() .
/div\n );
}
@@ -157,19 +153,15 @@
* @return bool true to keep running callbacks
*/
function injectUserCreate( $template ) {
- global $wgCaptchaTriggers;
-
- $user = $template-getSkin()-getUser();
- $out = $template-getSkin()-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['createaccount'] ) {
$this-action = 'usercreate';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on account creation\n );
return true;
}
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'createaccount'
) ) .
+ $wgOut-parse( $this-getMessage(
'createaccount' ) ) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -191,11 +183,11 @@
*/
function injectUserLogin( $template ) {
if ( $this-isBadLoginTriggered() ) {
- $out = $template-getSkin()-getOutput();
+ global $wgOut;
$this-action = 'badlogin';
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'badlogin' ) ) .
+ $wgOut-parse( $this-getMessage( 'badlogin' )
) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -219,7 +211,6 @@
*/
function triggerUserLogin( $user, $password, $retval ) {
global $wgCaptchaTriggers, $wgCaptchaBadLoginExpiration,
$wgMemc;
-
if ( $retval == LoginForm::WRONG_PASS
$wgCaptchaTriggers['badlogin'] ) {
$key = $this-badLoginKey();
$count = $wgMemc-get( $key );
@@ -308,17 +299,12 @@
* @param WikiPage $page
* @param $content Content|string
* @param $section string
-* @param
[MediaWiki-commits] [Gerrit] Revert Getting rid of some globals - change (mediawiki...ConfirmEdit)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert Getting rid of some globals
..
Revert Getting rid of some globals
This broke account creation for apps.
anomiebd808: Very likely $wgRequest !==
$loginForm-getContext()-getRequest() in
SimpleCaptcha::addNewAccountApiForm(), so when it
uses $wgRequest to check later on it doesn't see the parameter
renames made by that hook
function.
This reverts commit 23c6f2f04fe7616e057a3c7533e269f1800a84b3.
Change-Id: I793e7a987944d14c3be0eba4c4361793183a62b9
---
M Captcha.php
M ConfirmEditHooks.php
M FancyCaptcha.class.php
M QuestyCaptcha.class.php
4 files changed, 62 insertions(+), 75 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Captcha.php b/Captcha.php
index 0fd168d..5170914 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -103,7 +103,7 @@
$out = $context-getOutput();
if ( isset( $page-ConfirmEdit_ActivateCaptcha ) ||
$this-showEditCaptcha ||
- $this-shouldCheck( $page, '', '', $context, false )
+ $this-shouldCheck( $page, '', '', false )
) {
$out-addWikiText( $this-getMessage( $this-action ) );
$out-addHTML( $this-getForm() );
@@ -133,20 +133,16 @@
* @return bool true to keep running callbacks
*/
function injectEmailUser( $form ) {
- global $wgCaptchaTriggers;
-
- $user = $form-getUser();
- $out = $form-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['sendemail'] ) {
$this-action = 'sendemail';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on email sending\n );
return true;
}
$form-addFooterText(
div class='captcha' .
- $out-parse( $this-getMessage( 'sendemail' ) )
.
+ $wgOut-parse( $this-getMessage( 'sendemail' )
) .
$this-getForm() .
/div\n );
}
@@ -160,19 +156,15 @@
* @return bool true to keep running callbacks
*/
function injectUserCreate( $template ) {
- global $wgCaptchaTriggers;
-
- $user = $template-getSkin()-getUser();
- $out = $template-getSkin()-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['createaccount'] ) {
$this-action = 'usercreate';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on account creation\n );
return true;
}
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'createaccount'
) ) .
+ $wgOut-parse( $this-getMessage(
'createaccount' ) ) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -194,11 +186,11 @@
*/
function injectUserLogin( $template ) {
if ( $this-isBadLoginTriggered() ) {
- $out = $template-getSkin()-getOutput();
+ global $wgOut;
$this-action = 'badlogin';
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'badlogin' ) ) .
+ $wgOut-parse( $this-getMessage( 'badlogin' )
) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -222,7 +214,6 @@
*/
function triggerUserLogin( $user, $password, $retval ) {
global $wgCaptchaTriggers, $wgCaptchaBadLoginExpiration,
$wgMemc;
-
if ( $retval == LoginForm::WRONG_PASS
$wgCaptchaTriggers['badlogin'] ) {
$key = $this-badLoginKey();
$count = $wgMemc-get( $key );
@@ -311,18 +302,14 @@
* @param WikiPage $page
* @param $content Content|string
* @param $section string
-* @param $context IContextSource
* @param $isContent bool If true,
[MediaWiki-commits] [Gerrit] Prepare for revert of patch in ConfirmEdit - change (mediawiki...Flow)
EBernhardson has submitted this change and it was merged.
Change subject: Prepare for revert of patch in ConfirmEdit
..
Prepare for revert of patch in ConfirmEdit
Change-Id: I49d86646d609667f28192ca1ae66e168332a14c7
(cherry picked from commit fd82d8094e4e241f10962e941cbbb6738e9f63e9)
---
M includes/SpamFilter/ConfirmEdit.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
EBernhardson: Verified; Looks good to me, approved
diff --git a/includes/SpamFilter/ConfirmEdit.php
b/includes/SpamFilter/ConfirmEdit.php
index 8bb10b4..89baa3e 100644
--- a/includes/SpamFilter/ConfirmEdit.php
+++ b/includes/SpamFilter/ConfirmEdit.php
@@ -29,7 +29,7 @@
// first check if the submitted content is offensive (as
flagged by
// ConfirmEdit), next check for a (valid) captcha to have been
entered
- if ( $captcha-shouldCheck( $wikiPage, $newContent, false,
$context, false, $oldContent ) !$captcha-passCaptcha() ) {
+ if ( $captcha-shouldCheck( $wikiPage, $newContent, false,
false, $oldContent ) !$captcha-passCaptcha() ) {
// getting here means we submitted bad content without
good captcha
// result (or any captcha result at all) - let's get
the captcha
// HTML to display as error message!
--
To view, visit https://gerrit.wikimedia.org/r/201624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49d86646d609667f28192ca1ae66e168332a14c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.25wmf24
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] webservice2: EAFP, not LBYL - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: webservice2: EAFP, not LBYL .. webservice2: EAFP, not LBYL https://docs.python.org/2/glossary.html#term-lbyl https://docs.python.org/2/glossary.html#term-eafp Change-Id: I6a2d0549326129aa048bcc6620eacb231a4c47ee --- M modules/toollabs/files/webservice2 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve Yuvipanda: Verified; Looks good to me, approved diff --git a/modules/toollabs/files/webservice2 b/modules/toollabs/files/webservice2 index a705739..810a22e 100644 --- a/modules/toollabs/files/webservice2 +++ b/modules/toollabs/files/webservice2 @@ -6,6 +6,7 @@ import time import subprocess import argparse +import errno import xml.etree.ElementTree as ET @@ -29,10 +30,13 @@ :param default: Value to return if the file does not exist :return: String containing either contents of the file, or default value -if os.path.exists(path): +try: with open(path) as f: return f.read() -return default +except IOError as e: +if e.errno == errno.ENOENT: +return default +raise def start_web_job(server, release): -- To view, visit https://gerrit.wikimedia.org/r/201421 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a2d0549326129aa048bcc6620eacb231a4c47ee Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com 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] Prepare for revert of patch in ConfirmEdit - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201626
Change subject: Prepare for revert of patch in ConfirmEdit
..
Prepare for revert of patch in ConfirmEdit
Change-Id: I49d86646d609667f28192ca1ae66e168332a14c7
(cherry picked from commit fd82d8094e4e241f10962e941cbbb6738e9f63e9)
---
M includes/SpamFilter/ConfirmEdit.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/26/201626/1
diff --git a/includes/SpamFilter/ConfirmEdit.php
b/includes/SpamFilter/ConfirmEdit.php
index baeef0a..cd4b158 100644
--- a/includes/SpamFilter/ConfirmEdit.php
+++ b/includes/SpamFilter/ConfirmEdit.php
@@ -28,7 +28,7 @@
// first check if the submitted content is offensive (as
flagged by
// ConfirmEdit), next check for a (valid) captcha to have been
entered
- if ( $captcha-shouldCheck( $wikiPage, $newContent, false,
$context, false ) !$captcha-passCaptcha() ) {
+ if ( $captcha-shouldCheck( $wikiPage, $newContent, false,
false ) !$captcha-passCaptcha() ) {
// getting here means we submitted bad content without
good captcha
// result (or any captcha result at all) - let's get
the captcha
// HTML to display as error message!
--
To view, visit https://gerrit.wikimedia.org/r/201626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49d86646d609667f28192ca1ae66e168332a14c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.25wmf23
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Attempt to detect when a user is trying to input an external... - change (mediawiki...VisualEditor)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201627
Change subject: Attempt to detect when a user is trying to input an external
link to a wiki page
..
Attempt to detect when a user is trying to input an external link to a wiki page
Bug: T94334
Change-Id: I0ed67e6579b9ed0a0565968fd253fdf5c6151683
---
M modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
2 files changed, 15 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/27/201627/1
diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
index 1d4fb3a..d01632e 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
@@ -72,6 +72,8 @@
if ( matches ) {
// Take the relative path
href = matches[1];
+ } else {
+ return {};
}
// The href is simply the title, unless we're dealing with a page that
has slashes in its name
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
index 122a5b9..41e72ac 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
@@ -100,11 +100,21 @@
* @returns {jQuery.Promise} Promise without success or fail handlers attached
*/
ve.ui.MWLinkTargetInputWidget.prototype.getLookupRequest = function () {
- var req,
+ var req, internalLink,
widget = this,
promiseAbortObject = { abort: function () {
- // Do nothing. This is just so OOUI doesn't break due to abort
being undefined.
- } };
+ // Do nothing. This is just so OOUI doesn't break due
to abort being undefined.
+ } };
+
+ if ( ve.init.platform.getExternalLinkUrlProtocolsRegExp().test(
this.value ) ) {
+ internalLink =
ve.dm.MWInternalLinkAnnotation.static.getTargetDataFromHref(
+ this.value,
+ ve.init.target.doc
+ ).title;
+ if ( internalLink ) {
+ this.value = internalLink;
+ }
+ }
if ( mw.Title.newFromText( this.value ) ) {
return this.interwikiPrefixesPromise.then( function () {
--
To view, visit https://gerrit.wikimedia.org/r/201627
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ed67e6579b9ed0a0565968fd253fdf5c6151683
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ConfirmEdit for Id4798364d - change (mediawiki/core)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/201640 Change subject: Update ConfirmEdit for Id4798364d .. Update ConfirmEdit for Id4798364d Change-Id: I3539ce6d3739974e27825ff4f74e7c2080e0b65e --- M extensions/ConfirmEdit 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/40/201640/1 diff --git a/extensions/ConfirmEdit b/extensions/ConfirmEdit index b290716..c059f7b 16 --- a/extensions/ConfirmEdit +++ b/extensions/ConfirmEdit -Subproject commit b29071699b84187ec2b257d46d6a8ace65782243 +Subproject commit c059f7b208b28a7a64be1e1f9c5f9d67c1eaf177 -- To view, visit https://gerrit.wikimedia.org/r/201640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3539ce6d3739974e27825ff4f74e7c2080e0b65e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf24 Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tag v0.9.5 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Tag v0.9.5
..
Tag v0.9.5
Change-Id: Ic873b94ad848149c1b12bdfa309415d7d5a3020b
---
M History.md
M README.md
M package.json
3 files changed, 38 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/History.md b/History.md
index aa2ef62..ceb7557 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,41 @@
# OOjs UI Release History
+## v0.9.5 / 2015-04-02
+* ActionFieldLayout: Add description and example (Kirsten Menger-Anderson)
+* Add vertical spacing to RadioSelectWidget in MW theme (Ed Sanders)
+* Allow rejecting Process with single Error (Matthew Flaschen)
+* Apex theme: Tweak 'check.svg' syntax (Bartosz Dziewoński)
+* Balance padding now that focus highlight is balanced (Ed Sanders)
+* BookletLayout: Add description and example (Kirsten Menger-Anderson)
+* Bring in remaining VisualEditor icons for Apex and MediaWiki themes (James
D. Forrester)
+* Choose can't emit with a null item (Ed Sanders)
+* Correctly position popups in RTL (Moriel Schottlender)
+* Deprecate search widget event re-emission (Ed Sanders)
+* Fix opacity of icons/indicators in disabled DecoratedOptionWidget (Ed
Sanders)
+* IconWidget: Mix in FlaggedElement (Bartosz Dziewoński)
+* Increase specificity of ButtonElement icon and indicator styles (Bartosz
Dziewoński)
+* Make colorize-svg.js actually work more often (Bartosz Dziewoński)
+* MediaWiki theme: Allow intention flags for non-buttons (Andrew Garrett)
+* MediaWiki theme: Fix icon opacity for disabled ButtonOptionWidgets (Bartosz
Dziewoński)
+* MediaWiki theme: Use checkbox icon per mockups (Bartosz Dziewoński)
+* MediaWiki, Apex: Provide an RTL variant for the help icon (James D.
Forrester)
+* MenuLayout: Correct documentation (Bartosz Dziewoński)
+* OutlineOption: Add description (Kirsten Menger-Anderson)
+* PageLayout: Add description (Kirsten Menger-Anderson)
+* Process: Add description (Kirsten Menger-Anderson)
+* Properly support LTR/RTL icon versions in colorize-svg.js (Bartosz
Dziewoński)
+* Refactor icon handling again (Bartosz Dziewoński)
+* Remove line height reset for windows (Ed Sanders)
+* Restore font family definitions to form elements (Ed Sanders)
+* Revert Button styles between OOJS and MW (Bartosz Dziewoński)
+* StackLayout: Add description and example (Kirsten Menger-Anderson)
+* build: Add a 'generated automatically' banner to demo.rtl.css (Bartosz
Dziewoński)
+* build: Generate prettier task names for 'colorizeSvg' (Bartosz Dziewoński)
+* build: Have separate 'cssjanus' target for demo.rtl.css (Bartosz Dziewoński)
+* build: Simplify 'fileExists' task configuration (Bartosz Dziewoński)
+* build: Support (poorly) per-language icon versions in colorize-svg.js
(Bartosz Dziewoński)
+* build: Update grunt-banana-checker to v0.2.1 (James D. Forrester)
+
## v0.9.4 / 2015-03-25
* ButtonElement: Clarify description (Kirsten Menger-Anderson)
* ButtonElement: Disable line wrapping on buttons (Ed Sanders)
diff --git a/README.md b/README.md
index 4a28179..e537752 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@
# Update release notes
# Copy the resulting list into a new section on History.md
-$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e
'console.log(require(./package.json).version);')...HEAD | grep -v
Localisation updates from
+$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e
'console.log(require(./package.json).version);')...HEAD | grep -v
Localisation updates from | sort
$ edit History.md
# Update the version number
diff --git a/package.json b/package.json
index e4ed215..fdf1c57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
name: oojs-ui,
- version: 0.9.4,
+ version: 0.9.5,
description: User interface classes built on the OOjs framework.,
keywords: [
oojs-plugin,
--
To view, visit https://gerrit.wikimedia.org/r/201586
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic873b94ad848149c1b12bdfa309415d7d5a3020b
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove resources symlink - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Remove resources symlink .. Remove resources symlink It wasn't even pointing to a directory with resources in it, it made no sense. Change-Id: I22b08a5980ee679f170095f46a4dff858dc56cd8 --- D w/resources 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Ori.livneh: Looks good to me, approved Yuvipanda: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/w/resources b/w/resources deleted file mode 12 index 3b0dadb..000 --- a/w/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/201643 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22b08a5980ee679f170095f46a4dff858dc56cd8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable 'npm' for mwext-Sentry - change (integration/config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/201644 Change subject: Enable 'npm' for mwext-Sentry .. Enable 'npm' for mwext-Sentry Change-Id: Iaaebd5f1cdc7494e8882c4441e89521fdba9c175 --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/44/201644/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a255d5c..123030d 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6548,9 +6548,12 @@ - name: mediawiki/extensions/Sentry template: - - name: extension-jslint - name: extension-unittests - name: extension-phpcs + - name: npm +check: + - jshint + - jsonlint - name: mediawiki/extensions/Scribunto template: -- To view, visit https://gerrit.wikimedia.org/r/201644 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaaebd5f1cdc7494e8882c4441e89521fdba9c175 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Page: Implement addStylesheet method - change (integration/docroot)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201650
Change subject: Page: Implement addStylesheet method
..
Page: Implement addStylesheet method
Change-Id: I9531efbe3bbde05992ac7d22379a705eddd49313
---
M shared/Page.php
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/docroot
refs/changes/50/201650/1
diff --git a/shared/Page.php b/shared/Page.php
index 01c271d..0c4bd88 100644
--- a/shared/Page.php
+++ b/shared/Page.php
@@ -4,6 +4,7 @@
protected $pageName = false;
protected $embeddedCSS = array();
protected $scripts = array();
+ protected $stylesheets = array();
protected $content = '';
protected $hasFooter = false;
@@ -101,6 +102,13 @@
$this-scripts[] = $src;
}
+ /**
+* @param string $src Path to script (may be relative)
+*/
+ public function addStylesheet( $src ) {
+ $this-stylesheets[] = $src;
+ }
+
public function enableFooter() {
$this-hasFooter = true;
}
@@ -189,6 +197,11 @@
echo \tstyle\n\t . implode( \n\t, explode( \n, implode(
\n\n\n, $this-embeddedCSS ) ) ) . \n\t/style\n;
}
?
+?php
+ foreach ( $this-stylesheets as $stylesheet ) {
+ echo 'link rel=stylesheet href=' . htmlspecialchars(
$stylesheet ) . '' . \n;
+ }
+?
/head
body
header class=navbar navbar-default navbar-static-top base-nav id=top
role=banner
--
To view, visit https://gerrit.wikimedia.org/r/201650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9531efbe3bbde05992ac7d22379a705eddd49313
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] zuul: Match zuul_version display logic with upstream - change (integration/docroot)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201648
Change subject: zuul: Match zuul_version display logic with upstream
..
zuul: Match zuul_version display logic with upstream
Follows-up 37632ae. Makes it easier to pull in upstream patches
in the future.
(cherry-picked from https://github.com/openstack-infra/zuul/commit/df550c54)
Change-Id: I81122aaae9f525ceb04a7fbb63cf3111b4770f51
---
M org/wikimedia/integration/zuul/default.html
M org/wikimedia/integration/zuul/status.js
2 files changed, 12 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/docroot
refs/changes/48/201648/1
diff --git a/org/wikimedia/integration/zuul/default.html
b/org/wikimedia/integration/zuul/default.html
index 4d07c26..0e76921 100644
--- a/org/wikimedia/integration/zuul/default.html
+++ b/org/wikimedia/integration/zuul/default.html
@@ -41,8 +41,6 @@
amp;title=Zuul%20Geard%20job%20queue (8 hours) /
h4Zuul infos/h4
- Version: span id=zuul-version/spanbr/
- Last reconfigured: span id=zuul-last-reconfigured/span/br
-!--
---
+ pZuul version: span id=zuul-version-span/span/p
+ pLast reconfigured: span id=last-reconfigured-span/span/p
/div
diff --git a/org/wikimedia/integration/zuul/status.js
b/org/wikimedia/integration/zuul/status.js
index 3126d79..ad65c70 100644
--- a/org/wikimedia/integration/zuul/status.js
+++ b/org/wikimedia/integration/zuul/status.js
@@ -79,8 +79,12 @@
cache: false
})
.done(function (data) {
- var html = '', last_reconfigured,
- total_queued = 0, total_completed = 0,
total_running = 0;
+ var last_reconfigured,
+ html = '',
+ total_queued = 0,
+ total_completed = 0,
+ total_running = 0;
+
data = data || {};
if ('message' in data) {
@@ -130,15 +134,12 @@
$('#zuul-total-jobs-completed').text(total_completed);
$('#zuul-total-jobs-queued').text(total_queued);
- // Borrowed from OpenStack
- $('#zuul-version').text(
- data.zuul_version ? data.zuul_version :
'unknown'
- );
+ if ('zuul_version' in data) {
+
$('#zuul-version-span').text(data.zuul_version);
+ }
if ('last_reconfigured' in data) {
last_reconfigured = new
Date(data.last_reconfigured);
- $('#zuul-last-reconfigured').text(
- last_reconfigured.toString()
- );
+
$('#last-reconfigured-span').text(last_reconfigured.toString());
}
})
--
To view, visit https://gerrit.wikimedia.org/r/201648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81122aaae9f525ceb04a7fbb63cf3111b4770f51
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reducing polling of report screen when not visible - change (analytics/wikimetrics)
Milimetric has submitted this change and it was merged.
Change subject: Reducing polling of report screen when not visible
..
Reducing polling of report screen when not visible
Polling of report screen is done too frequently,
we take advantage of browsers that support the visibility API
to reduce polling so when we report the number of requests
received by wikimetrics we have as little self inflicted
traffic as possible.
Bug: T94193
Change-Id: I9a9dffccacd1e0a765a8bb234397321413266d70
---
M wikimetrics/static/js/reportList.js
M wikimetrics/static/js/site.js
2 files changed, 76 insertions(+), 29 deletions(-)
Approvals:
Milimetric: Looks good to me, approved
diff --git a/wikimetrics/static/js/reportList.js
b/wikimetrics/static/js/reportList.js
index 107524d..8b10771 100644
--- a/wikimetrics/static/js/reportList.js
+++ b/wikimetrics/static/js/reportList.js
@@ -1,12 +1,12 @@
$(document).ready(function(){
var viewModel = {
reports: ko.observableArray([]),
-
+
updatePublic: function(report, event) {
//TODO no csrf token, we need a request engine to wrap our ajax
// requests
if (!report.public()) {
-
+
$.post('/reports/set-public/' + report.id)
.done(site.handleWith(function(){
report.public(true);
@@ -37,10 +37,12 @@
return moment(report2.created) - moment(report1.created);
});
}, viewModel);
-
+
// get reports from reports/detail/endpoint
var getReports = function (once) {
-site.populateReports(viewModel);
+if (site.pollingActive) {
+site.populateReports(viewModel);
+}
if (!once) {
setTimeout(getReports, site.getRefreshRate());
}
diff --git a/wikimetrics/static/js/site.js b/wikimetrics/static/js/site.js
index a2d8dbf..217db31 100644
--- a/wikimetrics/static/js/site.js
+++ b/wikimetrics/static/js/site.js
@@ -7,7 +7,7 @@
}
};
},
-
+
isNormalResponse: function(response){
if (response.isError){
site.showError(response.message);
@@ -20,12 +20,12 @@
site.clearMessages();
return true;
},
-
+
confirmDanger: function(event, noQuestion){
var title = $(event.target).attr('title');
return confirm('Are you sure you want to ' + title + (noQuestion ? ''
: '?') );
},
-
+
showError: function (message, permanent){
site.showMessage(message, 'error', permanent);
},
@@ -40,7 +40,7 @@
},
showMessage: function (message, category, permanent){
site.clearMessages();
-
+
if (!site.messageTemplate){
site.messageTemplate = $('.messageTemplate').html();
}
@@ -55,20 +55,20 @@
clearMessages: function (){
$('.site-messages').children().not('.permanent').remove();
},
-
+
redirect: function (url){
location.href = url;
},
-
+
failure: function (error){
site.showError('Wikimetrics is experiencing problems. Visit the
Support page for help if this persists. You can also check the console for
details.');
console.log(error);
},
-
+
hasValidationErrors: function(){
return $('li.text-error').length 0;
},
-
+
/**
* Make use of this function to throttle your ajax pulls
* when tab is not visible to the user
@@ -83,17 +83,20 @@
}
}
},
-
-refreshEvery: 5,
+
+/*
+* Refresh rate for ajax polling
+* enter seconds, this will be converted to ms
+*/
+defaultRefreshRate: 5,
+
+pollingActive: true,
+
getRefreshRate: function() {
-/* if not visible refresh rate is lower */
-var rate = site.refreshEvery; /* enter seconds, this will be converted
to ms*/
-if (!site.isVisible()){
-rate = rate * 10;
-}
+var rate = site.defaultRefreshRate;
return rate*1000;
},
-
+
// ***
// Data population - usually done with something like Sammy JS
// ***
@@ -104,22 +107,22 @@
}))
.fail(site.failure);
},
-
-populateMetrics: function(viewModel){
+
+populateMetrics: function(viewModel){
$.get('/metrics/list/')
.done(site.handleWith(function(data){
viewModel.metrics(data.metrics);
}))
.fail(site.failure);
},
-
+
populateReports: function(viewModel){
$.get('/reports/list/')
.done(site.handleWith(function(data){
-//TODO this is a circular dependecy, reports depends on
+//TODO this is a circular dependecy, reports depends
[MediaWiki-commits] [Gerrit] Note pageterms query behavior if no wbptterms - change (mediawiki...Wikibase)
Spage has uploaded a new change for review. https://gerrit.wikimedia.org/r/201630 Change subject: Note pageterms query behavior if no wbptterms .. Note pageterms query behavior if no wbptterms Based on behavior and a comment in lib/includes/store/TermIndex.php, I added If not specified, all types are returned. It would be nice to document the entire set of valid page terms. Presumably some other API lets you query them. Bug: 94948 Change-Id: Ifa7ba3abea713b8f39e574d572c8e0f292202973 --- M client/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/30/201630/1 diff --git a/client/i18n/en.json b/client/i18n/en.json index 5b222e6..2dc2fb3 100644 --- a/client/i18n/en.json +++ b/client/i18n/en.json @@ -14,7 +14,7 @@ apihelp-query+pageterms-description: Get terms associated with a page via an associated data item., apihelp-query+pageterms-example-simple: Get all terms associated with the page 'London', in the user language., apihelp-query+pageterms-example-label-en: Get labels and aliases associated with the page 'London', in English., - apihelp-query+pageterms-param-terms: The kinds of terms to get, e.g. 'label', 'description', or 'alias'., + apihelp-query+pageterms-param-terms: The types of terms to get, e.g. 'label', 'description', or 'alias'. If not specified, all types are returned., apihelp-query+wikibase-description: Get information about the associated Wikibase repository., apihelp-query+wikibase-example: Get URL path and other information for the Wikibase repository., apihelp-query+wikibase-param-prop: Which properties to get:\n;kbdurl/kbd: Base URL, script path and article path., -- To view, visit https://gerrit.wikimedia.org/r/201630 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa7ba3abea713b8f39e574d572c8e0f292202973 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Spage sp...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
