[MediaWiki-commits] [Gerrit] Add a sanity check to the CORS test - change (mediawiki...ImageMetrics)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200118
Change subject: Add a sanity check to the CORS test
..
Add a sanity check to the CORS test
Failed CORS loads have been unexpectedly frequent; to detect false
positives, add a non-CORS loading with identical conditions and
log whether that was successful.
Bug: T507
Change-Id: I874dc488e18ebc2afbaa8376f6d757a4b92cfb78
---
M ImageMetrics.php
M resources/logger/CorsLogger.js
A resources/non-cors-test.js
M tests/qunit/logger/CorsLogger.test.js
4 files changed, 29 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageMetrics
refs/changes/18/200118/1
diff --git a/ImageMetrics.php b/ImageMetrics.php
index e43a6a7..41400de 100644
--- a/ImageMetrics.php
+++ b/ImageMetrics.php
@@ -36,7 +36,7 @@
$wgHooks['EventLoggingRegisterSchemas'][] = function( array $schemas ) {
$schemas['ImageMetricsLoadingTime'] = 10078363;
- $schemas['ImageMetricsCorsSupport'] = 10884476;
+ $schemas['ImageMetricsCorsSupport'] = 11686678;
};
diff --git a/resources/logger/CorsLogger.js b/resources/logger/CorsLogger.js
index 2250b1e..a661c3e 100644
--- a/resources/logger/CorsLogger.js
+++ b/resources/logger/CorsLogger.js
@@ -38,7 +38,6 @@
return new CorsLogger( samplingFactor, window.location,
mw.config, window.Geo, mw.eventLog );
};
-
/**
* Sets up logging.
* @static
@@ -47,7 +46,10 @@
CorsLogger.install = function ( samplingFactor ) {
var logger = CorsLogger.create( samplingFactor );
- logger.loadScriptViaCors().always( $.proxy( logger, 'collect' )
);
+ $.when(
+ logger.loadScript( 'cors-test.js', true),
+ logger.loadScript( 'non-cors-test.js' )
+ ).done( $.proxy( logger, 'collect' ) );
};
/**
@@ -59,31 +61,36 @@
xdomainSupported: typeof XDomainRequest !== 'undefined',
imgAttributeSupported: 'crossOrigin' in
document.createElement( 'img' ),
scriptAttributeSupported: 'crossOrigin' in
document.createElement( 'script' ),
- scriptLoaded: this.mwConfig.get(
'wgImageMetricsCorsTestSucceeded', false )
+ scriptLoaded: this.mwConfig.get(
'wgImageMetricsCorsTestSucceeded', false ),
+ sanityCheck: this.mwConfig.get(
'wgImageMetricsNonCorsTestSucceeded', false )
} );
};
/**
-* Loads cors-test.js with a crossorigin=anonymous script attribute.
+* Loads a resource.
+* @param {string} filename Name of the file
+* @param {bool} [crossorigin] Use a crossorigin=anonymous script
attribute.
* @return {jQuery.Deferred}
*/
- CorsLogger.prototype.loadScriptViaCors = function () {
+ CorsLogger.prototype.loadScript = function ( filename, crossorigin ) {
var script,
deferred = $.Deferred();
script = $( 'script' )
.attr( {
type: 'text/javascript',
- crossorigin: 'anonymous',
+ crossorigin: crossorigin ? 'anonymous' :
undefined,
// this will not work if wgExtensionAssetsPath
is a relative URL (which is the
// default) but there is no need for CORS
loading of assets in that case anyway
- src: this.mwConfig.get( 'wgExtensionAssetsPath'
) + '/ImageMetrics/resources/cors-test.js'
+ src: this.mwConfig.get( 'wgExtensionAssetsPath'
) + '/ImageMetrics/resources/' + filename
} )
.get( 0 );
- // jQuery subverts script insertion into an AJAX + eval call
which would break the whole point
+ // jQuery subverts script insertion into an AJAX + eval call
which would break the whole point, so
+ // we use native AJAX. Also, don't trust success/error
handlers, some browsers treat them in weird
+ // ways for CORS calls; we will check directly whether the
script has executed.
script.onload = $.proxy( deferred, 'resolve' );
- script.onerror = $.proxy( deferred, 'reject' );
+ script.onerror = $.proxy( deferred, 'resolve' );
$( 'head' ).get( 0 ).appendChild( script );
return deferred.promise();
diff --git a/resources/non-cors-test.js b/resources/non-cors-test.js
new file mode 100644
index 000..87e1037
--- /dev/null
+++ b/resources/non-cors-test.js
@@ -0,0 +1,8 @@
+/**
+ * Sanity test payload. This file should always load; its purpose is to detect
unexpected
[MediaWiki-commits] [Gerrit] T93451: ontology fix - ontology predicates go in lowercase - change (mediawiki...Wikibase)
Smalyshev has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200117
Change subject: T93451: ontology fix - ontology predicates go in lowercase
..
T93451: ontology fix - ontology predicates go in lowercase
Change-Id: Id9033610fe36b7ca3105e5892ed9d5a9beff572e
---
M repo/includes/rdf/RdfBuilder.php
M repo/tests/phpunit/data/rdf/Q4_all_statements.nt
M repo/tests/phpunit/data/rdf/Q4_claims.nt
M repo/tests/phpunit/data/rdf/Q4_props.nt
M repo/tests/phpunit/data/rdf/Q4_values.nt
M repo/tests/phpunit/data/rdf/Q5_badges.nt
M repo/tests/phpunit/data/rdf/Q6_no_qualifiers.nt
M repo/tests/phpunit/data/rdf/Q6_qualifiers.nt
M repo/tests/phpunit/data/rdf/Q6_with_qualifiers.nt
M repo/tests/phpunit/data/rdf/Q7_Q9_dedup.nt
M repo/tests/phpunit/data/rdf/Q7_no_refs.nt
M repo/tests/phpunit/data/rdf/Q7_references.nt
M repo/tests/phpunit/data/rdf/Q7_refs.nt
M repo/tests/phpunit/data/rdf/Q8_baddates.nt
M repo/tests/phpunit/data/rdf/dump_refs.nt
15 files changed, 149 insertions(+), 151 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/17/200117/1
diff --git a/repo/includes/rdf/RdfBuilder.php b/repo/includes/rdf/RdfBuilder.php
index a12d3d4..7210bcf 100644
--- a/repo/includes/rdf/RdfBuilder.php
+++ b/repo/includes/rdf/RdfBuilder.php
@@ -455,7 +455,7 @@
foreach ( $siteLink-getBadges() as $badge ) {
$this-sitelinkWriter
- -say( self::NS_ONTOLOGY, 'Badge' )
+ -say( self::NS_ONTOLOGY, 'badge' )
-is( self::NS_ENTITY,
$this-getEntityLName( $badge ) );
}
}
@@ -583,9 +583,9 @@
$rank = $statement-getRank();
if ( isset( self::$rankMap[$rank] ) ) {
$this-statementWriter-about(
self::NS_STATEMENT, $statementLName )
- -say( self::NS_ONTOLOGY, 'Rank' )-is(
self::NS_ONTOLOGY, self::$rankMap[$rank] );
+ -say( self::NS_ONTOLOGY, 'rank' )-is(
self::NS_ONTOLOGY, self::$rankMap[$rank] );
if( $isBest ) {
- $this-statementWriter-say(
self::NS_ONTOLOGY, 'Rank' )-is( self::NS_ONTOLOGY, self::WIKIBASE_RANK_BEST );
+ $this-statementWriter-say(
self::NS_ONTOLOGY, 'rank' )-is( self::NS_ONTOLOGY, self::WIKIBASE_RANK_BEST );
}
} else {
wfLogWarning( Unknown rank $rank encountered
for $entityId:{$statement-getGuid()} );
@@ -628,6 +628,7 @@
* Created full data value
*
* @param DataValue $value
+* @param string $prefix Prefix to use for predicate values
* @param array $props List of properties
*
* @return string the id of the value node, for use with the
self::NS_VALUE namespace.
@@ -641,7 +642,7 @@
foreach ( $props as $prop = $type ) {
$propLName = ucfirst( $prop );
- $getter = get . ucfirst( $prop );
+ $getter = get . $prop;
$data = $value-$getter();
if ( !is_null( $data ) ) {
$this-addValueToNode( $this-valueWriter,
self::NS_ONTOLOGY, $propLName, $type, $data );
@@ -870,9 +871,6 @@
'precision' =
'integer',
'timezone' = 'integer',
'calendarModel' =
'url',
-// TODO: not used currently
-// 'before' = 'dateTime',
-// 'after'= 'dateTime',
)
);
diff --git a/repo/tests/phpunit/data/rdf/Q4_all_statements.nt
b/repo/tests/phpunit/data/rdf/Q4_all_statements.nt
index 1b0837c..e9ae115 100644
--- a/repo/tests/phpunit/data/rdf/Q4_all_statements.nt
+++ b/repo/tests/phpunit/data/rdf/Q4_all_statements.nt
@@ -13,50 +13,50 @@
http://acme.test/Q4 http://www.w3.org/1999/02/22-rdf-syntax-ns#type
http://www.wikidata.org/ontology-0.0.1#Item .
http://acme.test/statement/TEST-Statement-2-423614cd831ed4e8da1138c9229cb65cf96f9366
http://acme.test/value/P2 http://acme.test/Q42 .
http://acme.test/statement/TEST-Statement-2-423614cd831ed4e8da1138c9229cb65cf96f9366
http://www.w3.org/1999/02/22-rdf-syntax-ns#type
http://www.wikidata.org/ontology-0.0.1#Statement .
-http://acme.test/statement/TEST-Statement-2-423614cd831ed4e8da1138c9229cb65cf96f9366
http://www.wikidata.org/ontology-0.0.1#Rank
[MediaWiki-commits] [Gerrit] mediawiki.ui: Add @activeColor argument to the .button-color... - change (mediawiki/core)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200116
Change subject: mediawiki.ui: Add @activeColor argument to the .button-colors()
mixin
..
mediawiki.ui: Add @activeColor argument to the .button-colors() mixin
Have kept the colors same for now. Can be changed later once the design
team has decided.
Change-Id: I7c418b970c5e5fa95f740ecf3d90622bf7f02364
---
M resources/src/mediawiki.less/mediawiki.ui/mixins.less
M resources/src/mediawiki.less/mediawiki.ui/variables.less
M resources/src/mediawiki.ui/components/buttons.less
3 files changed, 17 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/16/200116/1
diff --git a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
index db983a7..56b6811 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
@@ -33,7 +33,7 @@
// Button styling
//
-.button-colors(@bgColor, @highlightColor) {
+.button-colors(@bgColor, @highlightColor, @activeColor) {
background: @bgColor;
:hover {
@@ -55,12 +55,12 @@
:active,
.mw-ui-checked {
- background: @highlightColor;
+ background: @activeColor;
box-shadow: none;
}
}
-.button-colors(@bgColor, @highlightColor) when (lightness(@bgColor) = 70%) {
+.button-colors(@bgColor, @highlightColor, @activeColor) when
(lightness(@bgColor) = 70%) {
color: @colorButtonText;
border: 1px solid @colorGray12;
@@ -83,7 +83,7 @@
}
}
-.button-colors(@bgColor, @highlightColor) when (lightness(@bgColor) 70%) {
+.button-colors(@bgColor, @highlightColor, @activeColor) when
(lightness(@bgColor) 70%) {
color: #fff;
// border of the same color as background so that light background and
// dark background buttons are the same height and width
@@ -103,7 +103,7 @@
}
}
-.button-colors-quiet(@textColor, @highlightColor) {
+.button-colors-quiet(@textColor, @highlightColor, @activeColor) {
// Quiet buttons all start gray, and reveal
// constructive/progressive/destructive color on hover and active.
color: @colorButtonText;
@@ -115,7 +115,7 @@
:active,
.mw-ui-checked {
- color: @highlightColor;
+ color: @activeColor;
}
:disabled {
diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less
b/resources/src/mediawiki.less/mediawiki.ui/variables.less
index f130a68..aed4fd4 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/variables.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less
@@ -22,14 +22,17 @@
// Blue; for contextual use of a continuing action
@colorProgressive: #347bff;
@colorProgressiveHighlight: #2962CC;
+@colorProgressiveActive: #2962CC;
// Green; for contextual use of a positive finalizing action
@colorConstructive: #00af89;
@colorConstructiveHighlight: #008C6D;
+@colorConstructiveActive: #008C6D;
// Orange; for contextual use of returning to a past action
@colorRegressive: #FF5D00;
// Red; for contextual use of a negative action of high severity
@colorDestructive: #d11d13;
@colorDestructiveHighlight: #A7170F;
+@colorDestructiveActive: #A7170F;
// Orange; for contextual use of a potentially negative action of medium
severity
@colorMediumSevere: #FF5D00;
// Yellow; for contextual use of a potentially negative action of low severity
@@ -45,6 +48,7 @@
@colorTextLight: @colorGray6;
@colorButtonText: @colorGray5;
@colorButtonTextHighlight: @colorGray7;
+@colorButtonTextActive: @colorGray7;
@colorDisabledText: @colorGray12;
@colorErrorText: #CC;
diff --git a/resources/src/mediawiki.ui/components/buttons.less
b/resources/src/mediawiki.ui/components/buttons.less
index 53e13b7..7d8ba26 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -135,10 +135,10 @@
// Styleguide 2.1.1.
.mw-ui-progressive,
.mw-ui-primary {
- .button-colors(@colorProgressive, @colorProgressiveHighlight);
+ .button-colors(@colorProgressive, @colorProgressiveHighlight,
@colorProgressiveActive);
.mw-ui-quiet {
- .button-colors-quiet(@colorProgressive,
@colorProgressiveHighlight);
+ .button-colors-quiet(@colorProgressive,
@colorProgressiveHighlight, @colorProgressiveActive);
}
}
@@ -158,10 +158,10 @@
//
// Styleguide 2.1.2.
.mw-ui-constructive {
- .button-colors(@colorConstructive, @colorConstructiveHighlight);
+ .button-colors(@colorConstructive,
[MediaWiki-commits] [Gerrit] Improve contributions page entry point by adding 3 ways to c... - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200120
Change subject: Improve contributions page entry point by adding 3 ways to
contribute
..
Improve contributions page entry point by adding 3 ways to contribute
Bug: T92939
Change-Id: If6670eb05106516637221a24f0a64e084f27626b
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M modules/entrypoint/ext.cx.contributions.js
D modules/entrypoint/images/dropdown.svg
A modules/entrypoint/images/editarticle.png
A modules/entrypoint/images/editarticle.svg
A modules/entrypoint/images/translation.png
A modules/entrypoint/images/translation.svg
A modules/entrypoint/images/upload.png
A modules/entrypoint/images/upload.svg
M modules/entrypoint/styles/ext.cx.contributions.less
12 files changed, 105 insertions(+), 94 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/20/200120/1
diff --git a/Resources.php b/Resources.php
index 4304ade..8028cb0 100644
--- a/Resources.php
+++ b/Resources.php
@@ -26,9 +26,12 @@
'mediawiki.ui.button',
),
'messages' = array(
- 'cx-contributions',
+ 'cx-contributions-new-article',
'cx-contributions-translation',
- 'cx-contributions-media',
+ 'cx-contributions-upload',
+ 'cx-contributions-new-article-tooltip',
+ 'cx-contributions-translation-tooltip',
+ 'cx-contributions-upload-tooltip',
),
) + $resourcePaths;
diff --git a/i18n/en.json b/i18n/en.json
index aba65c9..d64a71f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -132,9 +132,12 @@
cx-save-draft-save-success: Saved {{PLURAL:$1|a minute ago|$1
minutes ago|0=just now}},
cx-save-draft-saving: Saving...,
cx-save-draft-tooltip: Translation drafts are saved automatically,
- cx-contributions: New contribution,
+ cx-contributions-new-article: Start a draft,
cx-contributions-translation: Translation,
- cx-contributions-media: Upload media file,
+ cx-contributions-upload: Upload media,
+ cx-contributions-new-article-tooltip: Start writing a new article
for wikipedia,
+ cx-contributions-translation-tooltip: Translate existing articles,
+ cx-contributions-upload-tooltip: Upload pictures, audio and video to
use in articles,
cx-publishing-dialog-message: The page $1 already exists. The
current content will be replaced by your translation. Do you want to publish
anyway?,
cx-publishing-dialog-keep-button: Keep both versions,
cx-publishing-dialog-publish-anyway-button: Publish anyway,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a546ece..08d5839 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -139,9 +139,12 @@
cx-save-draft-save-success: \Saved\ refers to a draft of a
translated page that was saved recently.,
cx-save-draft-saving: Label of button to save the translation as
draft while saving is in progress\n{{Identical|Saving}},
cx-save-draft-tooltip: Tooltip text shown for the save status
indicator text in the header of [[Special:ContentTranslation]].\n\nParameters:
\n* $1 - the number of minutes ago the translation was saved.,
- cx-contributions: Text of a button which opens a dropdown,
- cx-contributions-translation: Dropdown
item\n{{Identical|Translation}},
- cx-contributions-media: Dropdown item,
+ cx-contributions-new-article: Button label,
+ cx-contributions-translation: Button label,
+ cx-contributions-upload: Button label,
+ cx-contributions-new-article: Button label tooltip,
+ cx-contributions-translation: Button label tooltip,
+ cx-contributions-upload: Button label tooltip,
cx-publishing-dialog-message: Message that shows in the publishing
options dialog when there is an existing page with the same title already
published.\n\nParameters:\n* $1 - The link to the existing page with just the
title as text.,
cx-publishing-dialog-keep-button: Button label for publishing
options dialog. Clicking button preserves both the existing translation and the
new translation.,
cx-publishing-dialog-publish-anyway-button: Button label for
publishing options dialog. Clicking button overwrites the existing translation
with the new translation.,
diff --git a/modules/entrypoint/ext.cx.contributions.js
b/modules/entrypoint/ext.cx.contributions.js
index cbb42ff..786033c 100644
--- a/modules/entrypoint/ext.cx.contributions.js
+++ b/modules/entrypoint/ext.cx.contributions.js
@@ -11,13 +11,10 @@
/**
* @class
*/
- function CXContributions( element, options ) {
+ function CXContributions( element ) {
this.$element = $( element );
- this.options = $.extend( {}, $.fn.cxContributions.defaults,
options );
+
[MediaWiki-commits] [Gerrit] Use zuul-cloner for Wikibase/Wikidata jobs - change (integration/config)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200122
Change subject: Use zuul-cloner for Wikibase/Wikidata jobs
..
Use zuul-cloner for Wikibase/Wikidata jobs
Bug: T74001
Change-Id: I2c86f64889c8240f9ac54ce5dc92b0c06168ba13
---
M jjb/wikidata.yaml
1 file changed, 29 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/22/200122/1
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 7955ab0..3656e8d 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -3,23 +3,23 @@
builders:
- shell: |
composer=/srv/deployment/integration/composer/vendor/bin/composer
-cd $WORKSPACE/extensions/{extension} timeout 300 $composer
install --prefer-source -vvv
+cd $WORKSPACE/src/extensions/{extension} timeout 300
$composer install --prefer-source -vvv
- builder:
name: wd-wikibase-apply-settings
builders:
- - shell:
$WORKSPACE/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh -r
{repoorclient} -e {experimental} -b false
+ - shell:
$WORKSPACE/src/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh -r
{repoorclient} -e {experimental} -b false
- builder:
name: wd-build-apply-settings
builders:
- - shell:
$WORKSPACE/extensions/Wikidata/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh
-r {repoorclient} -e {experimental} -b true
+ - shell:
$WORKSPACE/src/extensions/Wikidata/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh
-r {repoorclient} -e {experimental} -b true
- builder:
name: wd-runtests
builders:
- shell: |
-cd $WORKSPACE/tests/phpunit
+cd $WORKSPACE/src/tests/phpunit
php phpunit.php \
--log-junit $WORKSPACE/log/junit-wikidata.xml \
--with-phpunitdir
/srv/deployment/integration/phpunit/vendor/phpunit/phpunit \
@@ -33,14 +33,17 @@
triggers:
- zuul
builders:
- - mw-setup-extension:
-mwbranch: 'master'
-dependencies: '{dependencies}'
+ - zuul-cloner-extdeps:
+ ext-name: 'Wikibase'
+ dependencies: '{dependencies}'
- wd-mw-composer-install-ext:
extension: 'Wikibase'
- wd-wikibase-apply-settings:
repoorclient: '{repoorclient}'
experimental: 'true'
+ - mw-install-sqlite
+ - shell: cp deps.txt src/extensions_load.txt
+ - mw-apply-settings
- mw-run-update-script
- wd-runtests:
params: '{phpunit-params}'
@@ -58,14 +61,17 @@
triggers:
- zuul
builders:
- - mw-setup-extension:
-mwbranch: 'master'
-dependencies: '{dependencies}'
+ - zuul-cloner-extdeps:
+ ext-name: 'Wikibase'
+ dependencies: '{dependencies}'
- wd-mw-composer-install-ext:
- extension: '{ext-name}'
+ extension: 'Wikibase'
- wd-wikibase-apply-settings:
repoorclient: 'repo' # qunit tests are in lib so this can be either..
experimental: 'true'
+ - mw-install-sqlite
+ - shell: cp deps.txt src/extensions_load.txt
+ - mw-apply-settings
- mw-run-update-script
- qunit
publishers:
@@ -80,12 +86,15 @@
triggers:
- zuul
builders:
- - mw-setup-extension:
-mwbranch: 'master' # This should test against the current branch (not
important yet)
-dependencies: '{dependencies}'
+ - zuul-cloner-extdeps:
+ ext-name: 'Wikidata'
+ dependencies: '{dependencies}'
- wd-build-apply-settings:
repoorclient: '{repoorclient}'
experimental: '{experimental}'
+ - mw-install-sqlite
+ - shell: cp deps.txt src/extensions_load.txt
+ - mw-apply-settings
- mw-run-update-script
- wd-runtests:
params: '{phpunit-params}'
@@ -103,12 +112,15 @@
triggers:
- zuul
builders:
- - mw-setup-extension:
-mwbranch: 'master'
-dependencies: '{dependencies}'
+ - zuul-cloner-extdeps:
+ ext-name: 'Wikidata'
+ dependencies: '{dependencies}'
- wd-build-apply-settings:
repoorclient: 'repo' # qunit tests are in lib so this can be either..
experimental: 'true'
+ - mw-install-sqlite
+ - shell: cp deps.txt src/extensions_load.txt
+ - mw-apply-settings
- mw-run-update-script
- qunit
publishers:
--
To view, visit https://gerrit.wikimedia.org/r/200122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c86f64889c8240f9ac54ce5dc92b0c06168ba13
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Add sniff to check for goto - change (mediawiki...codesniffer)
jenkins-bot has submitted this change and it was merged.
Change subject: Add sniff to check for goto
..
Add sniff to check for goto
This sniff detects the usage of goto control statement and reports an
error.
Change-Id: Ib780bd2fb2dd1c522bdc094b82b14eb1bc0a844c
---
A MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
A MediaWiki/Tests/files/GotoUsage/goto_usage_fail.php
A MediaWiki/Tests/files/GotoUsage/goto_usage_pass.php
3 files changed, 34 insertions(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
b/MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
new file mode 100644
index 000..dd566e5
--- /dev/null
+++ b/MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
@@ -0,0 +1,17 @@
+?php
+/**
+ * Report error when `goto` is used
+ */
+class MediaWiki_Sniffs_GotoUsage_GotoUsageSniff implements
PHP_CodeSniffer_Sniff {
+ public function register() {
+ // As per
https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP#Other
+ return array(
+ T_GOTO
+ );
+ }
+
+ public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
+ $error = 'Control statement goto must not be used.';
+ $phpcsFile-addError( $error, $stackPtr, 'GotoUsage');
+ }
+}
diff --git a/MediaWiki/Tests/files/GotoUsage/goto_usage_fail.php
b/MediaWiki/Tests/files/GotoUsage/goto_usage_fail.php
new file mode 100644
index 000..056e2ef
--- /dev/null
+++ b/MediaWiki/Tests/files/GotoUsage/goto_usage_fail.php
@@ -0,0 +1,9 @@
+?php
+
+for ($i=0; $i 20; $i++) {
+ if ($i == 15) {
+ goto endloop;
+ }
+}
+endloop:
+echo Done;
diff --git a/MediaWiki/Tests/files/GotoUsage/goto_usage_pass.php
b/MediaWiki/Tests/files/GotoUsage/goto_usage_pass.php
new file mode 100644
index 000..d870bf6
--- /dev/null
+++ b/MediaWiki/Tests/files/GotoUsage/goto_usage_pass.php
@@ -0,0 +1,8 @@
+?php
+
+for ($i=0; $i 20; $i++) {
+ if ($i == 15) {
+ break;
+ }
+}
+echo Done;
--
To view, visit https://gerrit.wikimedia.org/r/200121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib780bd2fb2dd1c522bdc094b82b14eb1bc0a844c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Hharchani hharch...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Polybuildr v.a.ghai...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a sanity check to the CORS test - change (mediawiki...ImageMetrics)
jenkins-bot has submitted this change and it was merged.
Change subject: Add a sanity check to the CORS test
..
Add a sanity check to the CORS test
Failed CORS loads have been unexpectedly frequent; to detect false
positives, add a non-CORS loading with identical conditions and
log whether that was successful.
Bug: T507
Change-Id: I874dc488e18ebc2afbaa8376f6d757a4b92cfb78
---
M ImageMetrics.php
M resources/logger/CorsLogger.js
A resources/non-cors-test.js
M tests/qunit/logger/CorsLogger.test.js
4 files changed, 29 insertions(+), 13 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ImageMetrics.php b/ImageMetrics.php
index e43a6a7..41400de 100644
--- a/ImageMetrics.php
+++ b/ImageMetrics.php
@@ -36,7 +36,7 @@
$wgHooks['EventLoggingRegisterSchemas'][] = function( array $schemas ) {
$schemas['ImageMetricsLoadingTime'] = 10078363;
- $schemas['ImageMetricsCorsSupport'] = 10884476;
+ $schemas['ImageMetricsCorsSupport'] = 11686678;
};
diff --git a/resources/logger/CorsLogger.js b/resources/logger/CorsLogger.js
index 2250b1e..a661c3e 100644
--- a/resources/logger/CorsLogger.js
+++ b/resources/logger/CorsLogger.js
@@ -38,7 +38,6 @@
return new CorsLogger( samplingFactor, window.location,
mw.config, window.Geo, mw.eventLog );
};
-
/**
* Sets up logging.
* @static
@@ -47,7 +46,10 @@
CorsLogger.install = function ( samplingFactor ) {
var logger = CorsLogger.create( samplingFactor );
- logger.loadScriptViaCors().always( $.proxy( logger, 'collect' )
);
+ $.when(
+ logger.loadScript( 'cors-test.js', true),
+ logger.loadScript( 'non-cors-test.js' )
+ ).done( $.proxy( logger, 'collect' ) );
};
/**
@@ -59,31 +61,36 @@
xdomainSupported: typeof XDomainRequest !== 'undefined',
imgAttributeSupported: 'crossOrigin' in
document.createElement( 'img' ),
scriptAttributeSupported: 'crossOrigin' in
document.createElement( 'script' ),
- scriptLoaded: this.mwConfig.get(
'wgImageMetricsCorsTestSucceeded', false )
+ scriptLoaded: this.mwConfig.get(
'wgImageMetricsCorsTestSucceeded', false ),
+ sanityCheck: this.mwConfig.get(
'wgImageMetricsNonCorsTestSucceeded', false )
} );
};
/**
-* Loads cors-test.js with a crossorigin=anonymous script attribute.
+* Loads a resource.
+* @param {string} filename Name of the file
+* @param {bool} [crossorigin] Use a crossorigin=anonymous script
attribute.
* @return {jQuery.Deferred}
*/
- CorsLogger.prototype.loadScriptViaCors = function () {
+ CorsLogger.prototype.loadScript = function ( filename, crossorigin ) {
var script,
deferred = $.Deferred();
script = $( 'script' )
.attr( {
type: 'text/javascript',
- crossorigin: 'anonymous',
+ crossorigin: crossorigin ? 'anonymous' :
undefined,
// this will not work if wgExtensionAssetsPath
is a relative URL (which is the
// default) but there is no need for CORS
loading of assets in that case anyway
- src: this.mwConfig.get( 'wgExtensionAssetsPath'
) + '/ImageMetrics/resources/cors-test.js'
+ src: this.mwConfig.get( 'wgExtensionAssetsPath'
) + '/ImageMetrics/resources/' + filename
} )
.get( 0 );
- // jQuery subverts script insertion into an AJAX + eval call
which would break the whole point
+ // jQuery subverts script insertion into an AJAX + eval call
which would break the whole point, so
+ // we use native AJAX. Also, don't trust success/error
handlers, some browsers treat them in weird
+ // ways for CORS calls; we will check directly whether the
script has executed.
script.onload = $.proxy( deferred, 'resolve' );
- script.onerror = $.proxy( deferred, 'reject' );
+ script.onerror = $.proxy( deferred, 'resolve' );
$( 'head' ).get( 0 ).appendChild( script );
return deferred.promise();
diff --git a/resources/non-cors-test.js b/resources/non-cors-test.js
new file mode 100644
index 000..87e1037
--- /dev/null
+++ b/resources/non-cors-test.js
@@ -0,0 +1,8 @@
+/**
+ * Sanity test payload. This file should always load; its purpose is to detect
unexpected
+ * loading errors which would otherwise be logged as lack of
[MediaWiki-commits] [Gerrit] When changing language first time, language code was shown - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: When changing language first time, language code was shown
..
When changing language first time, language code was shown
Now it shows the language autonym as expected
Change-Id: I1f2c3bca2b5582b917d65533b08545d1332782ab
---
M resources/js/ext.uls.interface.js
1 file changed, 46 insertions(+), 27 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.uls.interface.js
b/resources/js/ext.uls.interface.js
index 88b890b..5056920 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -164,6 +164,27 @@
}
/**
+* Gets the name of the previously active language
+* @param {string} code Language code of previously selected language.
+* @return {jQuery.Promise}
+*/
+ function getUndoAutonym( code ) {
+ var
+ deferred = $.Deferred(),
+ autonym = $.cookie(
mw.uls.previousLanguageAutonymCookie );
+
+ if ( autonym ) {
+ deferred.resolve( autonym );
+ } else {
+ mw.loader.using( 'jquery.uls.data', function () {
+ deferred.resolve( $.uls.data.getAutonym( code )
);
+ } );
+ }
+
+ return deferred.promise();
+ }
+
+ /**
* The tooltip to be shown when language changed using ULS.
* It also allows to undo the language selection.
*/
@@ -171,7 +192,6 @@
var ulsPosition = mw.config.get( 'wgULSPosition' ),
currentLang = mw.config.get( 'wgUserLanguage' ),
previousLang,
- previousLanguageAutonym,
$ulsTrigger,
anonMode,
rtlPage = $( 'body' ).hasClass( 'rtl' ),
@@ -203,35 +223,34 @@
return;
}
- previousLanguageAutonym = $.cookie(
mw.uls.previousLanguageAutonymCookie ) ||
- previousLang;
+ getUndoAutonym( previousLang ).done( function( autonym ) {
+ // Attach a tipsy tooltip to the trigger
+ $ulsTrigger.tipsy( {
+ gravity: tipsyGravity[ulsPosition],
+ delayOut: 3000,
+ html: true,
+ fade: true,
+ trigger: 'manual',
+ title: function () {
+ var link;
- // Attach a tipsy tooltip to the trigger
- $ulsTrigger.tipsy( {
- gravity: tipsyGravity[ulsPosition],
- delayOut: 3000,
- html: true,
- fade: true,
- trigger: 'manual',
- title: function () {
- var link;
+ link = $( 'a' ).text( autonym )
+ .attr( {
+ href: '#',
+ 'class':
'uls-prevlang-link',
+ lang: previousLang,
+ // We could get dir
from uls.data,
+ // but we are trying to
avoid loading it
+ // and 'auto' is safe
enough in this context
+ dir: 'auto'
+ } );
- link = $( 'a' ).text( previousLanguageAutonym
)
- .attr( {
- href: '#',
- 'class': 'uls-prevlang-link',
- lang: previousLang,
- // We could get dir from
uls.data,
- // but we are trying to avoid
loading it
- // and 'auto' is safe enough in
this context
- dir: 'auto'
- } );
+ // Get the html of the link by wrapping
it in div first
+ link = $( 'div' ).html( link ).html();
- // Get the html of the link by wrapping it in
div first
- link
[MediaWiki-commits] [Gerrit] Remove unneeded variable assignment in Usercreate.php - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Remove unneeded variable assignment in Usercreate.php .. Remove unneeded variable assignment in Usercreate.php Change-Id: I8fe2e6bc3a6c63dacee8d6c8f314d9b4161b7144 --- M includes/templates/Usercreate.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/templates/Usercreate.php b/includes/templates/Usercreate.php index dc9da63..f09b6bb 100644 --- a/includes/templates/Usercreate.php +++ b/includes/templates/Usercreate.php @@ -261,7 +261,7 @@ ?php echo Html::submitButton( $this-getMsg( $this-data['loggedin'] ? 'createacct-another-submit' : 'createacct-submit' ), - $attrs = array( + array( 'id' = 'wpCreateaccount', 'name' = 'wpCreateaccount', 'tabindex' = $tabIndex++ -- To view, visit https://gerrit.wikimedia.org/r/199970 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fe2e6bc3a6c63dacee8d6c8f314d9b4161b7144 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de 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] Templates: Remove compount content blocks from several trans... - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200126
Change subject: Templates: Remove compount content blocks from several
transclusions
..
Templates: Remove compount content blocks from several transclusions
An example: The infobox at enwiki:California
At present, we cannot provide edit support to them.
So remove it from source.
Also see
See
http://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Transclusion_content
Change-Id: I9a98379bc8bf365cb996a64e48de423d29a0721a
---
M modules/source/ext.cx.source.filter.js
1 file changed, 11 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/26/200126/1
diff --git a/modules/source/ext.cx.source.filter.js
b/modules/source/ext.cx.source.filter.js
index d0bdecc..a0056ff 100644
--- a/modules/source/ext.cx.source.filter.js
+++ b/modules/source/ext.cx.source.filter.js
@@ -81,14 +81,20 @@
mwData = $template.data( 'mw' );
- if ( !mwData || mwData.parts.length 1 ) {
- // Either the template is missing mw data or
having multiple parts.
- // At present, we cannot handle them.
+ if ( !mwData ) {
+ mw.log( '[CX] Skipping template!' );
+ return;
+ }
+
+ if ( mwData.parts.length 1 ) {
+ // This is compound content blocks that include
output from several transclusions
+ // At present, we cannot provide edit support
to them.
+ // See
http://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Transclusion_content
// An example:
// {{Version |o |1.1}}{{efn-ua |Due to an
incident ...ref name=releases /}}
// in enwiki:Debian, Timeline table.
- mw.log( '[CX] Skipping template!' );
-
+ mw.log( '[CX] Removing multi part template' );
+ sourceFilter.removeTemplate( $template );
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/200126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a98379bc8bf365cb996a64e48de423d29a0721a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Include style for edit links for page preview action - change (mediawiki...Wikibase)
Hoo man has submitted this change and it was merged.
Change subject: Include style for edit links for page preview action
..
Include style for edit links for page preview action
Bug: T94143
Change-Id: Ic752b44a5e7cace4bd9d70ac4831ccb313f9571e
---
M client/includes/Hooks/BeforePageDisplayHandler.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Hoo man: Verified; Looks good to me, approved
diff --git a/client/includes/Hooks/BeforePageDisplayHandler.php
b/client/includes/Hooks/BeforePageDisplayHandler.php
index 12791dd..b3e0d44 100644
--- a/client/includes/Hooks/BeforePageDisplayHandler.php
+++ b/client/includes/Hooks/BeforePageDisplayHandler.php
@@ -68,7 +68,7 @@
private function hasEditOrAddLinks( OutputPage $out, Title $title,
$actionName ) {
if (
$out-getProperty( 'noexternallanglinks' ) ||
- $actionName !== 'view' ||
+ !in_array( $actionName, array( 'view', 'submit' ) ) ||
!$title-exists()
) {
return false;
--
To view, visit https://gerrit.wikimedia.org/r/200125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic752b44a5e7cace4bd9d70ac4831ccb313f9571e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.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] Clean up bastionhost domain_search - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Clean up bastionhost domain_search .. Clean up bastionhost domain_search I would like to use hooft as a bastion, as it has *way* better connectivity than bast1001 for me... but the lacking domain search is very inconvenient. To handle that, I made all bastions use the same domain_search list. Change-Id: Ib53f564d68f6809369938f7a25b87419a96857d0 --- M hieradata/hosts/hooft.yaml D hieradata/hosts/iron.yaml M hieradata/role/common/bastionhost.yaml 3 files changed, 1 insertion(+), 12 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved BBlack: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, but someone else must approve diff --git a/hieradata/hosts/hooft.yaml b/hieradata/hosts/hooft.yaml index 2ff883a..c811ab0 100644 --- a/hieradata/hosts/hooft.yaml +++ b/hieradata/hosts/hooft.yaml @@ -1,8 +1,3 @@ -base::resolving::domain_search: - - esams.wikimedia.org - - wikimedia.org - - esams.wmnet - admin::groups: - deployment - restricted diff --git a/hieradata/hosts/iron.yaml b/hieradata/hosts/iron.yaml deleted file mode 100644 index 7159a60..000 --- a/hieradata/hosts/iron.yaml +++ /dev/null @@ -1,7 +0,0 @@ -base::resolving::domain_search: - - wikimedia.org - - eqiad.wmnet - - codfw.wmnet - - ulsfo.wmnet - - esams.wikimedia.org - - esams.wmnet diff --git a/hieradata/role/common/bastionhost.yaml b/hieradata/role/common/bastionhost.yaml index 65e7951..03ea2f6 100644 --- a/hieradata/role/common/bastionhost.yaml +++ b/hieradata/role/common/bastionhost.yaml @@ -5,3 +5,4 @@ - codfw.wmnet - ulsfo.wmnet - esams.wikimedia.org + - esams.wmnet -- To view, visit https://gerrit.wikimedia.org/r/196964 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib53f564d68f6809369938f7a25b87419a96857d0 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Hoo man h...@online.de 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] wip: move page toc to sidebar - change (mediawiki...Blueprint)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200131
Change subject: wip: move page toc to sidebar
..
wip: move page toc to sidebar
Change-Id: I9c6b1b52f0a026f2545a2b120cd5e2944f90edae
---
M Blueprint.php
M resources/master.less
A resources/toc.js
3 files changed, 43 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint
refs/changes/31/200131/1
diff --git a/Blueprint.php b/Blueprint.php
index cc17dac..edc9f74 100644
--- a/Blueprint.php
+++ b/Blueprint.php
@@ -54,7 +54,10 @@
'position' = 'top',
) + $styleguideSkinResourceTemplate,
'skin.blueprint' = array(
- 'scripts' = 'menu.js',
+ 'scripts' = array(
+ 'menu.js',
+ 'toc.js',
+ ),
) + $styleguideSkinResourceTemplate,
);
diff --git a/resources/master.less b/resources/master.less
index aadce38..245438d 100644
--- a/resources/master.less
+++ b/resources/master.less
@@ -109,7 +109,7 @@
ul {
list-style: none;
- padding: 10px 20px;
+ padding: 0;
li {
padding: 10px 0;
@@ -159,7 +159,40 @@
}
}
}
+
}
+
+#toc {
+ font-weight: 200;
+ font-size: 0.8em;
+ margin-top: 60px;
+
+ #toctitle {
+ display: none;
+ }
+
+ .tocnumber {
+ display: inline-block;
+ width: 60px;
+ }
+
+ ul {
+ margin: 0;
+ }
+
+ a {
+ display: inline-block;
+ padding: 5px 10px;
+ width: 280px;
+ border-radius: 2px;
+
+ :hover {
+ background: rgba(0,0,0,0.2);
+ }
+ }
+}
+
+
/* Offscreen Navigation */
/* Navbar */
diff --git a/resources/toc.js b/resources/toc.js
new file mode 100644
index 000..d5f7473
--- /dev/null
+++ b/resources/toc.js
@@ -0,0 +1,5 @@
+$( function () {
+ $( '#toc' )
+ .detach()
+ .appendTo( $( '#off-navigation' ) );
+} );
--
To view, visit https://gerrit.wikimedia.org/r/200131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c6b1b52f0a026f2545a2b120cd5e2944f90edae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Blueprint
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] Limit WikidataTests browser test to four hours - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Limit WikidataTests browser test to four hours
..
Limit WikidataTests browser test to four hours
The default timeout of three hours is not enough for a Wikidata job to
pass:
browsertests-Wikidata-WikidataTests-linux-firefox-sauce job needs more.
We introduced a feature which let us override the job timeout on a per
job basis. Simply set browsertest_job_timeout: 240 for that job.
Bug: T92275
Change-Id: Ieb17656dc91aec434114f212ba94fcc2870d962b
Signed-off-by: Antoine Musso has...@free.fr
---
M jjb/browsertests.yaml
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml
index b1e1047..5610c15 100644
--- a/jjb/browsertests.yaml
+++ b/jjb/browsertests.yaml
@@ -467,8 +467,8 @@
repository_host: github.com/wmde
jobs:
- - 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce'
-
+ - 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce':
+ browsertest_job_timeout: '240'
- 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce':
name: PerformanceTests
browser_timeout: 360
--
To view, visit https://gerrit.wikimedia.org/r/199919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb17656dc91aec434114f212ba94fcc2870d962b
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: WMDE-Fisch christoph.fisc...@wikimedia.de
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix choose event listeners - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200133
Change subject: Fix choose event listeners
..
Fix choose event listeners
* Choose can't emit with null
* Connect search straight to results' choose event.
Change-Id: I434829511ea70859d14e26f39095e0d094dea6c0
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
6 files changed, 32 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/33/200133/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 11ba3fa..660d274 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -353,7 +353,7 @@
this.borderCheckbox.connect( this, { change: 'onBorderCheckboxChange' }
);
this.positionSelect.connect( this, { choose: 'onPositionSelectChoose' }
);
this.typeSelect.connect( this, { choose: 'onTypeSelectChoose' } );
- this.search.connect( this, { choose: 'onSearchChoose' } );
+ this.search.getResults().connect( this, { choose:
'onSearchResultsChoose' } );
this.altTextInput.connect( this, { change: 'onAlternateTextChange' } );
// Initialization
@@ -737,19 +737,18 @@
};
/**
- * Handle search result choose event.
+ * Handle search choose event.
*
- * @param {ve.ui.MWMediaResultWidget} info Chosen item
+ * @param {ve.ui.MWMediaResultWidget} item Chosen item
*/
-ve.ui.MWMediaDialog.prototype.onSearchChoose = function ( info ) {
- if ( info ) {
- this.$infoPanelWrapper.empty();
- // Switch panels
- this.selectedImageInfo = info;
- this.switchPanels( 'imageInfo' );
- // Build info panel
- this.buildMediaInfoPanel( info );
- }
+ve.ui.MWMediaDialog.prototype.onSearchResultsChoose = function ( item ) {
+ var info = item.getData();
+ this.$infoPanelWrapper.empty();
+ // Switch panels
+ this.selectedImageInfo = info;
+ this.switchPanels( 'imageInfo' );
+ // Build info panel
+ this.buildMediaInfoPanel( info );
};
/**
@@ -897,7 +896,7 @@
* @param {OO.ui.ButtonOptionWidget} item Selected item
*/
ve.ui.MWMediaDialog.prototype.onPositionSelectChoose = function ( item ) {
- var position = item ? item.getData() : 'default';
+ var position = item.getData();
// Only update if the value is different than the model
if ( this.imageModel.getAlignment() !== position ) {
@@ -912,7 +911,7 @@
* @param {OO.ui.ButtonOptionWidget} item Selected item
*/
ve.ui.MWMediaDialog.prototype.onTypeSelectChoose = function ( item ) {
- var type = item ? item.getData() : 'default';
+ var type = item.getData();
// Only update if the value is different than the model
if ( this.imageModel.getType() !== type ) {
@@ -1041,8 +1040,8 @@
this.setSize( 'larger' );
this.selectedImageInfo = null;
if ( !stopSearchRequery ) {
- this.search.query.setValue( dialog.pageTitle );
- this.search.query.focus().select();
+ this.search.getQuery().setValue(
dialog.pageTitle );
+ this.search.getQuery().focus().select();
}
// Set the edit panel
@@ -1230,7 +1229,7 @@
.next( function () {
if ( this.currentPanel === 'search' ) {
// Focus the search input
- this.search.query.focus().select();
+ this.search.getQuery().focus().select();
} else {
// Focus the caption surface
this.captionSurface.focus();
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
index 63b4d33..1a6aa02 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
@@ -42,6 +42,14 @@
OO.mixinClass( ve.ui.MWCategoryInputWidget, OO.ui.LookupElement );
+/* Events */
+
+/**
+ * @event choose
+ * A category was chosen
+ * @param {OO.ui.MenuOptionWidget} item Chosen item
+ */
+
/* Methods */
/**
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
index
[MediaWiki-commits] [Gerrit] [BrowserTest] Add padding to some more screenshots - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200138
Change subject: [BrowserTest] Add padding to some more screenshots
..
[BrowserTest] Add padding to some more screenshots
Change-Id: If103488927e3309479b7b5f9f380135052c7ac9d
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 14 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/38/200138/1
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index f2b2504..c54f9c9 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -106,7 +106,8 @@
Screenshot.capture(
@browser,
VisualEditor_category_item-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.hamburger_menu_element,
@current_page.page_option_menu_element]
+[@current_page.hamburger_menu_element,
@current_page.page_option_menu_element],
+3
)
on(VisualEditorPage).category_link_element.when_present.click
@@ -139,7 +140,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.window_frame_element]
+[@current_page.window_frame_element],
+3
)
end
@@ -177,7 +179,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.disabled_save_button_element,
@current_page.page_option_menu_element]
+[@current_page.disabled_save_button_element,
@current_page.page_option_menu_element],
+3
)
end
@@ -256,7 +259,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.window_frame_element]
+[@current_page.window_frame_element],
+3
)
end
@@ -266,7 +270,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.window_frame_element]
+[@current_page.window_frame_element],
+3
)
Screenshot.capture(
@@ -379,7 +384,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.cite_button_element]
+[@current_page.cite_button_element],
+3
)
end
@@ -441,7 +447,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.window_frame_element, @current_page.formula_image_element]
+[@current_page.window_frame_element, @current_page.formula_image_element],
+3
)
end
--
To view, visit https://gerrit.wikimedia.org/r/200138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If103488927e3309479b7b5f9f380135052c7ac9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Redefine the Apply changes element for languag... - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200139
Change subject: [BrowserTest] Redefine the Apply changes element for language
screenshot
..
[BrowserTest] Redefine the Apply changes element for language screenshot
Redefine the element to include the full button
and remove the padding, which is now not needed.
Change-Id: I1ac244bc97b38c9d8b47ddd778a653783a748a49
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/39/200139/1
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index c54f9c9..f71f71f 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -299,8 +299,7 @@
Screenshot.capture(
@browser,
VisualEditor_Apply_Changes-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.settings_apply_button_element],
-3
+[@current_page.settings_apply_button_element]
)
end
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 6cb5dd8..fe31c13 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -146,7 +146,7 @@
div(:save_enabled, css: 'div.ve-init-mw-viewPageTarget-toolbar-actions
div.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled')
a(:second_reference, text: '[1]', index: 2)
span(:second_save_page, css: '.oo-ui-processDialog-actions-primary
div:nth-child(1) a:nth-child(1) span:nth-child(2)')
- div(:settings_apply_button, css: '.oo-ui-window-frame
.oo-ui-buttonElement.oo-ui-flaggedElement-progressive')
+ div(:settings_apply_button, css: '.oo-ui-window-frame
.oo-ui-processDialog-actions-primary')
span(:special_character, class: 'oo-ui-iconElement-icon
oo-ui-icon-special-character')
a(:subheading1, text: /Sub-heading 1/)
a(:subheading2, text: /Sub-heading 2/)
--
To view, visit https://gerrit.wikimedia.org/r/200139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ac244bc97b38c9d8b47ddd778a653783a748a49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] proxies: order the list by IP distance - change (mediawiki...scap)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200137
Change subject: proxies: order the list by IP distance
..
proxies: order the list by IP distance
Given our IP space is ordered by datacenter/row, having the list of
proxies to test be ordered by ip distance from the client is going to
give us the shortest path (with a very high probability) as the first
host to test.
Change-Id: Ic47117dfb06870f513b2a937ade0247b510c386f
---
M scap/utils.py
1 file changed, 25 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap
refs/changes/37/200137/1
diff --git a/scap/utils.py b/scap/utils.py
index f12751e..5dd6960 100644
--- a/scap/utils.py
+++ b/scap/utils.py
@@ -16,6 +16,7 @@
import re
import socket
import struct
+import math
import subprocess
@@ -23,6 +24,23 @@
Signal that a locking attempt failed.
pass
+def sort_ips(addresses, ipaddr):
+Sort a list of IPs based on their distance from a given address.
+This can be useful for our use case where subnets have info about
datacenter
+and row.
+
+:param addresses: list of addrinfo structs
+:param ipaddr: Ip address to measure the distance from, as a string.
+
+ip_num = lambda ip: struct.unpack('!i',
+ socket.inet_pton(socket.AF_INET, ip))[0]
+ip_dist = lambda ip, my_ip: math.pow(ip_num(ip) - my_ip)
+try:
+local_ip = ip_num(ipaddr)
+return sorted(addresses, key=lambda ipaddr:
+ ip_dist(ipaddr[1][4][0], local_ip))
+except:
+return random.sample(addresses, len(addresses))
def find_nearest_host(hosts, port=22, timeout=1):
Given a collection of hosts, find the one that is the fewest
@@ -43,16 +61,22 @@
:param timeout: Timeout in seconds (default: 1)
host_map = {}
+
for host in hosts:
try:
host_map[host] = socket.getaddrinfo(host, port)[0]
except socket.gaierror:
continue
+try:
+local_ip = ip_num(socket.gethostbyname(socket.getfqdn()))
+except socket.gaierror:
+local_ip = None
+
for ttl in range(1, 30):
if not host_map:
break
-for host, info in random.sample(host_map.items(), len(host_map)):
+for host, info in sort_ips(host_map.items(), local_ip):
family, type, proto, _, addr = info
s = socket.socket(family, type, proto)
s.setsockopt(socket.IPPROTO_IP, socket.IP_TTL,
--
To view, visit https://gerrit.wikimedia.org/r/200137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic47117dfb06870f513b2a937ade0247b510c386f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] proxies: allow filtering by datacenter - change (mediawiki...scap)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200130
Change subject: proxies: allow filtering by datacenter
..
proxies: allow filtering by datacenter
Having more than one datacenter we should be able to offer each scap
client only the list of proxies in its own datacenter, in order to
reduce cross-dc traffic and general latencies.
This should not be fundamental as the proxy should be chosen based on
network hops already, but this should completely avoid such an undesired
behaviour
Change-Id: I6ae8481b347525de532ce58aee71a97637188ec3
---
M scap.cfg
M scap/config.py
M scap/tasks.py
M scap/utils.py
4 files changed, 16 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap
refs/changes/30/200130/1
diff --git a/scap.cfg b/scap.cfg
index 8021b1c..a65e91f 100644
--- a/scap.cfg
+++ b/scap.cfg
@@ -64,10 +64,16 @@
ssh_user: mwdeploy
+
[eqiad.wmnet]
# Wikimedia Foundation production eqiad datacenter
datacenter: eqiad
+filter_proxies: yes
+[codfw.wmnet]
+# Wikimedia Foundation production codfw datacenter
+datacenter: codfw
+filter_proxies: yes
[wmnet]
# Wikimedia Foundation production cluster configuration
diff --git a/scap/config.py b/scap/config.py
index b3c8766..e7fdd7b 100644
--- a/scap/config.py
+++ b/scap/config.py
@@ -26,6 +26,7 @@
'wmf_realm': 'production',
'ssh_user': getpass.getuser(),
'datacenter': 'pmtpa',
+'filter_proxies': 'no',
}
diff --git a/scap/tasks.py b/scap/tasks.py
index 395264e..4143612 100644
--- a/scap/tasks.py
+++ b/scap/tasks.py
@@ -263,7 +263,7 @@
server = None
if sync_from:
-server = utils.find_nearest_host(sync_from)
+server = utils.find_nearest_host(sync_from, conf=cfg)
if server is None:
server = cfg['master_rsync']
server = server.strip()
diff --git a/scap/utils.py b/scap/utils.py
index f12751e..3570dc3 100644
--- a/scap/utils.py
+++ b/scap/utils.py
@@ -24,7 +24,7 @@
pass
-def find_nearest_host(hosts, port=22, timeout=1):
+def find_nearest_host(hosts, port=22, timeout=1, conf=None):
Given a collection of hosts, find the one that is the fewest
number of hops away.
@@ -43,6 +43,13 @@
:param timeout: Timeout in seconds (default: 1)
host_map = {}
+
+# Select only the hosts in the local datacenter, if filter_proxies is
active
+if conf is not None and conf['filter_proxies'] == 'yes':
+filtered = [host for host in hosts if host.find(cfg['datacenter']) =
0]
+if filtered:
+hosts = filtered
+
for host in hosts:
try:
host_map[host] = socket.getaddrinfo(host, port)[0]
--
To view, visit https://gerrit.wikimedia.org/r/200130
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ae8481b347525de532ce58aee71a97637188ec3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: partman for dm-cache - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200134
Change subject: install-server: partman for dm-cache
..
install-server: partman for dm-cache
this partman recipe provides LVM over two hardware raid (ssd and hdd) to be
used with dm-cache for hybrid caching, see also
https://phabricator.wikimedia.org/T88992
Bug: T88994
Change-Id: If14f2dc0fd84347d362e7a958593d34b68b3cb5c
---
M modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
1 file changed, 45 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/200134/1
diff --git
a/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
b/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
index 83b1d74..8e896b9 100644
--- a/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
+++ b/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
@@ -1,25 +1,30 @@
-# Automatic software RAID 10 with LVM partitioning
-# test dm-cache T88992
-#
+# use LVM and dm-cache to speed up read/write to spinning HDDs
+
+# expected hardware:
# * /dev/sda: db-class hw-raid10 spinning disks 1.7TB
# * /dev/sdb: hw-raid raid1 SSD 256GB
# * layout:
# - /boot: ext4 on ssd, no lvm
-# - two VG: data (hdd+ssd) and system (ssd)
+# - two VGs: vg-data (PV: sda+sdb) and vg-sys (PV: sdb)
# - swap: vg-sys 1GB
-# - /: vg-sys 20GB
+# - /: vg-sys 30GB
d-ipartman-auto/method string lvm
d-ipartman-md/device_remove_md boolean true
d-ipartman-lvm/device_remove_lvm boolean true
-d-ipartman-auto/disk string /dev/sda /dev/sdb
+# order is important, if not specified partitions get created on the first disk
+d-ipartman-auto/disk string /dev/sdb /dev/sda
+
+d-ipartman-auto/choose_recipe lvm
# Define physical partitions
+# regular partitions and partitions used in VGs first
+# then LVs
d-ipartman-auto/expert_recipe string \
- multiraid ::\
- 40 300 300 ext3 \
+ lvm :: \
+ 100 300 100 ext4\
$primary{ } \
$bootable{ }\
method{ format }\
@@ -29,12 +34,32 @@
mountpoint{ /boot } \
device{ /dev/sdb } \
. \
- 1000 8000 1000 linux-swap \
+ 4 4 4 ext4 \
+ $defaultignore{ } \
+ $primary{ } \
+ method{ lvm } \
+ device{ /dev/sdb } \
+ vg_name{ vg-sys } \
+ . \
+ 10 30 10 ext4 \
+ $primary{ } \
+ $defaultignore{ } \
+ method{ keep } \
+ device{ /dev/sdb } \
+ . \
+ 50 300 -1 ext4 \
+ $defaultignore{ } \
+ $primary{ } \
+ method{ lvm } \
+ device{ /dev/sda } \
+ vg_name{ vg-data } \
+ . \
+ 1000 1000 1000 linux-swap \
method{ swap } \
$lvmok{ } \
format{ } \
- device{ /dev/sdb } \
- vg_name{ vg-sys } \
+ in_vg{ vg-sys } \
+ lv_name{ swap } \
. \
3 3 3 ext4 \
$lvmok{ } \
@@ -43,20 +68,19 @@
use_filesystem{ } \
filesystem{ ext4 } \
mountpoint{ / } \
- device{ /dev/sdb } \
- vg_name{ vg-sys } \
- 10 3 -1 ext4\
- method{ keep } \
- device{ /dev/sdb } \
- 50 3 -1 ext4\
+ in_vg{ vg-sys } \
+ lv_name{ root } \
+ . \
+ 50 50 -1 ext4 \
$lvmok{ } \
method{ format }\
[MediaWiki-commits] [Gerrit] Deprecate search widget event re-emission - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200128
Change subject: Deprecate search widget event re-emission
..
Deprecate search widget event re-emission
1. The list of events it re-emits is out of date and incomplete
2. Re-emitting events with a different signature ('data' instead of
'item') seems evil.
Change-Id: Ife220d01bc0a20da76e410ce0284150ec34b63bd
---
M src/widgets/SearchWidget.js
1 file changed, 2 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/28/200128/1
diff --git a/src/widgets/SearchWidget.js b/src/widgets/SearchWidget.js
index 0ceecb8..8fd1f1d 100644
--- a/src/widgets/SearchWidget.js
+++ b/src/widgets/SearchWidget.js
@@ -62,26 +62,6 @@
OO.inheritClass( OO.ui.SearchWidget, OO.ui.Widget );
-/* Events */
-
-/**
- * A 'highlight' event is emitted when an item is highlighted. The highlight
indicates which
- * item will be selected. When a user mouses over a menu item, it is
highlighted. If a search
- * string is typed into the query field instead, the first menu item that
matches the query
- * will be highlighted.
-
- * @event highlight
- * @param {Object|null} item Item data or null if no item is highlighted
- */
-
-/**
- * A 'select' event is emitted when an item is selected. A menu item is
selected when it is clicked,
- * or when a user types a search query, a menu result is highlighted, and the
user presses enter.
- *
- * @event select
- * @param {Object|null} item Item data or null if no item is selected
- */
-
/* Methods */
/**
@@ -135,6 +115,7 @@
* Handle select widget highlight events.
*
* @private
+ * @deprecated Connect straight to getResults() events instead
* @param {OO.ui.OptionWidget} item Highlighted item
* @fires highlight
*/
@@ -146,6 +127,7 @@
* Handle select widget select events.
*
* @private
+ * @deprecated Connect straight to getResults() events instead
* @param {OO.ui.OptionWidget} item Selected item
* @fires select
*/
--
To view, visit https://gerrit.wikimedia.org/r/200128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife220d01bc0a20da76e410ce0284150ec34b63bd
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VarnishStatusCollector for diamond. - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: VarnishStatusCollector for diamond.
..
VarnishStatusCollector for diamond.
This is needed to collect specific request stats for T88705
Bug: T88705
Change-Id: I1b4448653d1cfe6420f23b87df792256e4d762be
---
M manifests/role/beta.pp
A modules/diamond/files/collector/varnishstatus.py
2 files changed, 101 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index ec07dbc..ad994b6 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -47,3 +47,16 @@
logstash_port = 5229,
}
}
+
+# = Class: role::beta::availability_collector
+# collect availability metrics for the beta / staging clusters
+class role::beta::availability_collector {
+include ::diamond
+diamond::collector { 'VarnishStatus':
+source = 'puppet:///modules/diamond/collector/varnishstatus.py',
+settings = {
+ path_prefix = $::instanceproject,
+ path = 'availability',
+}
+}
+}
diff --git a/modules/diamond/files/collector/varnishstatus.py
b/modules/diamond/files/collector/varnishstatus.py
new file mode 100644
index 000..b949b3f
--- /dev/null
+++ b/modules/diamond/files/collector/varnishstatus.py
@@ -0,0 +1,88 @@
+
+Collect request status code metrics from varnish (by using varnishtop)
+Used to collect beta / staging cluster availability metrics
+
+ Dependencies
+
+ * subprocess
+
+
+from diamond.collector import Collector
+import subprocess
+
+
+class VarnishStatusCollector(Collector):
+
+def get_default_config(self):
+
+Returns the default collector settings
+
+config = super(VarnishStatusCollector, self).get_default_config()
+config.update({
+'path': 'availability',
+'bin': '/usr/bin/varnishtop',
+})
+return config
+
+def collect(self):
+
+Publishes stats to the configured path.
+e.g. /deployment-prep/hostname/availability/#
+with one # for each http status code
+
+group_by_type = {'2xx': 0, '3xx': 0, '4xx': 0, '5xx': 0}
+total = 0
+lines = self.poll()
+# Publish Metric
+for line in lines:
+parts = line.split()
+if (len(parts) == 3):
+count = int(float(parts[0]))
+total += count
+code = parts[2]
+type = code[:1] + 'xx'
+group_by_type[type] = group_by_type.setdefault(type, 0) + count
+self.publish_gauge(code, count)
+
+for k, v in group_by_type.iteritems():
+if v 0:
+self.publish_gauge(k, v)
+
+success_count = group_by_type['2xx'] + group_by_type['3xx']
+
+# calculate the percentage of successful out of the total request count
+if success_count 0:
+self.publish_gauge('ok', success_count)
+ratio = float(success_count) / float(total)
+self.publish_gauge('availability', 100 * ratio)
+
+def poll(self):
+
+This runs `varnishtop -c -i TxStatus -1`
+which returns output like the following:
+
+ 5.00 TxStatus 200
+ 1050.00 TxStatus 302
+65.00 TxStatus 404
+40.00 TxStatus 503
+29.00 TxStatus 204
+19.00 TxStatus 401
+18.00 TxStatus 301
+ 3.00 TxStatus 304
+
+The 1st column is a request status counter, 2nd is irrelevant
+3rd is the http status code
+
+This method returns the output from the command,
+split into 1 element per line.
+
+
+try:
+command = [self.config['bin'], -c, -i, TxStatus, -1]
+output = subprocess.check_output(command)
+
+except Exception as e:
+self.log.error(Error: %s, e)
+output =
+
+return output.splitlines()
--
To view, visit https://gerrit.wikimedia.org/r/199302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b4448653d1cfe6420f23b87df792256e4d762be
Gerrit-PatchSet: 19
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@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] Add 'kn' and 'uk' languages - change (analytics/limn-language-data)
jenkins-bot has submitted this change and it was merged.
Change subject: Add 'kn' and 'uk' languages
..
Add 'kn' and 'uk' languages
Change-Id: I9668cf68727dcb195ad39e27e43d85214abd39e3
---
M language/content_translation_beta.sql
M language/content_translation_beta_manual.sql
M reportgenerator/config/config.json
3 files changed, 15 insertions(+), 3 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/language/content_translation_beta.sql
b/language/content_translation_beta.sql
index 311b5a7..2d8b270 100644
--- a/language/content_translation_beta.sql
+++ b/language/content_translation_beta.sql
@@ -12,7 +12,9 @@
minwiki,
uzwiki,
kywiki,
- pawiki
+ pawiki,
+ knwiki,
+ ukwiki
from
( select count(*) as cawiki from cawiki.user_properties where up_property =
'cx' and up_value = 1 ) ca
left join
@@ -41,4 +43,8 @@
( select count(*) as kywiki from kywiki.user_properties where up_property =
'cx' and up_value = 1 ) ky on 1=1
left join
( select count(*) as pawiki from pawiki.user_properties where up_property =
'cx' and up_value = 1 ) pa on 1=1
+left join
+( select count(*) as knwiki from knwiki.user_properties where up_property =
'cx' and up_value = 1 ) kn on 1=1
+left join
+( select count(*) as ukwiki from ukwiki.user_properties where up_property =
'cx' and up_value = 1 ) uk on 1=1
;
diff --git a/language/content_translation_beta_manual.sql
b/language/content_translation_beta_manual.sql
index 0e34aa1..98f0d75 100644
--- a/language/content_translation_beta_manual.sql
+++ b/language/content_translation_beta_manual.sql
@@ -12,7 +12,9 @@
minwiki,
uzwiki,
kywiki,
- pawiki
+ pawiki,
+ knwiki,
+ ukwiki
from
( select count(*) as cawiki from cawiki.user_properties where up_property =
'cx' and up_value = 1 and up_user not in ( select up_user from
cawiki.user_properties where up_property = 'betafeatures-auto-enroll' and
up_value = 1 ) ) ca
left join
@@ -41,4 +43,8 @@
( select count(*) as kywiki from kywiki.user_properties where up_property =
'cx' and up_value = 1 and up_user not in ( select up_user from
kywiki.user_properties where up_property = 'betafeatures-auto-enroll' and
up_value = 1 ) ) ky on 1=1
left join
( select count(*) as pawiki from pawiki.user_properties where up_property =
'cx' and up_value = 1 and up_user not in ( select up_user from
pawiki.user_properties where up_property = 'betafeatures-auto-enroll' and
up_value = 1 ) ) pa on 1=1
+left join
+( select count(*) as knwiki from knwiki.user_properties where up_property =
'cx' and up_value = 1 and up_user not in ( select up_user from
knwiki.user_properties where up_property = 'betafeatures-auto-enroll' and
up_value = 1 ) ) kn on 1=1
+left join
+( select count(*) as ukwiki from ukwiki.user_properties where up_property =
'cx' and up_value = 1 and up_user not in ( select up_user from
ukwiki.user_properties where up_property = 'betafeatures-auto-enroll' and
up_value = 1 ) ) uk on 1=1
;
diff --git a/reportgenerator/config/config.json
b/reportgenerator/config/config.json
index a915929..c0c6de3 100644
--- a/reportgenerator/config/config.json
+++ b/reportgenerator/config/config.json
@@ -1,3 +1,3 @@
{
- languages: [ ca, da, eo, es, id, ky, ms, nn, no,
pa, pt, sv, min, uz ]
+ languages: [ ca, da, eo, es, id, ky, ms, nn, no,
pa, pt, sv, min, uz, kn, uk ]
}
--
To view, visit https://gerrit.wikimedia.org/r/200101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9668cf68727dcb195ad39e27e43d85214abd39e3
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-language-data
Gerrit-Branch: master
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
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] Add composer test command to run phpcs and make it pass - change (mediawiki...WikiGrok)
jenkins-bot has submitted this change and it was merged.
Change subject: Add composer test command to run phpcs and make it pass
..
Add composer test command to run phpcs and make it pass
Bug: T90943
Change-Id: Ia761febf2348f95f755047bea44075a9cf5160bd
---
A composer.json
M maintenance/cleanupOldData.php
2 files changed, 15 insertions(+), 2 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..d3201eb
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,12 @@
+{
+ require-dev: {
+ jakub-onderka/php-parallel-lint: 0.8.*,
+ mediawiki/mediawiki-codesniffer: 0.1.0
+ },
+ scripts: {
+ test: [
+ parallel-lint . --exclude vendor,
+ phpcs
--standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki
--extensions=php,php5,inc --ignore=vendor -p .
+ ]
+ }
+}
diff --git a/maintenance/cleanupOldData.php b/maintenance/cleanupOldData.php
index 182a295..5201cff 100644
--- a/maintenance/cleanupOldData.php
+++ b/maintenance/cleanupOldData.php
@@ -1,13 +1,14 @@
?php
namespace WikiGrok;
+
use Maintenance;
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
- $IP = dirname( __FILE__ ) . '/../..';
+ $IP = __DIR__ . '/../..';
}
-require_once( $IP/maintenance/Maintenance.php );
+require_once $IP/maintenance/Maintenance.php;
class CleanupOldData extends Maintenance {
--
To view, visit https://gerrit.wikimedia.org/r/199788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia761febf2348f95f755047bea44075a9cf5160bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support per browsertest job timeout - change (integration/config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200129
Change subject: Support per browsertest job timeout
..
Support per browsertest job timeout
Our browser test jobs all share the same 180 minutes timeout. In most
cases that is way too long and for the WikidataTests job it is too
short. This patch bring support to specify the job timeout on a per job
basis.
Add a variable 'browsertest_job_timeout' = 180 to the browsertest
default.
Change the timeout wrapper to use that variable. Will let us override it
on a per job basis using something like:
jobs:
- myjob:
browsertest_job_timeout: 60 # override to 60 minutes
Change-Id: I2ede6fc8e171a65db71728c64ee17837e29e843e
---
M jjb/job-templates-browsertests.yaml
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/29/200129/1
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index 9d3f237..1a0ab0f 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -73,6 +73,7 @@
name: browsertests
node: contintLabsSlave UbuntuTrusty
browser_timeout: ''
+browsertest_job_timeout: 180
repository_host: 'gerrit.wikimedia.org/r'
cucumber_tags: ''
version: '10'
@@ -127,7 +128,7 @@
wrappers:
- ansicolor
- timeout:
- timeout: 180
+ timeout: '{browsertest_job_timeout}'
- timestamps
# Wiki usernames and passwords are hold in Jenkins credentials store
#
https://integration.wikimedia.org/ci/credential-store/domain/browsertests/
--
To view, visit https://gerrit.wikimedia.org/r/200129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ede6fc8e171a65db71728c64ee17837e29e843e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix choose event listeners - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200132
Change subject: Fix choose event listeners
..
Fix choose event listeners
* Choose can't emit with null
* Connect search straight to results' choose event.
Change-Id: I9d53c0c0a2c2cc52b910294f1d936004ad116a29
---
M src/ui/dialogs/ve.ui.LanguageSearchDialog.js
M src/ui/ve.ui.TableContext.js
M src/ui/widgets/ve.ui.MediaSizeWidget.js
3 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/32/200132/1
diff --git a/src/ui/dialogs/ve.ui.LanguageSearchDialog.js
b/src/ui/dialogs/ve.ui.LanguageSearchDialog.js
index 92c342a..7b33ce6 100644
--- a/src/ui/dialogs/ve.ui.LanguageSearchDialog.js
+++ b/src/ui/dialogs/ve.ui.LanguageSearchDialog.js
@@ -56,16 +56,18 @@
this.searchWidget = new this.constructor.static.languageSearchWidget( {
$: this.$
- } ).on( 'select', this.onSearchWidgetSelect.bind( this ) );
+ } );
+ this.searchWidget.getResults().connect( this, { choose:
'onSearchResultsChoose' } );
this.$body.append( this.searchWidget.$element );
};
/**
* Handle the search widget being selected
*
- * @param {Object} data Data from the selected option widget
+ * @param {ve.ui.LanguageResultWidget} item Chosen item
*/
-ve.ui.LanguageSearchDialog.prototype.onSearchWidgetSelect = function ( data ) {
+ve.ui.LanguageSearchDialog.prototype.onSearchResultsChoose = function ( item )
{
+ var data = item.getData();
this.close( {
action: 'apply',
lang: data.code,
diff --git a/src/ui/ve.ui.TableContext.js b/src/ui/ve.ui.TableContext.js
index 9943aae..1699deb 100644
--- a/src/ui/ve.ui.TableContext.js
+++ b/src/ui/ve.ui.TableContext.js
@@ -83,10 +83,8 @@
* @param {ve.ui.ContextOptionWidget} item Chosen item
*/
ve.ui.TableContext.prototype.onContextItemChoose = function ( item ) {
- if ( item ) {
- item.getCommand().execute( this.surface );
- this.toggle( false );
- }
+ item.getCommand().execute( this.surface );
+ this.toggle( false );
};
/**
diff --git a/src/ui/widgets/ve.ui.MediaSizeWidget.js
b/src/ui/widgets/ve.ui.MediaSizeWidget.js
index c021562..85cf296 100644
--- a/src/ui/widgets/ve.ui.MediaSizeWidget.js
+++ b/src/ui/widgets/ve.ui.MediaSizeWidget.js
@@ -252,7 +252,7 @@
* @fires changeSizeType
*/
ve.ui.MediaSizeWidget.prototype.onSizeTypeChoose = function ( item ) {
- var selectedType = item item.getData(),
+ var selectedType = item.getData(),
wasDefault = this.scalable.isDefault();
this.scalable.toggleDefault( selectedType === 'default' );
--
To view, visit https://gerrit.wikimedia.org/r/200132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d53c0c0a2c2cc52b910294f1d936004ad116a29
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support per browsertest job timeout - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Support per browsertest job timeout
..
Support per browsertest job timeout
Our browser test jobs all share the same 180 minutes timeout. In most
cases that is way too long and for the WikidataTests job it is too
short. This patch bring support to specify the job timeout on a per job
basis.
Add a variable 'browsertest_job_timeout' = 180 to the browsertest
default.
Change the timeout wrapper to use that variable. Will let us override it
on a per job basis using something like:
jobs:
- myjob:
browsertest_job_timeout: 60 # override to 60 minutes
Bug: T92275
Change-Id: I2ede6fc8e171a65db71728c64ee17837e29e843e
---
M jjb/job-templates-browsertests.yaml
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index 9d3f237..1a0ab0f 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -73,6 +73,7 @@
name: browsertests
node: contintLabsSlave UbuntuTrusty
browser_timeout: ''
+browsertest_job_timeout: 180
repository_host: 'gerrit.wikimedia.org/r'
cucumber_tags: ''
version: '10'
@@ -127,7 +128,7 @@
wrappers:
- ansicolor
- timeout:
- timeout: 180
+ timeout: '{browsertest_job_timeout}'
- timestamps
# Wiki usernames and passwords are hold in Jenkins credentials store
#
https://integration.wikimedia.org/ci/credential-store/domain/browsertests/
--
To view, visit https://gerrit.wikimedia.org/r/200129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ede6fc8e171a65db71728c64ee17837e29e843e
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
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] Run almost all browsertests* jobs daily - change (integration/config)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200135
Change subject: Run almost all browsertests* jobs daily
..
Run almost all browsertests* jobs daily
To be precise, all jobs that used to run at 3 and 18 UTC. Language
screenshot job should be started only manually, so the workaround is to
trigger it yearly, meaning almost never.
Bug: T94145
Change-Id: Idcd705021222c6f9c3081fcc819581d083967bcd
---
M jjb/job-templates-browsertests.yaml
1 file changed, 6 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/35/200135/1
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index 9d3f237..971c487 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -4,29 +4,17 @@
name: 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}'
defaults: browsertests
-triggers:
- - timed: 'H 3,18 * * *'
-
- job-template:
name: 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce'
defaults: browsertests
-
-triggers:
- - timed: 'H 3,18 * * *'
- job-template:
name:
'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-monobook-sauce'
defaults: browsertests
-triggers:
- - timed: 'H 3,18 * * *'
-
- job-template:
name:
'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-{version}-sauce'
defaults: browsertests
-
-triggers:
- - timed: 'H 3,18 * * *'
- job-template:
name: 'browsertests-{name}-language-screenshot-{platform}-{browser}'
@@ -54,6 +42,9 @@
name: LANGUAGE_SCREENSHOT_CODE
values:
- lang_list
+
+triggers:
+ - timed: @yearly
- job-template:
name: 'browsertests-MobileFrontend-{name}-{platform}-{browser}-sauce'
@@ -90,6 +81,9 @@
prune: true# prune remote obsoletes branches
recursive-submodules: true
+triggers:
+ - timed: @daily
+
builders:
- shell: mkdir -p $WORKSPACE/log/junit
- browsertest-website:
--
To view, visit https://gerrit.wikimedia.org/r/200135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcd705021222c6f9c3081fcc819581d083967bcd
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BlueSpiceSkin: Skin js components are loaded earlier - change (mediawiki...BlueSpiceSkin)
Pwirth has uploaded a new change for review. https://gerrit.wikimedia.org/r/200136 Change subject: BlueSpiceSkin: Skin js components are loaded earlier .. BlueSpiceSkin: Skin js components are loaded earlier * This stops some flickering and the page loading looks faster - even on pages with heavy extjs stuff Change-Id: Idf7d6a75fa202e3bc85f09cea7d46e051b54b12d --- M BlueSpiceSkin.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin refs/changes/36/200136/1 diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php index e193e40..2804f69 100644 --- a/BlueSpiceSkin.php +++ b/BlueSpiceSkin.php @@ -56,9 +56,9 @@ 'messages' = array( 'bs-tools-button' ), + 'position' = 'top', 'styles' = array(), 'dependencies' = array( - 'ext.bluespice', 'mediawiki.jqueryMsg', 'jquery.ui.tabs', ), -- To view, visit https://gerrit.wikimedia.org/r/200136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf7d6a75fa202e3bc85f09cea7d46e051b54b12d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: master Gerrit-Owner: Pwirth wi...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] zuul: provide sane defaults in init scripts - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: zuul: provide sane defaults in init scripts
..
zuul: provide sane defaults in init scripts
Filippo Giunchedi pointed we should not exit when a default file is
missing but instead provide sane default.
Add to the init script sane defaults to be overriden via the default
file:
START_DAEMON=0
DAEMON_ARGS=0
Our default files (in puppet templates) do have START_DAEMON=1 so no
impact for us.
Change-Id: I2fa45c3d0e46d1346d1906a48bd174b458a5b0c1
---
M modules/zuul/files/zuul-merger.init
M modules/zuul/files/zuul.init
2 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/zuul/files/zuul-merger.init
b/modules/zuul/files/zuul-merger.init
index f8470a5..db5b98a 100755
--- a/modules/zuul/files/zuul-merger.init
+++ b/modules/zuul/files/zuul-merger.init
@@ -23,7 +23,8 @@
# Exit if the package is not installed
[ -x $DAEMON ] || exit 0
-START_DAEMON=1
+START_DAEMON=0
+DAEMON_ARGS=''
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh
@@ -35,10 +36,6 @@
# Read configuration variable file if it is present
if [ -r /etc/default/$NAME ] ; then
. /etc/default/$NAME
-else
- log_daemon_msg $DESC: /etc/default/$NAME not found: exiting
- log_end_msg 1
- exit 0
fi
if ! [ ${START_DAEMON} = 1 ] ; then
diff --git a/modules/zuul/files/zuul.init b/modules/zuul/files/zuul.init
index 20ec8ad..2beb988 100755
--- a/modules/zuul/files/zuul.init
+++ b/modules/zuul/files/zuul.init
@@ -23,7 +23,8 @@
# Exit if the package is not installed
[ -x $DAEMON ] || exit 0
-START_DAEMON=1
+START_DAEMON=0
+DAEMON_ARGS=''
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh
@@ -35,10 +36,6 @@
# Read configuration variable file if it is present
if [ -r /etc/default/$NAME ] ; then
. /etc/default/$NAME
-else
- log_daemon_msg $DESC: /etc/default/$NAME not found: exiting
- log_end_msg 1
- exit 0
fi
if ! [ ${START_DAEMON} = 1 ] ; then
--
To view, visit https://gerrit.wikimedia.org/r/199861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fa45c3d0e46d1346d1906a48bd174b458a5b0c1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@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] Do API queries after API_DELAY - change (mediawiki...Popups)
jenkins-bot has submitted this change and it was merged.
Change subject: Do API queries after API_DELAY
..
Do API queries after API_DELAY
Based on the comments this is what it supposed to be.
mw.popups.render.article does the API-queries on init, so do that after
the API_DELAY-timer fired.
Change-Id: Ia235cbe1eb86fc774edda84208d320843401624e
---
M resources/ext.popups.renderer.js
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Prtksxna: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.popups.renderer.js b/resources/ext.popups.renderer.js
index 0781ad2..142889d 100644
--- a/resources/ext.popups.renderer.js
+++ b/resources/ext.popups.renderer.js
@@ -99,12 +99,13 @@
mw.popups.render.openPopup( link, event
);
} );
} else {
- // TODO: check for link type and call correct renderer
- // There is only one popup type so it isn't necessary
right now
- var cachePopup = mw.popups.render.article.init( link );
-
+ // Wait for timer before making API queries and showing
hovercard
mw.popups.render.openTimer = mw.popups.render.wait(
mw.popups.render.API_DELAY )
.done( function () {
+ // TODO: check for link type and call
correct renderer
+ // There is only one popup type right
now so it isn't necessary
+ var cachePopup =
mw.popups.render.article.init( link );
+
mw.popups.render.openTimer =
mw.popups.render.wait( mw.popups.render.POPUP_DELAY -
mw.popups.render.API_DELAY );
$.when( mw.popups.render.openTimer,
cachePopup ).done( function () {
--
To view, visit https://gerrit.wikimedia.org/r/199889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia235cbe1eb86fc774edda84208d320843401624e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Se4598 se4...@gmx.de
Gerrit-Reviewer: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Se4598 se4...@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] Fix the small font size issue in monobook skin - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix the small font size issue in monobook skin
..
Fix the small font size issue in monobook skin
Avoid font size inheritance from skin for CX widgets
Bug: T93180
Change-Id: Ic96def4aa352c2cc50850256fc09151febf00ea6
---
M modules/dashboard/styles/ext.cx.dashboard.less
M modules/translationview/styles/ext.cx.translationview.less
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dashboard/styles/ext.cx.dashboard.less
b/modules/dashboard/styles/ext.cx.dashboard.less
index 0325962..8e1c51b 100644
--- a/modules/dashboard/styles/ext.cx.dashboard.less
+++ b/modules/dashboard/styles/ext.cx.dashboard.less
@@ -45,6 +45,7 @@
color: @gray-darker;
background: white;
padding-bottom: 50px;
+ font-size: medium;
}
// Do not display the header bar containing the link to dashboard in dashboard
page.
diff --git a/modules/translationview/styles/ext.cx.translationview.less
b/modules/translationview/styles/ext.cx.translationview.less
index 41ff5cb..ff642b4 100644
--- a/modules/translationview/styles/ext.cx.translationview.less
+++ b/modules/translationview/styles/ext.cx.translationview.less
@@ -25,6 +25,7 @@
color: @gray-darker;
background: white;
padding-bottom: 50px;
+ font-size: medium;
}
.cx-widget__header {
--
To view, visit https://gerrit.wikimedia.org/r/199855
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic96def4aa352c2cc50850256fc09151febf00ea6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
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] synchs upstream changes to ProjectMoveController and TaskEdi... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: synchs upstream changes to ProjectMoveController and
TaskEditController with Sprint
..
synchs upstream changes to ProjectMoveController and TaskEditController with
Sprint
Sprint current with https://secure.phabricator.com/D12162 25-03-2015
Change-Id: I0c405951419476503a02c17bb11fd443e9b04100
---
M src/controller/SprintController.php
M src/controller/board/SprintBoardMoveController.php
M src/controller/board/SprintBoardTaskEditController.php
M src/customfield/SprintBeginDateField.php
M src/customfield/SprintEndDateField.php
M src/customfield/SprintProjectCustomField.php
M src/customfield/SprintTaskStoryPointsField.php
M src/events/BurndownActionMenuEventListener.php
M src/util/BurndownDataDate.php
9 files changed, 41 insertions(+), 43 deletions(-)
Approvals:
jenkins-bot: Verified
diff --git a/src/controller/SprintController.php
b/src/controller/SprintController.php
index 39c19c5..461c19e 100644
--- a/src/controller/SprintController.php
+++ b/src/controller/SprintController.php
@@ -1,6 +1,7 @@
?php
/**
* @author Michael Peters
+ * @author Christopher Johnson
* @license GPL version 3
*/
diff --git a/src/controller/board/SprintBoardMoveController.php
b/src/controller/board/SprintBoardMoveController.php
index 3b46891..b28784c 100644
--- a/src/controller/board/SprintBoardMoveController.php
+++ b/src/controller/board/SprintBoardMoveController.php
@@ -101,55 +101,46 @@
if ($task_phids ($order == PhabricatorProjectColumn::ORDER_PRIORITY)) {
$tasks = id(new ManiphestTaskQuery())
--setViewer($viewer)
--withPHIDs($task_phids)
--requireCapabilities(
- array(
-PhabricatorPolicyCapability::CAN_VIEW,
-PhabricatorPolicyCapability::CAN_EDIT,
- ))
--execute();
+ -setViewer($viewer)
+ -withPHIDs($task_phids)
+ -requireCapabilities(
+ array(
+ PhabricatorPolicyCapability::CAN_VIEW,
+ PhabricatorPolicyCapability::CAN_EDIT,
+ ))
+ -execute();
if (count($tasks) != count($task_phids)) {
return new Aphront404Response();
}
$tasks = mpull($tasks, null, 'getPHID');
- $a_task = idx($tasks, $after_phid);
- $b_task = idx($tasks, $before_phid);
+ $try = array(
+ array($after_phid, true),
+ array($before_phid, false),
+ );
- if ($a_task
- (($a_task-getPriority() $object-getPriority()) ||
- ($a_task-getPriority() == $object-getPriority()
- $a_task-getSubpriority() = $object-getSubpriority( {
-
-$after_pri = $a_task-getPriority();
-$after_sub = $a_task-getSubpriority();
-
-$xactions[] = id(new ManiphestTransaction())
- -setTransactionType(ManiphestTransaction::TYPE_SUBPRIORITY)
- -setNewValue(array(
-'newPriority' = $after_pri,
-'newSubpriorityBase' = $after_sub,
-'direction' = '',
- ));
-
- } else if ($b_task
- (($b_task-getPriority() $object-getPriority()) ||
- ($b_task-getPriority() == $object-getPriority()
- $b_task-getSubpriority() = $object-getSubpriority( {
-
-$before_pri = $b_task-getPriority();
-$before_sub = $b_task-getSubpriority();
-
-$xactions[] = id(new ManiphestTransaction())
- -setTransactionType(ManiphestTransaction::TYPE_SUBPRIORITY)
- -setNewValue(array(
-'newPriority' = $before_pri,
-'newSubpriorityBase' = $before_sub,
-'direction' = '',
- ));
+ $pri = null;
+ $sub = null;
+ foreach ($try as $spec) {
+list($task_phid, $is_after) = $spec;
+$task = idx($tasks, $task_phid);
+if ($task) {
+ list($pri, $sub) =
ManiphestTransactionEditor::getAdjacentSubpriority(
+ $task,
+ $is_after);
+ break;
+}
}
- }
+
+ if ($pri !== null) {
+$xactions[] = id(new ManiphestTransaction())
+-setTransactionType(ManiphestTransaction::TYPE_PRIORITY)
+-setNewValue($pri);
+$xactions[] = id(new ManiphestTransaction())
+-setTransactionType(ManiphestTransaction::TYPE_SUBPRIORITY)
+-setNewValue($sub);
+ }
+}
$editor = id(new ManiphestTransactionEditor())
-setActor($viewer)
diff --git a/src/controller/board/SprintBoardTaskEditController.php
b/src/controller/board/SprintBoardTaskEditController.php
index 32dfe1b..4fa8a9c 100644
--- a/src/controller/board/SprintBoardTaskEditController.php
+++ b/src/controller/board/SprintBoardTaskEditController.php
@@ -526,7 +526,7 @@
$error_view = null;
if ($errors) {
- $error_view = new PHUIErrorView();
+
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6bd5142..a0fbb38 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/200123 Change subject: Syncronize VisualEditor: 6bd5142..a0fbb38 .. Syncronize VisualEditor: 6bd5142..a0fbb38 Change-Id: I5f3d0075adae44971f4a1a55388e3381ba50971c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/23/200123/1 diff --git a/VisualEditor b/VisualEditor index 6bd5142..a0fbb38 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 6bd5142f2a8ecbc160bcad2588b9e73584deecf4 +Subproject commit a0fbb388f6e8c714b5d756464b6e2822b481c4a9 -- To view, visit https://gerrit.wikimedia.org/r/200123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f3d0075adae44971f4a1a55388e3381ba50971c 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] Syncronize VisualEditor: 6bd5142..a0fbb38 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 6bd5142..a0fbb38 .. Syncronize VisualEditor: 6bd5142..a0fbb38 Change-Id: I5f3d0075adae44971f4a1a55388e3381ba50971c --- 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 6bd5142..a0fbb38 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 6bd5142f2a8ecbc160bcad2588b9e73584deecf4 +Subproject commit a0fbb388f6e8c714b5d756464b6e2822b481c4a9 -- To view, visit https://gerrit.wikimedia.org/r/200123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f3d0075adae44971f4a1a55388e3381ba50971c 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] [BrowserTest] Add padding to the Apply changes button scre... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Add padding to the Apply changes button
screenshot
..
[BrowserTest] Add padding to the Apply changes button screenshot
Change-Id: I1a7aaca8013bf671ff39c310d5ad0dd1725b094a
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index f1ee179..f2b2504 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -294,7 +294,8 @@
Screenshot.capture(
@browser,
VisualEditor_Apply_Changes-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.settings_apply_button_element]
+[@current_page.settings_apply_button_element],
+3
)
end
--
To view, visit https://gerrit.wikimedia.org/r/200068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a7aaca8013bf671ff39c310d5ad0dd1725b094a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
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] Clunky workaround for putting link into escaped message - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Clunky workaround for putting link into escaped message .. Clunky workaround for putting link into escaped message Not escaping the message trips up my unescaped message checker Change-Id: I7e4de4c5b9008988f9d3eedd83c825b3a050849b --- M resources/js/ext.uls.interface.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: KartikMistry: Looks good to me, but someone else must approve Santhosh: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/js/ext.uls.interface.js b/resources/js/ext.uls.interface.js index 86d17e7..88b890b 100644 --- a/resources/js/ext.uls.interface.js +++ b/resources/js/ext.uls.interface.js @@ -230,7 +230,7 @@ // Get the html of the link by wrapping it in div first link = $( 'div' ).html( link ).html(); - return mw.msg( 'ext-uls-undo-language-tooltip-text', link ); + return mw.message( 'ext-uls-undo-language-tooltip-text', '$1' ).escaped().replace( '$1', link ); } } ); -- To view, visit https://gerrit.wikimedia.org/r/199873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e4de4c5b9008988f9d3eedd83c825b3a050849b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@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] Set parameter default to array() in WebResponse::setcookie() - change (mediawiki/core)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200124
Change subject: Set parameter default to array() in WebResponse::setcookie()
..
Set parameter default to array() in WebResponse::setcookie()
This is a direct follow-up for the question raised in Ifab16c2.
Null is not a meaningful value in this case. As far as I can see the
only reason it was added was to make the parameter optional. Optional
array parameters are better marked with = array().
Change-Id: I86965d390fdb718de7fb81a9f4c48b2261c16aa9
---
M includes/WebResponse.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/24/200124/1
diff --git a/includes/WebResponse.php b/includes/WebResponse.php
index 83ac51a..ab34931 100644
--- a/includes/WebResponse.php
+++ b/includes/WebResponse.php
@@ -60,7 +60,7 @@
* @param int|null $expire Unix timestamp (in seconds) when the cookie
should expire.
*0 (the default) causes it to expire $wgCookieExpiration
seconds from now.
*null causes it to be a session cookie.
-* @param array|null $options Assoc of additional cookie options:
+* @param array $options Assoc of additional cookie options:
* prefix: string, name prefix ($wgCookiePrefix)
* domain: string, cookie domain ($wgCookieDomain)
* path: string, cookie path ($wgCookiePath)
@@ -72,7 +72,7 @@
* 'prefix', 'domain', and 'secure'
* @since 1.22 Replaced $prefix, $domain, and $forceSecure with $options
*/
- public function setcookie( $name, $value, $expire = 0, $options = null
) {
+ public function setcookie( $name, $value, $expire = 0, $options =
array() ) {
global $wgCookiePath, $wgCookiePrefix, $wgCookieDomain;
global $wgCookieSecure, $wgCookieExpiration, $wgCookieHttpOnly;
@@ -188,9 +188,9 @@
* @param string $name The name of the cookie.
* @param string $value The value to be stored in the cookie.
* @param int|null $expire Ignored in this faux subclass.
-* @param array|null $options Ignored in this faux subclass.
+* @param array $options Ignored in this faux subclass.
*/
- public function setcookie( $name, $value, $expire = 0, $options = null
) {
+ public function setcookie( $name, $value, $expire = 0, $options =
array() ) {
$this-cookies[$name] = $value;
}
--
To view, visit https://gerrit.wikimedia.org/r/200124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86965d390fdb718de7fb81a9f4c48b2261c16aa9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Add sniff to check for goto - change (mediawiki...codesniffer)
Hharchani has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200121
Change subject: Add sniff to check for goto
..
Add sniff to check for goto
This sniff detects the usage of goto control statement and reports an
error.
Change-Id: Ib780bd2fb2dd1c522bdc094b82b14eb1bc0a844c
---
A MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
A MediaWiki/Tests/files/GotoUsage/goto_usage_fail.php
A MediaWiki/Tests/files/GotoUsage/goto_usage_pass.php
3 files changed, 35 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer
refs/changes/21/200121/1
diff --git a/MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
b/MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
new file mode 100644
index 000..be3730b
--- /dev/null
+++ b/MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
@@ -0,0 +1,18 @@
+?php
+/**
+ * Report error when `goto` is used
+ */
+class MediaWiki_Sniffs_GotoUsage_GotoUsageSniff implements
PHP_CodeSniffer_Sniff {
+ public function register() {
+ // As per
https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP#Other
+ return array(
+ T_GOTO
+ );
+ }
+
+ public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
+ $tokens = $phpcsFile-getTokens();
+ $error = 'Control statement goto must not be used.';
+ $phpcsFile-addError( $error, $stackPtr, 'GotoUsage');
+ }
+}
diff --git a/MediaWiki/Tests/files/GotoUsage/goto_usage_fail.php
b/MediaWiki/Tests/files/GotoUsage/goto_usage_fail.php
new file mode 100644
index 000..056e2ef
--- /dev/null
+++ b/MediaWiki/Tests/files/GotoUsage/goto_usage_fail.php
@@ -0,0 +1,9 @@
+?php
+
+for ($i=0; $i 20; $i++) {
+ if ($i == 15) {
+ goto endloop;
+ }
+}
+endloop:
+echo Done;
diff --git a/MediaWiki/Tests/files/GotoUsage/goto_usage_pass.php
b/MediaWiki/Tests/files/GotoUsage/goto_usage_pass.php
new file mode 100644
index 000..d870bf6
--- /dev/null
+++ b/MediaWiki/Tests/files/GotoUsage/goto_usage_pass.php
@@ -0,0 +1,8 @@
+?php
+
+for ($i=0; $i 20; $i++) {
+ if ($i == 15) {
+ break;
+ }
+}
+echo Done;
--
To view, visit https://gerrit.wikimedia.org/r/200121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib780bd2fb2dd1c522bdc094b82b14eb1bc0a844c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Hharchani hharch...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Complete renaming of LSG skin to Blueprint - change (mediawiki...Blueprint)
jenkins-bot has submitted this change and it was merged.
Change subject: Complete renaming of LSG skin to Blueprint
..
Complete renaming of LSG skin to Blueprint
Change-Id: I2d8c441b77dc97dcb68a72cf15e211ff6d91ea4e
---
A Blueprint.php
M LivingStyleGuide.php
M README.md
M autoload.php
R src/BlueprintSkinTemplate.php
A src/SkinBlueprint.php
D src/SkinLivingStyleGuide.php
7 files changed, 103 insertions(+), 99 deletions(-)
Approvals:
Prtksxna: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Blueprint.php b/Blueprint.php
new file mode 100644
index 000..cc17dac
--- /dev/null
+++ b/Blueprint.php
@@ -0,0 +1,74 @@
+?php
+/**
+ * MediaWiki skin: Blueprint
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the Software), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY.
+ */
+
+/**
+ *
+ * @file
+ * @ingroup Extensions
+ * @author Andrew Garrett
+ */
+
+# Alert the user that this is not a valid entry point to MediaWiki if they try
to access the special pages file directly.
+if ( !defined( 'MEDIAWIKI' ) ) {
+ echo EOT
+To install this extension, put the following line in LocalSettings.php:
+require_once( $IP/skins/Blueprint/Blueprint.php );
+EOT;
+ exit( 1 );
+}
+
+// Extension credits that will show up on Special:Version
+$wgExtensionCredits['skin'][] = array(
+ 'path' = __FILE__,
+ 'name' = 'Blueprint',
+ 'url' = 'http://gerrit.wikimedia.org/r/p/mediawiki/skins/Blueprint',
+ 'author' = array(
+ 'Andrew Garrett',
+ 'Prateek Saxena',
+ ),
+);
+
+$styleguideSkinResourceTemplate = array(
+ 'localBasePath' = __DIR__ . /resources,
+ 'remoteSkinPath' = 'Blueprint/resources',
+ 'group' = 'skin.blueprint',
+);
+
+$wgResourceModules += array(
+ 'skin.blueprint.styles' = array(
+ 'styles' = 'master.less',
+ 'position' = 'top',
+ ) + $styleguideSkinResourceTemplate,
+ 'skin.blueprint' = array(
+ 'scripts' = 'menu.js',
+ ) + $styleguideSkinResourceTemplate,
+);
+
+$wgResourceModuleSkinStyles['blueprint'] = array(
+ // Apply original Tipsy styles
+ 'jquery.tipsy' = array(
+ 'tipsy.original.less',
+ 'tipsy.override.less',
+ ),
+ 'remoteSkinPath' = 'Blueprint/skinStyles',
+ 'localBasePath' = __DIR__ . '/skinStyles',
+);
+
+require_once __DIR__./autoload.php;
+require_once __DIR__./vendor/autoload.php;
+
+$wgValidSkinNames['blueprint'] = 'Blueprint';
diff --git a/LivingStyleGuide.php b/LivingStyleGuide.php
index d392861..d6f0788 100644
--- a/LivingStyleGuide.php
+++ b/LivingStyleGuide.php
@@ -1,73 +1,3 @@
?php
-/**
- * MediaWiki Extension: LivingStyleGuideSkin
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the Software), to
deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * This program is distributed WITHOUT ANY WARRANTY.
- */
-/**
- *
- * @file
- * @ingroup Extensions
- * @author Andrew Garrett
- */
-
-# Alert the user that this is not a valid entry point to MediaWiki if they try
to access the special pages file directly.
-if ( !defined( 'MEDIAWIKI' ) ) {
- echo EOT
-To install this extension, put the following line in LocalSettings.php:
-require_once( $IP/extensions/LightNCandySkin/LightNCandySkin.php );
-EOT;
- exit( 1 );
-}
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['skin'][] = array(
- 'path' = __FILE__,
- 'name' = 'LivingStyleGuideSkin',
- 'url' = 'URL to extension information',
- 'author' = array(
- 'Andrew Garrett',
- ),
-);
-
-$styleguideSkinResourceTemplate = array(
- 'localBasePath' = __DIR__ . /resources,
- 'remoteSkinPath' = 'LivingStyleGuide/resources',
- 'group' = 'skin.livingstyleguide',
-);
-
-$wgResourceModules += array(
- 'skin.styleguide.styles' = array(
-
[MediaWiki-commits] [Gerrit] Stop throttling SauceLabs jobs - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Stop throttling SauceLabs jobs
..
Stop throttling SauceLabs jobs
The browser tests once executed directly on the slaves and we suspected
some performance bottleneck when several ran concurrently.
We found out there is a race condition that causes the XVFB server to be
killed and causing the failure of other jobs running on the same job
Thus, we wanted to only have one browser test per job.
Nowadays we have migrated all browsertests to run on SauceLabs. The part
of code running on the slaves is quite lightweight. Thus remove the
throttling from all browser tests jobs.
Change-Id: I8f9d34ce19a0b5a878e40dbb79f55f10fd43a7ae
---
M jjb/job-templates-browsertests.yaml
1 file changed, 0 insertions(+), 11 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index 5a3c382..9d3f237 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -80,17 +80,6 @@
logrotate:
daysToKeep: 31 # ~ 2 * 2 weeks sprints
-properties:
- - throttle:
- max-per-node: 1
- max-total: 0
- enabled: true
- option: 'category'
- categories:
- # They are defined in the global configuration
- # https://integration.wikimedia.org/ci/configure
- - browsertest-one-per-node
-
scm:
- git:
url: https://{repository_host}/{repository}
--
To view, visit https://gerrit.wikimedia.org/r/199932
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f9d34ce19a0b5a878e40dbb79f55f10fd43a7ae
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix incorrect apihelp i18n message - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Fix incorrect apihelp i18n message .. Fix incorrect apihelp i18n message Change-Id: I9c4546295dc2d9506a7ba15422feef83857e3739 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 41f14bb..2ce98b9 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -417,7 +417,7 @@ apihelp-flow+close-open-topic-description: Deprecated in favor of [[Special:ApiHelp/flow+lock-topic|action=flowsubmodule=lock-topic]]., apihelp-flow+close-open-topic-param-moderationState: State to put topic in, either locked or unlocked., apihelp-flow+close-open-topic-param-reason: Reason for locking or unlocking the topic., - apihelp-flow+edit-header-description: Edits a topic's header., + apihelp-flow+edit-header-description: Edits a board's header., apihelp-flow+edit-header-param-prev_revision: Revision ID of the current header revision, to check for edit conflicts., apihelp-flow+edit-header-param-content: Content for header., apihelp-flow+edit-header-param-format: Format of the header (wikitext|html), -- To view, visit https://gerrit.wikimedia.org/r/198398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c4546295dc2d9506a7ba15422feef83857e3739 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Made User actually use the mQuickTouched process cache - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Made User actually use the mQuickTouched process cache
..
Made User actually use the mQuickTouched process cache
Change-Id: I158eae2dac16b5fdacd095fff7fb031b42804a1e
---
M includes/User.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/User.php b/includes/User.php
index 2f9b716..78693c1 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2309,7 +2309,9 @@
if ( $this-mQuickTouched === null ) {
$key = wfMemcKey( 'user-quicktouched', 'id',
$this-mId );
$timestamp = $wgMemc-get( $key );
- if ( !$timestamp ) {
+ if ( $timestamp ) {
+ $this-mQuickTouched = $timestamp;
+ } else {
# Set the timestamp to get HTTP 304
cache hits
$this-touch();
}
--
To view, visit https://gerrit.wikimedia.org/r/200115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I158eae2dac16b5fdacd095fff7fb031b42804a1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@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] [BrowserTest] Show the full Formatting pull-down in the scre... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Show the full Formatting pull-down in the
screenshot
..
[BrowserTest] Show the full Formatting pull-down in the screenshot
The scenario for the Formatting pull-down screenshot didn't click
the More element in the bottom. This is now added.
The More element itself is redefined to be generic and work with
all pull-down menus - there is supposed to be only
one active menu at a time.
Change-Id: I27122f3192b220919311993ecd9a10d85ef5828d
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
2 files changed, 8 insertions(+), 7 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index d3e5fa8..1ae8cfe 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -56,7 +56,7 @@
When(/^I click on the Special character option in Insert menu$/) do
step 'I click on the Insert menu'
- step 'I click on More in insert pull-down menu'
+ step 'I click on More in the pull-down menu'
on(VisualEditorPage).special_character_element.when_present.click
end
@@ -113,7 +113,7 @@
When(/^I click on Formula option in Insert menu$/) do
step 'I click on the Insert menu'
- step 'I click on More in insert pull-down menu'
+ step 'I click on More in the pull-down menu'
on(VisualEditorPage).formula_link_element.when_present.click
end
@@ -129,7 +129,7 @@
When(/^I click on References list in Insert menu$/) do
step 'I click in the editable part'
step 'I click on the Insert menu'
- step 'I click on More in insert pull-down menu'
+ step 'I click on More in the pull-down menu'
on(VisualEditorPage).ve_references_element.when_present.click
end
@@ -162,6 +162,7 @@
end
Then(/^I take screenshot of Formatting pull-down menu$/) do
+ step 'I click on More in the pull-down menu'
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
@@ -185,7 +186,7 @@
end
Then(/^I take screenshot of insert pull-down menu$/) do
- step 'I click on More in insert pull-down menu'
+ step 'I click on More in the pull-down menu'
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
@@ -233,8 +234,8 @@
)
end
-Then(/^I click on More in insert pull-down menu$/) do
- on(VisualEditorPage).insert_more_fewer_element.when_present.click
+Then(/^I click on More in the pull-down menu$/) do
+ on(VisualEditorPage).more_fewer_element.when_present.click
end
Then(/^I should see Special character Insertion window$/) do
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 66d0c67..6cb5dd8 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -75,7 +75,7 @@
span(:insert_indicator, text: 'Insert')
div(:insert_button, class: 've-test-toolbar-insert')
span(:insert_indicator_down, css: '.ve-test-toolbar-insert
.oo-ui-indicator-down')
- a(:insert_more_fewer, css: '.ve-test-toolbar-insert
.oo-ui-tool-name-more-fewer .oo-ui-tool-link')
+ a(:more_fewer, css: '.oo-ui-popupToolGroup-active
.oo-ui-tool-name-more-fewer .oo-ui-tool-link')
div(:insert_pull_down, css: '.ve-test-toolbar-insert
.oo-ui-clippableElement-clippable')
div(:insert_references, class: 'oo-ui-processDialog-location')
span(:insert, text: 'Insert')
--
To view, visit https://gerrit.wikimedia.org/r/200055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I27122f3192b220919311993ecd9a10d85ef5828d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
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] [BrowserTest] Add padding to screenshots of the page setting... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Add padding to screenshots of the page settings
dialog
..
[BrowserTest] Add padding to screenshots of the page settings dialog
Change-Id: I460fc82a10ca5172537a97f28f3a50573c784a93
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 212fb7c..f1ee179 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -272,13 +272,15 @@
Screenshot.capture(
@browser,
VisualEditor_Page_Settings_Redirects-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.enable_redirect_element,
@current_page.prevent_redirect_element]
+[@current_page.enable_redirect_element,
@current_page.prevent_redirect_element],
+3
)
Screenshot.capture(
@browser,
VisualEditor_Page_Settings_TOC-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.table_of_contents_element]
+[@current_page.table_of_contents_element],
+3
)
Screenshot.capture(
--
To view, visit https://gerrit.wikimedia.org/r/200067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I460fc82a10ca5172537a97f28f3a50573c784a93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
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] [BrowserTest] Add padding to the Edit Links screenshot - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Add padding to the Edit Links screenshot
..
[BrowserTest] Add padding to the Edit Links screenshot
Change-Id: Ife795e5f34b69fc6790cd04b217f823205737c0c
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index fb2f531..212fb7c 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -284,7 +284,8 @@
Screenshot.capture(
@browser,
VisualEditor_Page_Settings_Edit_Links-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.page_settings_editlinks_element]
+[@current_page.page_settings_editlinks_element],
+3
)
Screenshot.zoom_browser(@browser, 3)
--
To view, visit https://gerrit.wikimedia.org/r/200066
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife795e5f34b69fc6790cd04b217f823205737c0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
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] [BrowserTest] Add padding to the page settings item screenshot - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Add padding to the page settings item screenshot
..
[BrowserTest] Add padding to the page settings item screenshot
Change-Id: I38f9d81cbfaa28c51997105bdc2cbaa81ed02783
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 1ae8cfe..fb2f531 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -69,7 +69,8 @@
Screenshot.capture(
@browser,
VisualEditor_page_settings_item-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.hamburger_menu_element,
@current_page.page_option_menu_element]
+[@current_page.hamburger_menu_element,
@current_page.page_option_menu_element],
+3
)
on(VisualEditorPage).page_settings_element.when_present.click
--
To view, visit https://gerrit.wikimedia.org/r/200065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38f9d81cbfaa28c51997105bdc2cbaa81ed02783
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
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] Include style for edit links for page preview action - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200125
Change subject: Include style for edit links for page preview action
..
Include style for edit links for page preview action
Bug: T94143
Change-Id: Ic752b44a5e7cace4bd9d70ac4831ccb313f9571e
---
M client/includes/Hooks/BeforePageDisplayHandler.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/25/200125/1
diff --git a/client/includes/Hooks/BeforePageDisplayHandler.php
b/client/includes/Hooks/BeforePageDisplayHandler.php
index 12791dd..b3e0d44 100644
--- a/client/includes/Hooks/BeforePageDisplayHandler.php
+++ b/client/includes/Hooks/BeforePageDisplayHandler.php
@@ -68,7 +68,7 @@
private function hasEditOrAddLinks( OutputPage $out, Title $title,
$actionName ) {
if (
$out-getProperty( 'noexternallanglinks' ) ||
- $actionName !== 'view' ||
+ !in_array( $actionName, array( 'view', 'submit' ) ) ||
!$title-exists()
) {
return false;
--
To view, visit https://gerrit.wikimedia.org/r/200125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic752b44a5e7cace4bd9d70ac4831ccb313f9571e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: 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] Hygiene: Use factory closures instead of Action classes - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Use factory closures instead of Action classes .. Hygiene: Use factory closures instead of Action classes When this was first written the only option was specific classes, but since then the wikidata team have updated the Action handling to accept closures. This patch removes the redundant classes that only specify the explicit action name and replaces them with Closures. Change-Id: I0c9d96cee594975b32c9c22cf145e0f3c3749f7c --- M FlowActions.php M autoload.php D includes/Actions/ActionTemplate.php.template D includes/Actions/CompareHeaderRevisionsAction.php D includes/Actions/ComparePostRevisionsAction.php D includes/Actions/ComparePostSummaryRevisionsAction.php D includes/Actions/CreateTopicSummaryAction.php D includes/Actions/EditHeaderAction.php D includes/Actions/EditPostAction.php D includes/Actions/EditTitleAction.php D includes/Actions/EditTopicSummaryAction.php D includes/Actions/HistoryAction.php D includes/Actions/LockTopicAction.php D includes/Actions/ModeratePostAction.php D includes/Actions/ModerateTopicAction.php D includes/Actions/NewTopicAction.php D includes/Actions/PostSingleViewAction.php D includes/Actions/ReplyAction.php D includes/Actions/RestorePostAction.php D includes/Actions/RestoreTopicAction.php D includes/Actions/UndoEditHeaderAction.php D includes/Actions/UndoEditPostAction.php D includes/Actions/UndoEditTopicSummaryAction.php D includes/Actions/ViewHeaderAction.php D includes/Actions/ViewTopicSummaryAction.php M includes/Content/BoardContentHandler.php 26 files changed, 37 insertions(+), 330 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/FlowActions.php b/FlowActions.php index 93e6d5e..3e5e5bb 100644 --- a/FlowActions.php +++ b/FlowActions.php @@ -76,7 +76,7 @@ ), 'class' = 'flow-history-edit-header', ), - 'handler-class' = 'Flow\Actions\EditHeaderAction', + 'handler-class' = 'Flow\Actions\FlowAction', 'editcount' = true, ), @@ -99,7 +99,7 @@ ), 'class' = 'flow-history-edit-header', ), - 'handler-class' = 'Flow\Actions\UndoEditHeaderAction', + 'handler-class' = 'Flow\Actions\FlowAction', 'editcount' = true, // theis modules/moduleStyles is repeated in all the undo-* actions. Find a way to share. 'modules' = array( 'ext.flow.undo' ), @@ -159,7 +159,7 @@ ), 'class' = 'flow-history-edit-topic-summary', ), - 'handler-class' = 'Flow\Actions\EditTopicSummaryAction', + 'handler-class' = 'Flow\Actions\FlowAction', 'editcount' = true, ), @@ -187,7 +187,7 @@ ), 'class' = 'flow-history-edit-topic-summary', ), - 'handler-class' = 'Flow\Actions\UndoEditTopicSummaryAction', + 'handler-class' = 'Flow\Actions\FlowAction', 'editcount' = true, 'modules' = array( 'ext.flow.undo' ), 'moduleStyles' = array( @@ -219,7 +219,7 @@ ), 'class' = 'flow-history-edit-title', ), - 'handler-class' = 'Flow\Actions\EditTitleAction', + 'handler-class' = 'Flow\Actions\FlowAction', 'watch' = array( 'immediate' = array( 'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ), ), @@ -247,7 +247,7 @@ ), 'class' = 'flow-history-new-post', ), - 'handler-class' = 'Flow\Actions\NewTopicAction', + 'handler-class' = 'Flow\Actions\FlowAction', 'watch' = array( 'immediate' = array( 'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ), ), @@ -279,7 +279,7 @@ ), 'class' = 'flow-history-edit-post', ), - 'handler-class' = 'Flow\Actions\EditPostAction', + 'handler-class' = 'Flow\Actions\FlowAction', 'watch' = array( 'immediate' = array( 'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ), ), @@ -309,7 +309,7 @@ ), 'class' = 'flow-history-edit-post', ), - 'handler-class' = 'Flow\Actions\UndoEditPostAction', + 'handler-class' = 'Flow\Actions\FlowAction', 'watch' = array( 'immediate' =
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-03-27T10:00:01+0000 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/200127 Change subject: New Wikidata Build - 2015-03-27T10:00:01+ .. New Wikidata Build - 2015-03-27T10:00:01+ Change-Id: Ie9c99f0323a6ef682c0a8bc710ba55630efbedce --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.lock M extensions/PropertySuggester/build/travis/after_script.sh M extensions/PropertySuggester/build/travis/before_script.sh M extensions/PropertySuggester/build/travis/script.sh M extensions/ValueView/README.md M extensions/ValueView/ValueView.php M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.inputextender.tests.js M extensions/ValueView/tests/lib/jquery/jquery.focusAt.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.tests.js M extensions/Wikibase/.jscsrc M extensions/Wikibase/README.md M extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh M extensions/Wikibase/build/travis/install.sh M extensions/Wikibase/build/travis/mw-apply-wb-settings.sh M extensions/Wikibase/build/travis/script.sh M extensions/Wikibase/build/travis/update-db.sh M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/config/WikibaseClient.default.php A extensions/Wikibase/client/i18n/ang.json M extensions/Wikibase/client/i18n/arq.json M extensions/Wikibase/client/i18n/as.json M extensions/Wikibase/client/i18n/az.json M extensions/Wikibase/client/i18n/be-tarask.json A extensions/Wikibase/client/i18n/bho.json M extensions/Wikibase/client/i18n/da.json M extensions/Wikibase/client/i18n/de.json A extensions/Wikibase/client/i18n/gom-deva.json M extensions/Wikibase/client/i18n/kk-cyrl.json M extensions/Wikibase/client/i18n/lt.json M extensions/Wikibase/client/i18n/lzh.json M extensions/Wikibase/client/i18n/oc.json M extensions/Wikibase/client/i18n/ps.json M extensions/Wikibase/client/i18n/qqq.json M extensions/Wikibase/client/i18n/ru.json M extensions/Wikibase/client/i18n/sr-el.json A extensions/Wikibase/client/i18n/tcy.json M extensions/Wikibase/client/i18n/tt-cyrl.json M extensions/Wikibase/client/i18n/uk.json M extensions/Wikibase/client/i18n/zh-hant.json M extensions/Wikibase/client/includes/Changes/ChangeHandler.php M extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php M extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php M extensions/Wikibase/client/includes/Hooks/UpdateRepoHookHandlers.php M extensions/Wikibase/client/includes/RepoItemLinkGenerator.php M extensions/Wikibase/client/includes/UpdateRepo/UpdateRepo.php M extensions/Wikibase/client/includes/Usage/HashUsageAccumulator.php M extensions/Wikibase/client/includes/Usage/ParserOutputUsageAccumulator.php M extensions/Wikibase/client/includes/Usage/UsageAccumulator.php M extensions/Wikibase/client/includes/scribunto/EntityAccessor.php M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php M extensions/Wikibase/client/includes/scribunto/SnakSerializationRenderer.php M extensions/Wikibase/client/includes/scribunto/mw.wikibase.lua A extensions/Wikibase/client/includes/store/sql/BulkSubscriptionUpdater.php A extensions/Wikibase/client/maintenance/updateSubscriptions.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/HashUsageAccumulatorTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageAccumulatorContractTester.php M extensions/Wikibase/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua A extensions/Wikibase/client/tests/phpunit/includes/store/sql/BulkSubscriptionUpdaterTest.php M extensions/Wikibase/composer.json M extensions/Wikibase/docs/json.wiki M extensions/Wikibase/docs/lua.wiki A extensions/Wikibase/lib/i18n/arq.json M extensions/Wikibase/lib/i18n/as.json M extensions/Wikibase/lib/i18n/az.json A extensions/Wikibase/lib/i18n/gom-deva.json M extensions/Wikibase/lib/i18n/hr.json M extensions/Wikibase/lib/i18n/lt.json A extensions/Wikibase/lib/i18n/ne.json M extensions/Wikibase/lib/i18n/oc.json M extensions/Wikibase/lib/i18n/ps.json M extensions/Wikibase/lib/i18n/qqq.json M extensions/Wikibase/lib/i18n/qu.json M extensions/Wikibase/lib/i18n/sr-ec.json M extensions/Wikibase/lib/i18n/sr-el.json M extensions/Wikibase/lib/i18n/sv.json A extensions/Wikibase/lib/i18n/sw.json M extensions/Wikibase/lib/i18n/uk.json M extensions/Wikibase/lib/includes/Summary.php M extensions/Wikibase/lib/includes/changes/EntityChange.php M extensions/Wikibase/lib/includes/formatters/CommonsLinkFormatter.php M extensions/Wikibase/lib/includes/formatters/EntityIdLinkFormatter.php M
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: d941263..8cb387a - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: d941263..8cb387a .. Syncronize VisualEditor: d941263..8cb387a Change-Id: I4d726920283cbf65f5ad5d26356ad6df11ed6e24 --- 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 d941263..8cb387a 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit d941263d334ad454149f57ea053918ab55b114ce +Subproject commit 8cb387a2693fa3f53480b83672bded0897238166 -- To view, visit https://gerrit.wikimedia.org/r/200141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d726920283cbf65f5ad5d26356ad6df11ed6e24 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: d941263..8cb387a - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/200141 Change subject: Syncronize VisualEditor: d941263..8cb387a .. Syncronize VisualEditor: d941263..8cb387a Change-Id: I4d726920283cbf65f5ad5d26356ad6df11ed6e24 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/41/200141/1 diff --git a/VisualEditor b/VisualEditor index d941263..8cb387a 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit d941263d334ad454149f57ea053918ab55b114ce +Subproject commit 8cb387a2693fa3f53480b83672bded0897238166 -- To view, visit https://gerrit.wikimedia.org/r/200141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d726920283cbf65f5ad5d26356ad6df11ed6e24 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] Refactor badgeselector - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200144
Change subject: Refactor badgeselector
..
Refactor badgeselector
This removes a lot of code necessary for handling asynchronous badge adding,
since the placeholder badges are added synchronously, and provide the same
interface. It also condenses handling of the empty badge used as a menu anchor.
Change-Id: I24a144d917d3e8c094ab54c501d82a23e2714148
---
M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
2 files changed, 90 insertions(+), 114 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/44/200144/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
index bc2b125..c7598d2 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
@@ -170,42 +170,14 @@
/**
* Creates the individual badges' DOM structures.
-*
-* @return {jQuery.Promise}
-* No resolved parameters.
-* No rejected parameters.
*/
_createBadges: function() {
- var deferred = $.Deferred();
-
if( this.element.children( '.wb-badge' ).length ) {
- return deferred.resolve().promise();
+ return;
}
- if( !this.options.value.length this.isInEditMode() ) {
- this._addEmptyBadge();
- return deferred.resolve().promise();
- }
-
- var self = this;
-
- for( var i = 0; i this.options.value.length; i++ ) {
- this._addPlaceholderBadge( this.options.value[i] );
- }
-
- $.when.apply( $, $.map( this.options.value, function( badgeId )
{
- return self.options.entityIdPlainFormatter.format(
badgeId ).done( function( badgeLabel ) {
- self._addBadge( badgeId, badgeLabel );
- } );
- } ) ).done( function() {
- deferred.resolve();
- } )
- .fail( function() {
- // TODO: Display error message
- deferred.reject();
- } );
-
- return deferred.promise();
+ this._updateEmptyBadge();
+ this._addBadges();
},
/**
@@ -310,7 +282,7 @@
deferred.reject();
} );
- return deferred;
+ return deferred.promise();
},
/**
@@ -320,78 +292,76 @@
* @param {boolean} targetState
*/
_toggleBadge: function( badgeId, targetState ) {
- var self = this;
if( targetState ) {
this.element.children( '.wb-badge-' + badgeId
).remove();
- if( !this.element.children( '.wb-badge' ).length ) {
- this._addEmptyBadge();
- }
-
- this._trigger( 'change' );
} else {
- this.options.entityIdPlainFormatter.format( badgeId
).done( function( badgeLabel ) {
- self._addBadge( badgeId, badgeLabel );
- self._getEmptyBadge().remove();
- self._trigger( 'change' );
- } );
+ this._addBadge( badgeId );
}
+ this._updateEmptyBadge();
+ this._trigger( 'change' );
+ },
+
+ _addBadges: function() {
+ var self = this;
+ $.each( this.options.value, function( index, badgeId ) {
+ self._addBadge( badgeId );
+ } );
},
/**
-* Creates a placeholder badge to be displayed while loading the actual
badge information. The
-* placeholder will be replaced when calling this._addBadge() with the
same badge id.
+* Add the DOM for a badge with the given itemId.
*
* @param {string} badgeId
*/
- _addPlaceholderBadge: function( badgeId ) {
- if( this.element.children( '[data-wb-badge=' + badgeId + ']'
).length ) {
- return;
- }
- this.element.append(
- mw.wbTemplate( 'wb-badge',
- badgeId + ' ' + this.options.badges[badgeId],
- badgeId,
+ _addBadge: function( badgeId ) {
+ var self = this,
+ $badge;
+
+
[MediaWiki-commits] [Gerrit] Update AFNetworking dependency - change (apps...wikipedia)
Dr0ptp4kt has submitted this change and it was merged. Change subject: Update AFNetworking dependency .. Update AFNetworking dependency Change-Id: I34bec177bb26b03b5e318715f590a6bfbd837f57 --- M Podfile.lock 1 file changed, 14 insertions(+), 14 deletions(-) Approvals: Dr0ptp4kt: Looks good to me, approved jenkins-bot: Verified diff --git a/Podfile.lock b/Podfile.lock index be2de22..8fd0494 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,23 +1,23 @@ PODS: - - AFNetworking (2.5.1): -- AFNetworking/NSURLConnection (= 2.5.1) -- AFNetworking/NSURLSession (= 2.5.1) -- AFNetworking/Reachability (= 2.5.1) -- AFNetworking/Security (= 2.5.1) -- AFNetworking/Serialization (= 2.5.1) -- AFNetworking/UIKit (= 2.5.1) - - AFNetworking/NSURLConnection (2.5.1): + - AFNetworking (2.5.2): +- AFNetworking/NSURLConnection (= 2.5.2) +- AFNetworking/NSURLSession (= 2.5.2) +- AFNetworking/Reachability (= 2.5.2) +- AFNetworking/Security (= 2.5.2) +- AFNetworking/Serialization (= 2.5.2) +- AFNetworking/UIKit (= 2.5.2) + - AFNetworking/NSURLConnection (2.5.2): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/NSURLSession (2.5.1): + - AFNetworking/NSURLSession (2.5.2): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/Reachability (2.5.1) - - AFNetworking/Security (2.5.1) - - AFNetworking/Serialization (2.5.1) - - AFNetworking/UIKit (2.5.1): + - AFNetworking/Reachability (2.5.2) + - AFNetworking/Security (2.5.2) + - AFNetworking/Serialization (2.5.2) + - AFNetworking/UIKit (2.5.2): - AFNetworking/NSURLConnection - AFNetworking/NSURLSession - BlocksKit/Core (2.2.5) @@ -38,7 +38,7 @@ - OCMockito (~ 1.4) SPEC CHECKSUMS: - AFNetworking: 8bee59492a6ff15d69130efa4d0dc67e0094a52a + AFNetworking: fefbce9660acb17f48ae0011292d4da0f457bf36 BlocksKit: 4439e7f30a9f90743462ca63545a15c1f4304cef HockeySDK: bfd1f5ac75938b07499c4ac12932244b72a2e70b hpple: f4eb7c21a8db83ec264e5d614ec7509e10e5adec -- To view, visit https://gerrit.wikimedia.org/r/200145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I34bec177bb26b03b5e318715f590a6bfbd837f57 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Dr0ptp4kt ab...@wikimedia.org Gerrit-Reviewer: Dr0ptp4kt ab...@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] Expand new-topic form if it has preloaded content - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200151
Change subject: Expand new-topic form if it has preloaded content
..
Expand new-topic form if it has preloaded content
Change-Id: Ia9d7e5e9ad657a0d31585aa53fea1492848c1b56
---
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
M handlebars/flow_newtopic_form.partial.handlebars
M modules/engine/components/common/flow-component-events.js
4 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/51/200151/1
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index a5620dc..9a78bcc 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -112,7 +112,7 @@
class=mw-ui-button mw-ui-destructive mw-ui-quiet mw-ui-flush-right
flow-js
'.LCRun3::ch($cx, 'l10n', array(array('flow-cancel'),array()),
'encq').'/button
-';},'flow_newtopic_form' = function ($cx, $in) {return
''.((LCRun3::ifvar($cx, ((isset($in['actions']['newtopic'])
is_array($in['actions'])) ? $in['actions']['newtopic'] : null))) ? 'form
action='.htmlentities((string)((isset($in['actions']['newtopic']['url'])
is_array($in['actions']['newtopic'])) ? $in['actions']['newtopic']['url'] :
null), ENT_QUOTES, 'UTF-8').' method=POST class=flow-newtopic-form
data-flow-initial-state=collapsed
+';},'flow_newtopic_form' = function ($cx, $in) {return
''.((LCRun3::ifvar($cx, ((isset($in['actions']['newtopic'])
is_array($in['actions'])) ? $in['actions']['newtopic'] : null))) ? 'form
action='.htmlentities((string)((isset($in['actions']['newtopic']['url'])
is_array($in['actions']['newtopic'])) ? $in['actions']['newtopic']['url'] :
null), ENT_QUOTES, 'UTF-8').' method=POST class=flow-newtopic-form
data-flow-initial-state='.((LCRun3::ifvar($cx,
((isset($in['submitted']['content']) is_array($in['submitted'])) ?
$in['submitted']['content'] : null))) ? 'expanded' : 'collapsed').'
'.LCRun3::p($cx, 'flow_errors', array(array($in),array())).'
'.LCRun3::hbch($cx, 'ifAnonymous', array(array(),array()), $in, false,
function($cx, $in) {return ''.LCRun3::p($cx, 'flow_anon_warning',
array(array($in),array())).'';}).'
input type=hidden name=wpEditToken
value='.htmlentities((string)((isset($cx['sp_vars']['root']['editToken'])
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['editToken'] :
null), ENT_QUOTES, 'UTF-8').' /
diff --git a/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
b/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
index 650b09c..523f946 100644
--- a/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
@@ -50,7 +50,7 @@
class=mw-ui-button mw-ui-destructive mw-ui-quiet mw-ui-flush-right
flow-js
'.LCRun3::ch($cx, 'l10n', array(array('flow-cancel'),array()),
'encq').'/button
-';},'flow_newtopic_form' = function ($cx, $in) {return
''.((LCRun3::ifvar($cx, ((isset($in['actions']['newtopic'])
is_array($in['actions'])) ? $in['actions']['newtopic'] : null))) ? 'form
action='.htmlentities((string)((isset($in['actions']['newtopic']['url'])
is_array($in['actions']['newtopic'])) ? $in['actions']['newtopic']['url'] :
null), ENT_QUOTES, 'UTF-8').' method=POST class=flow-newtopic-form
data-flow-initial-state=collapsed
+';},'flow_newtopic_form' = function ($cx, $in) {return
''.((LCRun3::ifvar($cx, ((isset($in['actions']['newtopic'])
is_array($in['actions'])) ? $in['actions']['newtopic'] : null))) ? 'form
action='.htmlentities((string)((isset($in['actions']['newtopic']['url'])
is_array($in['actions']['newtopic'])) ? $in['actions']['newtopic']['url'] :
null), ENT_QUOTES, 'UTF-8').' method=POST class=flow-newtopic-form
data-flow-initial-state='.((LCRun3::ifvar($cx,
((isset($in['submitted']['content']) is_array($in['submitted'])) ?
$in['submitted']['content'] : null))) ? 'expanded' : 'collapsed').'
'.LCRun3::p($cx, 'flow_errors', array(array($in),array())).'
'.LCRun3::hbch($cx, 'ifAnonymous', array(array(),array()), $in, false,
function($cx, $in) {return ''.LCRun3::p($cx, 'flow_anon_warning',
array(array($in),array())).'';}).'
input type=hidden name=wpEditToken
value='.htmlentities((string)((isset($cx['sp_vars']['root']['editToken'])
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['editToken'] :
null), ENT_QUOTES, 'UTF-8').' /
diff --git a/handlebars/flow_newtopic_form.partial.handlebars
b/handlebars/flow_newtopic_form.partial.handlebars
index 2858ce4..fcf7c34 100644
--- a/handlebars/flow_newtopic_form.partial.handlebars
+++
[MediaWiki-commits] [Gerrit] Get rid of hidden collapsible state - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200150
Change subject: Get rid of hidden collapsible state
..
Get rid of hidden collapsible state
The only one using it was edit-title, which didn't need it.
I guess it was only still there for legacy reasons, from back when we didn't
do an ajax request to get the most recent title content. Nowadays, we do, then
render that into the template append to DOM display it. It's never in a
hidden state.
Change-Id: I14e6a9a649ab433bb104368e3ee92b0cc0c4bfa2
---
M handlebars/compiled/flow_block_topic_edit_title.handlebars.php
M handlebars/flow_edit_topic_title.partial.handlebars
M modules/engine/components/board/base/flow-board-api-events.js
M modules/engine/components/common/flow-component-events.js
4 files changed, 17 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/50/200150/1
diff --git a/handlebars/compiled/flow_block_topic_edit_title.handlebars.php
b/handlebars/compiled/flow_block_topic_edit_title.handlebars.php
index 279f468..540fb3d 100644
--- a/handlebars/compiled/flow_block_topic_edit_title.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_edit_title.handlebars.php
@@ -31,7 +31,7 @@
'.LCRun3::p($cx, 'flow_errors', array(array($in),array())).' input
type=hidden name=wpEditToken
value='.htmlentities((string)((isset($cx['sp_vars']['root']['editToken'])
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['editToken'] :
null), ENT_QUOTES, 'UTF-8').' /
input type=hidden name=topic_prev_revision
value='.htmlentities((string)((isset($in['revisionId']) is_array($in)) ?
$in['revisionId'] : null), ENT_QUOTES, 'UTF-8').' /
input name=topic_content class=mw-ui-input
value='.((LCRun3::ifvar($cx,
((isset($cx['sp_vars']['root']['submitted']['content'])
is_array($cx['sp_vars']['root']['submitted'])) ?
$cx['sp_vars']['root']['submitted']['content'] : null))) ?
''.htmlentities((string)((isset($cx['sp_vars']['root']['submitted']['content'])
is_array($cx['sp_vars']['root']['submitted'])) ?
$cx['sp_vars']['root']['submitted']['content'] : null), ENT_QUOTES, 'UTF-8').''
: ''.htmlentities((string)((isset($in['content']['content'])
is_array($in['content'])) ? $in['content']['content'] : null), ENT_QUOTES,
'UTF-8').'').' /
- div class=flow-form-actions flow-form-collapsible
+ div class=flow-form-actions
button data-role=submit
data-flow-api-handler=submitTopicTitle
data-flow-api-target= .flow-topic
diff --git a/handlebars/flow_edit_topic_title.partial.handlebars
b/handlebars/flow_edit_topic_title.partial.handlebars
index 163b32c..19516b8 100644
--- a/handlebars/flow_edit_topic_title.partial.handlebars
+++ b/handlebars/flow_edit_topic_title.partial.handlebars
@@ -10,7 +10,7 @@
{{~content.content~}}
{{~/if~}}
/
- div class=flow-form-actions flow-form-collapsible
+ div class=flow-form-actions
button data-role=submit
data-flow-api-handler=submitTopicTitle
data-flow-api-target= .flow-topic
diff --git a/modules/engine/components/board/base/flow-board-api-events.js
b/modules/engine/components/board/base/flow-board-api-events.js
index 7f164f4..4f0ed26 100644
--- a/modules/engine/components/board/base/flow-board-api-events.js
+++ b/modules/engine/components/board/base/flow-board-api-events.js
@@ -747,9 +747,7 @@
) ).children();
flowBoard.emitWithReturn( 'addFormCancelCallback',
$form, cancelCallback );
- $form
- .data( 'flow-initial-state', 'hidden' )
- .prependTo( info.$target );
+ $form.prependTo( info.$target );
}
$form.find( '.mw-ui-input' ).focus();
diff --git a/modules/engine/components/common/flow-component-events.js
b/modules/engine/components/common/flow-component-events.js
index f3b9770..bd78ff7 100644
--- a/modules/engine/components/common/flow-component-events.js
+++ b/modules/engine/components/common/flow-component-events.js
@@ -459,7 +459,8 @@
// Find all the forms
// @todo move this into a flow-load-handler
$container.find( 'form' ).add( $container.filter( 'form' )
).each( function () {
- var $this = $( this );
+ var $this = $( this ),
+ initialState = $this.data( 'flow-initial-state'
);
// Trigger for flow-actions-disabler
$this.find( 'input, textarea' ).trigger( 'keyup' );
@@ -474,7 +475,9 @@
}
} );
-
[MediaWiki-commits] [Gerrit] Remove unused data attr - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200152
Change subject: Remove unused data attr
..
Remove unused data attr
Change-Id: Idfc0a44f296960069e0ac31b9fbb278736663379
---
M modules/engine/components/common/flow-component-events.js
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/52/200152/1
diff --git a/modules/engine/components/common/flow-component-events.js
b/modules/engine/components/common/flow-component-events.js
index 6baf8b2..7a5df74 100644
--- a/modules/engine/components/common/flow-component-events.js
+++ b/modules/engine/components/common/flow-component-events.js
@@ -653,9 +653,6 @@
function flowEventsMixinHideForm( $form ) {
var component = mw.flow.getPrototypeMethod( 'component',
'getInstanceByElement' )( $form );
- // Store state
- $form.data( 'flow-state', 'hidden' );
-
// If any preview is visible cancel it
// Must be done before compressing text areas because
// the preview may have manipulated them.
@@ -733,9 +730,6 @@
// Initialize editors, turning them from textareas into editor
objects
self.emitWithReturn( 'initializeEditors', $form );
-
- // Store state
- $form.data( 'flow-state', 'visible' );
}
FlowComponentEventsMixin.eventHandlers.showForm =
flowEventsMixinShowForm;
--
To view, visit https://gerrit.wikimedia.org/r/200152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfc0a44f296960069e0ac31b9fbb278736663379
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Redefine the Apply changes element for languag... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Redefine the Apply changes element for language
screenshot
..
[BrowserTest] Redefine the Apply changes element for language screenshot
Redefine the element to include the full button
and remove the padding, which is now not needed.
Change-Id: I1ac244bc97b38c9d8b47ddd778a653783a748a49
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
2 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index c54f9c9..f71f71f 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -299,8 +299,7 @@
Screenshot.capture(
@browser,
VisualEditor_Apply_Changes-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.settings_apply_button_element],
-3
+[@current_page.settings_apply_button_element]
)
end
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 6cb5dd8..fe31c13 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -146,7 +146,7 @@
div(:save_enabled, css: 'div.ve-init-mw-viewPageTarget-toolbar-actions
div.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled')
a(:second_reference, text: '[1]', index: 2)
span(:second_save_page, css: '.oo-ui-processDialog-actions-primary
div:nth-child(1) a:nth-child(1) span:nth-child(2)')
- div(:settings_apply_button, css: '.oo-ui-window-frame
.oo-ui-buttonElement.oo-ui-flaggedElement-progressive')
+ div(:settings_apply_button, css: '.oo-ui-window-frame
.oo-ui-processDialog-actions-primary')
span(:special_character, class: 'oo-ui-iconElement-icon
oo-ui-icon-special-character')
a(:subheading1, text: /Sub-heading 1/)
a(:subheading2, text: /Sub-heading 2/)
--
To view, visit https://gerrit.wikimedia.org/r/200139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ac244bc97b38c9d8b47ddd778a653783a748a49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
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] [BrowserTest] Add padding to some more screenshots - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Add padding to some more screenshots
..
[BrowserTest] Add padding to some more screenshots
Change-Id: If103488927e3309479b7b5f9f380135052c7ac9d
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 14 insertions(+), 7 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index f2b2504..c54f9c9 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -106,7 +106,8 @@
Screenshot.capture(
@browser,
VisualEditor_category_item-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.hamburger_menu_element,
@current_page.page_option_menu_element]
+[@current_page.hamburger_menu_element,
@current_page.page_option_menu_element],
+3
)
on(VisualEditorPage).category_link_element.when_present.click
@@ -139,7 +140,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.window_frame_element]
+[@current_page.window_frame_element],
+3
)
end
@@ -177,7 +179,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.disabled_save_button_element,
@current_page.page_option_menu_element]
+[@current_page.disabled_save_button_element,
@current_page.page_option_menu_element],
+3
)
end
@@ -256,7 +259,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.window_frame_element]
+[@current_page.window_frame_element],
+3
)
end
@@ -266,7 +270,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.window_frame_element]
+[@current_page.window_frame_element],
+3
)
Screenshot.capture(
@@ -379,7 +384,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.cite_button_element]
+[@current_page.cite_button_element],
+3
)
end
@@ -441,7 +447,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.window_frame_element, @current_page.formula_image_element]
+[@current_page.window_frame_element, @current_page.formula_image_element],
+3
)
end
--
To view, visit https://gerrit.wikimedia.org/r/200138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If103488927e3309479b7b5f9f380135052c7ac9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
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] Syncronize VisualEditor: a0fbb38..d941263 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: a0fbb38..d941263 .. Syncronize VisualEditor: a0fbb38..d941263 Change-Id: I43bd2e44a09cd10cd4682d23cd59b1ea171a6ee7 --- 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 a0fbb38..d941263 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit a0fbb388f6e8c714b5d756464b6e2822b481c4a9 +Subproject commit d941263d334ad454149f57ea053918ab55b114ce -- To view, visit https://gerrit.wikimedia.org/r/200140 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43bd2e44a09cd10cd4682d23cd59b1ea171a6ee7 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: a0fbb38..d941263 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/200140 Change subject: Syncronize VisualEditor: a0fbb38..d941263 .. Syncronize VisualEditor: a0fbb38..d941263 Change-Id: I43bd2e44a09cd10cd4682d23cd59b1ea171a6ee7 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/40/200140/1 diff --git a/VisualEditor b/VisualEditor index a0fbb38..d941263 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit a0fbb388f6e8c714b5d756464b6e2822b481c4a9 +Subproject commit d941263d334ad454149f57ea053918ab55b114ce -- To view, visit https://gerrit.wikimedia.org/r/200140 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43bd2e44a09cd10cd4682d23cd59b1ea171a6ee7 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 AFNetworking dependency - change (apps...wikipedia)
Dr0ptp4kt has uploaded a new change for review. https://gerrit.wikimedia.org/r/200145 Change subject: Update AFNetworking dependency .. Update AFNetworking dependency Change-Id: I34bec177bb26b03b5e318715f590a6bfbd837f57 --- M Podfile.lock 1 file changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/45/200145/1 diff --git a/Podfile.lock b/Podfile.lock index be2de22..8fd0494 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,23 +1,23 @@ PODS: - - AFNetworking (2.5.1): -- AFNetworking/NSURLConnection (= 2.5.1) -- AFNetworking/NSURLSession (= 2.5.1) -- AFNetworking/Reachability (= 2.5.1) -- AFNetworking/Security (= 2.5.1) -- AFNetworking/Serialization (= 2.5.1) -- AFNetworking/UIKit (= 2.5.1) - - AFNetworking/NSURLConnection (2.5.1): + - AFNetworking (2.5.2): +- AFNetworking/NSURLConnection (= 2.5.2) +- AFNetworking/NSURLSession (= 2.5.2) +- AFNetworking/Reachability (= 2.5.2) +- AFNetworking/Security (= 2.5.2) +- AFNetworking/Serialization (= 2.5.2) +- AFNetworking/UIKit (= 2.5.2) + - AFNetworking/NSURLConnection (2.5.2): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/NSURLSession (2.5.1): + - AFNetworking/NSURLSession (2.5.2): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/Reachability (2.5.1) - - AFNetworking/Security (2.5.1) - - AFNetworking/Serialization (2.5.1) - - AFNetworking/UIKit (2.5.1): + - AFNetworking/Reachability (2.5.2) + - AFNetworking/Security (2.5.2) + - AFNetworking/Serialization (2.5.2) + - AFNetworking/UIKit (2.5.2): - AFNetworking/NSURLConnection - AFNetworking/NSURLSession - BlocksKit/Core (2.2.5) @@ -38,7 +38,7 @@ - OCMockito (~ 1.4) SPEC CHECKSUMS: - AFNetworking: 8bee59492a6ff15d69130efa4d0dc67e0094a52a + AFNetworking: fefbce9660acb17f48ae0011292d4da0f457bf36 BlocksKit: 4439e7f30a9f90743462ca63545a15c1f4304cef HockeySDK: bfd1f5ac75938b07499c4ac12932244b72a2e70b hpple: f4eb7c21a8db83ec264e5d614ec7509e10e5adec -- To view, visit https://gerrit.wikimedia.org/r/200145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I34bec177bb26b03b5e318715f590a6bfbd837f57 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Dr0ptp4kt ab...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: don't show diff for builder files - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200146
Change subject: swift: don't show diff for builder files
..
swift: don't show diff for builder files
puppet will bail trying to log non-utf8 byte sequences in the diff
Bug: T93614
Change-Id: Iaa0eb84052854612c4cd8a4768fce4718580d3c3
---
M manifests/swift.pp
M modules/swift_new/manifests/ring.pp
2 files changed, 14 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/200146/1
diff --git a/manifests/swift.pp b/manifests/swift.pp
index dd817f2..53d7e54 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -64,8 +64,9 @@
}
file { '/etc/swift/account.builder':
-ensure = 'present',
-source = puppet:///volatile/swift/${cluster_name}/account.builder,
+ensure= 'present',
+source=
puppet:///volatile/swift/${cluster_name}/account.builder,
+show_diff = false,
}
file { '/etc/swift/account.ring.gz':
@@ -76,6 +77,7 @@
file { '/etc/swift/container.builder':
ensure = 'present',
source = puppet:///volatile/swift/${cluster_name}/container.builder,
+show_diff = false,
}
file { '/etc/swift/container.ring.gz':
@@ -86,6 +88,7 @@
file { '/etc/swift/object.builder':
ensure = 'present',
source = puppet:///volatile/swift/${cluster_name}/object.builder,
+show_diff = false,
}
file { '/etc/swift/object.ring.gz':
diff --git a/modules/swift_new/manifests/ring.pp
b/modules/swift_new/manifests/ring.pp
index c56e129..ea461a7 100644
--- a/modules/swift_new/manifests/ring.pp
+++ b/modules/swift_new/manifests/ring.pp
@@ -3,8 +3,9 @@
$swift_cluster = $swift_new::params::swift_cluster,
) {
file { '/etc/swift/account.builder':
-ensure = present,
-source = puppet:///volatile/swift/${swift_cluster}/account.builder,
+ensure= present,
+source=
puppet:///volatile/swift/${swift_cluster}/account.builder,
+show_diff = false,
}
file { '/etc/swift/account.ring.gz':
@@ -13,8 +14,9 @@
}
file { '/etc/swift/container.builder':
-ensure = present,
-source =
puppet:///volatile/swift/${swift_cluster}/container.builder,
+ensure= present,
+source=
puppet:///volatile/swift/${swift_cluster}/container.builder,
+show_diff = false,
}
file { '/etc/swift/container.ring.gz':
@@ -23,8 +25,9 @@
}
file { '/etc/swift/object.builder':
-ensure = present,
-source = puppet:///volatile/swift/${swift_cluster}/object.builder,
+ensure= present,
+source=
puppet:///volatile/swift/${swift_cluster}/object.builder,
+show_diff = false,
}
file { '/etc/swift/object.ring.gz':
--
To view, visit https://gerrit.wikimedia.org/r/200146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa0eb84052854612c4cd8a4768fce4718580d3c3
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] geoip: disable show_diff - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200147
Change subject: geoip: disable show_diff
..
geoip: disable show_diff
potentially the same issue we've experienced with puppet failing when the diff
contains invalid utf8 byte sequences
Bug: T93614
Change-Id: I2de2d484b8c4540aa5ea5704e2c254591bd58054
---
M modules/geoip/manifests/data/puppet.pp
1 file changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/200147/1
diff --git a/modules/geoip/manifests/data/puppet.pp
b/modules/geoip/manifests/data/puppet.pp
index aaacc0c..159d9e1 100644
--- a/modules/geoip/manifests/data/puppet.pp
+++ b/modules/geoip/manifests/data/puppet.pp
@@ -12,12 +12,13 @@
{
# recursively copy the $data_directory from $source.
file { $data_directory:
-ensure = directory,
-owner = 'root',
-group = 'root',
-mode= '0644',
-source = $source,
-recurse = true,
-backup = false,
+ensure= directory,
+owner = 'root',
+group = 'root',
+mode = '0644',
+source= $source,
+recurse = true,
+backup= false,
+show_diff = false,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/200147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2de2d484b8c4540aa5ea5704e2c254591bd58054
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] Display submitted topic content - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200148
Change subject: Display submitted topic content
..
Display submitted topic content
For no-js, if content fails to submit (e.g. blocked by abusefilter),
it shouldn't be lost.
Change-Id: I1c7dc4dde239da0e25ee31263e0053eab3dc244a
---
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
M handlebars/flow_newtopic_form.partial.handlebars
3 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/48/200148/1
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index fae07bd..a5620dc 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -119,6 +119,7 @@
input type=hidden name=topiclist_replyTo
value='.htmlentities((string)((isset($in['workflowId']) is_array($in)) ?
$in['workflowId'] : null), ENT_QUOTES, 'UTF-8').' /
input name=topiclist_topic class=mw-ui-input
mw-ui-input-large
required
+ '.((LCRun3::ifvar($cx,
((isset($in['submitted']['topic']) is_array($in['submitted'])) ?
$in['submitted']['topic'] : null))) ?
'value='.htmlentities((string)((isset($in['submitted']['topic'])
is_array($in['submitted'])) ? $in['submitted']['topic'] : null), ENT_QUOTES,
'UTF-8').'' : '').'
type=text
placeholder='.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-start-placeholder'),array()), 'encq').'
data-role=title
@@ -133,7 +134,7 @@
placeholder='.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-content-placeholder',((isset($cx['sp_vars']['root']['title'])
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['title'] :
null)),array()), 'encq').'
data-role=content
required
- /textarea
+ '.((LCRun3::ifvar($cx, ((isset($in['submitted']['content'])
is_array($in['submitted'])) ? $in['submitted']['content'] : null))) ?
''.htmlentities((string)((isset($in['submitted']['content'])
is_array($in['submitted'])) ? $in['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'' : '').'/textarea
div class=flow-form-actions flow-form-collapsible
'.((LCRun3::ifvar($cx, ((isset($in['isOnFlowBoard'])
is_array($in)) ? $in['isOnFlowBoard'] : null))) ? 'style=display:none;' :
'').'
diff --git a/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
b/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
index d2fced4..650b09c 100644
--- a/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
@@ -57,6 +57,7 @@
input type=hidden name=topiclist_replyTo
value='.htmlentities((string)((isset($in['workflowId']) is_array($in)) ?
$in['workflowId'] : null), ENT_QUOTES, 'UTF-8').' /
input name=topiclist_topic class=mw-ui-input
mw-ui-input-large
required
+ '.((LCRun3::ifvar($cx,
((isset($in['submitted']['topic']) is_array($in['submitted'])) ?
$in['submitted']['topic'] : null))) ?
'value='.htmlentities((string)((isset($in['submitted']['topic'])
is_array($in['submitted'])) ? $in['submitted']['topic'] : null), ENT_QUOTES,
'UTF-8').'' : '').'
type=text
placeholder='.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-start-placeholder'),array()), 'encq').'
data-role=title
@@ -71,7 +72,7 @@
placeholder='.LCRun3::ch($cx, 'l10n',
array(array('flow-newtopic-content-placeholder',((isset($cx['sp_vars']['root']['title'])
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['title'] :
null)),array()), 'encq').'
data-role=content
required
- /textarea
+ '.((LCRun3::ifvar($cx, ((isset($in['submitted']['content'])
is_array($in['submitted'])) ? $in['submitted']['content'] : null))) ?
''.htmlentities((string)((isset($in['submitted']['content'])
is_array($in['submitted'])) ? $in['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'' : '').'/textarea
div class=flow-form-actions flow-form-collapsible
'.((LCRun3::ifvar($cx, ((isset($in['isOnFlowBoard'])
is_array($in)) ? $in['isOnFlowBoard'] : null))) ? 'style=display:none;' :
'').'
diff --git a/handlebars/flow_newtopic_form.partial.handlebars
b/handlebars/flow_newtopic_form.partial.handlebars
index e988bd1..2858ce4 100644
---
[MediaWiki-commits] [Gerrit] Accept preload preloadtitle params - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200149
Change subject: Accept preload preloadtitle params
..
Accept preload preloadtitle params
These are similar to action=editsection=new params, but with topiclist_
prefix.
Similar to new-section, preload will take the name of a page, of which
the content will be loaded; preloadtitle will just accept the title text.
Change-Id: I0f6d9d3db4f07df6729bb34bf1660a8c3be73a0a
---
M includes/Block/TopicList.php
1 file changed, 31 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/49/200149/1
diff --git a/includes/Block/TopicList.php b/includes/Block/TopicList.php
index 26ebfe9..085f2e7 100644
--- a/includes/Block/TopicList.php
+++ b/includes/Block/TopicList.php
@@ -132,7 +132,6 @@
$topicTitle-setChildren( array( $firstPost ) );
}
-
return array( $topicWorkflow, $topicListEntry, $topicTitle,
$firstPost );
}
@@ -170,6 +169,8 @@
}
public function renderApi( array $options ) {
+ $options = $this-preloadTexts( $options );
+
$response = array(
'submitted' = $this-wasSubmitted() ? $this-submitted
: $options,
'errors' = $this-errors,
@@ -233,6 +234,35 @@
return $response + $serializer-formatApi( $this-workflow,
$workflows, $found, $page, $this-context );
}
+ /**
+* Transforms preload params into proper options we can assign to
template.
+*
+* @param array $options
+* @return array
+* @throws \MWException
+*/
+ protected function preloadTexts( $options ) {
+ if ( isset( $options['preload'] ) ) {
+ $title = \Title::newFromText( $options['preload'] );
+ $page = \WikiPage::factory( $title );
+ if ( $page-isRedirect() ) {
+ $title = $page-getRedirectTarget();
+ $page = \WikiPage::factory( $title );
+ }
+
+ if ( $page-exists() ) {
+ $content = $page-getContent( \Revision::RAW );
+ $options['content'] = $content-serialize();
+ }
+ }
+
+ if ( isset( $options['preloadtitle'] ) ) {
+ $options['topic'] = $options['preloadtitle'];
+ }
+
+ return $options;
+ }
+
public function getName() {
return 'topiclist';
}
--
To view, visit https://gerrit.wikimedia.org/r/200149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f6d9d3db4f07df6729bb34bf1660a8c3be73a0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Disable the Cite button screenshot - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/200142 Change subject: [BrowserTest] Disable the Cite button screenshot .. [BrowserTest] Disable the Cite button screenshot It looks differently in different languages, and it is likely changing now with Citoid being deployed, so it shold be disabled for now and revived when Citoid deployment stabilizes. Change-Id: If6a6ecf450060eb1387aaf90fd0cfb937b08bd3d --- M modules/ve-mw/tests/browser/features/language_screenshot.feature 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/42/200142/1 diff --git a/modules/ve-mw/tests/browser/features/language_screenshot.feature b/modules/ve-mw/tests/browser/features/language_screenshot.feature index 4b5bc7e..12820f1 100644 --- a/modules/ve-mw/tests/browser/features/language_screenshot.feature +++ b/modules/ve-mw/tests/browser/features/language_screenshot.feature @@ -99,7 +99,6 @@ And I select the image in VisualEditor Then I should see media in VisualEditor - @language_screenshot Scenario: VisualEditor_Cite_Pulldown Given I am editing the language screenshots page Then I should see the Cite button -- To view, visit https://gerrit.wikimedia.org/r/200142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If6a6ecf450060eb1387aaf90fd0cfb937b08bd3d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Run almost all browsertests* jobs daily - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Run almost all browsertests* jobs daily
..
Run almost all browsertests* jobs daily
To be precise, all jobs that used to run at 3 and 18 UTC. Language
screenshot job should be started only manually, so the workaround is to
trigger it yearly, meaning almost never.
Updates most of browsertests-* jobs.
Bug: T94145
Change-Id: Idcd705021222c6f9c3081fcc819581d083967bcd
---
M jjb/job-templates-browsertests.yaml
1 file changed, 6 insertions(+), 12 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index 1a0ab0f..c69f19c 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -4,29 +4,17 @@
name: 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}'
defaults: browsertests
-triggers:
- - timed: 'H 3,18 * * *'
-
- job-template:
name: 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce'
defaults: browsertests
-
-triggers:
- - timed: 'H 3,18 * * *'
- job-template:
name:
'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-monobook-sauce'
defaults: browsertests
-triggers:
- - timed: 'H 3,18 * * *'
-
- job-template:
name:
'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-{version}-sauce'
defaults: browsertests
-
-triggers:
- - timed: 'H 3,18 * * *'
- job-template:
name: 'browsertests-{name}-language-screenshot-{platform}-{browser}'
@@ -54,6 +42,9 @@
name: LANGUAGE_SCREENSHOT_CODE
values:
- lang_list
+
+triggers:
+ - timed: @yearly # This job should be executed only manually. Setting
it to trigger yearly is a workaround.
- job-template:
name: 'browsertests-MobileFrontend-{name}-{platform}-{browser}-sauce'
@@ -91,6 +82,9 @@
prune: true# prune remote obsoletes branches
recursive-submodules: true
+triggers:
+ - timed: @daily
+
builders:
- shell: mkdir -p $WORKSPACE/log/junit
- browsertest-website:
--
To view, visit https://gerrit.wikimedia.org/r/200135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idcd705021222c6f9c3081fcc819581d083967bcd
Gerrit-PatchSet: 4
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
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] Syncronize VisualEditor: 8cb387a..9962663 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 8cb387a..9962663 .. Syncronize VisualEditor: 8cb387a..9962663 Change-Id: Id72e3deb11dc5e74aa792afa0871c38fe2e37b07 --- 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 8cb387a..9962663 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 8cb387a2693fa3f53480b83672bded0897238166 +Subproject commit 9962663f81afb3399dd3ffc363092a0b1a6e85b9 -- To view, visit https://gerrit.wikimedia.org/r/200143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id72e3deb11dc5e74aa792afa0871c38fe2e37b07 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: 8cb387a..9962663 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/200143 Change subject: Syncronize VisualEditor: 8cb387a..9962663 .. Syncronize VisualEditor: 8cb387a..9962663 Change-Id: Id72e3deb11dc5e74aa792afa0871c38fe2e37b07 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/43/200143/1 diff --git a/VisualEditor b/VisualEditor index 8cb387a..9962663 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 8cb387a2693fa3f53480b83672bded0897238166 +Subproject commit 9962663f81afb3399dd3ffc363092a0b1a6e85b9 -- To view, visit https://gerrit.wikimedia.org/r/200143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id72e3deb11dc5e74aa792afa0871c38fe2e37b07 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] [BrowserTest] Disable the Cite button screenshot - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [BrowserTest] Disable the Cite button screenshot .. [BrowserTest] Disable the Cite button screenshot It looks differently in different languages, and it is likely changing now with Citoid being deployed, so it shold be disabled for now and revived when Citoid deployment stabilizes. Change-Id: If6a6ecf450060eb1387aaf90fd0cfb937b08bd3d --- M modules/ve-mw/tests/browser/features/language_screenshot.feature 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/tests/browser/features/language_screenshot.feature b/modules/ve-mw/tests/browser/features/language_screenshot.feature index 4b5bc7e..12820f1 100644 --- a/modules/ve-mw/tests/browser/features/language_screenshot.feature +++ b/modules/ve-mw/tests/browser/features/language_screenshot.feature @@ -99,7 +99,6 @@ And I select the image in VisualEditor Then I should see media in VisualEditor - @language_screenshot Scenario: VisualEditor_Cite_Pulldown Given I am editing the language screenshots page Then I should see the Cite button -- To view, visit https://gerrit.wikimedia.org/r/200142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If6a6ecf450060eb1387aaf90fd0cfb937b08bd3d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add roulette query string to the next url - change (mediawiki...WikiGrok)
jenkins-bot has submitted this change and it was merged.
Change subject: Add roulette query string to the next url
..
Add roulette query string to the next url
Follow up on I4bf3c30cba665b86787697c772b5641fde77b238
Bug: T93449
Change-Id: I6938a36f4b39b2794b95562bd1a288a24021fb42
---
M includes/Resources.php
M resources/roulette/wikiGrokRoulette.js
2 files changed, 11 insertions(+), 4 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index d61c8f5..5cc327f 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -92,6 +92,7 @@
'ext.wikigrok.roulette' = $wgWikiGrokResourceFileModuleBoilerplate +
array(
'dependencies' = array(
+ 'mediawiki.Uri',
'mobile.overlays',
),
'scripts' = array(
diff --git a/resources/roulette/wikiGrokRoulette.js
b/resources/roulette/wikiGrokRoulette.js
index 5542fed..1d0a794 100644
--- a/resources/roulette/wikiGrokRoulette.js
+++ b/resources/roulette/wikiGrokRoulette.js
@@ -20,7 +20,8 @@
* @return {jQuery.Deferred}
*/
getNextPage: function () {
- var result;
+ var result,
+ uri;
if ( nextPage ) {
result = $.Deferred().resolve( nextPage );
@@ -34,11 +35,16 @@
response.query.wikigrokrandom
response.query.wikigrokrandom.length 0
) {
+
+ // Maintain the query string
removing only the title because the title
+ // is already being used in
constructing the new url.
+ uri = new mw.Uri(
window.location.href );
+ delete uri.query.title;
+
nextPage = {
- // FIXME: Maintain the
query string but remove the title because
- // it's already being
used in constructing the URL.
url: mw.util.getUrl(
-
response.query.wikigrokrandom[0].title
+
response.query.wikigrokrandom[0].title,
+ uri.query
) +
'#wikigrokversion=c',
title:
response.query.wikigrokrandom[0].title
};
--
To view, visit https://gerrit.wikimedia.org/r/198448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6938a36f4b39b2794b95562bd1a288a24021fb42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use site.lang instead of site.code - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Use site.lang instead of site.code .. Use site.lang instead of site.code It can cause bugs when i18n is being used on wikis when code is not the same as language (like test wikis, etc.) Change-Id: Ic96ac272c95a54a5b42ad2777dce9b32114f7418 --- M pywikibot/i18n.py 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: XZise: Looks good to me, approved Gerardduenas: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 1be4248..2da6de8 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -390,9 +390,9 @@ family = pywikibot.config.family # If a site is given instead of a code, use its language -if hasattr(code, 'code'): +if hasattr(code, 'lang'): family = code.family.name -code = code.code +code = code.lang # Check whether xdict has multiple projects if isinstance(xdict, dict): @@ -457,8 +457,8 @@ transdict = _get_messages_bundle(package) code_needed = False # If a site is given instead of a code, use its language -if hasattr(code, 'code'): -lang = code.code +if hasattr(code, 'lang'): +lang = code.lang # check whether we need the language code back elif isinstance(code, list): lang = code.pop() @@ -553,8 +553,8 @@ # If a site is given instead of a code, use its language -if hasattr(code, 'code'): -code = code.code +if hasattr(code, 'lang'): +code = code.lang # we send the code via list and get the alternate code back code = [code] trans = twtranslate(code, twtitle) @@ -592,8 +592,8 @@ return False # If a site is given instead of a code, use its language -if hasattr(code, 'code'): -code = code.code +if hasattr(code, 'lang'): +code = code.lang return code in transdict and twtitle in transdict[code] -- To view, visit https://gerrit.wikimedia.org/r/199579 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic96ac272c95a54a5b42ad2777dce9b32114f7418 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Gerardduenas gerarddue...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: Xqt i...@gno.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] Rename popups.eventLogging to popups.logger - change (mediawiki...Popups)
jenkins-bot has submitted this change and it was merged.
Change subject: Rename popups.eventLogging to popups.logger
..
Rename popups.eventLogging to popups.logger
...and eventLogging.logEvent to logger.log
Change-Id: I9af697a56c2248069a32ac586f5b78b55095460e
---
M Popups.hooks.php
R resources/ext.popups.logger.js
M resources/ext.popups.renderer.js
3 files changed, 30 insertions(+), 30 deletions(-)
Approvals:
Werdna: Looks good to me, approved
Nuria: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Popups.hooks.php b/Popups.hooks.php
index 5880f34..4944c8c 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -67,7 +67,7 @@
$rl-register( ext.popups, array(
'scripts' = array(
'resources/ext.popups.core.js',
- 'resources/ext.popups.eventlogging.js',
+ 'resources/ext.popups.logger.js',
'resources/ext.popups.renderer.js',
'resources/ext.popups.renderer.article.js',
'resources/ext.popups.disablenavpop.js',
diff --git a/resources/ext.popups.eventlogging.js
b/resources/ext.popups.logger.js
similarity index 63%
rename from resources/ext.popups.eventlogging.js
rename to resources/ext.popups.logger.js
index 8690ca7..b3d10b4 100644
--- a/resources/ext.popups.eventlogging.js
+++ b/resources/ext.popups.logger.js
@@ -1,28 +1,28 @@
( function ( $, mw ) {
/**
-* @class mw.popups.eventLogging
+* @class mw.popups.logger
* @singleton
*/
- var eventLogging = {};
+ var logger = {};
/**
* Unix timestamp of when the popup was rendered
* @property time
*/
- eventLogging.time = undefined;
+ logger.time = undefined;
/**
* How long was the popup open in milliseconds
* @property {Number} duration
*/
- eventLogging.duration = undefined;
+ logger.duration = undefined;
/**
* Was the popup clicked, middle clicked or dismissed
* @property {String} action
*/
- eventLogging.action = undefined;
+ logger.action = undefined;
/**
* Logs different actions such as meta and shift click on the popup
@@ -31,18 +31,18 @@
* @method logClick
* @param {Object} event
*/
- eventLogging.logClick = function ( event ) {
+ logger.logClick = function ( event ) {
if ( event.which === 2 ) { // middle click
- eventLogging.action = 'opened in new tab';
+ logger.action = 'opened in new tab';
} else if ( event.which === 1 ) {
if ( event.ctrlKey || event.metaKey ) {
- eventLogging.action = 'opened in new tab';
+ logger.action = 'opened in new tab';
} else if ( event.shiftKey ) {
- eventLogging.action = 'opened in new window';
+ logger.action = 'opened in new window';
} else {
- eventLogging.action = 'opened in same tab';
- eventLogging.duration = mw.now() -
eventLogging.time;
- eventLogging.logEvent(
mw.popups.render.currentLink.attr( 'href' ) );
+ logger.action = 'opened in same tab';
+ logger.duration = mw.now() - logger.time;
+ logger.log( mw.popups.render.currentLink.attr(
'href' ) );
event.preventDefault();
}
}
@@ -53,11 +53,11 @@
* https://meta.wikimedia.org/wiki/Schema:Popups
* If `href` is passed it redirects to that location after the event is
logged.
*
-* @method logEvent
+* @method log
* @param {String} href
* @return {Boolean} logged Whether or not the event was logged
*/
- eventLogging.logEvent = function ( href ) {
+ logger.log = function ( href ) {
if ( mw.eventLog === undefined ) {
return false;
}
@@ -65,12 +65,12 @@
var
deferred = $.Deferred(),
event = {
- 'duration': Math.round( eventLogging.duration ),
- 'action': eventLogging.action
+ 'duration': Math.round( logger.duration ),
+ 'action': logger.action
};
- if ( eventLogging.sessionId !== null ) {
-
[MediaWiki-commits] [Gerrit] Make spinner as a widget module - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Make spinner as a widget module .. Make spinner as a widget module Change-Id: Id984cfd455ffa8ad2ae47a816983f88f13de82d2 --- M Resources.php R modules/widgets/spinner/ext.cx.spinner.less 2 files changed, 8 insertions(+), 2 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index 4304ade..00630a7 100644 --- a/Resources.php +++ b/Resources.php @@ -173,7 +173,6 @@ ), 'styles' = array( 'source/styles/ext.cx.source.less', - 'base/styles/ext.cx.spinner.less', ), 'dependencies' = array( 'ext.cx.util', @@ -183,6 +182,7 @@ 'mediawiki.api', 'mediawiki.jqueryMsg', 'mediawiki.util', + 'ext.cx.widgets.spinner', ), 'messages' = array( 'cx-source-view-page', @@ -272,7 +272,6 @@ ), 'styles' = array( 'tools/styles/ext.cx.tools.less', - 'base/styles/ext.cx.spinner.less', ), 'dependencies' = array( 'ext.cx.feedback', @@ -291,6 +290,7 @@ 'ext.cx.util.selection', 'jquery.uls.data', 'mediawiki.jqueryMsg', + 'ext.cx.widgets.spinner', ), ) + $resourcePaths; @@ -734,6 +734,12 @@ ), ) + $resourcePaths; +$wgResourceModules['ext.cx.widgets.spinner'] = array( + 'styles' = array( + 'widgets/spinner/ext.cx.spinner.less', + ), +) + $resourcePaths; + $wgResourceModules['ext.cx.widgets.callout'] = array( 'scripts' = array( 'widgets/callout/ext.cx.callout.js', diff --git a/modules/base/styles/ext.cx.spinner.less b/modules/widgets/spinner/ext.cx.spinner.less similarity index 100% rename from modules/base/styles/ext.cx.spinner.less rename to modules/widgets/spinner/ext.cx.spinner.less -- To view, visit https://gerrit.wikimedia.org/r/199862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id984cfd455ffa8ad2ae47a816983f88f13de82d2 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Santhosh santhosh.thottin...@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] Provide documentation for usage tracking migration - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Provide documentation for usage tracking migration
..
Provide documentation for usage tracking migration
Change-Id: I33e0300aed467cbe65e8b2b2631d50ebd9d23988
---
M docs/options.wiki
A docs/usagetracking-migration.wiki
2 files changed, 71 insertions(+), 1 deletion(-)
Approvals:
Aude: Looks good to me, approved
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/docs/options.wiki b/docs/options.wiki
index d11a2e2..35e9322 100644
--- a/docs/options.wiki
+++ b/docs/options.wiki
@@ -97,7 +97,7 @@
)
/poem
;allowDataTransclusion: switch to enable data transclusion features like the
nowiki{{#property}}/nowiki parser function and the ttwikibase/tt
Scribunto module. Defaults to tttrue/tt.
-;allowArbitraryDataAccess: switch to allow accessing abitrary items from the
ttwikibase/tt Scribunto module and the via the parser functions (instead of
just the item which is linked to the current page). Defaults to tttrue/tt.
+;allowArbitraryDataAccess: switch to allow accessing arbitrary items from the
ttwikibase/tt Scribunto module and the via the parser functions (instead of
just the item which is linked to the current page). Defaults to tttrue/tt.
;allowDataAccessInUserLanguage: switch to allow accessing data in the user's
language rather than the content language from the ttwikibase/tt Scribunto
module and the via the parser functions. Useful for multilingual wikis: Allows
users to split the ParserCache by user language. Defaults to ttfalse/tt.
;propagateChangesToRepo: switch to enable or disable the propagation of client
changes to the repo. Defaults to tttrue/tt.
;languageLinkSiteGroup: the ID of the site group to be shown as language
links. Defaults to ttnull/tt, which means the site's own site group.
diff --git a/docs/usagetracking-migration.wiki
b/docs/usagetracking-migration.wiki
new file mode 100644
index 000..7a2cfbc
--- /dev/null
+++ b/docs/usagetracking-migration.wiki
@@ -0,0 +1,70 @@
+This document describes the deployment process necessary for migrating from
naive sitelink
+based dispatching and purging to the full usage tracking needed to support
arbitrary access to
+entities from wikitext.
+
+Overview of the tables involved (using repowiki and clientwiki as the
database name and site
+ID for the repo and respective client wiki):
+
+* repowiki.wb_items_per_site: The sitelinks stored on the repo, mapping
entity IDs to page titles on client wikis.
+* repowiki.wb_changes_subscription: (new) Subscriptions to change
notifications, mapping entity IDs to client site ids. (Note that site ids are
often, but not necessarily, the same as the client wiki's database name).
+* clientwiki.wbc_entity_usage: (new) Tracks the usage of entities on the
client, including the information which page uses which aspect of which entity.
+
+For deferred deployment of schema changes, usage of the new tables can be
disabled using the appropriate feature switches:
+* To not use repowiki.wb_changes_subscription, set
useLegacyChangesSubscription = true (on both client and repo wikis).
+* To not use clientwiki.wbc_entity_usage, set useLegacyUsageIndex = true on
the client wiki.
+
+Maintenance scripts are used to populate the new database tables used for
usage tracking and subscription management:
+* repo/maintenance/populateChangesSubscription.php populates
wb_changes_subscription table based on repowiki.wb_items_per_site.
+* client/maintenance/populateEntityUsage.php populates the wbc_entity_usage
table based on repowiki.wb_items_per_site (data transfer from repo to client).
+* client/maintenance/updateSubscriptions.php updates
repowiki.wb_changes_subscription based on the client wiki's wbc_entity_usage
table (data transfer from client to repo). This should be run ''after''
populateChangesSubscription.php and populateEntityUsage.php.
+
+
+Deployment of the new usage tracking scheme can be done in three steps:
+
+
+== Create subscription table on the repo ==
+
+To set up the subscription tracking table on the repo:
+* Deploy the schema change and set useLegacyChangesSubscription = false.
+** If useLegacyChangesSubscription is false, update.php will create the table
automatically.
+** If useLegacyChangesSubscription is true, apply
repo/sql/changes_subscription.sql manually.
+* Run repo/maintenance/populateChangesSubscription.php to initialize the
wb_changes_subscription table based on repowiki.wb_items_per_site.
+
+NOTE: client wikis should be configured to keep track of their subscriptions
in the wb_changes_subscription.
+This can be done right away or at any later point, using the instructions in
section ''Start tracking
+client subscriptions based on entity usage'' below.
+
+NOTE: the dispatchChanges.php script does not yet use wb_changes_subscription
at all. This means
+that if a
[MediaWiki-commits] [Gerrit] Add clarification about subscriptions table deployment - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/200154 Change subject: Add clarification about subscriptions table deployment .. Add clarification about subscriptions table deployment in the usage tracking migration docs Change-Id: I3e9a13f93b29f4b5c60b2c97380a9764deb0b4f4 --- M docs/usagetracking-migration.wiki 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/54/200154/1 diff --git a/docs/usagetracking-migration.wiki b/docs/usagetracking-migration.wiki index 7a2cfbc..1fafad5 100644 --- a/docs/usagetracking-migration.wiki +++ b/docs/usagetracking-migration.wiki @@ -30,11 +30,13 @@ ** If useLegacyChangesSubscription is true, apply repo/sql/changes_subscription.sql manually. * Run repo/maintenance/populateChangesSubscription.php to initialize the wb_changes_subscription table based on repowiki.wb_items_per_site. -NOTE: client wikis should be configured to keep track of their subscriptions in the wb_changes_subscription. +NOTE: If any clients already have arbitrary access and usage tracking, then updateSubscriptions.php needs to also be run for each of them at this point. + +NOTE: Client wikis should be configured to keep track of their subscriptions in the wb_changes_subscription. This can be done right away or at any later point, using the instructions in section ''Start tracking client subscriptions based on entity usage'' below. -NOTE: the dispatchChanges.php script does not yet use wb_changes_subscription at all. This means +NOTE: The dispatchChanges.php script does not yet use wb_changes_subscription at all. This means that if a client wiki uses an entity ''only'' via arbitrary access (i.e. no page on that wiki is linked to that entity via a sitelink), changes to the entity will not cause a change notification to the client wiki. This issue is tracked on phabricator as ticket [https://phabricator.wikimedia.org/T66590 T66590]. -- To view, visit https://gerrit.wikimedia.org/r/200154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e9a13f93b29f4b5c60b2c97380a9764deb0b4f4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: 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] [FEAT] ParamInfo: Guess write using mustbeposted - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200153
Change subject: [FEAT] ParamInfo: Guess write using mustbeposted
..
[FEAT] ParamInfo: Guess write using mustbeposted
Almost all default write actions (apart from purge) must be POSTed so
it can guess that actions that are POSTed (except for login) are also
write actions.
Change-Id: I65fa9ffcfd25f18d8589160485c3c5a318f0a046
---
M pywikibot/data/api.py
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/53/200153/1
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 71cc0a9..ab620e4 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -494,6 +494,15 @@
if (help_text.find('\n\nThis module only accepts POST '
'requests.\n', start) end):
self._paraminfo[path]['mustbeposted'] = ''
+# All actions which must be POSTed are write actions except for
+# login. Because Request checks if the user is logged in when
+# doing a write action the check would always fail on login.
+# Purge is the onl action which isn't POSTed but actually does
+# write to it. This was checked with the data from 1.25wmf22 on
+# en.wikipedia.org.
+if ('mustbeposted' in self._paraminfo[path] and
+path != 'login') or path == 'purge':
+self._paraminfo[path]['writerights'] = ''
self._emulate_pageset()
--
To view, visit https://gerrit.wikimedia.org/r/200153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65fa9ffcfd25f18d8589160485c3c5a318f0a046
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce common widget style LESS file - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce common widget style LESS file
..
Introduce common widget style LESS file
* Add widgets/common/ext.cx.common.less as the top level common
styling for CX
* Abstract the Grid system in it
This is part of common UI widgets refactoring.
Change-Id: I51dfe65f1f23f56845c0ea3051ba6152bf61c80b
---
M modules/base/styles/ext.cx.feedback.less
M modules/dashboard/styles/ext.cx.dashboard.less
M modules/dashboard/styles/ext.cx.magnuslink.less
M modules/dashboard/styles/ext.cx.translationlist.less
M modules/entrypoint/styles/ext.cx.entrypoint.less
M modules/entrypoint/styles/ext.cx.redlink.less
M modules/header/styles/ext.cx.header.less
M modules/publish/styles/ext.cx.publish.dialog.less
M modules/publish/styles/ext.cx.publish.less
M modules/source/styles/ext.cx.source.less
M modules/source/styles/ext.cx.source.selector.less
M modules/stats/styles/ext.cx.stats.less
M modules/tools/styles/ext.cx.progressbar.less
M modules/tools/styles/ext.cx.tools.card.less
M modules/tools/styles/ext.cx.tools.categories.less
M modules/tools/styles/ext.cx.tools.dictionary.less
M modules/tools/styles/ext.cx.tools.formatter.less
M modules/tools/styles/ext.cx.tools.instructions.less
M modules/tools/styles/ext.cx.tools.less
M modules/tools/styles/ext.cx.tools.link.less
M modules/tools/styles/ext.cx.tools.manager.less
M modules/tools/styles/ext.cx.tools.mt.less
M modules/tools/styles/ext.cx.tools.mtabuse.less
M modules/tools/styles/ext.cx.tools.reference.less
M modules/translation/styles/ext.cx.translation.conflict.less
M modules/translation/styles/ext.cx.translation.less
M modules/translationview/styles/ext.cx.translationview.less
A modules/widgets/common/ext.cx.common.less
R modules/widgets/common/grid/agora-grid.less
R modules/widgets/common/grid/grid-core.less
R modules/widgets/common/grid/grid-responsive.less
R modules/widgets/common/grid/grid-settings.less
32 files changed, 42 insertions(+), 65 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/styles/ext.cx.feedback.less
b/modules/base/styles/ext.cx.feedback.less
index c54bf9e..ca3d46c 100644
--- a/modules/base/styles/ext.cx.feedback.less
+++ b/modules/base/styles/ext.cx.feedback.less
@@ -1,4 +1,4 @@
-@import ../../base/styles/grid/agora-grid;
+@import ../../widgets/common/ext.cx.common;
@import mediawiki.mixins;
.cx-feedback {
diff --git a/modules/dashboard/styles/ext.cx.dashboard.less
b/modules/dashboard/styles/ext.cx.dashboard.less
index 8e1c51b..070511d 100644
--- a/modules/dashboard/styles/ext.cx.dashboard.less
+++ b/modules/dashboard/styles/ext.cx.dashboard.less
@@ -1,11 +1,4 @@
-@import ../../base/styles/grid/agora-grid;
-@import mediawiki.mixins;
-
-@gray-darker: #252525;
-@gray-dark: #565656;
-@gray: #C9C9C9;
-@gray-light: #f0f0f0;
-@gray-lighter: #fbfbfb;
+@import ../../widgets/common/ext.cx.common;
h2 {
color: @gray-darker;
@@ -38,14 +31,6 @@
.cx-feedback {
right: 10px;
}
-}
-
-.cx-widget {
- .mw-ui-grid;
- color: @gray-darker;
- background: white;
- padding-bottom: 50px;
- font-size: medium;
}
// Do not display the header bar containing the link to dashboard in dashboard
page.
diff --git a/modules/dashboard/styles/ext.cx.magnuslink.less
b/modules/dashboard/styles/ext.cx.magnuslink.less
index f521641..78dc0b5 100644
--- a/modules/dashboard/styles/ext.cx.magnuslink.less
+++ b/modules/dashboard/styles/ext.cx.magnuslink.less
@@ -1,5 +1,4 @@
-@import ../../base/styles/grid/agora-grid;
-@import mediawiki.mixins;
+@import ../../widgets/common/ext.cx.common;
.cx-magnus-link {
.mw-ui-item;
diff --git a/modules/dashboard/styles/ext.cx.translationlist.less
b/modules/dashboard/styles/ext.cx.translationlist.less
index 5683834..b07ec04 100644
--- a/modules/dashboard/styles/ext.cx.translationlist.less
+++ b/modules/dashboard/styles/ext.cx.translationlist.less
@@ -1,4 +1,4 @@
-@import ../../base/styles/grid/agora-grid;
+@import ../../widgets/common/ext.cx.common;
@import mediawiki.mixins;
.cx-translationlist {
diff --git a/modules/entrypoint/styles/ext.cx.entrypoint.less
b/modules/entrypoint/styles/ext.cx.entrypoint.less
index 8b5aae9..c2cfdad 100644
--- a/modules/entrypoint/styles/ext.cx.entrypoint.less
+++ b/modules/entrypoint/styles/ext.cx.entrypoint.less
@@ -1,4 +1,4 @@
-@import ../../base/styles/grid/agora-grid;
+@import ../../widgets/common/ext.cx.common;
@import mediawiki.mixins;
.cx-entrypoint-dialog {
@@ -80,4 +80,4 @@
font-size: 12px;
color: #777;
border-top: 1px solid #f5f5f5;
-}
\ No newline at end of file
+}
diff --git a/modules/entrypoint/styles/ext.cx.redlink.less
b/modules/entrypoint/styles/ext.cx.redlink.less
index 932cae3..0d78924 100644
--- a/modules/entrypoint/styles/ext.cx.redlink.less
+++
[MediaWiki-commits] [Gerrit] Refactor the feedback tool as a widget module - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Refactor the feedback tool as a widget module
..
Refactor the feedback tool as a widget module
Change-Id: I7d64dd5e76eb3bf92b6331f4a0e384fe3cb8b556
---
M Resources.php
R modules/widgets/feedback/ext.cx.feedback.js
R modules/widgets/feedback/images/horn.png
R modules/widgets/feedback/images/horn.svg
R modules/widgets/feedback/styles/ext.cx.feedback.less
5 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 00630a7..1051014 100644
--- a/Resources.php
+++ b/Resources.php
@@ -53,10 +53,10 @@
'ext.cx.model',
),
'scripts' = array(
- 'base/ext.cx.feedback.js',
+ 'widgets/feedback/ext.cx.feedback.js',
),
'styles' = array(
- 'base/styles/ext.cx.feedback.less',
+ 'widgets/feedback/styles/ext.cx.feedback.less',
),
'messages' = array(
'cx-feedback-link',
diff --git a/modules/base/ext.cx.feedback.js
b/modules/widgets/feedback/ext.cx.feedback.js
similarity index 100%
rename from modules/base/ext.cx.feedback.js
rename to modules/widgets/feedback/ext.cx.feedback.js
diff --git a/modules/base/images/horn.png
b/modules/widgets/feedback/images/horn.png
similarity index 100%
rename from modules/base/images/horn.png
rename to modules/widgets/feedback/images/horn.png
Binary files differ
diff --git a/modules/base/images/horn.svg
b/modules/widgets/feedback/images/horn.svg
similarity index 100%
rename from modules/base/images/horn.svg
rename to modules/widgets/feedback/images/horn.svg
diff --git a/modules/base/styles/ext.cx.feedback.less
b/modules/widgets/feedback/styles/ext.cx.feedback.less
similarity index 87%
rename from modules/base/styles/ext.cx.feedback.less
rename to modules/widgets/feedback/styles/ext.cx.feedback.less
index ca3d46c..4c54298 100644
--- a/modules/base/styles/ext.cx.feedback.less
+++ b/modules/widgets/feedback/styles/ext.cx.feedback.less
@@ -1,4 +1,3 @@
-@import ../../widgets/common/ext.cx.common;
@import mediawiki.mixins;
.cx-feedback {
--
To view, visit https://gerrit.wikimedia.org/r/199865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d64dd5e76eb3bf92b6331f4a0e384fe3cb8b556
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@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] Usergrpus: Fix formatting in message usergroups-editgroup-de... - change (mediawiki...UserGroups)
Purodha has uploaded a new change for review. https://gerrit.wikimedia.org/r/200156 Change subject: Usergrpus: Fix formatting in message usergroups-editgroup-delete .. Usergrpus: Fix formatting in message usergroups-editgroup-delete See also: https://www.mediawiki.org/wiki/Localisation#Use_standard_capitalization Change-Id: Iaeb66117b4114b1f65a0ac25801c005b9db50031 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserGroups refs/changes/56/200156/1 diff --git a/i18n/en.json b/i18n/en.json index dd8863e..2c3dbd7 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -13,7 +13,7 @@ usergroups: User groups management, usergroups-desc: Provides finer control over what userrights can be registered with which user groups., usergroups-createnew: (create new...), -usergroups-editgroup-delete: Delete this user group span class=\important\ style=\color:red\(WARNING: This is irreversible. To recreate this class, you must use [[Special:UserGroups/new|this form]].)/span, +usergroups-editgroup-delete: Delete this user group span class=\important\ style=\color:red\(span style=text-transform:uppercaseWarning/span: This is irreversible. To recreate this class, you must use [[Special:UserGroups/new|this form]].)/span, usergroups-editgroup-desc: Select a user group from the dropdown below, or create your own with the \create new...\ option., usergroups-editgroup-newgroup: Enter the name of your new usergroup:, usergroups-editgroup-reason: Reason:, -- To view, visit https://gerrit.wikimedia.org/r/200156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaeb66117b4114b1f65a0ac25801c005b9db50031 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UserGroups Gerrit-Branch: master Gerrit-Owner: Purodha puro...@blissenbach.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [roundtrip-test] T93315: Use API v2 pagebundles to get wt2html - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: [roundtrip-test] T93315: Use API v2 pagebundles to get wt2html
..
[roundtrip-test] T93315: Use API v2 pagebundles to get wt2html
* New command line parameter --domain to set the v2 API domain. If
not passed, a reverse lookup from the prefix will be tried.
Change-Id: I642b845a53d9eda6aebf9868b4c91a04d312ca19
---
M tests/roundtrip-test.js
1 file changed, 79 insertions(+), 43 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/roundtrip-test.js b/tests/roundtrip-test.js
index 62a5ff8..4c8df06 100755
--- a/tests/roundtrip-test.js
+++ b/tests/roundtrip-test.js
@@ -428,29 +428,36 @@
}
};
-var parsoidPost = function (env, parsoidURL, prefix, title, text, oldid,
+var parsoidPost = function (env, uri, domain, title, text, dp, oldid,
recordSizes, profilePrefix, cb) {
var data = {};
- if ( oldid ) {
- data.oldid = oldid;
- data.html = text;
- } else {
- data.wt = text;
+ // make sure the Parsoid URI ends on /
+ if ( !/\/$/.test(uri) ) {
+ uri += '/';
}
+ uri += 'v2/' + domain + '/';
+ title = encodeURIComponent(title);
- // make sure parsoidURL ends on /
- if ( !/\/$/.test(parsoidURL) ) {
- parsoidURL += '/';
+ if ( oldid ) {
+ // We want html2wt
+ uri += 'wt/' + title + '/' + oldid;
+ data.html = {
+ body: text
+ };
+ data.original = {
+ 'data-parsoid': dp
+ };
+ } else {
+ // We want wt2html
+ uri += 'pagebundle/' + title;
+ data.wikitext = text;
}
var options = {
- uri: parsoidURL + prefix + '/' + encodeURI(title),
+ uri: uri,
method: 'POST',
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded',
- },
- encoding: 'utf8',
- form: data
+ json: true,
+ body: data
};
Util.retryingHTTPRequest( 10, options, function( err, res, body ) {
@@ -459,6 +466,14 @@
} else if (res.statusCode !== 200) {
cb(res.body, null);
} else {
+ var resBody, resDP;
+ if (oldid) {
+ // Extract the wikitext from the response
+ resBody = body.wikitext.body;
+ } else {
+ resBody = body.html.body;
+ resDP = body['data-parsoid'];
+ }
if ( env.profile ) {
if (!profilePrefix) {
profilePrefix = '';
@@ -469,20 +484,20 @@
// Record the sizes
var sizePrefix = profilePrefix + (oldid
? 'wt' : 'html');
env.profile.size[ sizePrefix + 'raw' ] =
- body.length;
+ resBody.length;
// Compress to record the gzipped size
- zlib.gzip( res.body, function( err,
gzippedbuf ) {
+ zlib.gzip( resBody, function( err,
gzippedbuf ) {
if ( !err ) {
env.profile.size[
sizePrefix + 'gzip' ] =
gzippedbuf.length;
}
- cb( null, body );
+ cb( null, resBody, resDP );
} );
} else {
- cb(null, body);
+ cb(null, resBody, resDP);
}
} else {
- cb( null, body );
+ cb( null, resBody, resDP );
}
}
} );
@@ -531,10 +546,31 @@
// Returns a Promise for an { env, rtDiffs } object. `cb` is optional.
var fetch = function ( page, options, cb ) {
cb = JSUtils.mkPromised( cb, [ 'env', 'rtDiffs' ] );
- var prefix = options.prefix || 'enwiki';
+ var domain, prefix, apiURL,
+ // options are ParsoidConfig options
[MediaWiki-commits] [Gerrit] Ensure reply button moves user to correct place - change (mediawiki...Comments)
UltrasonicNXT has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200155
Change subject: Ensure reply button moves user to correct place
..
Ensure reply button moves user to correct place
As per bug report on github
Change-Id: Idc2578f76449f51a199fb2e5dcfa42eec873184d
---
M Comments.php
M CommentsHooks.php
M CommentsPage.php
3 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Comments
refs/changes/55/200155/1
diff --git a/Comments.php b/Comments.php
index 7337a21..9a20af8 100644
--- a/Comments.php
+++ b/Comments.php
@@ -24,7 +24,7 @@
$wgExtensionCredits['parserhook'][] = array(
'path' = __FILE__,
'name' = 'Comments',
- 'version' = '4.0.1',
+ 'version' = '4.0.2',
'author' = array( 'David Pean', 'Misza', 'Jack Phoenix', 'Adam
Carter/UltrasonicNXT' ),
'descriptionmsg' = 'comments-desc',
'url' = 'https://www.mediawiki.org/wiki/Extension:Comments'
diff --git a/CommentsHooks.php b/CommentsHooks.php
index 3c37e80..7cf0a45 100644
--- a/CommentsHooks.php
+++ b/CommentsHooks.php
@@ -85,6 +85,7 @@
$output = 'div class=comments-body';
if ( $wgCommentsSortDescending ) { // form before comments
+ $output .= 'a id=end name=end rel=nofollow/a';
if ( !wfReadOnly() ) {
$output .= $commentsPage-displayForm();
} else {
@@ -104,6 +105,7 @@
} else {
$output .= wfMessage( 'comments-db-locked'
)-parse();
}
+ $output .= 'a id=end name=end rel=nofollow/a';
}
$output .= '/div'; // div.comments-body
diff --git a/CommentsPage.php b/CommentsPage.php
index 174dabf..96e2d5c 100644
--- a/CommentsPage.php
+++ b/CommentsPage.php
@@ -478,7 +478,7 @@
}
$output .= $pager;
}
-$output .= 'a id=end name=end rel=nofollow/a';
+
return $output;
}
--
To view, visit https://gerrit.wikimedia.org/r/200155
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc2578f76449f51a199fb2e5dcfa42eec873184d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Comments
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: don't show diff for builder files - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: swift: don't show diff for builder files
..
swift: don't show diff for builder files
puppet will bail trying to log non-utf8 byte sequences in the diff
Bug: T93614
Change-Id: Iaa0eb84052854612c4cd8a4768fce4718580d3c3
---
M manifests/swift.pp
M modules/swift_new/manifests/ring.pp
2 files changed, 18 insertions(+), 12 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/swift.pp b/manifests/swift.pp
index dd817f2..ca83755 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -64,8 +64,9 @@
}
file { '/etc/swift/account.builder':
-ensure = 'present',
-source = puppet:///volatile/swift/${cluster_name}/account.builder,
+ensure= 'present',
+source=
puppet:///volatile/swift/${cluster_name}/account.builder,
+show_diff = false,
}
file { '/etc/swift/account.ring.gz':
@@ -74,8 +75,9 @@
}
file { '/etc/swift/container.builder':
-ensure = 'present',
-source = puppet:///volatile/swift/${cluster_name}/container.builder,
+ensure= 'present',
+source=
puppet:///volatile/swift/${cluster_name}/container.builder,
+show_diff = false,
}
file { '/etc/swift/container.ring.gz':
@@ -84,8 +86,9 @@
}
file { '/etc/swift/object.builder':
-ensure = 'present',
-source = puppet:///volatile/swift/${cluster_name}/object.builder,
+ensure= 'present',
+source= puppet:///volatile/swift/${cluster_name}/object.builder,
+show_diff = false,
}
file { '/etc/swift/object.ring.gz':
diff --git a/modules/swift_new/manifests/ring.pp
b/modules/swift_new/manifests/ring.pp
index c56e129..ea461a7 100644
--- a/modules/swift_new/manifests/ring.pp
+++ b/modules/swift_new/manifests/ring.pp
@@ -3,8 +3,9 @@
$swift_cluster = $swift_new::params::swift_cluster,
) {
file { '/etc/swift/account.builder':
-ensure = present,
-source = puppet:///volatile/swift/${swift_cluster}/account.builder,
+ensure= present,
+source=
puppet:///volatile/swift/${swift_cluster}/account.builder,
+show_diff = false,
}
file { '/etc/swift/account.ring.gz':
@@ -13,8 +14,9 @@
}
file { '/etc/swift/container.builder':
-ensure = present,
-source =
puppet:///volatile/swift/${swift_cluster}/container.builder,
+ensure= present,
+source=
puppet:///volatile/swift/${swift_cluster}/container.builder,
+show_diff = false,
}
file { '/etc/swift/container.ring.gz':
@@ -23,8 +25,9 @@
}
file { '/etc/swift/object.builder':
-ensure = present,
-source = puppet:///volatile/swift/${swift_cluster}/object.builder,
+ensure= present,
+source=
puppet:///volatile/swift/${swift_cluster}/object.builder,
+show_diff = false,
}
file { '/etc/swift/object.ring.gz':
--
To view, visit https://gerrit.wikimedia.org/r/200146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa0eb84052854612c4cd8a4768fce4718580d3c3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] geoip: disable show_diff - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: geoip: disable show_diff
..
geoip: disable show_diff
potentially the same issue we've experienced with puppet failing when the diff
contains invalid utf8 byte sequences
Bug: T93614
Change-Id: I2de2d484b8c4540aa5ea5704e2c254591bd58054
---
M modules/geoip/manifests/data/puppet.pp
1 file changed, 8 insertions(+), 7 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/geoip/manifests/data/puppet.pp
b/modules/geoip/manifests/data/puppet.pp
index aaacc0c..159d9e1 100644
--- a/modules/geoip/manifests/data/puppet.pp
+++ b/modules/geoip/manifests/data/puppet.pp
@@ -12,12 +12,13 @@
{
# recursively copy the $data_directory from $source.
file { $data_directory:
-ensure = directory,
-owner = 'root',
-group = 'root',
-mode= '0644',
-source = $source,
-recurse = true,
-backup = false,
+ensure= directory,
+owner = 'root',
+group = 'root',
+mode = '0644',
+source= $source,
+recurse = true,
+backup= false,
+show_diff = false,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/200147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2de2d484b8c4540aa5ea5704e2c254591bd58054
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace duplicate ids in wikitext - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace duplicate ids in wikitext
..
Replace duplicate ids in wikitext
* With the switch to the v2 api, duplicate page ids are intolerable. We
saw on frwiki/Grande_mosaïque_de_Lillebonne and the thousands of
other article de qualité that every edit was dirtied by colliding
data-parsoids.
Change-Id: I73a9a3d787222eee8a1a3ada8852af7748a20b94
---
M lib/dom.cleanup.js
M lib/mediawiki.DOMUtils.js
M lib/mediawiki.WikitextSerializer.js
M lib/mediawiki.parser.defines.js
M tests/mocha/parse.js
M tests/parserTests.txt
6 files changed, 103 insertions(+), 8 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/dom.cleanup.js b/lib/dom.cleanup.js
index 8360fa7..38f35fe 100644
--- a/lib/dom.cleanup.js
+++ b/lib/dom.cleanup.js
@@ -92,7 +92,7 @@
}
if ( atTopLevel env.storeDataParsoid ) {
- DU.stripDataParsoid( node, dp );
+ DU.stripDataParsoid( env, node, dp );
}
}
DU.saveDataAttribs( node );
diff --git a/lib/mediawiki.DOMUtils.js b/lib/mediawiki.DOMUtils.js
index e54c58c..ab43e1e 100644
--- a/lib/mediawiki.DOMUtils.js
+++ b/lib/mediawiki.DOMUtils.js
@@ -2033,21 +2033,45 @@
// Generates a unique id with the following format:
// mwbase64-encoded counter
// but attempts to keep user defined ids.
- stripDataParsoid: function ( node, dp ) {
- var uid = node.id,
+ stripDataParsoid: function( env, node, dp ) {
+ var uid = node.getAttribute( id ),
document = node.ownerDocument,
- docDp = this.getDataParsoid( document );
+ docDp = DU.getDataParsoid( document ),
+ origId = uid || null;
+ if ( docDp.ids.hasOwnProperty( uid ) ) {
+ uid = null;
+ // FIXME: Protect mw ids while tokenizing to avoid
false positives.
+ env.log( warning, Wikitext for this page has
duplicate ids: + origId );
+ }
if ( !uid ) {
do {
docDp.counter += 1;
uid = mw + JSUtils.counterToBase64(
docDp.counter );
} while ( document.getElementById( uid ) );
- node.setAttribute( id, uid );
+ DU.addNormalizedAttribute( node, id, uid, origId );
}
docDp.ids[uid] = dp;
- delete this.getNodeData( node ).parsoid;
+ delete DU.getNodeData( node ).parsoid;
// It would be better to instrument all the load sites.
node.removeAttribute( data-parsoid );
+ },
+
+ // Similar to the method on tokens
+ addNormalizedAttribute: function( node, name, val, origVal ) {
+ node.setAttribute( name, val );
+ DU.setShadowInfo( node, name, val, origVal );
+ },
+
+ // Similar to the method on tokens
+ setShadowInfo: function( node, name, val, origVal ) {
+ if ( val === origVal || origVal === null ) { return; }
+ var dp = DU.getDataParsoid( node );
+ if ( !dp.a ) { dp.a = {}; }
+ if ( !dp.sa ) { dp.sa = {}; }
+ if ( origVal !== undefined !dp.a.hasOwnProperty( name ) ) {
+ dp.sa[ name ] = origVal;
+ }
+ dp.a[ name ] = val;
}
};
diff --git a/lib/mediawiki.WikitextSerializer.js
b/lib/mediawiki.WikitextSerializer.js
index 7ba7394..87644ca 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -226,6 +226,11 @@
state.env.log(warning/html2wt,
Parsoid id found on element without a
matching data-parsoid +
entry: ID= + kv.v + ; ELT= +
node.outerHTML);
+ } else {
+ vInfo = token.getAttributeShadowInfo( k );
+ if ( !vInfo.modified vInfo.fromsrc ) {
+ out.push( k + '=' + '' +
vInfo.value.replace( //g, 'quot;' ) + '' );
+ }
}
continue;
}
@@ -1436,7 +1441,7 @@
}
if ( finalCB typeof finalCB === 'function' ) {
- finalCB();
+ finalCB( null, out );
}
return out;
diff --git a/lib/mediawiki.parser.defines.js b/lib/mediawiki.parser.defines.js
index 7b3c8c8..7fc3261
[MediaWiki-commits] [Gerrit] Remove chunk callback from serializeDOM - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove chunk callback from serializeDOM
..
Remove chunk callback from serializeDOM
* We only ever return one large chunk (accumulation happens internally)
and this process is sync. Just pass it all in the final callback.
Change-Id: I0122f1e015f35badb4598a74b39ebc6a7d8ef377
---
M api/routes.js
M lib/mediawiki.SelectiveSerializer.js
M lib/mediawiki.WikitextSerializer.js
M tests/mocha/parse.js
M tests/parserTests.js
5 files changed, 30 insertions(+), 50 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/routes.js b/api/routes.js
index 97b18ee..3ff6e73 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -124,8 +124,6 @@
};
var roundTripDiff = function( env, req, res, selser, doc ) {
- var out = [];
-
// Re-parse the HTML to uncover foster-parenting issues
doc = domino.createDocument( doc.outerHTML );
@@ -133,17 +131,14 @@
serializer = new Serializer({ env: env });
return Promise.promisify( serializer.serializeDOM, false, serializer )(
- doc.body, function( chunk ) { out.push(chunk); }, false
- ).then(function() {
- var i;
- out = out.join('');
-
+ doc.body, false
+ ).then(function( out ) {
// Strip selser trigger comment
out = out.replace(/!--rtSelserEditTestComment--\n*$/, '');
// Emit base href so all relative urls resolve properly
var hNodes = doc.body.firstChild.childNodes;
- var headNodes = ;
+ var i, headNodes = ;
for (i = 0; i hNodes.length; i++) {
if (hNodes[i].nodeName.toLowerCase() === 'base') {
headNodes += DU.serializeNode(hNodes[i]);
@@ -270,7 +265,6 @@
env.conf.parsoid.allowCORS );
}
- var out = [];
var p = new Promise(function( resolve, reject ) {
if ( v2 v2.original v2.original.wikitext ) {
env.setPageSrcInfo( v2.original.wikitext.body );
@@ -323,11 +317,10 @@
}
}
return Promise.promisify( serializer.serializeDOM, false,
serializer )(
- doc.body, function( chunk ) { out.push( chunk ); },
false
+ doc.body, false
);
- }).timeout( REQ_TIMEOUT ).then(function() {
- var output = out.join(''),
- contentType =
'text/plain;profile=mediawiki.org/specs/wikitext/1.0.0;charset=utf-8';
+ }).timeout( REQ_TIMEOUT ).then(function( output ) {
+ var contentType =
'text/plain;profile=mediawiki.org/specs/wikitext/1.0.0;charset=utf-8';
if ( v2 ) {
apiUtils.jsonResponse(res, env, {
wikitext: {
diff --git a/lib/mediawiki.SelectiveSerializer.js
b/lib/mediawiki.SelectiveSerializer.js
index 788a8bf..e525854 100644
--- a/lib/mediawiki.SelectiveSerializer.js
+++ b/lib/mediawiki.SelectiveSerializer.js
@@ -50,11 +50,9 @@
*
* @param {Error} err
* @param {Node} body
- * @param {Function} cb Callback that is called for each chunk.
- * @param {string} cb.res The wikitext of the chunk we've just serialized.
* @param {Function} finalcb The callback for when we've finished serializing
the DOM.
*/
-SSP.doSerializeDOM = function( err, body, cb, finalcb ) {
+SSP.doSerializeDOM = function( err, body, finalcb ) {
var self = this;
var startTimers = new Map();
@@ -64,7 +62,7 @@
}
// If there's no old source, fall back to non-selective
serialization.
- this.wts.serializeDOM( body, cb, false, finalcb );
+ this.wts.serializeDOM( body, false, finalcb );
if ( this.timer ) {
this.timer.timing( 'html2wt.full.serialize', '', (
Date.now() - startTimers.get( 'html2wt.full.serialize' )) );
@@ -97,7 +95,7 @@
}
// Call the WikitextSerializer to do our bidding
- this.wts.serializeDOM( body, cb, true, finalcb );
+ this.wts.serializeDOM( body, true, finalcb );
if ( this.timer ) {
this.timer.timing( 'html2wt.selser.serialize',
'', ( Date.now() - startTimers.get( 'html2wt.selser.serialize' )) );
@@ -105,8 +103,7 @@
} else {
// Nothing was modified, just re-use the original source
- cb( this.env.page.src );
- finalcb();
+ finalcb( null, this.env.page.src );
}
}
};
@@ -118,14 +115,12
[MediaWiki-commits] [Gerrit] Add 'v' option to google books - change (mediawiki...translators)
Mvolz has uploaded a new change for review. https://gerrit.wikimedia.org/r/200157 Change subject: Add 'v' option to google books .. Add 'v' option to google books Change-Id: Ibf1614ec7fee348bbf981a2446d460cf7c1fb91a --- M Google Books.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/zotero/translators refs/changes/57/200157/1 diff --git a/Google Books.js b/Google Books.js index 188871c..642a69d 100644 --- a/Google Books.js +++ b/Google Books.js @@ -8,7 +8,7 @@ priority: 100, inRepository: true, translatorType: 4, - browserSupport: gcsb, + browserSupport: gcsbv, lastUpdated: 2014-12-11 17:17:45 } @@ -492,4 +492,4 @@ ] } ] -/** END TEST CASES **/ \ No newline at end of file +/** END TEST CASES **/ -- To view, visit https://gerrit.wikimedia.org/r/200157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf1614ec7fee348bbf981a2446d460cf7c1fb91a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/zotero/translators Gerrit-Branch: master Gerrit-Owner: Mvolz mv...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dsh: use FQDN for mediawiki-installation hosts - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/200158 Change subject: dsh: use FQDN for mediawiki-installation hosts .. dsh: use FQDN for mediawiki-installation hosts This is to prevent rsync issues in deployment when a scap-proxy runs rsync at the same time as a regular appserver does. scap removes scap proxies from the mediawiki-installation list to prevent this but fails to do so since the current scap-proxy list uses FQDNs and a simple diff is executed between the two lists. This is explained and the requested solution in: https://phabricator.wikimedia.org/T93983#1151838 Bug:T93983 Change-Id: I6ddd5df7e239969caa59eb88ada1f5cfa0fe195b --- M modules/dsh/files/group/mediawiki-installation 1 file changed, 484 insertions(+), 482 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/58/200158/1 diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 430e800..4ce5e8c 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -1,485 +1,487 @@ -silver -tin -terbium +# !all names added here must be FQDN's now (T93983) ! -snapshot1001 -snapshot1002 -snapshot1003 -snapshot1004 -tmh1001 -tmh1002 -mw1001 -mw1002 -mw1003 -mw1004 -mw1005 -mw1006 -mw1007 -mw1008 -mw1009 -mw1010 -mw1011 -mw1012 -mw1013 -mw1014 -mw1015 -mw1016 -mw1017 -mw1018 -mw1019 -mw1020 -mw1021 -mw1022 -mw1023 -mw1024 -mw1025 -mw1026 -mw1027 -mw1028 -mw1029 -mw1030 -mw1031 -mw1032 -mw1033 -mw1034 -mw1035 -mw1036 -mw1037 -mw1038 -mw1039 -mw1040 -mw1041 -mw1042 -mw1043 -mw1044 -mw1045 -mw1046 -mw1047 -mw1048 -mw1049 -mw1050 -mw1051 -mw1052 -mw1053 -mw1054 -mw1055 -mw1056 -mw1057 -mw1058 -mw1059 -mw1060 -mw1061 -mw1062 -mw1063 -mw1064 -mw1065 -mw1066 -mw1067 -mw1068 -mw1069 -mw1070 -mw1071 -mw1072 -mw1073 -mw1074 -mw1075 -mw1076 -mw1077 -mw1078 -mw1079 -mw1080 -mw1081 -mw1082 -mw1083 -mw1084 -mw1085 -mw1086 -mw1087 -mw1088 -mw1089 -mw1090 -mw1091 -mw1092 -mw1093 -mw1094 -mw1095 -mw1096 -mw1097 -mw1098 -mw1099 -mw1100 -mw1101 -mw1102 -mw1103 -mw1104 -mw1105 -mw1106 -mw1107 -mw1108 -mw1109 -mw1110 -mw -mw1112 -mw1113 -mw1114 -mw1115 -mw1116 -mw1117 -mw1118 -mw1119 -mw1120 -mw1121 -mw1122 -mw1123 -mw1124 -mw1125 -mw1126 -mw1127 -mw1128 -mw1129 -mw1130 -mw1131 -mw1132 -mw1133 -mw1134 -mw1135 -mw1136 -mw1137 -mw1138 -mw1139 -mw1140 -mw1141 -mw1142 -mw1143 -mw1144 -mw1145 -mw1146 -mw1147 -mw1148 -mw1149 -mw1150 -mw1151 -mw1152 -mw1153 -mw1154 -mw1155 -mw1156 -mw1157 -mw1158 -mw1159 -mw1160 -mw1161 -mw1162 -mw1163 -mw1164 -mw1165 -mw1166 -mw1167 -mw1168 -mw1169 -mw1170 -mw1171 -mw1172 -mw1173 -mw1174 -mw1175 -mw1176 -mw1177 -mw1178 -mw1179 -mw1180 -mw1181 -mw1182 -mw1183 -mw1184 -mw1185 -mw1186 -mw1187 -mw1188 -mw1189 -mw1190 -mw1191 -mw1192 -mw1193 -mw1194 -mw1195 -mw1196 -mw1197 -mw1198 -mw1199 -mw1200 -mw1201 -mw1202 -mw1203 -mw1204 -mw1205 -mw1206 -mw1207 -mw1208 -mw1209 -mw1210 -mw1211 -mw1212 -mw1213 -mw1214 -mw1215 -mw1216 -mw1217 -mw1218 -mw1219 -mw1220 -mw1221 -mw1222 -mw1223 -mw1224 -mw1225 -mw1226 -mw1227 -mw1228 -mw1229 -mw1230 -mw1231 -mw1232 -mw1233 -mw1234 -mw1235 -mw1236 -mw1237 -mw1238 -mw1239 -mw1240 -mw1241 -mw1242 -mw1243 -mw1244 -mw1245 -mw1246 -mw1247 -mw1248 -mw1249 -mw1250 -mw1251 -mw1252 -mw1253 -mw1254 -mw1255 -mw1256 -mw1257 -mw1258 +silver.wikimedia.org +tin.eqiad.wmnet +terbium.eqiad.wmnet -#Codfw -#mw2001 -#mw2002 -#mw2003 -#mw2004 -#mw2005 -#mw2006 -#mw2007 -#mw2008 -#mw2009 -#mw2010 -#mw2011 -#mw2012 -#mw2013 -#mw2014 -#mw2015 -#mw2016 -#mw2017 -#mw2018 -#mw2019 -#mw2020 -#mw2021 -#mw2022 -#mw2023 -#mw2024 -#mw2025 -#mw2026 -#mw2027 -#mw2028 -#mw2029 -#mw2030 -#mw2031 -#mw2032 -#mw2033 -#mw2034 -#mw2035 -#mw2036 -#mw2037 -#mw2038 -#mw2039 -#mw2040 -#mw2041 -#mw2042 -#mw2043 -#mw2044 -#mw2045 -#mw2046 -#mw2047 -#mw2048 -#mw2049 -#mw2050 -#mw2051 -#mw2052 -#mw2053 -#mw2054 -#mw2055 -#mw2056 -#mw2057 -#mw2058 -#mw2059 -#mw2060 -#mw2061 -#mw2062 -#mw2063 -#mw2064 -#mw2065 -#mw2066 -#mw2067 -#mw2068 -#mw2069 -#mw2070 -#mw2071 -#mw2072 -#mw2073 -#mw2074 -#mw2075 -#mw2076 -#mw2077 -#mw2078 -#mw2079 -#mw2080 -#mw2081 -#mw2082 -#mw2083 -#mw2084 -#mw2085 -#mw2086 -#mw2087 -#mw2088 -#mw2089 -#mw2090 -#mw2091 -#mw2092 -#mw2093 -#mw2094 -#mw2095 -#mw2096 -#mw2097 -#mw2098 -#mw2099 -#mw2100 -#mw2101 -#mw2102 -#mw2103 -#mw2104 -#mw2105 -#mw2106 -#mw2107 -#mw2108 -#mw2109 -#mw2110 -#mw2111 -#mw2112 -#mw2113 -#mw2114 -#mw2115 -#mw2116 -#mw2117 -#mw2118 -#mw2119 -#mw2120 -#mw2121 -#mw2122 -#mw2123 -#mw2124 -#mw2125 -#mw2126 -#mw2127 -#mw2128 -#mw2129 -#mw2130 -#mw2131 -#mw2132 -#mw2133 -#mw2134 -#mw2135 -#mw2136 -#mw2137 -#mw2138 -#mw2139 -#mw2140 -#mw2141 -#mw2142 -#mw2143 -#mw2144 -#mw2145 -#mw2146 -#mw2147 -#mw2148 -#mw2149 -#mw2150 -#mw2151 -#mw2152 -#mw2153 -#mw2154 -#mw2155 -#mw2156 -#mw2157 -#mw2158 -#mw2159 -#mw2160 -#mw2161 -#mw2162 -#mw2163 -#mw2164 -#mw2165 -#mw2166
[MediaWiki-commits] [Gerrit] [WIP] adding wikitext editor data to queries - change (analytics/limn-edit-data)
Milimetric has uploaded a new change for review. https://gerrit.wikimedia.org/r/200159 Change subject: [WIP] adding wikitext editor data to queries .. [WIP] adding wikitext editor data to queries Change-Id: I0e98ba53d38493025b6b361ff94afe21f5bc7432 --- R edit/sessions.sql 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-edit-data refs/changes/59/200159/1 diff --git a/edit/funnel_save_rates_low_noise.sql b/edit/sessions.sql similarity index 100% rename from edit/funnel_save_rates_low_noise.sql rename to edit/sessions.sql -- To view, visit https://gerrit.wikimedia.org/r/200159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e98ba53d38493025b6b361ff94afe21f5bc7432 Gerrit-PatchSet: 1 Gerrit-Project: analytics/limn-edit-data Gerrit-Branch: master Gerrit-Owner: Milimetric dandree...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ContextMenu: Fixed NPE - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200160
Change subject: ContextMenu: Fixed NPE
..
ContextMenu: Fixed NPE
In some cases the file object parameter is null
Change-Id: I758651130fc7a8c04771ce81e3bf96509b65c65d
---
M ContextMenu/ContextMenu.class.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/60/200160/1
diff --git a/ContextMenu/ContextMenu.class.php
b/ContextMenu/ContextMenu.class.php
index 681612a..aa777dd 100644
--- a/ContextMenu/ContextMenu.class.php
+++ b/ContextMenu/ContextMenu.class.php
@@ -123,7 +123,12 @@
public function onLinkerMakeMediaLinkFile( $title, $file, $html,
$attribs, $ret ) {
$attribs['data-bs-title'] = $title-getPrefixedText();
- $attribs['data-bs-filename'] = $file-getName();
+ if( $file instanceof File ) {
+ $attribs['data-bs-filename'] = $file-getName();
+ }
+ else {
+ $attribs['data-bs-filename'] = $title-getText();
+ }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/200160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I758651130fc7a8c04771ce81e3bf96509b65c65d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
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] UEModulePDF: Support for target name in upload - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200161
Change subject: UEModulePDF: Support for target name in upload
..
UEModulePDF: Support for target name in upload
* Added new BShtml2PDF servlet which supports a target name when uploading
files
* Adapted PHP code to support this new feature
* Fixed issue with entities in CSS
Change-Id: Ic7a507e689a4bd8a6bdd9ff86ead8a65625e410e
---
M UEModulePDF/includes/PDFServlet.class.php
M UEModulePDF/includes/PDFTemplateProvider.class.php
M UEModulePDF/webservices/BShtml2PDF.war
3 files changed, 30 insertions(+), 22 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/61/200161/1
diff --git a/UEModulePDF/includes/PDFServlet.class.php
b/UEModulePDF/includes/PDFServlet.class.php
index 3521c86..e86b4a7 100644
--- a/UEModulePDF/includes/PDFServlet.class.php
+++ b/UEModulePDF/includes/PDFServlet.class.php
@@ -44,9 +44,10 @@
'timeout' = 120,
'postData' = array(
'fileType' = '', //Need to stay empty so
UploadAsset servlet saves file to document root directory
- 'documentToken' =
$this-aParams['document-token'],
+ 'documentToken' =
$this-aParams['document-token'],
+ 'sourceHtmlFile_name' = basename(
$sTmpHtmlFile ),
'sourceHtmlFile' = '@'.$sTmpHtmlFile,
- 'wikiId' = wfWikiID()
+ 'wikiId' = wfWikiID()
)
);
@@ -65,8 +66,8 @@
//Upload HTML source
//TODO: Handle $sResponse
$sResponse = Http::post(
-
$this-aParams['soap-service-url'].'/UploadAsset',
- $aOptions
+ $this-aParams['soap-service-url'].'/UploadAsset',
+ $aOptions
);
//Now do the rendering
@@ -123,7 +124,9 @@
$aErrors[] = $sFilePath;
continue;
}
- $aPostData['file'.$iCounter++] = '@'.$sFilePath;
+ $aPostData['file'.$iCounter.'_name'] =
$sFileName;
+ $aPostData['file'.$iCounter] = '@'.$sFilePath;
+ $iCounter++;
}
if( !empty( $aErrors ) ) {
@@ -142,6 +145,7 @@
global $bsgUEModulePDFCURLOptions;
$aOptions = array_merge_recursive($aOptions,
$bsgUEModulePDFCURLOptions);
+
$vHttpEngine = Http::$httpEngine;
Http::$httpEngine = 'curl';
$sResponse = Http::post(
diff --git a/UEModulePDF/includes/PDFTemplateProvider.class.php
b/UEModulePDF/includes/PDFTemplateProvider.class.php
index 4b0de00..438c78e 100644
--- a/UEModulePDF/includes/PDFTemplateProvider.class.php
+++ b/UEModulePDF/includes/PDFTemplateProvider.class.php
@@ -19,9 +19,9 @@
* @subpackage UEModulePDF
*/
class BsPDFTemplateProvider {
-
+
/**
-* Provides a array suitable for the MediaWiki HtmlFormField class
+* Provides a array suitable for the MediaWiki HtmlFormField class
* HtmlSelectField.
* @param array $aParams Has to contain the 'template-path' that has to
be
* searched for valid templates.
@@ -45,13 +45,13 @@
wfDebugLog( 'BS::UEModulePDF',
'BsPDFTemplateProvider::getTemplatesForSelectOptions: Error: '.$e-getMessage()
);
return array( '-' = '-' );
}
-
+
return $aOptions;
-
+
}
-
+
/**
-* Reads in a template file to a DOMDocuments and collects additional
+* Reads in a template file to a DOMDocuments and collects additional
* information.
* @param array $aParams Has to contain a valid 'template' entry.
* @return array with the DOMDocument and some references.
@@ -77,23 +77,23 @@
$oTemplateDOM = new DOMDocument();
$oTemplateDOM-formatOutput = true;
$oTemplateDOM-load( $sTemplateMarkup );
-
+
$oHeadElement = $oTemplateDOM-getElementsByTagName( 'head'
)-item( 0 );
$oBodyElement = $oTemplateDOM-getElementsByTagName( 'body'
)-item( 0 );
$oTitleElement = $oTemplateDOM-getElementsByTagName( 'title'
)-item( 0 );
-
+
$aResources = array();
foreach( $aTemplate['resources'] as $sType = $aFiles ) {
[MediaWiki-commits] [Gerrit] wikimetrics: lint - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: wikimetrics: lint
..
wikimetrics: lint
3 x double quoted string containing no variables
4 x indentation of = is not properly aligned
1 x ensure found on line but it's not the first attribute
puppet-lint 1.1.0
Change-Id: I60588381ef15d22d25a90d2f75e8e1fa5c1680c5
---
M manifests/role/wikimetrics.pp
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/wikimetrics.pp b/manifests/role/wikimetrics.pp
index 88c6ea4..ff16971 100644
--- a/manifests/role/wikimetrics.pp
+++ b/manifests/role/wikimetrics.pp
@@ -168,11 +168,11 @@
# Setup mysql, put data in /srv
class { 'mysql::server':
-config_hash = {
+config_hash = {
'datadir' = '/srv/mysql'
},
-before = Class['::wikimetrics::database'],
-require = Labs_lvm::Volume['second-local-disk']
+before = Class['::wikimetrics::database'],
+require = Labs_lvm::Volume['second-local-disk']
}
class { '::wikimetrics':
@@ -234,7 +234,7 @@
var_directory= $var_directory,
public_subdirectory = $public_subdirectory,
-require = Labs_lvm::Volume['second-local-disk'],
+require = Labs_lvm::Volume['second-local-disk'],
}
# Run the wikimetrics/scripts/install script
@@ -270,7 +270,7 @@
class { '::redis':
dir = $redis_dir,
dbfilename = $redis_dbfilename,
-saves = [ 900 1, 300 10, 60 20 ],
+saves = [ '900 1', '300 10', '60 20' ],
stop_writes_on_bgsave_error = true,
}
@@ -299,6 +299,7 @@
$backup_ensure = 'absent'
}
class { '::wikimetrics::backup':
+ensure= $backup_ensure,
destination = /data/project/wikimetrics/backup/${::hostname},
db_user = $db_user_wikimetrics,
db_pass = $db_pass_wikimetrics,
@@ -307,7 +308,6 @@
redis_db_file = ${redis_dir}/${redis_dbfilename},
public_files = $public_directory,
keep_days = 10,
-ensure= $backup_ensure,
}
# Link aggregated projectcounts files to public directory
--
To view, visit https://gerrit.wikimedia.org/r/200103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I60588381ef15d22d25a90d2f75e8e1fa5c1680c5
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: Ottomata 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 mobile target for mediawiki.confirmCloseWindow - change (mediawiki/core)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/200178 Change subject: Add mobile target for mediawiki.confirmCloseWindow .. Add mobile target for mediawiki.confirmCloseWindow Bug: T88949 Change-Id: I1e06668cbd149c23f7b961f7603be07262a021a9 --- M resources/Resources.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/78/200178/1 diff --git a/resources/Resources.php b/resources/Resources.php index 448f502..1096cbc 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -849,6 +849,7 @@ 'scripts' = array( 'resources/src/mediawiki/mediawiki.confirmCloseWindow.js', ), + 'targets' = array( 'desktop', 'mobile' ), ), 'mediawiki.debug' = array( 'scripts' = array( -- To view, visit https://gerrit.wikimedia.org/r/200178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e06668cbd149c23f7b961f7603be07262a021a9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special Edit feed - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200181
Change subject: Special Edit feed
..
Special Edit feed
Change-Id: I8cc2b3ebefcf6cead0c33ef463acf1cb6fbc99f5
---
M Gather.php
M i18n/en.json
M i18n/qqq.json
A includes/models/CollectionFeed.php
A includes/models/CollectionFeedItem.php
A includes/specials/SpecialGatherEditFeed.php
A includes/views/CollectionFeed.php
A includes/views/CollectionFeedItem.php
M resources/Resources.php
A resources/ext.gather.styles/editfeed.less
A resources/ext.gather.styles/minerva.less
M resources/ext.gather.styles/vector.less
12 files changed, 847 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/81/200181/1
diff --git a/Gather.php b/Gather.php
index dca7fa2..72e6d84 100644
--- a/Gather.php
+++ b/Gather.php
@@ -37,6 +37,8 @@
'Gather\models\CollectionItem' = 'models/CollectionItem',
'Gather\models\CollectionBase' = 'models/CollectionBase',
+ 'Gather\models\CollectionFeed' = 'models/CollectionFeed',
+ 'Gather\models\CollectionFeedItem' = 'models/CollectionFeedItem',
'Gather\models\CollectionInfo' = 'models/CollectionInfo',
'Gather\models\Collection' = 'models/Collection',
'Gather\models\CollectionsList' = 'models/CollectionsList',
@@ -46,6 +48,8 @@
'Gather\views\View' = 'views/View',
'Gather\views\NotFound' = 'views/NotFound',
'Gather\views\NoPublic' = 'views/NoPublic',
+ 'Gather\views\CollectionFeed' = 'views/CollectionFeed',
+ 'Gather\views\CollectionFeedItem' = 'views/CollectionFeedItem',
'Gather\views\Collection' = 'views/Collection',
'Gather\views\CollectionItemCard' = 'views/CollectionItemCard',
'Gather\views\Image' = 'views/Image',
@@ -56,6 +60,7 @@
'Gather\SpecialGather' = 'specials/SpecialGather',
'Gather\SpecialGatherLists' = 'specials/SpecialGatherLists',
+ 'Gather\SpecialGatherEditFeed' = 'specials/SpecialGatherEditFeed',
'Gather\api\ApiEditList' = 'api/ApiEditList',
'Gather\api\ApiQueryLists' = 'api/ApiQueryLists',
@@ -70,6 +75,7 @@
$wgSpecialPages['Gather'] = 'Gather\SpecialGather';
$wgSpecialPages['GatherLists'] = 'Gather\SpecialGatherLists';
+$wgSpecialPages['GatherEditFeed'] = 'Gather\SpecialGatherEditFeed';
// Hooks
$wgExtensionFunctions[] = 'Gather\Hooks::onExtensionSetup';
diff --git a/i18n/en.json b/i18n/en.json
index 1d26909..b0f55b4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -71,5 +71,8 @@
apihelp-gather-description: List and edit gather collections.,
apihelp-gather-param-gather: Action to perform on collections.,
apihelp-gather-param-owner: Owner of the collections to search for.
If omitted, defaults to current user.,
- apihelp-gather-example-1: List the collections for user
kbdjohn/kbd.
+ apihelp-gather-example-1: List the collections for user
kbdjohn/kbd.,
+ gather-editfeed-show: Show,
+ gather-editfeed-title: My edit feeds,
+ gather-editfeed-empty: There have been no recent edits to any pages
in this collection.
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 36f420f..f3f48ef 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -76,5 +76,8 @@
apihelp-gather-description: {{doc-apihelp-description|gather}},
apihelp-gather-param-gather: {{doc-apihelp-param|gather|gather}},
apihelp-gather-param-owner: {{doc-apihelp-param|gather|owner}},
- apihelp-gather-example-1: {{doc-apihelp-example|gather}}
+ apihelp-gather-example-1: {{doc-apihelp-example|gather}},
+ gather-editfeed-show: Label for button that toggles list on feed of
edits.,
+ gather-editfeed-title: Title for page that allows you to view edits
inside a collection.,
+ gather-editfeed-empty: Message that shows when no edits have been
made recently to any pages inside a collection.
}
diff --git a/includes/models/CollectionFeed.php
b/includes/models/CollectionFeed.php
new file mode 100644
index 000..f52f37b
--- /dev/null
+++ b/includes/models/CollectionFeed.php
@@ -0,0 +1,206 @@
+?php
+
+/**
+ * Collection.php
+ */
+
+namespace Gather\models;
+
+use \IteratorAggregate;
+use \ArrayIterator;
+use \User;
+use \ApiMain;
+use \FauxRequest;
+use \Title;
+use \ResultWrapper;
+use \Linker;
+use \Sanitizer;
+use \MWTimestamp;
+use \IP;
+use ChangeTags;
+
+/**
+ * A collection with a list of items, which are represented by the
CollectionItem class.
+ */
+class CollectionFeed implements IteratorAggregate {
+ const LIMIT = 50;
+
+ /**
+* The internal collection of items.
+*
+* @var CollectionFeedItem[]
+*/
+ protected $items = array();
+
+ /**
+* Adds a item to the collection.
+*
+* @param CollectionFeedItem $item
+*/
+ public function add( CollectionFeedItem
[MediaWiki-commits] [Gerrit] Update MWLoggerLegacyLogger phpdoc - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update MWLoggerLegacyLogger phpdoc
..
Update MWLoggerLegacyLogger phpdoc
Add a missing @return declaration for MWLoggerLegacyLogger::interpolate
Change-Id: Ia7d35606d63a3da92b1e38284c611de1961a0c8e
---
M includes/debug/logger/legacy/Logger.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/debug/logger/legacy/Logger.php
b/includes/debug/logger/legacy/Logger.php
index c53aeaa..610635d 100644
--- a/includes/debug/logger/legacy/Logger.php
+++ b/includes/debug/logger/legacy/Logger.php
@@ -290,6 +290,7 @@
*
* @param string $message
* @param array $context
+* @return string Interpolated message
*/
public static function interpolate( $message, array $context ) {
if ( strpos( $message, '{' ) !== false ) {
--
To view, visit https://gerrit.wikimedia.org/r/198664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7d35606d63a3da92b1e38284c611de1961a0c8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@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] Update maintenance script CreateMWSHarvest - change (mediawiki...MathSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Update maintenance script CreateMWSHarvest
..
Update maintenance script CreateMWSHarvest
* use new MwsDumpWriter
Change-Id: Iac557fe5b52725f182d59aea94cfdb23e3b0c3db
---
M includes/MwsDumpWriter.php
M maintenance/CreateMWSHarvest.php
2 files changed, 12 insertions(+), 35 deletions(-)
Approvals:
Physikerwelt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MwsDumpWriter.php b/includes/MwsDumpWriter.php
index 5595e15..1595227 100644
--- a/includes/MwsDumpWriter.php
+++ b/includes/MwsDumpWriter.php
@@ -6,7 +6,8 @@
private $XMLFooter;
private $outBuffer = '';
- public function __construct() {
+ public function __construct( $ns = 'mws:' ) {
+ $this-setMwsns( $ns );
$this-InitializeHeader();
}
diff --git a/maintenance/CreateMWSHarvest.php b/maintenance/CreateMWSHarvest.php
index ec30e7e..3c3f794 100644
--- a/maintenance/CreateMWSHarvest.php
+++ b/maintenance/CreateMWSHarvest.php
@@ -28,24 +28,13 @@
*
*/
class CreateMWSHarvest extends IndexBase {
- private static $mwsns = 'mws:';
- private static $XMLHead;
- private static $XMLFooter;
+ /** @var MwsDumpWriter */
+ private $dw;
- /**
-*
-*/
public function __construct() {
parent::__construct();
$this-mDescription = 'Generates harvest files for the
MathWebSearch Daemon.';
$this-addOption( 'mwsns', 'The namespace or mws normally
mws:', false );
- }
-
- public function InitializeHeader() {
- self::$XMLHead =
- ?xml version=\1.0\?\n . self::$mwsns .
- 'harvest xmlns:mws=http://search.mathweb.org/ns;
xmlns:m=http://www.w3.org/1998/Math/MathML;';
- self::$XMLFooter = '/' . self::$mwsns . 'harvest';
}
/**
@@ -54,7 +43,6 @@
* @return string
*/
protected function generateIndexString( $row ) {
- $out = ;
$xml = simplexml_load_string( utf8_decode( $row-math_mathml )
);
if ( !$xml ) {
echo ERROR while converting:\n . var_export(
$row-math_mathml, true ) . \n;
@@ -64,35 +52,23 @@
libxml_clear_errors();
return '';
}
- // if ( $xml-math ) {
- // $smath = $xml-math-semantics- { 'annotation-xml' }
-children()-asXML();
- $out .= \n . self::$mwsns . expr url=\ .
- MathSearchHooks::generateMathAnchorString(
$row-mathindex_revision_id,
- $row-mathindex_anchor, '' ) .
\\n\t;
- $out .= utf8_decode( $row-math_mathml );//
$xml-math-children()-asXML();
- $out .= \n/ . self::$mwsns . expr\n;
- return $out;
- /*} else {
- var_dump($xml);
- die(nomath);
- }*/
-
+ return $this-dw-getMwsExpression(
+ utf8_decode( $row-math_mathml ),
+ $row-mathindex_revision_id,
+ $row-mathindex_anchor );
}
protected function getHead() {
- return self::$XMLHead;
+ return $this-dw-getHead();
}
protected function getFooter() {
- return self::$XMLFooter;
+ return $this-dw-getFooter();
}
- /**
-*
-*/
public function execute() {
- self::$mwsns = $this-getOption( 'mwsns', '' );
- $this-InitializeHeader();
+ $ns = $this-getOption( 'mwsns', '' );
+ $this-dw = new MwsDumpWriter( $ns );
parent::execute();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/200180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac557fe5b52725f182d59aea94cfdb23e3b0c3db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Hcohl hc...@nist.gov
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.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] Wikidata: add phpunit group Purtle - change (integration/config)
JanZerebecki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200187
Change subject: Wikidata: add phpunit group Purtle
..
Wikidata: add phpunit group Purtle
Bug: T94172
Change-Id: If32fbda0437c6a90ea6a934468612e3666c1b478
---
M jjb/wikidata.yaml
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/87/200187/1
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 7955ab0..b874d2f 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -146,7 +146,7 @@
kind: repo-api
repoorclient: 'repo'
dependencies: 'cldr'
-phpunit-params: '--group WikibaseAPI'
+phpunit-params: '--group WikibaseAPI,Purtle'
- 'mwext-Wikibase-{kind}-tests':
ext-name: 'Wikibase'
@@ -180,7 +180,7 @@
repoorclient: 'repo'
experimental: 'true'
dependencies: 'Scribunto,cldr'
-phpunit-params: '--group Wikibase,PropertySuggester'
+phpunit-params: '--group Wikibase,PropertySuggester,Purtle'
- 'mwext-Wikidata-{kind}-tests':
ext-name: 'Wikidata'
@@ -188,7 +188,7 @@
repoorclient: 'repo'
experimental: 'false'
dependencies: 'Scribunto,cldr'
-phpunit-params: '--group Wikibase,PropertySuggester'
+phpunit-params: '--group Wikibase,PropertySuggester,Purtle'
- 'mwext-Wikidata-qunit':
ext-name: 'Wikidata'
--
To view, visit https://gerrit.wikimedia.org/r/200187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If32fbda0437c6a90ea6a934468612e3666c1b478
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace Html::... with self::... in the Html class - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace Html::... with self::... in the Html class
..
Replace Html::... with self::... in the Html class
How cool is that, I can call a patch SelfHTML. ;-)
Change-Id: I17d36bc45a349c92715b88004aaae046d4f7be1c
---
M includes/Html.php
1 file changed, 18 insertions(+), 18 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Html.php b/includes/Html.php
index 6bd661f..4b69885 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -170,7 +170,7 @@
* @return string Raw HTML
*/
public static function linkButton( $contents, $attrs, $modifiers =
array() ) {
- return Html::element( 'a',
+ return self::element( 'a',
self::buttonAttributes( $attrs, $modifiers ),
$contents
);
@@ -192,7 +192,7 @@
public static function submitButton( $contents, $attrs, $modifiers =
array() ) {
$attrs['type'] = 'submit';
$attrs['value'] = $contents;
- return Html::element( 'input', self::buttonAttributes( $attrs,
$modifiers ) );
+ return self::element( 'input', self::buttonAttributes( $attrs,
$modifiers ) );
}
/**
@@ -716,7 +716,7 @@
$attribs['value'] = $value;
$attribs['name'] = $name;
if ( in_array( $type, array( 'text', 'search', 'email',
'password', 'number' ) ) ) {
- $attribs = Html::getTextInputAttributes( $attribs );
+ $attribs = self::getTextInputAttributes( $attribs );
}
return self::element( 'input', $attribs );
}
@@ -819,7 +819,7 @@
} else {
$spacedValue = $value;
}
- return self::element( 'textarea', Html::getTextInputAttributes(
$attribs ), $spacedValue );
+ return self::element( 'textarea', self::getTextInputAttributes(
$attribs ), $spacedValue );
}
/**
@@ -890,7 +890,7 @@
} elseif ( is_int( $nsId ) ) {
$nsName = $wgContLang-convertNamespace( $nsId
);
}
- $optionsHtml[] = Html::element(
+ $optionsHtml[] = self::element(
'option', array(
'disabled' = in_array( $nsId,
$params['disable'] ),
'value' = $nsId,
@@ -909,7 +909,7 @@
$ret = '';
if ( isset( $params['label'] ) ) {
- $ret .= Html::element(
+ $ret .= self::element(
'label', array(
'for' = isset( $selectAttribs['id'] )
? $selectAttribs['id'] : null,
), $params['label']
@@ -917,11 +917,11 @@
}
// Wrap options in a select
- $ret .= Html::openElement( 'select', $selectAttribs )
+ $ret .= self::openElement( 'select', $selectAttribs )
. \n
. implode( \n, $optionsHtml )
. \n
- . Html::closeElement( 'select' );
+ . self::closeElement( 'select' );
return $ret;
}
@@ -962,7 +962,7 @@
$attribs['version'] = $wgHtml5Version;
}
- $html = Html::openElement( 'html', $attribs );
+ $html = self::openElement( 'html', $attribs );
if ( $html ) {
$html .= \n;
@@ -998,25 +998,25 @@
* @return string
*/
static function infoBox( $text, $icon, $alt, $class = '' ) {
- $s = Html::openElement( 'div', array( 'class' = mw-infobox
$class ) );
+ $s = self::openElement( 'div', array( 'class' = mw-infobox
$class ) );
- $s .= Html::openElement( 'div', array( 'class' =
'mw-infobox-left' ) ) .
- Html::element( 'img',
+ $s .= self::openElement( 'div', array( 'class' =
'mw-infobox-left' ) ) .
+ self::element( 'img',
array(
'src' = $icon,
'alt' = $alt,
)
) .
- Html::closeElement( 'div' );
+ self::closeElement( 'div' );
- $s .= Html::openElement( 'div', array( 'class' =
'mw-infobox-right' ) ) .
+ $s .=
[MediaWiki-commits] [Gerrit] build: jenkins now clones to src/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: build: jenkins now clones to src/ .. build: jenkins now clones to src/ Change-Id: If97a26dff1056e7ac1f3776bb5d777416553fd1f --- M build/jenkins/mw-apply-wb-settings.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Aude: Looks good to me, approved Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/build/jenkins/mw-apply-wb-settings.sh b/build/jenkins/mw-apply-wb-settings.sh index f840886..89fde06 100755 --- a/build/jenkins/mw-apply-wb-settings.sh +++ b/build/jenkins/mw-apply-wb-settings.sh @@ -55,7 +55,7 @@ echo define( 'WB_EXPERIMENTAL_FEATURES', $EXPERIMENTAL ); LocalSettings.php } -cd $WORKSPACE +cd $WORKSPACE/src echo '?php' LocalSettings.php -- To view, visit https://gerrit.wikimedia.org/r/200185 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If97a26dff1056e7ac1f3776bb5d777416553fd1f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
