[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Position ULS correctly for rtl languages
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393098 )
Change subject: Position ULS correctly for rtl languages
..
Position ULS correctly for rtl languages
Position after rendering using ULS::onVisible, so we
can be sure everything is in the right place. Doing this
means we can call initialiseUls in the constructor of
UlsWidget, rather than having to call it from
mw.UploadWizardDetails.js
Bug: T179779
Change-Id: I4f8218c67ab4f68f458d2e01a74e68c766af2964
---
M resources/details/uw.DescriptionDetailsWidget.js
M resources/details/uw.DescriptionsDetailsWidget.js
M resources/details/uw.UlsWidget.js
M resources/mw.UploadWizardDetails.js
4 files changed, 15 insertions(+), 43 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/details/uw.DescriptionDetailsWidget.js
b/resources/details/uw.DescriptionDetailsWidget.js
index 9e11b6a..6fcaec4 100644
--- a/resources/details/uw.DescriptionDetailsWidget.js
+++ b/resources/details/uw.DescriptionDetailsWidget.js
@@ -70,21 +70,6 @@
OO.mixinClass( uw.DescriptionDetailsWidget, uw.ValidationMessageElement
);
/**
-* Initialise a ULS for language selection
-*
-* Not called from the constructor because we don't want the ULS to be
in its default position,
-* and in order to know where to re-position to we must wait until the
widgets have been
-* attached to the DOM
-*
-* Called from containing widget (DescriptionsDetailsWidget)
-*/
- uw.DescriptionDetailsWidget.prototype.initialiseUls = function () {
- if ( mw.loader.getState( 'ext.uls.mediawiki' ) === 'ready' ) {
- this.languageSelector.initialiseUls();
- }
- };
-
- /**
* Handle remove button click events.
*
* @private
diff --git a/resources/details/uw.DescriptionsDetailsWidget.js
b/resources/details/uw.DescriptionsDetailsWidget.js
index a62c394..294ba47 100644
--- a/resources/details/uw.DescriptionsDetailsWidget.js
+++ b/resources/details/uw.DescriptionsDetailsWidget.js
@@ -51,20 +51,6 @@
OO.mixinClass( uw.DescriptionsDetailsWidget, OO.ui.mixin.GroupElement );
/**
-* Initialise a ULS for language selection within the
DescriptionDetailsWidget(s)
-*
-* Not called from the constructor because we don't want the ULS to be
in its default position,
-* and in order to know where to re-position to we must wait until the
widgets have been
-* attached to the DOM
-*/
- uw.DescriptionsDetailsWidget.prototype.initialiseUls = function () {
- var i;
- for ( i = 0; i < this.items.length; i++ ) {
- this.items[ i ].initialiseUls();
- }
- };
-
- /**
* Add multiple descriptions in another language.
*
* @param {number} n Number of descriptions
diff --git a/resources/details/uw.UlsWidget.js
b/resources/details/uw.UlsWidget.js
index 4d933ef..bde6a33 100644
--- a/resources/details/uw.UlsWidget.js
+++ b/resources/details/uw.UlsWidget.js
@@ -32,28 +32,30 @@
}
this.languages = config.languages;
+
+ if ( mw.loader.getState( 'ext.uls.mediawiki' ) === 'ready' ) {
+ this.initialiseUls();
+ }
};
- /**
-* Initialise the ULS
-*
-* Not called from the constructor because we don't want the ULS to be
in its default position,
-* and in order to know where to re-position to we must wait until the
widgets have been
-* attached to the DOM
-*
-* Called from containing widget (DescriptionsDetailsWidget)
-*/
uw.UlsWidget.prototype.initialiseUls = function () {
- var ulsWidget = this,
- offset = this.$element.offset();
+ var ulsWidget = this;
this.uls = $( this.$element ).uls( {
onSelect: function ( language ) {
ulsWidget.setValue( language );
ulsWidget.$element.parent().find(
'.oo-ui-inputWidget-input' ).focus();
},
languages: ulsWidget.languages,
- top: offset.top,
- left: offset.left
+ onVisible: function () {
+ // Re-position the ULS *after* the widget has
been rendered, so that we can be
+ // sure it's in the right place
+ var offset = ulsWidget.$element.offset();
+ if ( this.$menu.css( 'direction' ) === 'rtl' ) {
+ offset.left =
+
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1106"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399140 ) Change subject: Revert "db-eqiad.php: Depool db1106" .. Revert "db-eqiad.php: Depool db1106" This reverts commit af2956e906af7db1c25db8668883864a3d4fb951. Change-Id: Ibc1c4bad1d045f21ea4f96d426699d3b0f821d27 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 965cdd8..cf67da4 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -149,7 +149,7 @@ 'db1096:3315' => 1, # A6 3.6TB 512GB, # rc, log: s5 and s6 'db1097:3315' => 1, # D1 3.6TB 512GB, # rc, log: s4 and s5 # 'db1100' => 50, # C2 3.6TB 512GB, old master #api, depool, broken - # 'db1106' => 500, # D3 3.6TB 512GB # T161294 + 'db1106' => 500, # D3 3.6TB 512GB 'db1110' => 500, # C3 3.6TB 512GB ], 's6' => [ -- To view, visit https://gerrit.wikimedia.org/r/399140 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc1c4bad1d045f21ea4f96d426699d3b0f821d27 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Warn on usage of create_function()
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399143 ) Change subject: Warn on usage of create_function() .. Warn on usage of create_function() Closures should be used instead. Bug: T181865 Change-Id: I65c1e117f34fa7c937cf0ac63fb7311702867ccf --- M MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer refs/changes/43/399143/1 diff --git a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php index 21d710c..e3e4045 100644 --- a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php +++ b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php @@ -32,6 +32,7 @@ */ private $functions = [ 'is_integer' => 'is_int', + 'create_function' => false, 'extract' => false, ]; -- To view, visit https://gerrit.wikimedia.org/r/399143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65c1e117f34fa7c937cf0ac63fb7311702867ccf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Forbid usage of extract()
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399142 ) Change subject: Forbid usage of extract() .. Forbid usage of extract() It's evil. Bug: T180398 Change-Id: I9b571008c323943f9820c20b69a786924ff7e397 --- M MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php M MediaWiki/Tests/files/Usage/forbidden_functions_usage.php M MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.expect M MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.fixed 4 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer refs/changes/42/399142/1 diff --git a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php index 1779b2b..21d710c 100644 --- a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php +++ b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php @@ -32,6 +32,7 @@ */ private $functions = [ 'is_integer' => 'is_int', + 'extract' => false, ]; /** diff --git a/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php b/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php index 329ef36..9838220 100644 --- a/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php +++ b/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php @@ -4,3 +4,4 @@ is_integer( 12 ); FooBar::is_integer( 13 ); $this->is_integer( 14 ); +extract( $someArray ); diff --git a/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.expect b/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.expect index 197ddbd..f7ad297 100644 --- a/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.expect +++ b/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.expect @@ -1,3 +1,5 @@ 4 | WARNING | [x] Use is_int() instead of is_integer | | (MediaWiki.Usage.ForbiddenFunctions.is_integer) + 7 | WARNING | [ ] extract should not be used + | | (MediaWiki.Usage.ForbiddenFunctions.extract) PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY diff --git a/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.fixed b/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.fixed index 232ea33..8c1144e 100644 --- a/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.fixed +++ b/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.fixed @@ -4,3 +4,4 @@ is_int( 12 ); FooBar::is_integer( 13 ); $this->is_integer( 14 ); +extract( $someArray ); -- To view, visit https://gerrit.wikimedia.org/r/399142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b571008c323943f9820c20b69a786924ff7e397 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 2e7f6b7
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399141 ) Change subject: Update restbase to 2e7f6b7 .. Update restbase to 2e7f6b7 List of changes: f2c28a3 Parsoid: Add the time_to_live config option to projects Change-Id: Ic35666d229fdf67a81414277b3d2dd71a1b1508f --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index b683cf6..2e7f6b7 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit b683cf6c011fdf5f14622fdf1ed676f75cbfdf3d +Subproject commit 2e7f6b7272dfa7d392e6cfd9d675679c796dd057 -- To view, visit https://gerrit.wikimedia.org/r/399141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic35666d229fdf67a81414277b3d2dd71a1b1508f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 2e7f6b7
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399141 ) Change subject: Update restbase to 2e7f6b7 .. Update restbase to 2e7f6b7 List of changes: f2c28a3 Parsoid: Add the time_to_live config option to projects Change-Id: Ic35666d229fdf67a81414277b3d2dd71a1b1508f --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/41/399141/1 diff --git a/restbase b/restbase index b683cf6..2e7f6b7 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit b683cf6c011fdf5f14622fdf1ed676f75cbfdf3d +Subproject commit 2e7f6b7272dfa7d392e6cfd9d675679c796dd057 -- To view, visit https://gerrit.wikimedia.org/r/399141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic35666d229fdf67a81414277b3d2dd71a1b1508f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1106"
Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/399140 to review the following change. Change subject: Revert "db-eqiad.php: Depool db1106" .. Revert "db-eqiad.php: Depool db1106" This reverts commit af2956e906af7db1c25db8668883864a3d4fb951. Change-Id: Ibc1c4bad1d045f21ea4f96d426699d3b0f821d27 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/40/399140/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 965cdd8..cf67da4 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -149,7 +149,7 @@ 'db1096:3315' => 1, # A6 3.6TB 512GB, # rc, log: s5 and s6 'db1097:3315' => 1, # D1 3.6TB 512GB, # rc, log: s4 and s5 # 'db1100' => 50, # C2 3.6TB 512GB, old master #api, depool, broken - # 'db1106' => 500, # D3 3.6TB 512GB # T161294 + 'db1106' => 500, # D3 3.6TB 512GB 'db1110' => 500, # C3 3.6TB 512GB ], 's6' => [ -- To view, visit https://gerrit.wikimedia.org/r/399140 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc1c4bad1d045f21ea4f96d426699d3b0f821d27 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1106
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399138 ) Change subject: db-eqiad.php: Depool db1106 .. db-eqiad.php: Depool db1106 Going to use it to fix some data drifts Bug: T161294 Change-Id: I9a4b1ce6d80b3cf6453c40f189668661c6cb1204 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index cf67da4..965cdd8 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -149,7 +149,7 @@ 'db1096:3315' => 1, # A6 3.6TB 512GB, # rc, log: s5 and s6 'db1097:3315' => 1, # D1 3.6TB 512GB, # rc, log: s4 and s5 # 'db1100' => 50, # C2 3.6TB 512GB, old master #api, depool, broken - 'db1106' => 500, # D3 3.6TB 512GB + # 'db1106' => 500, # D3 3.6TB 512GB # T161294 'db1110' => 500, # C3 3.6TB 512GB ], 's6' => [ -- To view, visit https://gerrit.wikimedia.org/r/399138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9a4b1ce6d80b3cf6453c40f189668661c6cb1204 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] icons: Flag unused 'quotesAdd' & 'redir...
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399139 )
Change subject: [DEPRECATING CHANGE] icons: Flag unused 'quotesAdd' &
'redirect' as to be removed
..
[DEPRECATING CHANGE] icons: Flag unused 'quotesAdd' & 'redirect' as to be
removed
Change-Id: Ia98ba8532adca79e7cdb215d9443d75036680d47
---
M demos/pages/icons.js
M src/themes/apex/icons-editing-advanced.json
M src/themes/wikimediaui/icons-editing-advanced.json
3 files changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/39/399139/1
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 818dade..bbe18e6 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -133,7 +133,6 @@
'outline',
'puzzle',
'quotes',
- 'quotesAdd',
'searchCaseSensitive',
'searchDiacritics',
'searchRegularExpression',
diff --git a/src/themes/apex/icons-editing-advanced.json
b/src/themes/apex/icons-editing-advanced.json
index 432d7df..55b732b 100644
--- a/src/themes/apex/icons-editing-advanced.json
+++ b/src/themes/apex/icons-editing-advanced.json
@@ -51,11 +51,15 @@
"quotesAdd": { "file": {
"ltr": "images/icons/quotesAdd-ltr.svg",
"rtl": "images/icons/quotesAdd-rtl.svg"
- } },
+ },
+ "deprecated": "This will be removed in v0.26.0."
+ },
"redirect": { "file": {
"ltr": "images/icons/articleRedirect-ltr.svg",
"rtl": "images/icons/articleRedirect-rtl.svg"
- } },
+ },
+ "deprecated": "This will be removed in v0.26.0."
+ },
"searchCaseSensitive": { "file":
"images/icons/case-sensitive.svg" },
"searchDiacritics": { "file": "images/icons/diacritic.svg" },
"searchRegularExpression": { "file":
"images/icons/regular-expression.svg" },
diff --git a/src/themes/wikimediaui/icons-editing-advanced.json
b/src/themes/wikimediaui/icons-editing-advanced.json
index 2bcb097..ec2ab3d 100644
--- a/src/themes/wikimediaui/icons-editing-advanced.json
+++ b/src/themes/wikimediaui/icons-editing-advanced.json
@@ -68,11 +68,15 @@
"quotesAdd": { "file": {
"ltr": "images/icons/quotesAdd-ltr.svg",
"rtl": "images/icons/quotesAdd-rtl.svg"
- } },
+ },
+ "deprecated": "This will be removed in v0.26.0."
+ },
"redirect": { "file": {
"ltr": "images/icons/articleRedirect-ltr.svg",
"rtl": "images/icons/articleRedirect-rtl.svg"
- } },
+ },
+ "deprecated": "This will be removed in v0.26.0."
+ },
"searchCaseSensitive": { "file":
"images/icons/case-sensitive.svg" },
"searchDiacritics": { "file": "images/icons/diacritic.svg" },
"searchRegularExpression": { "file":
"images/icons/regular-expression.svg" },
--
To view, visit https://gerrit.wikimedia.org/r/399139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia98ba8532adca79e7cdb215d9443d75036680d47
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1106
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399138 ) Change subject: db-eqiad.php: Depool db1106 .. db-eqiad.php: Depool db1106 Going to use it to fix some data drifts Bug: T161294 Change-Id: I9a4b1ce6d80b3cf6453c40f189668661c6cb1204 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/38/399138/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index cf67da4..965cdd8 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -149,7 +149,7 @@ 'db1096:3315' => 1, # A6 3.6TB 512GB, # rc, log: s5 and s6 'db1097:3315' => 1, # D1 3.6TB 512GB, # rc, log: s4 and s5 # 'db1100' => 50, # C2 3.6TB 512GB, old master #api, depool, broken - 'db1106' => 500, # D3 3.6TB 512GB + # 'db1106' => 500, # D3 3.6TB 512GB # T161294 'db1110' => 500, # C3 3.6TB 512GB ], 's6' => [ -- To view, visit https://gerrit.wikimedia.org/r/399138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a4b1ce6d80b3cf6453c40f189668661c6cb1204 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: UserProfilePage: Avoid &$this in hooks
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398673 )
Change subject: UserProfilePage: Avoid &$this in hooks
..
UserProfilePage: Avoid &$this in hooks
&$this triggers warnings in PHP 7.1. Simply renaming the variable before
passing it by reference avoids the warning, without breaking backwards
compatibility.
Bug: T153505
Change-Id: Ibb7308623437666f8b3afd2f8e8610f786883b20
---
M UserProfile/UserProfilePage.php
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserProfile/UserProfilePage.php b/UserProfile/UserProfilePage.php
index 61e40fa..3e7fdcb 100644
--- a/UserProfile/UserProfilePage.php
+++ b/UserProfile/UserProfilePage.php
@@ -108,7 +108,10 @@
// Left side
$wgOut->addHTML( '' );
- if ( !Hooks::run( 'UserProfileBeginLeft', array( &$this ) ) ) {
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $userProfilePage = $this;
+
+ if ( !Hooks::run( 'UserProfileBeginLeft', array(
&$userProfilePage ) ) ) {
wfDebug( __METHOD__ . ": UserProfileBeginLeft messed up
profile!\n" );
}
@@ -121,7 +124,7 @@
$wgOut->addHTML( $this->getFanBoxes( $this->user_name ) );
$wgOut->addHTML( $this->getUserStats( $this->user_id,
$this->user_name ) );
- if ( !Hooks::run( 'UserProfileEndLeft', array( &$this ) ) ) {
+ if ( !Hooks::run( 'UserProfileEndLeft', array(
&$userProfilePage ) ) ) {
wfDebug( __METHOD__ . ": UserProfileEndLeft messed up
profile!\n" );
}
@@ -132,7 +135,7 @@
// Right side
$wgOut->addHTML( ''
);
- if ( !Hooks::run( 'UserProfileBeginRight', array( &$this ) ) ) {
+ if ( !Hooks::run( 'UserProfileBeginRight', array(
&$userProfilePage ) ) ) {
wfDebug( __METHOD__ . ": UserProfileBeginRight messed
up profile!\n" );
}
@@ -145,7 +148,7 @@
$wgOut->addHTML( $this->getCasualGames( $this->user_id,
$this->user_name ) );
$wgOut->addHTML( $this->getUserBoard( $this->user_id,
$this->user_name ) );
- if ( !Hooks::run( 'UserProfileEndRight', array( &$this ) ) ) {
+ if ( !Hooks::run( 'UserProfileEndRight', array(
&$userProfilePage ) ) ) {
wfDebug( __METHOD__ . ": UserProfileEndRight messed up
profile!\n" );
}
--
To view, visit https://gerrit.wikimedia.org/r/398673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb7308623437666f8b3afd2f8e8610f786883b20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Lewis Cawte
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RevisionTest: Make @covers tags absolute
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399137 )
Change subject: RevisionTest: Make @covers tags absolute
..
RevisionTest: Make @covers tags absolute
PHPUnit requires @covers tags to be absolute, they cannot depend
upon `use ...` statements.
Change-Id: I92fadc51cc924477d884536b860272b5a230cd36
---
M tests/phpunit/includes/RevisionTest.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/RevisionTest.php
b/tests/phpunit/includes/RevisionTest.php
index f4ad98d..ef55e72 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -166,7 +166,7 @@
/**
* @dataProvider provideConstructFromArrayThrowsExceptions
* @covers Revision::__construct
-* @covers RevisionStore::newMutableRevisionFromArray
+* @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
*/
public function testConstructFromArrayThrowsExceptions( $rowArray,
Exception $expectedException ) {
$this->setExpectedException(
@@ -179,7 +179,7 @@
/**
* @covers Revision::__construct
-* @covers RevisionStore::newMutableRevisionFromArray
+* @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
*/
public function testConstructFromNothing() {
$this->setExpectedException(
@@ -265,7 +265,7 @@
/**
* @dataProvider provideConstructFromRow
* @covers Revision::__construct
-* @covers RevisionStore::newRevisionFromRow
+* @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow
*/
public function testConstructFromRow( array $arrayData, $assertions ) {
$data = 'Hello goat.'; // needs to match model and format
--
To view, visit https://gerrit.wikimedia.org/r/399137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92fadc51cc924477d884536b860272b5a230cd36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GlobalContribs[master]: SpecialGlobalContributions: Avoid &$this in hooks
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398672 ) Change subject: SpecialGlobalContributions: Avoid &$this in hooks .. SpecialGlobalContributions: Avoid &$this in hooks &$this triggers warnings in PHP 7.1. Simply renaming the variable before passing it by reference avoids the warning, without breaking backwards compatibility. Bug: T153505 Change-Id: I11b8f07a90e0ccb7fabe1f99f3bba7c7d83c1437 --- M SpecialGlobalContributions.php 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialGlobalContributions.php b/SpecialGlobalContributions.php index 58139b3..ad0c759 100644 --- a/SpecialGlobalContributions.php +++ b/SpecialGlobalContributions.php @@ -369,7 +369,9 @@ $this->tagFilter ); - Hooks::run( 'ContribsPager::getQueryInfo', array( &$this, &$queryInfo ) ); + // Avoid PHP 7.1 warning of passing $this by reference + $globalContribsPager = $this; + Hooks::run( 'ContribsPager::getQueryInfo', array( &$globalContribsPager, &$queryInfo ) ); return $queryInfo; } -- To view, visit https://gerrit.wikimedia.org/r/398672 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I11b8f07a90e0ccb7fabe1f99f3bba7c7d83c1437 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalContribs Gerrit-Branch: master Gerrit-Owner: Rafidaslam Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RevisionTest: Make @covers tags absolute
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399137 )
Change subject: RevisionTest: Make @covers tags absolute
..
RevisionTest: Make @covers tags absolute
PHPUnit requires @covers tags to be absolute, they cannot depend
upon `use ...` statements.
Change-Id: I92fadc51cc924477d884536b860272b5a230cd36
---
M tests/phpunit/includes/RevisionTest.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/37/399137/1
diff --git a/tests/phpunit/includes/RevisionTest.php
b/tests/phpunit/includes/RevisionTest.php
index f4ad98d..ef55e72 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -166,7 +166,7 @@
/**
* @dataProvider provideConstructFromArrayThrowsExceptions
* @covers Revision::__construct
-* @covers RevisionStore::newMutableRevisionFromArray
+* @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
*/
public function testConstructFromArrayThrowsExceptions( $rowArray,
Exception $expectedException ) {
$this->setExpectedException(
@@ -179,7 +179,7 @@
/**
* @covers Revision::__construct
-* @covers RevisionStore::newMutableRevisionFromArray
+* @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
*/
public function testConstructFromNothing() {
$this->setExpectedException(
@@ -265,7 +265,7 @@
/**
* @dataProvider provideConstructFromRow
* @covers Revision::__construct
-* @covers RevisionStore::newRevisionFromRow
+* @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow
*/
public function testConstructFromRow( array $arrayData, $assertions ) {
$data = 'Hello goat.'; // needs to match model and format
--
To view, visit https://gerrit.wikimedia.org/r/399137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92fadc51cc924477d884536b860272b5a230cd36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Unify SVG markup
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399136 ) Change subject: Unify SVG markup .. Unify SVG markup Align SVG markup across Foundation products by: - unifying XML declaration, - removing unnecessary `standalone="no"` attribute as it's default, - removing all SVG editor metadata, - removing unnecessary `g` group elements, - putting attributes on `path`, - removing unnecessary ids and - unifying whitespace. Saving up to 13% file size before gzipping. Bug: T178867 Change-Id: Ice5aebb17143c64b3e77c28000e9902b45dc3ff8 --- M resources/ext.TwoColConflict.helpDialog/slide1-ltr.svg M resources/ext.TwoColConflict.helpDialog/slide1-rtl.svg M resources/ext.TwoColConflict.helpDialog/slide2-ltr.svg M resources/ext.TwoColConflict.helpDialog/slide2-rtl.svg M resources/ext.TwoColConflict.helpDialog/slide3-ltr.svg M resources/ext.TwoColConflict.helpDialog/slide3-rtl.svg M resources/ext.TwoColConflict.helpDialog/slide4-ltr.svg M resources/ext.TwoColConflict.helpDialog/slide4-rtl.svg M resources/ext.TwoColConflict.helpDialog/slide5-ltr.svg M resources/ext.TwoColConflict.helpDialog/slide5-rtl.svg 10 files changed, 518 insertions(+), 1,610 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict refs/changes/36/399136/1 -- To view, visit https://gerrit.wikimedia.org/r/399136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice5aebb17143c64b3e77c28000e9902b45dc3ff8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwoColConflict Gerrit-Branch: master Gerrit-Owner: VolkerE ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Update rangy lib to 1.3.0
Santhosh has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399135 ) Change subject: Update rangy lib to 1.3.0 .. Update rangy lib to 1.3.0 Change-Id: I9ad4758e9f4ecde84bdb2afc2ba9bf5492141495 --- M lib/rangy/rangy-core.js 1 file changed, 3,493 insertions(+), 2,872 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/35/399135/1 -- To view, visit https://gerrit.wikimedia.org/r/399135 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ad4758e9f4ecde84bdb2afc2ba9bf5492141495 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Santhosh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Replace assertRaises with assertRaisesRegex in isbn_tests.py
Ryan10145 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399134 ) Change subject: Replace assertRaises with assertRaisesRegex in isbn_tests.py .. Replace assertRaises with assertRaisesRegex in isbn_tests.py assertRaises is not as good of a test as asserRaisesRegex. The latter has an extra parameter to match the exception message, allowing more more precision when checking an error. Bug: T154281 Change-Id: I0386fd012d6b92dfa776cc8e55bfff265af40e2e --- M tests/isbn_tests.py 1 file changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/34/399134/1 diff --git a/tests/isbn_tests.py b/tests/isbn_tests.py index df00417..bc31b0e 100644 --- a/tests/isbn_tests.py +++ b/tests/isbn_tests.py @@ -39,6 +39,8 @@ """Test CosmeticChanges ISBN fix.""" +ISBN_DIGITERROR_RE = 'The ISBN [0-9]+ is not [0-9]+ digits long.' + def test_valid_isbn(self): """Test ISBN.""" cc = CosmeticChangesToolkit(self.site, namespace=0) @@ -54,17 +56,17 @@ cc = CosmeticChangesToolkit(self.site, namespace=0) # Invalid characters -self.assertRaises(AnyIsbnValidationException, - cc.fix_ISBN, 'ISBN 0975229LOL') +self.assertRaisesRegex(AnyIsbnValidationException, + self.ISBN_DIGITERROR_RE, cc.fix_ISBN, 'ISBN 0975229LOL') # Invalid checksum -self.assertRaises(AnyIsbnValidationException, - cc.fix_ISBN, 'ISBN 0975229801') +self.assertRaisesRegex(AnyIsbnValidationException, + 'The ISBN checksum of [0-9]+ is incorrect.', cc.fix_ISBN, 'ISBN 0975229801') # Invalid length -self.assertRaises(AnyIsbnValidationException, - cc.fix_ISBN, 'ISBN 09752298') +self.assertRaisesRegex(AnyIsbnValidationException, + self.ISBN_DIGITERROR_RE, cc.fix_ISBN, 'ISBN 09752298') # X in the middle -self.assertRaises(AnyIsbnValidationException, - cc.fix_ISBN, 'ISBN 09752X9801') +self.assertRaisesRegex(AnyIsbnValidationException, + 'The ISBN [0-9a-zA-Z]+ contains invalid characters.', cc.fix_ISBN, 'ISBN 09752X9801') def test_ignore_invalid_isbn(self): """Test fixing ISBN numbers with an invalid ISBN.""" -- To view, visit https://gerrit.wikimedia.org/r/399134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0386fd012d6b92dfa776cc8e55bfff265af40e2e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ryan10145 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RelatedArticles[master]: Unify SVG markup
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399133 ) Change subject: Unify SVG markup .. Unify SVG markup Align SVG markup across Foundation products by - unifying XML declaration, - removing `enable-background` as it's deprecated and - unifying whitespace. Bug: T178867 Change-Id: I32972de815484fa89bd7cdacbbcd65f4663a4161 --- M resources/ext.relatedArticles.cards/noimage.svg 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles refs/changes/33/399133/1 diff --git a/resources/ext.relatedArticles.cards/noimage.svg b/resources/ext.relatedArticles.cards/noimage.svg index d48d9cd..bc4f53c 100644 --- a/resources/ext.relatedArticles.cards/noimage.svg +++ b/resources/ext.relatedArticles.cards/noimage.svg @@ -1,5 +1,5 @@ - -http://www.w3.org/2000/svg"; viewBox="0 0 56 56" enable-background="new 0 0 56 56"> - - + +http://www.w3.org/2000/svg"; viewBox="0 0 56 56"> + + -- To view, visit https://gerrit.wikimedia.org/r/399133 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32972de815484fa89bd7cdacbbcd65f4663a4161 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RelatedArticles Gerrit-Branch: master Gerrit-Owner: VolkerE ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RevisionTest: Revision::constructFromRowArray is not a function
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399132 )
Change subject: RevisionTest: Revision::constructFromRowArray is not a function
..
RevisionTest: Revision::constructFromRowArray is not a function
I'm guessing that RevisionStore::newMutableRevisionFromArray() is
what is supposed to be tested here, since Revision::__construct()
calls that if it gets an array.
Change-Id: Ia6c2e7eb667aa746a12ce74aad62e58d2468defd
---
M tests/phpunit/includes/RevisionTest.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/RevisionTest.php
b/tests/phpunit/includes/RevisionTest.php
index b7f1a47d..f4ad98d 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -57,7 +57,7 @@
/**
* @dataProvider provideConstructFromArray
* @covers Revision::__construct
-* @covers Revision::constructFromRowArray
+* @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
*/
public function testConstructFromArray( $rowArray ) {
$rev = new Revision( $rowArray, 0, $this->getMockTitle() );
@@ -68,7 +68,7 @@
/**
* @covers Revision::__construct
-* @covers Revision::constructFromRowArray
+* @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
*/
public function testConstructFromEmptyArray() {
$rev = new Revision( [], 0, $this->getMockTitle() );
@@ -106,7 +106,7 @@
/**
* @dataProvider provideConstructFromArray_userSetAsExpected
* @covers Revision::__construct
-* @covers Revision::constructFromRowArray
+* @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
*
* @param array $rowArray
* @param mixed $expectedUserId null to expect the current wgUser ID
--
To view, visit https://gerrit.wikimedia.org/r/399132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6c2e7eb667aa746a12ce74aad62e58d2468defd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RevisionTest: Revision::constructFromRowArray is not a function
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399132 )
Change subject: RevisionTest: Revision::constructFromRowArray is not a function
..
RevisionTest: Revision::constructFromRowArray is not a function
I'm guessing that RevisionStore::newMutableRevisionFromArray() is
what is supposed to be tested here, since Revision::__construct()
calls that if it gets an array.
Change-Id: Ia6c2e7eb667aa746a12ce74aad62e58d2468defd
---
M tests/phpunit/includes/RevisionTest.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/32/399132/1
diff --git a/tests/phpunit/includes/RevisionTest.php
b/tests/phpunit/includes/RevisionTest.php
index b7f1a47d..f4ad98d 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -57,7 +57,7 @@
/**
* @dataProvider provideConstructFromArray
* @covers Revision::__construct
-* @covers Revision::constructFromRowArray
+* @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
*/
public function testConstructFromArray( $rowArray ) {
$rev = new Revision( $rowArray, 0, $this->getMockTitle() );
@@ -68,7 +68,7 @@
/**
* @covers Revision::__construct
-* @covers Revision::constructFromRowArray
+* @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
*/
public function testConstructFromEmptyArray() {
$rev = new Revision( [], 0, $this->getMockTitle() );
@@ -106,7 +106,7 @@
/**
* @dataProvider provideConstructFromArray_userSetAsExpected
* @covers Revision::__construct
-* @covers Revision::constructFromRowArray
+* @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
*
* @param array $rowArray
* @param mixed $expectedUserId null to expect the current wgUser ID
--
To view, visit https://gerrit.wikimedia.org/r/399132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6c2e7eb667aa746a12ce74aad62e58d2468defd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Remove Ruby browser tests
Mattflaschen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399131 ) Change subject: Remove Ruby browser tests .. Remove Ruby browser tests The continuous integration infrastructure for these is being removed (or never existed), and our team decided not to invest the time to convert them to node.js. Bug: T171848 Change-Id: I0faeecb2635f24c40c83aa689b670e69aa381431 --- D tests/browser/README.md D tests/browser/ci.yml D tests/browser/environments.yml D tests/browser/features/no_javascript.feature D tests/browser/features/notifications.feature D tests/browser/features/step_definition/badge_steps.rb D tests/browser/features/step_definition/no_javascript.rb D tests/browser/features/step_definition/notifications_steps.rb D tests/browser/features/step_definition/popup_steps.rb D tests/browser/features/support/components/notifications.rb D tests/browser/features/support/data_manager.rb D tests/browser/features/support/echo_api_helper.rb D tests/browser/features/support/echo_pageobject_extension.rb D tests/browser/features/support/env.rb D tests/browser/features/support/hooks.rb D tests/browser/features/support/pages/article_page.rb D tests/browser/features/support/pages/special_notifications_page.rb 17 files changed, 0 insertions(+), 311 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/31/399131/1 diff --git a/tests/browser/README.md b/tests/browser/README.md deleted file mode 100644 index 3631949..000 --- a/tests/browser/README.md +++ /dev/null @@ -1 +0,0 @@ -Please see https://github.com/wikimedia/mediawiki-selenium for instructions on how to run tests. diff --git a/tests/browser/ci.yml b/tests/browser/ci.yml deleted file mode 100644 index c2eca93..000 --- a/tests/browser/ci.yml +++ /dev/null @@ -1,9 +0,0 @@ -BROWSER: - - chrome - - firefox - -MEDIAWIKI_ENVIRONMENT: - - beta - -PLATFORM: - - Linux diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml deleted file mode 100644 index c32e21b..000 --- a/tests/browser/environments.yml +++ /dev/null @@ -1,48 +0,0 @@ -# Customize this configuration as necessary to provide defaults for various -# test environments. -# -# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT -# environment variable. -# -# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host -# bundle exec cucumber -# -# Additional variables set by the environment will override the corresponding -# defaults defined here. -# -# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host -# export MEDIAWIKI_USER=Selenium_user2 -# bundle exec cucumber -# -mw-vagrant-host: &default - user_factory: true - mediawiki_url: http://127.0.0.1:8080/wiki/ - -mw-vagrant-guest: - user_factory: true - mediawiki_url: http://127.0.0.1/wiki/ - -local: - mediawiki_user: Admin - mediawiki_password: vagrant - mediawiki_user_b: Selenium Echo user 2 - mediawiki_url: http://dev.wiki.local.wmftest.net:8080/wiki/ - -beta: - mediawiki_url: https://en.wikipedia.beta.wmflabs.org/wiki/ - mediawiki_user: Selenium_user - mediawiki_user_b: Selenium Echo user 2 - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -test2: - mediawiki_url: https://test2.wikipedia.org/wiki/ - mediawiki_user: Selenium_user - mediawiki_user_b: Selenium Echo user 2 - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -integration: - browser: chrome - user_factory: true - # mediawiki_url: THIS WILL BE SET BY JENKINS - -default: *default diff --git a/tests/browser/features/no_javascript.feature b/tests/browser/features/no_javascript.feature deleted file mode 100644 index a8b318e..000 --- a/tests/browser/features/no_javascript.feature +++ /dev/null @@ -1,11 +0,0 @@ -@chrome @en.wikipedia.beta.wmflabs.org @firefox @localhost @vagrant -Feature: Basic features for no-js functionality - - Background: -Given I am using a nojs browser - - Scenario: Clicking alerts badge goes to Special:Notifications -Given I am logged in -When I click the alert badge -And I wait for the page to load -Then I am on Special Notifications page diff --git a/tests/browser/features/notifications.feature b/tests/browser/features/notifications.feature deleted file mode 100644 index 3d443a7..000 --- a/tests/browser/features/notifications.feature +++ /dev/null @@ -1,22 +0,0 @@ -@chrome @en.wikipedia.beta.wmflabs.org @firefox @localhost @vagrant -Feature: Testing notification types - - Background: -Given I am logged in -And all my notifications are read - - Scenario: Someone mentions me -Given another user mentions me -When I refresh the page -Then the alert badge is showing unseen notifications -And the alert badge value is "Alert (1)" - - @skip - Scenario: Someone writes on my talk page -Given another user writes on my talk page -When I refresh the page -Then the alert badge is showing unseen notifications -And t
[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Remove Ruby browser tests
Mattflaschen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399130 ) Change subject: Remove Ruby browser tests .. Remove Ruby browser tests The continuous integration infrastructure for these is being removed (or never existed), and our team decided not to invest the time to convert them to node.js. Bug: T174589 Change-Id: I77b060a16a484ef65518d3924a8ee1c3ccaf1f23 --- D tests/browser/ci.yml D tests/browser/environments.yml D tests/browser/features/page_triage.feature D tests/browser/features/step_definitions/page_triage_steps.rb D tests/browser/features/support/env.rb D tests/browser/features/support/pages/page_triage_page.rb 6 files changed, 0 insertions(+), 138 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage refs/changes/30/399130/1 diff --git a/tests/browser/ci.yml b/tests/browser/ci.yml deleted file mode 100644 index c2eca93..000 --- a/tests/browser/ci.yml +++ /dev/null @@ -1,9 +0,0 @@ -BROWSER: - - chrome - - firefox - -MEDIAWIKI_ENVIRONMENT: - - beta - -PLATFORM: - - Linux diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml deleted file mode 100644 index 8740e5d..000 --- a/tests/browser/environments.yml +++ /dev/null @@ -1,39 +0,0 @@ -# Customize this configuration as necessary to provide defaults for various -# test environments. -# -# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT -# environment variable. -# -# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host -# bundle exec cucumber -# -# Additional variables set by the environment will override the corresponding -# defaults defined here. -# -# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host -# export MEDIAWIKI_USER=Selenium_user2 -# bundle exec cucumber -# -mw-vagrant-host: &default - user_factory: true - mediawiki_url: http://127.0.0.1:8080/wiki/ - -mw-vagrant-guest: - user_factory: true - mediawiki_url: http://127.0.0.1/wiki/ - -beta: - mediawiki_url: https://en.wikipedia.beta.wmflabs.org/wiki/ - mediawiki_user: Selenium_user - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -test2: - mediawiki_url: https://test2.wikipedia.org/wiki/ - mediawiki_user: Selenium_user - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -integration: - user_factory: true - # mediawiki_url: THIS WILL BE SET BY JENKINS - -default: *default diff --git a/tests/browser/features/page_triage.feature b/tests/browser/features/page_triage.feature deleted file mode 100644 index cf06f71..000 --- a/tests/browser/features/page_triage.feature +++ /dev/null @@ -1,18 +0,0 @@ -@chrome @en.wikipedia.beta.wmflabs.org @firefox @internet_explorer_8 @internet_explorer_9 @internet_explorer_10 @phantomjs @test2.wikipedia.org -Feature: PageTriage - - @internet_explorer_6 @internet_explorer_7 - Scenario: Check that NewPagesFeed has correct controls for anonymous user -Given I am at the NewPagesFeed page -Then I should see a Learn more link - And I should see a Leave feedback link - And I should see a status icon for a new article - And I should not see a Review button - - # https://phabricator.wikimedia.org/T45598 @internet_explorer_6 @internet_explorer_7 - Scenario: Check set filters selection -Given I am at the NewPagesFeed page -When I click Set filters -Then I should be able to set many checkboxes for filtering new pages - And I should see namespace selectbox - And I should see Username text field diff --git a/tests/browser/features/step_definitions/page_triage_steps.rb b/tests/browser/features/step_definitions/page_triage_steps.rb deleted file mode 100644 index a76ac15..000 --- a/tests/browser/features/step_definitions/page_triage_steps.rb +++ /dev/null @@ -1,46 +0,0 @@ -Given(/^I am at the NewPagesFeed page$/) do - visit PageTriagePage -end - -When(/^I click Set filters$/) do - on(PageTriagePage).set_filters_element.when_present.click -end - -Then(/^I should see a Learn more link$/) do - expect(on(PageTriagePage).learn_more_element.when_present).to exist -end - -Then(/^I should be able to set many checkboxes for filtering new pages$/) do - on(PageTriagePage) do |page| -page.select_blocked -page.select_bots -page.check_deletion -page.select_new_editors -page.select_no_categories -page.select_orphan -page.check_redirects -page.check_reviewed_pages -page.check_unreviewed_pages -page.select_user_selected - end -end - -Then(/^I should see a Leave feedback link$/) do - expect(on(PageTriagePage).leave_feedback_element.when_present).to exist -end - -Then(/^I should see a status icon for a new article$/) do - expect(on(PageTriagePage).status_element.when_present).to exist -end - -Then(/^I should not see a Review button$/) do - expect(on(PageTriagePage).review_element).not_to exist -end - -Then(/^I should see namespace selectbox$/) do - expect(on(PageTriagePage).namesp
[MediaWiki-commits] [Gerrit] mediawiki...WikiLove[master]: Remove Ruby browser tests
Mattflaschen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399129 ) Change subject: Remove Ruby browser tests .. Remove Ruby browser tests The continuous integration infrastructure for these is being removed (or never existed), and our team decided not to invest the time to convert them to node.js Bug: T174593 Change-Id: Ie9127c9a92bc3f978578db054bd05ac9477aa850 --- D tests/browser/README.md D tests/browser/ci.yml D tests/browser/environments.yml D tests/browser/features/step_definitions/wikilove_steps.rb D tests/browser/features/support/env.rb D tests/browser/features/support/pages/wikilove_page.rb D tests/browser/features/wikilove.feature 7 files changed, 0 insertions(+), 163 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLove refs/changes/29/399129/1 diff --git a/tests/browser/README.md b/tests/browser/README.md deleted file mode 100644 index 3631949..000 --- a/tests/browser/README.md +++ /dev/null @@ -1 +0,0 @@ -Please see https://github.com/wikimedia/mediawiki-selenium for instructions on how to run tests. diff --git a/tests/browser/ci.yml b/tests/browser/ci.yml deleted file mode 100644 index 8c9865e..000 --- a/tests/browser/ci.yml +++ /dev/null @@ -1,8 +0,0 @@ -BROWSER: - - firefox - -MEDIAWIKI_ENVIRONMENT: - - beta - -PLATFORM: - - Linux diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml deleted file mode 100644 index 8740e5d..000 --- a/tests/browser/environments.yml +++ /dev/null @@ -1,39 +0,0 @@ -# Customize this configuration as necessary to provide defaults for various -# test environments. -# -# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT -# environment variable. -# -# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host -# bundle exec cucumber -# -# Additional variables set by the environment will override the corresponding -# defaults defined here. -# -# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host -# export MEDIAWIKI_USER=Selenium_user2 -# bundle exec cucumber -# -mw-vagrant-host: &default - user_factory: true - mediawiki_url: http://127.0.0.1:8080/wiki/ - -mw-vagrant-guest: - user_factory: true - mediawiki_url: http://127.0.0.1/wiki/ - -beta: - mediawiki_url: https://en.wikipedia.beta.wmflabs.org/wiki/ - mediawiki_user: Selenium_user - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -test2: - mediawiki_url: https://test2.wikipedia.org/wiki/ - mediawiki_user: Selenium_user - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -integration: - user_factory: true - # mediawiki_url: THIS WILL BE SET BY JENKINS - -default: *default diff --git a/tests/browser/features/step_definitions/wikilove_steps.rb b/tests/browser/features/step_definitions/wikilove_steps.rb deleted file mode 100644 index 19c4996..000 --- a/tests/browser/features/step_definitions/wikilove_steps.rb +++ /dev/null @@ -1,54 +0,0 @@ -# -# This file is subject to the license terms in the COPYING file found in the -# WikiLove top-level directory and at -# https://phabricator.wikimedia.org/diffusion/EWLO/browse/master/COPYING. No part of -# WikiLove, including this file, may be copied, modified, propagated, or -# distributed except according to the terms contained in the COPYING file. -# -# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the -# WikiLove top-level directory and at -# https://phabricator.wikimedia.org/diffusion/EWLO/browse/master/CREDITS -# -When(/^I click Barnstars$/) do - on(WikilovePage).barnstars_element.click -end - -When(/^I click Food and drink$/) do - on(WikilovePage).food_and_drink_element.click -end - -When(/^I click Kittens$/) do - on(WikilovePage).kittens_element.click -end - -When(/^I click Wikilove$/) do - on(WikilovePage).heart_element.click -end - -When(/^I visit the User page of Selenium_user2$/) do - visit WikilovePage -end - -Then(/^I should be able to select an image$/) do - on(WikilovePage).kitten_image_element.when_visible.click -end - -Then(/^I should see the Food and drink selectbox$/) do - expect(on(WikilovePage).food_drink_select_element).to be_visible -end - -Then(/^I should see the header text field containing (.+)$/) do |wikilove_message| - expect(on(WikilovePage).food_header).to match Regexp.escape(wikilove_message) -end - -Then(/^I should see the barnstars selectbox$/) do - expect(on(WikilovePage).barnstar_select_element).to be_visible -end - -Then(/^I should see the message text field$/) do - expect(on(WikilovePage).wikilove_message_element).to be_visible -end - -Then(/^Wikilove window appears$/) do - expect(on(WikilovePage).wikilove_window_element).to be_visible -end diff --git a/tests/browser/features/support/env.rb b/tests/browser/features/support/env.rb deleted file mode 100644 index c1072b2..000 --- a/tests/browser/features/support/env.rb +++ /dev/null @@ -1,3 +0,0 @@ -require 'mediawiki_selenium/cucumber' -require '
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Linter: Suppress false positives for multiline-table-in-list
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398418 )
Change subject: Linter: Suppress false positives for multiline-table-in-list
..
Linter: Suppress false positives for multiline-table-in-list
* Content of ref tags end up in the references section which
happen to be rendered as an ordered list.
* So, the logic that looks for tables embedded in lists should
ignore instances when that list happens to be the references list.
* Added a new mocha test to verify this expectation.
* Verified on itwiki:Padova
Change-Id: If633fc34584bde6a7f13ba903a563026fd304272
---
M lib/wt2html/pp/handlers/linter.js
M tests/mocha/linter.js
2 files changed, 14 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Arlolra: Looks good to me, approved
diff --git a/lib/wt2html/pp/handlers/linter.js
b/lib/wt2html/pp/handlers/linter.js
index ffa1079..517b2ad 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -789,10 +789,19 @@
detectMultipleUnclosedFormattingTags(lints);
}
+function hasListAncestor(node) {
+ while (node && node.nodeName !== 'LI') {
+ node = node.parentNode;
+ }
+
+ // If the list item comes from references content, ignore it
+ return node &&
!(/mw:Extension\/references/.test(node.parentNode.getAttribute('typeof')));
+}
+
function logPHPParserBug(env, node, dp, tplInfo) {
if (!DU.isLiteralHTMLNode(node) ||
node.nodeName !== 'TABLE' ||
- !DU.hasAncestorOfName(node, 'LI') ||
+ !hasListAncestor(node) ||
!/\n/.test(node.outerHTML)
) {
return;
diff --git a/tests/mocha/linter.js b/tests/mocha/linter.js
index 69f02ad..9ee19f5 100644
--- a/tests/mocha/linter.js
+++ b/tests/mocha/linter.js
@@ -852,9 +852,12 @@
result[0].params.should.have.a.property("ancestorName", "li");
});
});
- it('should not detect single-line HTML tables in lists
(2)', function() {
+ it('should not detect single-line HTML tables in
lists', function() {
return expectEmptyResults("*
x");
});
+ it('should not detect multiline HTML tables in ref
tags', function() {
+ return expectEmptyResults("a
\nb\n ");
+ });
});
});
});
--
To view, visit https://gerrit.wikimedia.org/r/398418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If633fc34584bde6a7f13ba903a563026fd304272
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Sbailey
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Use the INDEX_NAME constant in all the places.
Jonathanischoice has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399128 )
Change subject: Use the INDEX_NAME constant in all the places.
..
Use the INDEX_NAME constant in all the places.
Change-Id: I044e88f6e7e8f8f6dedd87bd0e147dfce3a5c0d2
---
M maintenance/checkIndexes.php
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/28/399128/1
diff --git a/maintenance/checkIndexes.php b/maintenance/checkIndexes.php
index f59f45e..81923f1 100644
--- a/maintenance/checkIndexes.php
+++ b/maintenance/checkIndexes.php
@@ -3,6 +3,7 @@
namespace CirrusSearch;
use CirrusSearch\Maintenance\Maintenance;
+use CirrusSearch\Maintenance\MetaStoreIndex;
/**
* Check that all Cirrus indexes report OK.
@@ -95,10 +96,10 @@
}
private function checkMetastore( array $aliases ) {
- $this->in( 'mw_cirrus_metastore' );
- if ( isset( $aliases[ 'mw_cirrus_metastore' ] ) ) {
- $this->check( 'alias count', 1, count( $aliases[
'mw_cirrus_metastore' ] ) );
- foreach ( $aliases[ 'mw_cirrus_metastore'] as
$indexName ) {
+ $this->in( MetaStoreIndex::INDEX_NAME );
+ if ( isset( $aliases[ MetaStoreIndex::INDEX_NAME ] ) ) {
+ $this->check( 'alias count', 1, count( $aliases[
MetaStoreIndex::INDEX_NAME ] ) );
+ foreach ( $aliases[ MetaStoreIndex::INDEX_NAME ] as
$indexName ) {
$this->checkIndex( $indexName, 1 );
}
} else {
@@ -243,7 +244,7 @@
$query = new \Elastica\Query();
$query->setSize( 5000 );
$res = $this->getConnection()
- ->getIndex( 'mw_cirrus_metastore' )
+ ->getIndex( MetaStoreIndex::INDEX_NAME )
->getType( 'version' )
->search( $query );
$this->cirrusInfo = [];
--
To view, visit https://gerrit.wikimedia.org/r/399128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I044e88f6e7e8f8f6dedd87bd0e147dfce3a5c0d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Jonathanischoice
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: History.md: Correct entries for old special releases
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399114 ) Change subject: History.md: Correct entries for old special releases .. History.md: Correct entries for old special releases OOjs UI versions v0.12.8.1 and v0.17.10 were additional, unscheduled releases to fix major problems in the preceding release. It appears we never updated the release notes in master after making them. https://gerrit.wikimedia.org/r/#/q/status:merged+project:oojs/ui+branch:v0.12.8 https://gerrit.wikimedia.org/r/#/q/status:merged+project:oojs/ui+branch:v0.17.10 * v0.17.10: Add release notes and remove duplicates from v0.18.0. * v0.12.8.1: Remove duplicates from v0.12.9. Change-Id: I3d3a31a129b36865649987b62ae0a6afba0c0603 --- M History.md 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/History.md b/History.md index c9f9787..da0f089 100644 --- a/History.md +++ b/History.md @@ -975,8 +975,6 @@ * ButtonGroupWidget: Change `cursor` on `.oo-ui-buttonElement-active` (Volker E) * CapsuleItemWidget: Make interactivity of label clearer (Volker E) * ComboBoxInputWidget: Align to design specification (Volker E) -* FieldsetLayout: Styling fixes for `` labels (Bartosz Dziewoński) -* FieldsetLayout: Work around positioning problems in Firefox (Bartosz Dziewoński) * PopupToolGroup: Fix border colour (Ed Sanders) * MessageDialog: Improve `-actions` buttons by resetting `border-radius` (Volker E) * SelectFileWidget: Don't show action-indicating cursor on empty state (Volker E) @@ -1021,6 +1019,10 @@ * build: Remove upstreamed rules and fix documentation (Ed Sanders) * build: Update eslint-config-wikimedia to v0.2.0 (Ed Sanders) +## v0.17.10 / 2016-10-03 (special release) +### Styles +* FieldsetLayout: Styling fixes for `` labels (Bartosz Dziewoński) +* FieldsetLayout: Work around positioning problems in Firefox (Bartosz Dziewoński) ## v0.17.9 / 2016-09-13 ### Features @@ -1807,9 +1809,8 @@ * Widget: Fix docs for disable event (Ed Sanders) * docs: Remove excess empty lines in comments (Bartosz Dziewoński) * docs: Add quotes around PROJECT_BRIEF setting (Timo Tijhof) -* Update version requirement for mediawiki/at-ease: 1.0.0 → 1.1.0 (Ori Livneh) -## v0.12.8.1 / 2015-09-18 special release +## v0.12.8.1 / 2015-09-18 (special release) ### Code * build: Update version requirement for mediawiki/at-ease: 1.0.0 → 1.1.0 (Ori Livneh) -- To view, visit https://gerrit.wikimedia.org/r/399114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d3a31a129b36865649987b62ae0a6afba0c0603 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: uranium: remove mapped v6, add decom comment
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399127 )
Change subject: uranium: remove mapped v6, add decom comment
..
uranium: remove mapped v6, add decom comment
Bug: T183209
Change-Id: I67ee59110277179561a9c9ee53f047cf4f46e243
---
M manifests/site.pp
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 79082b1..7a86568 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2232,10 +2232,9 @@
interface::add_ip6_mapped { 'main': }
}
-# ex-Ganglia Web UI - to be decomed
+# ex-Ganglia Web UI - ready for decom (T183209)
node 'uranium.wikimedia.org' {
role(spare::system)
-interface::add_ip6_mapped { 'main': }
}
node /^labvirt100[0-9].eqiad.wmnet/ {
--
To view, visit https://gerrit.wikimedia.org/r/399127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67ee59110277179561a9c9ee53f047cf4f46e243
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: uranium: remove mapped v6, add decom comment
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399127 )
Change subject: uranium: remove mapped v6, add decom comment
..
uranium: remove mapped v6, add decom comment
Bug: T183209
Change-Id: I67ee59110277179561a9c9ee53f047cf4f46e243
---
M manifests/site.pp
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/399127/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 79082b1..7a86568 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2232,10 +2232,9 @@
interface::add_ip6_mapped { 'main': }
}
-# ex-Ganglia Web UI - to be decomed
+# ex-Ganglia Web UI - ready for decom (T183209)
node 'uranium.wikimedia.org' {
role(spare::system)
-interface::add_ip6_mapped { 'main': }
}
node /^labvirt100[0-9].eqiad.wmnet/ {
--
To view, visit https://gerrit.wikimedia.org/r/399127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67ee59110277179561a9c9ee53f047cf4f46e243
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...source[master]: JsonRefine - Be nicer about what type coercions we will accept
Ottomata has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399126 )
Change subject: JsonRefine - Be nicer about what type coercions we will accept
..
JsonRefine - Be nicer about what type coercions we will accept
This modifies the merge function to use
HiveTypeCoercion.findTightestCommonTypeOfTwo
to determine if an incoming type will cause an insertion error later on.
We don't attempt to modify the existing schema type at all, but just use
the fact that Spark has some ability to do things like cast ints to floats.
In the case that the repeat types are compatible, we choose the existing
(Hive table) schema type.
Later, when reading a JSON DataFrame using schema with fields chosen
as described, Spark will do type coercion for records with conflicting
types. For the case of reading a decimal number into an integer number,
Spark will resolve this by nullifying all fields of the incoming record.
(Why it doesn't just nullify the one conflicting field, I don't know.)
This at least lets a given partition refinement succeed even if it has
some records that might conflict. I believe Spark 2 will give us greater
flexibility with read mode options that might be smarter than
just nullifying records out.
Future work: Collect and write out stats about nullified / converted records.
Bug: T182000
Change-Id: I611420faa34a65ff1295c8092576f14c456a3b58
---
M
refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkJsonToHive.scala
M
refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkSQLHiveExtensions.scala
2 files changed, 100 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source
refs/changes/26/399126/1
diff --git
a/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkJsonToHive.scala
b/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkJsonToHive.scala
index 8369104..96849de 100644
---
a/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkJsonToHive.scala
+++
b/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkJsonToHive.scala
@@ -203,6 +203,9 @@
* @param schema Optional schema to use for reading data. If
not given,
* Spark's JSON reading logic will infer the
schema by passing over
* all data and examining fields in each record.
+ * Providing a schema will also set the
"DROPMALFORMED" read mode,
+ * Causing any records in the input path that
don't match the schema
+ * to have all fields converted to NULLs.
*
* @return
*/
@@ -215,7 +218,7 @@
// If we have a schema, then use it to read JSON data,
// else just infer schemas while reading.
val dfReader = if (schema.isDefined) {
-sqlContext.read.schema(schema.get)
+sqlContext.read.schema(schema.get).option("mode", "DROPMALFORMED")
}
else {
sqlContext.read
diff --git
a/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkSQLHiveExtensions.scala
b/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkSQLHiveExtensions.scala
index 1ef1ece..49a6db6 100644
---
a/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkSQLHiveExtensions.scala
+++
b/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkSQLHiveExtensions.scala
@@ -1,6 +1,11 @@
package org.wikimedia.analytics.refinery.core
+import org.apache.log4j.LogManager
+
import org.apache.spark.sql.types._
+import org.apache.spark.sql.catalyst.analysis.HiveTypeCoercion
+
+
/**
@@ -23,6 +28,28 @@
* hiveContext.sql(hiveAlterStatement)
*/
object SparkSQLHiveExtensions {
+private val log = LogManager.getLogger("SparkSQLHiveExtensions")
+
+// Usage:
+// p(instance)('privateMethod)(arg1, arg2, arg3)
+class PrivateMethodCaller(x: AnyRef, methodName: String) {
+def apply(_args: Any*): Any = {
+val args = _args.map(_.asInstanceOf[AnyRef])
+def _parents: Stream[Class[_]] = Stream(x.getClass) #:::
_parents.map(_.getSuperclass)
+val parents = _parents.takeWhile(_ != null).toList
+val methods = parents.flatMap(_.getDeclaredMethods)
+val method = methods.find(_.getName == methodName).getOrElse(throw
new IllegalArgumentException("Method " + methodName + " not found"))
+method.setAccessible(true)
+method.invoke(x, args : _*)
+}
+}
+
+class PrivateMethodExposer(x: AnyRef) {
+def apply(method: scala.Symbol): PrivateMethodCaller = new
PrivateMethodCaller(x, method.name)
+}
+
+def p(x: AnyRef): PrivateMethodExposer = new PrivateMethodExposer(x)
+
/**
* Implicit m
[MediaWiki-commits] [Gerrit] operations/dns[master]: remove uranium.wikimedia.org, v4 + v6
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399125 ) Change subject: remove uranium.wikimedia.org, v4 + v6 .. remove uranium.wikimedia.org, v4 + v6 Bug: T183209 Change-Id: I483d9b5fb3fd4abdd9d61d891623f9343724498f --- M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/154.80.208.in-addr.arpa M templates/wikimedia.org 3 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/25/399125/1 diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index b9a8051..9a24f7f 100644 --- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -27,8 +27,6 @@ 7.1.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR contint1001.wikimedia.org. -3.5.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR uranium.wikimedia.org. - 4.1.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR fermium.wikimedia.org. 0.5.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR hydrogen.wikimedia.org. 1.2.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR lists.wikimedia.org.; service IP for lists on fermium diff --git a/templates/154.80.208.in-addr.arpa b/templates/154.80.208.in-addr.arpa index b9804a4..bc0cb9d 100644 --- a/templates/154.80.208.in-addr.arpa +++ b/templates/154.80.208.in-addr.arpa @@ -47,7 +47,6 @@ 49 1H IN PTR actinium.wikimedia.org. 50 1H IN PTR hydrogen.wikimedia.org. 52 1H IN PTR rhenium.wikimedia.org. -53 1H IN PTR uranium.wikimedia.org. 55 1H IN PTR lvs1001.wikimedia.org. 56 1H IN PTR lvs1002.wikimedia.org. 57 1H IN PTR lvs1003.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 365f37a..08f1129 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -270,8 +270,6 @@ tegmen 1H IN 2620:0:860:3:208:80:153:74 tellurium 1H IN A208.80.155.9 ununpentium 1H IN A208.80.154.19 ; VM on ganeti01.svc.eqiad.wmnet -uranium 1H IN A208.80.154.53 -uranium 1H IN 2620:0:861:1:208:80:154:53 ; Service aliases -- To view, visit https://gerrit.wikimedia.org/r/399125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I483d9b5fb3fd4abdd9d61d891623f9343724498f Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: remove ganglia.wikimedia.org
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399124 ) Change subject: remove ganglia.wikimedia.org .. remove ganglia.wikimedia.org The ganglia-web host, uranium, already uses just role spare::system and the webserver is removed. Bug: T177225 Change-Id: I9aad381d22d26ddd54ee87f783662e696f0823fa --- M templates/wikimedia.org 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/24/399124/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index ce481f1..365f37a 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -759,7 +759,6 @@ download 600 IN DYNA geoip!text-addrs etherpad 600 IN DYNA geoip!misc-addrs fundraising 1H IN CNAMEfundraising-eqiad -ganglia 1H IN CNAMEuranium hue 600 IN DYNA geoip!misc-addrs iegreview600 IN DYNA geoip!misc-addrs tendril 5M IN CNAMEdbmonitor1001 -- To view, visit https://gerrit.wikimedia.org/r/399124 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9aad381d22d26ddd54ee87f783662e696f0823fa Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rm role/manifests/ganglia/config
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399121 )
Change subject: rm role/manifests/ganglia/config
..
rm role/manifests/ganglia/config
One last remnant to delete ganglia roles and stop
using ganglia_aggregator config.
Bug: T177225
Change-Id: I62c7aec1d306259ff878213e5f804f062edce90d
---
D modules/role/manifests/ganglia/config.pp
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/role/manifests/ganglia/config.pp
b/modules/role/manifests/ganglia/config.pp
deleted file mode 100644
index 6724a2b..000
--- a/modules/role/manifests/ganglia/config.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-class role::ganglia::config {
-# TODO: hiera this
-$rra_sizes = '"RRA:AVERAGE:0.5:1:360" "RRA:AVERAGE:0.5:24:245"
"RRA:AVERAGE:0.5:168:241" "RRA:AVERAGE:0.5:672:241" "RRA:AVERAGE:0.5:5760:371"'
-$data_sources = ganglia_aggregator_config()
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/399121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62c7aec1d306259ff878213e5f804f062edce90d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Nightly server: let MW releasers manage Jenkins
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399123 ) Change subject: Nightly server: let MW releasers manage Jenkins .. Nightly server: let MW releasers manage Jenkins Change-Id: Ibb01d135b131e976f6f18437fe38f92f10a2afd1 --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/23/399123/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index ba638a1..1de6812 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -97,6 +97,8 @@ gid: 711 description: people who upload mediawiki releases members: [catrope, demon, hashar, legoktm, reedy, thcipriani] +priviledges: ['ALL = (jenkins) NOPASSWD: ALL', + 'ALL = NOPASSWD: /usr/bin/service jenkins *'] releasers-mobile: gid: 712 description: people who upload mobile app releases -- To view, visit https://gerrit.wikimedia.org/r/399123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb01d135b131e976f6f18437fe38f92f10a2afd1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Fix Contributions ORES preference and form override
Petar.petkovic has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399122 )
Change subject: Fix Contributions ORES preference and form override
..
Fix Contributions ORES preference and form override
- If form is submitted: filter is enabled if the parameter is set,
disabled otherwise.
- If Contributions page is opened regularly: filter is enabled if
the parameter is set or the preference is enabled, disabled otherwise.
Bug: T182911
Change-Id: I837540e3dcbcc42e7ded8345469c4770e58d8f55
---
M includes/Hooks/ContributionsHooksHandler.php
1 file changed, 15 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES
refs/changes/22/399122/1
diff --git a/includes/Hooks/ContributionsHooksHandler.php
b/includes/Hooks/ContributionsHooksHandler.php
index 01b2c8e..338108c 100644
--- a/includes/Hooks/ContributionsHooksHandler.php
+++ b/includes/Hooks/ContributionsHooksHandler.php
@@ -141,21 +141,28 @@
}
/**
-* Get user preference for hiding non-damaging edits, either by:
-* - URL parameter 'hidenondamaging' or
-* - User preference 'oresRCHideNonDamaging'
+* Get user preference for hiding non-damaging edits.
+* - If form is submitted: filter is enabled if the hidenondamaging is
set, disabled otherwise.
+* - If Contributions page is opened regularly: filter is enabled if
the parameter is set or
+* the preference is enabled, disabled otherwise.
*
* @param IContextSource $context
-* @return string|boolean $option URL string param or boolean user
preference
+* @return boolean True if non damaging preference should be enabled
*/
private static function hideNonDamagingPreference( IContextSource
$context ) {
- $option = $context->getRequest()->getVal( 'hidenondamaging' );
+ $checkbox = $context->getRequest()->getBool( 'hidenondamaging'
);
+ $preference = $context->getUser()->getOption(
'oresRCHideNonDamaging' );
- if ( $option === null ) {
- $option = $context->getUser()->getOption(
'oresRCHideNonDamaging' );
+ // Unchecked options aren't submitted with HTML form, so we
have hidenondamaging=1 or null.
+ // To distinguish when form on Special:Contributions is
submitted, we check for
+ // hidden parameter on the Special:Contributions form, with
name 'limit'.
+ // Watchlist special page defines similar hidden input field,
called 'action'
+ // which is used in the same fashion as we are using 'limit'
here.
+ if ( $context->getRequest()->getBool( 'limit' ) ) {
+ return $checkbox;
}
- return $option;
+ return $preference || $checkbox;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/399122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I837540e3dcbcc42e7ded8345469c4770e58d8f55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rm role/manifests/ganglia/config
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399121 )
Change subject: rm role/manifests/ganglia/config
..
rm role/manifests/ganglia/config
One last remnant to delete ganglia roles.
Bug:T177225
Change-Id: I62c7aec1d306259ff878213e5f804f062edce90d
---
D modules/role/manifests/ganglia/config.pp
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/399121/1
diff --git a/modules/role/manifests/ganglia/config.pp
b/modules/role/manifests/ganglia/config.pp
deleted file mode 100644
index 6724a2b..000
--- a/modules/role/manifests/ganglia/config.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-class role::ganglia::config {
-# TODO: hiera this
-$rra_sizes = '"RRA:AVERAGE:0.5:1:360" "RRA:AVERAGE:0.5:24:245"
"RRA:AVERAGE:0.5:168:241" "RRA:AVERAGE:0.5:672:241" "RRA:AVERAGE:0.5:5760:371"'
-$data_sources = ganglia_aggregator_config()
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/399121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62c7aec1d306259ff878213e5f804f062edce90d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: remove ganglia_aggregators settings from hiera
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399120 ) Change subject: remove ganglia_aggregators settings from hiera .. remove ganglia_aggregators settings from hiera Bug: T177225 Change-Id: I0f397081294a5afe190ff67c464fcca702bb3f87 --- M hieradata/codfw.yaml M hieradata/eqiad.yaml M hieradata/esams.yaml M hieradata/ulsfo.yaml 4 files changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/20/399120/1 diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml index ecd8356..e902c67 100644 --- a/hieradata/codfw.yaml +++ b/hieradata/codfw.yaml @@ -18,8 +18,6 @@ - '10.192.48.79:11211:1 "shard17"' - '10.192.48.80:11211:1 "shard18"' -ganglia_aggregators: install2002.wikimedia.org:10649 - # Cloud Services < # labs_puppet_master: "labtestpuppetmaster2001.wikimedia.org" diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml index ba309c3..ed1db08 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -21,11 +21,6 @@ - '10.64.48.157:11211:1 "shard17"' - '10.64.48.158:11211:1 "shard18"' -# -# Ganglia -# -ganglia_aggregators: install1002.wikimedia.org:9649 - # Eventlogging eventlogging_host: 10.64.32.167 # eventlog1001 diff --git a/hieradata/esams.yaml b/hieradata/esams.yaml index e5b2fb9..cfc50b4 100644 --- a/hieradata/esams.yaml +++ b/hieradata/esams.yaml @@ -1,4 +1,3 @@ -ganglia_aggregators: bast3002.wikimedia.org:11649 prometheus_nodes: - bast3002.wikimedia.org diff --git a/hieradata/ulsfo.yaml b/hieradata/ulsfo.yaml index d2fbf5d..791878b 100644 --- a/hieradata/ulsfo.yaml +++ b/hieradata/ulsfo.yaml @@ -1,4 +1,3 @@ -ganglia_aggregators: bast4001.wikimedia.org:12649 prometheus_nodes: - bast4001.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/399120 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f397081294a5afe190ff67c464fcca702bb3f87 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: network::constants: drop uranium from monitoring hosts
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399119 ) Change subject: network::constants: drop uranium from monitoring hosts .. network::constants: drop uranium from monitoring hosts uranium (formerly-ganglia-web) is not a monitoring host anymore and just using role spare::system already Bug: T177225 Change-Id: Ie2c76a4e5de501818cbf014941972a51ec90af81 --- M modules/network/manifests/constants.pp 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/19/399119/1 diff --git a/modules/network/manifests/constants.pp b/modules/network/manifests/constants.pp index 02d88ed..4be6e71 100644 --- a/modules/network/manifests/constants.pp +++ b/modules/network/manifests/constants.pp @@ -52,8 +52,6 @@ '2620:0:861:3:208:80:154:82', # dbmonitor1001.wikimedia.org '208.80.153.52',# dbmonitor2001.wikimedia.org '2620:0:860:2:208:80:153:52', # dbmonitor2001.wikimedia.org -'208.80.154.53',# uranium.wikimedia.org (ganglia, gmetad needs it) -'2620:0:861:1:208:80:154:53', # uranium.wikimedia.org ], 'deployment_hosts' => [ '10.64.0.196', # tin.eqiad.wmnet -- To view, visit https://gerrit.wikimedia.org/r/399119 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2c76a4e5de501818cbf014941972a51ec90af81 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganglia: delete ganglia-web classes and role
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382932 )
Change subject: ganglia: delete ganglia-web classes and role
..
ganglia: delete ganglia-web classes and role
These are not used anymore now since uranium
(former ganglia-web) uses role::spare.
Bug: T177225
Change-Id: Ic0b0958cc1bb5966e56cee7198b17d8a8d573ae6
---
D modules/ganglia/manifests/web.pp
D modules/role/manifests/ganglia/views.pp
D modules/role/manifests/ganglia/web.pp
3 files changed, 0 insertions(+), 197 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/ganglia/manifests/web.pp b/modules/ganglia/manifests/web.pp
deleted file mode 100644
index 0cfa8ad..000
--- a/modules/ganglia/manifests/web.pp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Class for the ganglia frontend machine
-class ganglia::web(
-$rrdcached_socket,
-$gmetad_root,
-$ensure='present',
-) {
-include ::apache
-include ::apache::mod::php5
-include ::apache::mod::ssl
-include ::apache::mod::rewrite
-include ::apache::mod::headers
-include ::apache::mod::authnz_ldap
-include ::passwords::ldap::production
-
-$ganglia_servername = 'ganglia.wikimedia.org'
-$ganglia_serveralias = 'uranium.wikimedia.org'
-$ganglia_webdir = '/usr/share/ganglia-webfrontend'
-$ganglia_ssl_cert = '/etc/acme/cert/ganglia.crt'
-$ganglia_ssl_chain = '/etc/acme/cert/ganglia.chain.crt'
-$ganglia_ssl_key = '/etc/acme/key/ganglia.key'
-$ssl_settings = ssl_ciphersuite('apache', 'mid', true)
-# Apache's docroot. Used for populating robots.txt
-$doc_root = '/var/www'
-
-package { [ 'php5-gd',
-'php5-mysql',
-'rrdtool',
-'librrds-perl',
-'ganglia-webfrontend',
-]:
-ensure => $ensure,
-}
-
-$proxypass = $passwords::ldap::production::proxypass
-
-apache::site { $ganglia_servername:
-content => template("ganglia/${ganglia_servername}.erb"),
-}
-
-file { '/var/cache/ganglia':
-ensure => ensure_directory($ensure),
-owner => 'www-data',
-group => 'www-data',
-mode => '0755',
-}
-
-file { '/etc/ganglia-webfrontend/conf.php':
-ensure => $ensure,
-mode=> '0444',
-owner => 'root',
-group => 'root',
-content => template('ganglia/conf_production.php.erb'),
-require => Package['ganglia-webfrontend'],
-}
-
-file { "${doc_root}/robots.txt":
-ensure => $ensure,
-mode=> '0444',
-owner => 'root',
-group => 'root',
-source => 'puppet:///modules/ganglia/robots.txt',
-require => Package['ganglia-webfrontend'],
-}
-
-# Increase the default memory limit
-file_line { 'php.ini-memory':
-line => 'memory_limit = 768M',
-match => '^memory_limit\s*=',
-path => '/etc/php5/apache2/php.ini',
-notify => Class['::apache'],
-}
-file_line { 'php.ini-opcache':
-line => 'opcache.enable=1',
-path => '/etc/php5/apache2/php.ini',
-notify => Class['::apache'],
-}
-
-# clean up after ganglia T97637
-tidy { 'cleanup_tmp_ganglia_graph':
-path=> '/tmp',
-age => '1w',
-recurse => true,
-matches => ['ganglia-graph*'],
-type=> 'mtime',
-}
-
-file { "${ganglia_webdir}/templates/default/user_header.tpl":
-ensure => $ensure,
-mode=> '0444',
-owner => 'root',
-group => 'root',
-source => 'puppet:///modules/ganglia/user_header.tpl',
-require => Package['ganglia-webfrontend'],
-}
-}
diff --git a/modules/role/manifests/ganglia/views.pp
b/modules/role/manifests/ganglia/views.pp
deleted file mode 100644
index 02068d6..000
--- a/modules/role/manifests/ganglia/views.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::ganglia::views {
-include ganglia::views::dns
-}
diff --git a/modules/role/manifests/ganglia/web.pp
b/modules/role/manifests/ganglia/web.pp
deleted file mode 100644
index f262e89..000
--- a/modules/role/manifests/ganglia/web.pp
+++ /dev/null
@@ -1,99 +0,0 @@
-# A role that includes all the needed stuff to run a ganglia web frontend
-class role::ganglia::web {
-include ::profile::base::firewall
-include ::standard
-include role::ganglia::config
-include role::ganglia::views
-
-letsencrypt::cert::integrated { 'ganglia':
-subjects => 'ganglia.wikimedia.org',
-puppet_svc => 'apache2',
-system_svc => 'apache2',
-require=> Class['apache::mod::ssl']
-}
-
-monitoring::service { 'https':
-description => 'HTTPS',
-check_command => 'check_ssl_http_letsencrypt!ganglia.wikimedia.org',
-}
-
-$gmetad_root
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Use backticks in HISTORY.md
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399118 ) Change subject: Use backticks in HISTORY.md .. Use backticks in HISTORY.md Text within double underscores is otherwise rendered as bold. Change-Id: I0a18e7018f2c8b6032f8f80d85c1e0872ae592de --- M HISTORY.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.md b/HISTORY.md index e45b592..4088663 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -163,7 +163,7 @@ * Add IfElseStructureSniff to handle else structures (TasneemLo) * Handle multiple # comments in Space Before Comment (TasneemLo) * Sniff to check assignment in while & if (TasneemLo) -* Sniff to warn when using dirname(__FILE__) (TasneemLo) +* Sniff to warn when using `dirname(__FILE__)` (TasneemLo) ## 0.4.0 / 2015-09-26 ## * Use upstream codesniffer 2.3.4 (Kunal Mehta & Paladox) -- To view, visit https://gerrit.wikimedia.org/r/399118 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a18e7018f2c8b6032f8f80d85c1e0872ae592de Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: Ricordisamoa Gerrit-Reviewer: Addshore Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: standard: actually drop 'has_ganglia' param entirely
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/382926 ) Change subject: standard: actually drop 'has_ganglia' param entirely .. standard: actually drop 'has_ganglia' param entirely After Idcafe53ffde5e3000f6 has been merged for more than 30 minutes we can assume ganglia decom _really_ happened on all (even before that there was nothing in Ganglia web UI anymore). Now we can just drop the parameter and inclusion in standard entirely and cleanup all the Hiera lines that were added during global decom. Bug: T177225 Change-Id: I5c57620b998e2b262f13c97274a1ccb2b74c67f7 --- D hieradata/hosts/bast3002.yaml D hieradata/hosts/bast4001.yaml D hieradata/hosts/bast4002.yaml D hieradata/hosts/db2011.yaml M hieradata/hosts/db2023.yaml M hieradata/hosts/db2028.yaml M hieradata/hosts/db2029.yaml D hieradata/hosts/dbstore1001.yaml D hieradata/hosts/dbstore1002.yaml M hieradata/hosts/dbstore2001.yaml M hieradata/hosts/dbstore2002.yaml M hieradata/hosts/eventlog1001.yaml D hieradata/hosts/labsdb1004.yaml D hieradata/hosts/labsdb1006.yaml D hieradata/hosts/labsdb1007.yaml D hieradata/hosts/pc1004.yaml D hieradata/hosts/pc1005.yaml D hieradata/hosts/pc1006.yaml D hieradata/hosts/pc2004.yaml D hieradata/hosts/pc2005.yaml D hieradata/hosts/pc2006.yaml M hieradata/hosts/puppetmaster1001.yaml M hieradata/hosts/puppetmaster1002.yaml M hieradata/hosts/puppetmaster2001.yaml M hieradata/hosts/puppetmaster2002.yaml M hieradata/hosts/rhodium.yaml M hieradata/hosts/uranium.yaml M hieradata/labs.yaml M hieradata/regex.yaml M hieradata/role/common/analytics_cluster/coordinator.yaml D hieradata/role/common/analytics_cluster/hadoop/client.yaml M hieradata/role/common/analytics_cluster/hadoop/master.yaml M hieradata/role/common/analytics_cluster/hadoop/standby.yaml M hieradata/role/common/analytics_cluster/hadoop/worker.yaml M hieradata/role/common/aqs.yaml D hieradata/role/common/archiva.yaml D hieradata/role/common/authdns/server.yaml M hieradata/role/common/backup.yaml D hieradata/role/common/backup/offsite.yaml M hieradata/role/common/bastionhost/general.yaml D hieradata/role/common/bastionhost/twofa.yaml M hieradata/role/common/builder.yaml M hieradata/role/common/cache/canary.yaml M hieradata/role/common/cache/misc.yaml M hieradata/role/common/cache/text.yaml M hieradata/role/common/cache/upload.yaml M hieradata/role/common/ci/master.yaml M hieradata/role/common/cluster/management.yaml M hieradata/role/common/configcluster.yaml D hieradata/role/common/debug_proxy.yaml M hieradata/role/common/deployment_server.yaml D hieradata/role/common/dmarc.yaml M hieradata/role/common/dnsrecursor.yaml M hieradata/role/common/docker/registry.yaml M hieradata/role/common/druid/analytics/worker.yaml M hieradata/role/common/druid/public/worker.yaml D hieradata/role/common/dumps/generation/server/fallback.yaml D hieradata/role/common/dumps/generation/server/primary.yaml M hieradata/role/common/dumps/generation/worker/dumper.yaml M hieradata/role/common/dumps/generation/worker/dumper_misc.yaml M hieradata/role/common/dumps/generation/worker/testbed.yaml D hieradata/role/common/dumps/public/server.yaml M hieradata/role/common/dumps/web/htmldumps.yaml D hieradata/role/common/dumps/web/xmldumps_active.yaml D hieradata/role/common/dumps/web/xmldumps_fallback.yaml M hieradata/role/common/elasticsearch/cirrus.yaml M hieradata/role/common/elasticsearch/relforge.yaml M hieradata/role/common/etcd/kubernetes.yaml M hieradata/role/common/etcd/networking.yaml D hieradata/role/common/etherpad.yaml D hieradata/role/common/failoid.yaml M hieradata/role/common/ganeti.yaml M hieradata/role/common/gerrit.yaml M hieradata/role/common/graphite/production.yaml D hieradata/role/common/icinga.yaml M hieradata/role/common/installserver/dhcp.yaml M hieradata/role/common/jobqueue_redis/master.yaml M hieradata/role/common/jobqueue_redis/slave.yaml M hieradata/role/common/kafka/analytics/broker.yaml M hieradata/role/common/kafka/jumbo/broker.yaml D hieradata/role/common/kafka/main/broker.yaml M hieradata/role/common/kubernetes/master.yaml M hieradata/role/common/kubernetes/staging/etcd.yaml M hieradata/role/common/kubernetes/staging/master.yaml M hieradata/role/common/kubernetes/staging/worker.yaml M hieradata/role/common/kubernetes/worker.yaml D hieradata/role/common/labs/db/master.yaml M hieradata/role/common/labs/db/replica.yaml M hieradata/role/common/lists.yaml M hieradata/role/common/logging/kafkatee/webrequest/ops.yaml M hieradata/role/common/logstash/collector.yaml M hieradata/role/common/logstash/elasticsearch.yaml M hieradata/role/common/lvs/balancer.yaml M hieradata/role/common/mail/mx.yaml M hieradata/role/common/maps/master.yaml M hieradata/role/common/maps/slave.yaml M hieradata/role/common/maps/test/master.yaml M hieradata/role/common/maps/test/slave.yaml M hieradata/role/common/maps/test/vectortiles_master.yaml M hieradata/role/common/mariadb/labs_deprecate
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Use backticks in HISTORY.md
Ricordisamoa has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399118 ) Change subject: Use backticks in HISTORY.md .. Use backticks in HISTORY.md Text within double underscores is otherwise rendered as bold. Change-Id: I0a18e7018f2c8b6032f8f80d85c1e0872ae592de --- M HISTORY.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer refs/changes/18/399118/1 diff --git a/HISTORY.md b/HISTORY.md index e45b592..4088663 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -163,7 +163,7 @@ * Add IfElseStructureSniff to handle else structures (TasneemLo) * Handle multiple # comments in Space Before Comment (TasneemLo) * Sniff to check assignment in while & if (TasneemLo) -* Sniff to warn when using dirname(__FILE__) (TasneemLo) +* Sniff to warn when using `dirname(__FILE__)` (TasneemLo) ## 0.4.0 / 2015-09-26 ## * Use upstream codesniffer 2.3.4 (Kunal Mehta & Paladox) -- To view, visit https://gerrit.wikimedia.org/r/399118 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a18e7018f2c8b6032f8f80d85c1e0872ae592de Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: Ricordisamoa ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: All kinds of pylint and other style fixes
Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399117 )
Change subject: All kinds of pylint and other style fixes
..
All kinds of pylint and other style fixes
Change-Id: If368d6a1cff9b282ad9059569708935bfd384aab
---
M scap/plugins/clean.py
M scap/plugins/prep.py
M scap/plugins/updateinterwikicache.py
M scap/plugins/updatewikiversions.py
D scap/plugins/wmf-beta-autoupdate.py
5 files changed, 23 insertions(+), 78 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/17/399117/1
diff --git a/scap/plugins/clean.py b/scap/plugins/clean.py
index 520814a..fd4b59e 100644
--- a/scap/plugins/clean.py
+++ b/scap/plugins/clean.py
@@ -1,9 +1,5 @@
# -*- coding: utf-8 -*-
-"""
-scap.plugins.clean
-~~
-For cleaning up old MediaWiki
-"""
+"""For cleaning up old MediaWiki."""
import os
import subprocess
@@ -49,13 +45,13 @@
@cli.command('clean')
class Clean(main.AbstractSync):
-""" Scap sub-command to clean old branches """
+"""Scap sub-command to clean old branches."""
@cli.argument('branch', help='The name of the branch to clean.')
@cli.argument('--delete', action='store_true',
help='Delete everything (not just static assets).')
def main(self, *extra_args):
-""" Clean old branches from the cluster for space savings! """
+"""Clean old branches from the cluster for space savings."""
self.arguments.message = 'Pruned MediaWiki: %s' % self.arguments.branch
if not self.arguments.delete:
self.arguments.message += ' [keeping static files]'
@@ -70,7 +66,7 @@
def cleanup_branch(self, branch, delete):
"""
-Given a branch, go through the cleanup proccess on the master:
+Given a branch, go through the cleanup proccess on the master.
(1) Prune git branches [if deletion]
(2) Remove l10nupdate cache
diff --git a/scap/plugins/prep.py b/scap/plugins/prep.py
index 513b3e4..043a7ae 100644
--- a/scap/plugins/prep.py
+++ b/scap/plugins/prep.py
@@ -1,9 +1,5 @@
# -*- coding: utf-8 -*-
-"""
-scap.plugins.prep
-~
-Scap plugin for setting up a new version of MediaWiki for deployment
-"""
+"""Scap plugin for setting up a new version of MediaWiki for deployment."""
import argparse
import multiprocessing
import os
@@ -19,16 +15,16 @@
def version_parser(ver):
-"""Validation our version number formats"""
+"""Validate our version number formats."""
try:
-return re.match("(\d+\.\d+(\.\d+-)?wmf\.?\d+|master)", ver).group(0)
-except:
+return re.match(r"(1\.\d\d\.\d+-wmf\.\d+|master)", ver).group(0)
+except re.error:
raise argparse.ArgumentTypeError(
"Branch '%s' does not match required format" % ver)
def update_update_strategy(path):
-"""For all submodules, update the merge strategy"""
+"""For all submodules, update the merge strategy."""
with utils.cd(path):
base_cmd = '/usr/bin/git -C %s config ' % path
base_cmd += 'submodule.$name.update rebase'
@@ -37,7 +33,7 @@
def write_settings_stub(dest, include):
-"""Write a silly little PHP file that includes another"""
+"""Write a silly little PHP file that includes another."""
file_stub = (
'https://gerrit.wikimedia.org/r/399117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If368d6a1cff9b282ad9059569708935bfd384aab
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Replace PEAR with Packagist in README.md link
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398945 ) Change subject: Replace PEAR with Packagist in README.md link .. Replace PEAR with Packagist in README.md link Compare with commit 83b4ab6bb9720393185bdfa691d4448a9ed759c6 which made installation instructions use Composer. Change-Id: Ie77281e69371fe45d927cb9f877d507e11903c0c --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index 3f370c2..0be5bc9 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,6 @@ * Migrate the old code-utils/check-vars.php --- -[0]: https://pear.php.net/package/PHP_CodeSniffer +[0]: https://packagist.org/packages/squizlabs/php_codesniffer [1]: https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP [2]: https://www.mediawiki.org/wiki/Continuous_integration/Entry_points#PHP -- To view, visit https://gerrit.wikimedia.org/r/398945 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie77281e69371fe45d927cb9f877d507e11903c0c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: Ricordisamoa Gerrit-Reviewer: Addshore Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Ricordisamoa Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove unfinished/broken branch plugin
Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399116 )
Change subject: Remove unfinished/broken branch plugin
..
Remove unfinished/broken branch plugin
Change-Id: I9e9f638cae0e9b216e943f7278103da02a2d586e
---
D scap/plugins/branch.notpy
D scap/plugins/iter.py
2 files changed, 0 insertions(+), 164 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/16/399116/1
diff --git a/scap/plugins/branch.notpy b/scap/plugins/branch.notpy
deleted file mode 100644
index 300e1db..000
--- a/scap/plugins/branch.notpy
+++ /dev/null
@@ -1,95 +0,0 @@
-import json
-import sh
-
-import scap.cli as cli
-import scap.terminal as terminal
-import scap.utils as utils
-import scap.plugins.gerrit as gerrit
-
-from scap.plugins.iter import SubdirectoryIterator
-
-
-git = sh.git
-
-with open('./multiversion/submodules.json') as f:
-submodules = json.load(f)
-
-
-@cli.command('branch', subcommands=True)
-class WmfBranch(cli.Application):
-"""
-Manage wmf/ branches
-"""
-
-def project_branches(self, project, pattern='wmf/.*'):
-"""
-get a mapping of { branch: sha1 } for all branches matching the regex
-`pattern` in a given gerrit `project`
-"""
-branches = gerrit.ProjectBranches(project)
-return {branch.ref[11:]: branch.revision for (branch) in
-branches.get(params={'r': pattern})}
-
-@cli.argument('project', help='Gerrit project name')
-@cli.subcommand('list')
-def list(self, extra_args):
-""" List wmf branches in project, sorted by version """
-project_branches = self.project_branches(self.arguments.project)
-sorted_branches = sorted(project_branches)
-sorted_branches = [{key: project_branches[key]} for key in
- sorted_branches]
-gerrit.dump_json(sorted_branches)
-
-@cli.argument('-o', '--old', default='master')
-@cli.argument('-n', '--new', required=True)
-@cli.subcommand('foreach')
-def foreach(self, extra_args):
-term = terminal.term
-# paths = [m for m in git.list_submodules()]
-paths = sorted(submodules.items())
-
-old = self.arguments.old
-branch = self.arguments.new
-branch_dir = "php-" + branch
-
-def checkout_submodule(path, data):
-action = data.get('action')
-ref = data.get('ref', '.')
-if (ref == '.'):
-ref = old
-
-repo = '../' + path
-project = "mediawiki/" + path
-
-if action == "checkout-latest":
-# get /projects/$path/branches/?m=$ref
-branches = self.project_branches(project, pattern=ref)
-branches = sorted(branches)
-ref = branches[-1]
-try:
-git('submodule', 'add', '--branch', ref, repo, path)
-except:
-utils.mkdir_p(path)
-elif action == 'branch':
-oldbranch = gerrit.ProjectBranch(project, ref)
-rev = oldbranch.get()
-branch_api = gerrit.ProjectBranches(project)
-branch_api.create(branch, rev.revision)
-return git('submodule', 'add', '--branch', branch, repo, path)
-elif action == 'checkout':
-return git('submodule', 'add', '--branch', ref, repo, path)
-
-with utils.cd(branch_dir):
-dlist = SubdirectoryIterator(paths, on_missing=checkout_submodule)
-
-term.nl()
-
-for progress in dlist:
-term.writeln(repr(progress))
-# res = gitcmd.run('describe', '--all', '--always')
-# res = gitcmd.run('log', '--oneline', '-2')
-res = git.log('--oneline', '-1')
-term.write(res)
-
-
-# print('Completed: %s' % self.completed)
diff --git a/scap/plugins/iter.py b/scap/plugins/iter.py
deleted file mode 100644
index d085f31..000
--- a/scap/plugins/iter.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Coding: utf-8
-""" Iterators / Generators """
-
-from os import getcwd, path, chdir
-import scap.log as log
-
-
-class ProgressIterator(log.ProgressReporter):
-
-def __iter__(self):
-raise NotImplementedError('Subclass should override __iter__')
-
-
-class SubdirectoryIterator(ProgressIterator):
-"""
-Wraps a list of (relative) paths to filesystem directories, providing a
-generator which will visit each directory in turn when you iterate over
-the list.
-"""
-
-def __init__(self, paths=[], on_missing=None, ignore_invalid=False):
-self.paths_completed = []
-self.paths_failed = []
-self.paths = paths
-self._on_missing = on_missing
-self.ignore_invalid = ignore_invalid
-super(SubdirectoryIterator, self).__init__(name='.
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Replace class_exists with proper extension registration checks
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398797 )
Change subject: Replace class_exists with proper extension registration checks
..
Replace class_exists with proper extension registration checks
This patch does not fully solve the issue, but focuses on production
code.
Bug: T183096
Change-Id: Ifdb0e2c97eed0fa6d93d6b89339f6628e0233078
---
M client/WikibaseClient.hooks.php
M lib/includes/LanguageFallbackChainFactory.php
M repo/includes/BabelUserLanguageLookup.php
M repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
M repo/includes/ParserOutput/GeoDataDataUpdater.php
M repo/includes/Specials/SpecialMyLanguageFallbackChain.php
M repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
7 files changed, 19 insertions(+), 11 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index facd5f1..b53ef3c 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -4,8 +4,8 @@
use Action;
use BaseTemplate;
-use EchoEvent;
use EditPage;
+use ExtensionRegistry;
use OutputPage;
use Parser;
use RecentChange;
@@ -343,7 +343,7 @@
global $wgHooks;
// These hooks should only be run if we use the Echo extension
- if ( class_exists( EchoEvent::class ) ) {
+ if ( ExtensionRegistry::getInstance()->isLoaded( 'Echo' ) ) {
$wgHooks['LocalUserCreated'][] =
EchoNotificationsHandlers::class . '::onLocalUserCreated';
$wgHooks['WikibaseHandleChange'][] =
EchoNotificationsHandlers::class . '::onWikibaseHandleChange';
}
diff --git a/lib/includes/LanguageFallbackChainFactory.php
b/lib/includes/LanguageFallbackChainFactory.php
index 6693045..63d6436 100644
--- a/lib/includes/LanguageFallbackChainFactory.php
+++ b/lib/includes/LanguageFallbackChainFactory.php
@@ -3,6 +3,7 @@
namespace Wikibase;
use Babel;
+use ExtensionRegistry;
use IContextSource;
use InvalidArgumentException;
use Language;
@@ -209,7 +210,7 @@
* @return LanguageFallbackChain
*/
public function newFromUserAndLanguageCode( User $user, $languageCode )
{
- if ( !class_exists( Babel::class ) || $user->isAnon() ) {
+ if ( !ExtensionRegistry::getInstance()->isLoaded( 'Babel' ) ||
$user->isAnon() ) {
return $this->newFromLanguageCode( $languageCode,
self::FALLBACK_ALL );
}
diff --git a/repo/includes/BabelUserLanguageLookup.php
b/repo/includes/BabelUserLanguageLookup.php
index 16116de..0d83f82 100644
--- a/repo/includes/BabelUserLanguageLookup.php
+++ b/repo/includes/BabelUserLanguageLookup.php
@@ -3,6 +3,7 @@
namespace Wikibase\Repo;
use Babel;
+use ExtensionRegistry;
use User;
use Wikibase\Lib\UserLanguageLookup;
@@ -35,7 +36,7 @@
// Lazy initialisation
if ( !isset( $this->babelLanguages[$key] ) ) {
// If the extension is installed, grab the languages
from the user's Babel box
- if ( class_exists( Babel::class ) && !$user->isAnon() )
{
+ if ( ExtensionRegistry::getInstance()->isLoaded(
'Babel' ) && !$user->isAnon() ) {
$this->babelLanguages[$key] =
Babel::getCachedUserLanguages( $user );
} else {
$this->babelLanguages[$key] = [];
diff --git a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
index 5514e95..481c971 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
@@ -2,7 +2,7 @@
namespace Wikibase\Repo\ParserOutput;
-use GeoData\GeoData;
+use ExtensionRegistry;
use Language;
use PageImages;
use Serializers\Serializer;
@@ -188,14 +188,16 @@
new ImageLinksDataUpdater( $propertyDataTypeMatcher )
];
- if ( !empty( $this->preferredPageImagesProperties ) &&
class_exists( PageImages::class ) ) {
+ if ( !empty( $this->preferredPageImagesProperties )
+ && ExtensionRegistry::getInstance()->isLoaded(
'PageImages' )
+ ) {
$updaters[] = new PageImagesDataUpdater(
$this->preferredPageImagesProperties,
PageImages::PROP_NAME_FREE
);
}
- if ( class_exists( GeoData::class ) ) {
+ if ( ExtensionRegistry::getInstance()->isLoaded( 'GeoData' ) ) {
$updaters[] = new GeoDataDataUpdater(
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Allow _ in unit test method names
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389668 )
Change subject: Allow _ in unit test method names
..
Allow _ in unit test method names
PHPUnit tests conventionally have names like
test_ and
test_
when there are multiple tests for the same method. Reconcile
that with the no underscore rule.
Change-Id: I22058e77a0858b2433254d4c55ac53dfd2b6f837
---
M MediaWiki/Sniffs/NamingConventions/LowerCamelFunctionsNameSniff.php
M MediaWiki/Tests/files/NamingConventions/function_name.php
M MediaWiki/Tests/files/NamingConventions/function_name.php.expect
3 files changed, 79 insertions(+), 17 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
Thiemo Kreuz (WMDE): Looks good to me, but someone else must approve
diff --git
a/MediaWiki/Sniffs/NamingConventions/LowerCamelFunctionsNameSniff.php
b/MediaWiki/Sniffs/NamingConventions/LowerCamelFunctionsNameSniff.php
index 2737c80..a1a2b7f 100644
--- a/MediaWiki/Sniffs/NamingConventions/LowerCamelFunctionsNameSniff.php
+++ b/MediaWiki/Sniffs/NamingConventions/LowerCamelFunctionsNameSniff.php
@@ -68,23 +68,45 @@
$functionContent = $tokens[$stackPtr + 2]['content'];
$lowerFunctionName = strtolower( $functionContent );
foreach ( $tokens[$stackPtr]['conditions'] as $scope => $code )
{
- if ( isset( self::$scopeList[$code] ) === true &&
- isset(
self::$methodsDoubleUnderscore[$lowerFunctionName] ) !== true &&
- isset( self::$magicMethods[$lowerFunctionName]
) !== true
+ if ( !isset( self::$scopeList[$code] ) ||
+ isset(
self::$methodsDoubleUnderscore[$lowerFunctionName] ) ||
+ isset( self::$magicMethods[$lowerFunctionName] )
) {
- $pos = strpos( $functionContent, '_' );
- if ( $pos !== false ||
- $functionContent[0] !==
$lowerFunctionName[0]
- ) {
- $error = 'Function name "%s" should use
lower camel case.';
- $fix = $phpcsFile->addError(
- $error,
- $stackPtr,
- 'FunctionName',
- [ $functionContent ]
- );
- }
+ continue;
+ }
+
+ $pos = strpos( $functionContent, '_' );
+ $isTest = substr( $this->getClassName( $phpcsFile,
$stackPtr ), -4 ) === 'Test' &&
+ preg_match(
'/^(test|provide)[A-Z]|\wProvider$/', $functionContent );
+ if ( $pos !== false && !$isTest ||
+ $functionContent[0] !== $lowerFunctionName[0]
+ ) {
+ $error = 'Function name "%s" should use lower
camel case.';
+ $fix = $phpcsFile->addError(
+ $error,
+ $stackPtr,
+ 'FunctionName',
+ [ $functionContent ]
+ );
}
}
}
+
+ /**
+* Gets the name of the class which the $functionPtr points into.
+* The stack pointer must point to a function keyword.
+* @param File $phpcsFile File object.
+* @param int $functionPtr Pointer to a function token inside the class.
+* @return string|null
+*/
+ private function getClassName( $phpcsFile, $functionPtr ) {
+ $tokens = $phpcsFile->getTokens();
+ $token = $tokens[$functionPtr];
+ foreach ( $token['conditions'] as $ptr => $type ) {
+ if ( $type === T_CLASS ) {
+ return $phpcsFile->getDeclarationName( $ptr );
+ }
+ }
+ return null;
+ }
}
diff --git a/MediaWiki/Tests/files/NamingConventions/function_name.php
b/MediaWiki/Tests/files/NamingConventions/function_name.php
index 144d7d4..c293dcb 100644
--- a/MediaWiki/Tests/files/NamingConventions/function_name.php
+++ b/MediaWiki/Tests/files/NamingConventions/function_name.php
@@ -1,8 +1,8 @@
https://gerrit.wikimedia.org/r/389668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22058e77a0858b2433254d4c55ac53dfd2b6f837
Gerrit-PatchSet: 4
Gerrit-Projec
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Avoid using EntityDiffChangedAspectsFactory like a static co...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398815 ) Change subject: Avoid using EntityDiffChangedAspectsFactory like a static constructor .. Avoid using EntityDiffChangedAspectsFactory like a static constructor This follows Id17259c, which was rebased multiple times and did not touched all cases because of these rebases. This patch also fixes the class autoloading. Without these additional lines I can not run the ItemChangeTest locally. Bug: T113468 Change-Id: I8a4acb47930a1c911750274ec9a2ccd5330b0491 --- M client/tests/phpunit/includes/Changes/InjectRCRecordsJobTest.php M client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php M lib/autoload.php M lib/tests/phpunit/Changes/ItemChangeTest.php M repo/tests/phpunit/includes/Store/Sql/SqlChangeStoreTest.php 5 files changed, 11 insertions(+), 20 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/client/tests/phpunit/includes/Changes/InjectRCRecordsJobTest.php b/client/tests/phpunit/includes/Changes/InjectRCRecordsJobTest.php index e8bdd4e..f4db267 100644 --- a/client/tests/phpunit/includes/Changes/InjectRCRecordsJobTest.php +++ b/client/tests/phpunit/includes/Changes/InjectRCRecordsJobTest.php @@ -13,11 +13,10 @@ use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Services\Diff\EntityDiffer; -use Wikibase\DataModel\Services\Diff\ItemDiff; use Wikibase\EntityChange; use Wikibase\ItemChange; use Wikibase\Lib\Changes\EntityChangeFactory; -use Wikibase\Lib\Changes\EntityDiffChangedAspectsFactory; +use Wikibase\Lib\Changes\EntityDiffChangedAspects; use Wikibase\Lib\Store\Sql\EntityChangeLookup; use Wikimedia\Rdbms\LBFactory; use Wikimedia\TestingAccessWrapper; @@ -219,7 +218,7 @@ 'object_id' => $itemId->getSerialization(), ] ); - $diff = ( new EntityDiffChangedAspectsFactory() )->newFromEntityDiff( new ItemDiff() ); + $diff = EntityDiffChangedAspects::newEmpty(); return [ 'mock change' => [ diff --git a/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php b/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php index b60a22e..affc250 100644 --- a/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php +++ b/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php @@ -8,7 +8,7 @@ use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Services\Diff\ItemDiffer; use Wikibase\DataModel\SiteLink; -use Wikibase\Lib\Changes\EntityDiffChangedAspectsFactory; +use Wikibase\Lib\Changes\EntityDiffChangedAspects; use Wikibase\Lib\Tests\Changes\MockRepoClientCentralIdLookup; use SiteLookup; use Wikimedia\TestingAccessWrapper; @@ -71,10 +71,7 @@ // instantiate and handle the change $type = 'wikibase-' . $entityId->getEntityType() . '~' . $action; $instance->setField( 'type', $type ); - $aspects = ( new EntityDiffChangedAspectsFactory() )->newFromEntityDiff( - $diff - ); - $instance->setCompactDiff( $aspects ); + $instance->setCompactDiff( EntityDiffChangedAspects::newFromEntityDiff( $diff ) ); return $instance; } diff --git a/lib/autoload.php b/lib/autoload.php index b5e441a..c47636a 100644 --- a/lib/autoload.php +++ b/lib/autoload.php @@ -158,6 +158,8 @@ 'Wikibase\\Lib\\Store\\TypeDispatchingEntityStore' => __DIR__ . '/includes/Store/TypeDispatchingEntityStore.php', 'Wikibase\\Lib\\Store\\WikiPagePropertyOrderProvider' => __DIR__ . '/includes/Store/WikiPagePropertyOrderProvider.php', 'Wikibase\\Lib\\Store\\WikiTextPropertyOrderProvider' => __DIR__ . '/includes/Store/WikiTextPropertyOrderProvider.php', + 'Wikibase\\Lib\\Tests\\Changes\\ChangeRowTest' => __DIR__ . '/tests/phpunit/Changes/ChangeRowTest.php', + 'Wikibase\\Lib\\Tests\\Changes\\EntityChangeTest' => __DIR__ . '/tests/phpunit/Changes/EntityChangeTest.php', 'Wikibase\\Lib\\Tests\\Changes\\MockRepoClientCentralIdLookup' => __DIR__ . '/tests/phpunit/Changes/MockRepoClientCentralIdLookup.php', 'Wikibase\\Lib\\Tests\\Changes\\TestChanges' => __DIR__ . '/tests/phpunit/Changes/TestChanges.php', 'Wikibase\\Lib\\Tests\\EntityRevisionLookupTest' => __DIR__ . '/tests/phpunit/EntityRevisionLookupTest.php', diff --git a/lib/tests/phpunit/Changes/ItemChangeTest.php b/lib/tests/phpunit/Changes/ItemChangeTest.php index 67b2e7f..f035a39 100644 --- a/lib/tests/phpunit/Changes/ItemChangeTest.php +++ b/lib/tests/phpunit/Changes/ItemChangeTest.php @@ -8,7 +8,7 @@ use Wikibase\DataModel\Services\Diff\ItemDiff; use Wikibase\EntityChange; use Wikibase\ItemChange; -use Wikibase\Lib\Changes\E
[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP]mariadb: Add mysql 8.0-compatible template
Jcrespo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399115 ) Change subject: [WIP]mariadb: Add mysql 8.0-compatible template .. [WIP]mariadb: Add mysql 8.0-compatible template Change-Id: I9330498242ef2b45160ee339ee3faa2bdd9583f2 --- A modules/role/templates/mariadb/mysqld_config/core-mysql.my.cnf.erb 1 file changed, 120 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/15/399115/1 diff --git a/modules/role/templates/mariadb/mysqld_config/core-mysql.my.cnf.erb b/modules/role/templates/mariadb/mysqld_config/core-mysql.my.cnf.erb new file mode 100644 index 000..acece1f --- /dev/null +++ b/modules/role/templates/mariadb/mysqld_config/core-mysql.my.cnf.erb @@ -0,0 +1,120 @@ +# Warning: This file is managed by Puppet! +# Production + +[client] +port = 3306 +socket = /run/mysqld/mysqld.sock +# ssl +#ssl-ca=/etc/ssl/certs/Puppet_Internal_CA.pem +#ssl-cert=/etc/mysql/ssl/cert.pem +#ssl-key=/etc/mysql/ssl/server.key +#ssl-verify-server-cert + +[mysqld] + +user = mysql +socket = /run/mysqld/mysqld.sock +port = 3306 +# extra_port = 3307 +basedir= /opt/mysql +datadir= /srv/sqldata +tmpdir = /srv/tmp +server_id = 1 + +# Always start in read_only mode. +# Master selection will be handled by cluster control. +#read_only = on + +log_bin +log_slave_updates +skip-external-locking +skip-name-resolve +#temp-pool + +# thread_handling= pool-of-threads +# thread_pool_stall_limit= 100 +# thread_pool_size = 32 +max_connections= 5000 +back_log = 500 +#extra_max_connections = 10 +max_connect_errors = 10 +max_allowed_packet = 32M +connect_timeout= 3 +# query_cache_size = 0 +# query_cache_type = 0 +event_scheduler= 1 +#log-warnings = 0 +thread_stack = 192K +thread_cache_size = 300 +interactive_timeout= 28800 +wait_timeout = 3600 +transaction-isolation = REPEATABLE-READ +#use_stat_tables= preferably + +sync_binlog= 1 +binlog_cache_size = 1M +max_binlog_size= 1000M +binlog_format = ROW +# expire_logs_days = 7 +binlog_expire_logs_seconds = 604800 +slave_transaction_retries = 4294967295 +#sql-mode = IGNORE_BAD_TABLE_OPTIONS +tmp_table_size = 64M +max_heap_table_size= 64M + +table_open_cache = 5 +table_definition_cache = 4 +open-files-limit = 20 +character_set_server = binary +character_set_filesystem = binary +collation_server = binary + +default-storage-engine = InnoDB +innodb_file_per_table = 1 +innodb_buffer_pool_size= 1G +innodb_log_file_size = 100M +innodb_flush_log_at_trx_commit = 1 +innodb_flush_method= O_DIRECT +innodb_thread_concurrency = 0 +innodb_io_capacity = 1000 +#innodb_stats_sample_pages = 16 +innodb_stats_method= nulls_unequal +#aria_pagecache_buffer_size = 1G +#join_cache_level = 8 + +# dump and load innodb buffer at start and stop +innodb_buffer_pool_load_at_startup = 1 +innodb_buffer_pool_dump_at_shutdown = 1 + +# ssl +#ssl-ca=/etc/ssl/certs/Puppet_Internal_CA.pem +#ssl-cert=/etc/mysql/ssl/cert.pem +#ssl-key=/etc/mysql/ssl/server.key +#ssl-cipher=TLSv1.2 +# Enabling performance_schema (disabled by default in MariaDB10) +performance_schema = 1 +# downsizing performance schema memory usage: T99485 +#performance_schema_digests_size= -1 +#performance_schema_max_thread_instances= 500 +#performance_schema_max_cond_instances = 1000 +#performance_schema_accounts_size = 300 +#performance_schema_hosts_size = 300 +#performance_schema_events_statements_history_size = 10 +#performance_schema_events_statements_history_long_size = 1000 +#performance_schema_events_waits_history_size = 10 +#performance_schema_events_waits_history_long_size = 1000 +#performance_schema_events_stages_history_size = 10 +#performance_schema_events_stages_history_long_size = 1000 +#performance_schema_max_mutex_instances = 5000 +#performance_schema_max_rwlock_instances= 2000 +#performance_schema_max_socket_instances= 500 +#performance_schema_max_table_instances = 1000 + +#optimizer_switch = 'mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on' +optimizer_switch = 'mrr=on,mrr_cost_based=on' + +[mysqldump] + +quick +max_allowed_packe
[MediaWiki-commits] [Gerrit] oojs/ui[master]: History.md: Correct entries for old special releases
Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399114 ) Change subject: History.md: Correct entries for old special releases .. History.md: Correct entries for old special releases OOjs UI versions v0.12.8.1 and v0.17.10 were additional, unscheduled releases to fix major problems in the preceding release. It appears we never updated the release notes in master after making them. https://gerrit.wikimedia.org/r/#/q/status:merged+project:oojs/ui+branch:v0.12.8 https://gerrit.wikimedia.org/r/#/q/status:merged+project:oojs/ui+branch:v0.17.10 * v0.17.10: Add release notes and remove duplicates from v0.18.0. * v0.12.8.1: Remove duplicates from v0.12.9. Change-Id: I3d3a31a129b36865649987b62ae0a6afba0c0603 --- M History.md 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/14/399114/1 diff --git a/History.md b/History.md index c9f9787..da0f089 100644 --- a/History.md +++ b/History.md @@ -975,8 +975,6 @@ * ButtonGroupWidget: Change `cursor` on `.oo-ui-buttonElement-active` (Volker E) * CapsuleItemWidget: Make interactivity of label clearer (Volker E) * ComboBoxInputWidget: Align to design specification (Volker E) -* FieldsetLayout: Styling fixes for `` labels (Bartosz Dziewoński) -* FieldsetLayout: Work around positioning problems in Firefox (Bartosz Dziewoński) * PopupToolGroup: Fix border colour (Ed Sanders) * MessageDialog: Improve `-actions` buttons by resetting `border-radius` (Volker E) * SelectFileWidget: Don't show action-indicating cursor on empty state (Volker E) @@ -1021,6 +1019,10 @@ * build: Remove upstreamed rules and fix documentation (Ed Sanders) * build: Update eslint-config-wikimedia to v0.2.0 (Ed Sanders) +## v0.17.10 / 2016-10-03 (special release) +### Styles +* FieldsetLayout: Styling fixes for `` labels (Bartosz Dziewoński) +* FieldsetLayout: Work around positioning problems in Firefox (Bartosz Dziewoński) ## v0.17.9 / 2016-09-13 ### Features @@ -1807,9 +1809,8 @@ * Widget: Fix docs for disable event (Ed Sanders) * docs: Remove excess empty lines in comments (Bartosz Dziewoński) * docs: Add quotes around PROJECT_BRIEF setting (Timo Tijhof) -* Update version requirement for mediawiki/at-ease: 1.0.0 → 1.1.0 (Ori Livneh) -## v0.12.8.1 / 2015-09-18 special release +## v0.12.8.1 / 2015-09-18 (special release) ### Code * build: Update version requirement for mediawiki/at-ease: 1.0.0 → 1.1.0 (Ori Livneh) -- To view, visit https://gerrit.wikimedia.org/r/399114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d3a31a129b36865649987b62ae0a6afba0c0603 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/software[master]: mysql-package: add mysql service unit derived from the mariadb
Jcrespo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399113 ) Change subject: mysql-package: add mysql service unit derived from the mariadb .. mysql-package: add mysql service unit derived from the mariadb Tested on MySQL 8.0. Change-Id: Ia597f13665eb388758c0466c6cb965e4764b8cf2 --- A dbtools/mysql.service 1 file changed, 161 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software refs/changes/13/399113/1 diff --git a/dbtools/mysql.service b/dbtools/mysql.service new file mode 100644 index 000..81e3593 --- /dev/null +++ b/dbtools/mysql.service @@ -0,0 +1,161 @@ +# +# /etc/systemd/system/mariadb.service +# +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Thanks to: +# Daniel Black +# Erkan Yanar +# David Strauss +# and probably others +# +# Lightly customized for WMF needs by Jaime Crespo + +[Unit] +Description=MySQL database server +After=network.target + +[Install] +WantedBy=multi-user.target +Alias=mysql.service +Alias=mysqld.service + + +[Service] + +## +## Core requirements +## + +Type=forking + +# Setting this to true can break replication and the Type=notify settings +# See also bind-address mysqld option. +PrivateNetwork=false + +## +## Package maintainers +## + +User=mysql +Group=mysql + +# To allow memlock to be used as non-root user if set in configuration +CapabilityBoundingSet=CAP_IPC_LOCK + +# Prevent writes to /usr, /boot, and /etc +ProtectSystem=full + +# Doesn't yet work properly with SELinux enabled +NoNewPrivileges=true + +PrivateDevices=true + +# Prevent accessing /home, /root and /run/user +ProtectHome=true + +# Execute pre and post scripts as root, otherwise it does it as User= +PermissionsStartOnly=true + +# Set TimeoutStartSec and TimeoutStopSec to infinity (sometimes it +# can take a very long time to stop a server or start it if it crashed, +# like 1 hour or more and be a normal behaviour) +TimeoutSec=infinity + +# WE DISABLE ALL GALERA RELATED FUNCTIONALITY + +# Perform automatic wsrep recovery. When server is started without wsrep, +# galera_recovery simply returns an empty string. In any case, however, +# the script is not expected to return with a non-zero status. +# It is always safe to unset _WSREP_START_POSITION environment variable. +# Do not panic if galera_recovery script is not available. (MDEV-10538) +#ExecStartPre=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION" +#ExecStartPre=/bin/sh -c "[ ! -e /opt/wmf-mariadb101//bin/galera_recovery ] && VAR= || \ +# VAR=`/opt/wmf-mariadb101//bin/galera_recovery`; [ $? -eq 0 ] \ +# && systemctl set-environment _WSREP_START_POSITION=$VAR || exit 1" + +# Needed to create system tables etc. +# ExecStartPre=/opt/wmf-mariadb101//scripts/mysql_install_db -u mysql + +# Start main service +# MYSQLD_OPTS here is for users to set in /etc/systemd/system/mariadb.service.d/MY_SPECIAL.conf +# Use the [service] section and Environment="MYSQLD_OPTS=...". +# This isn't a replacement for my.cnf. +# _WSREP_NEW_CLUSTER is for the exclusive use of the script galera_new_cluster +PIDFile=/run/mysqld/mysqld.pid +ExecStart=/opt/mysql/bin/mysqld --daemonize --pid-file=/run/mysqld/mysqld.pid $MYSQLD_OPTS + + +# Unset _WSREP_START_POSITION environment variable. +#ExecStartPost=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION" + +KillMode=process +KillSignal=SIGTERM + +# Don't want to see an automated SIGKILL ever +SendSIGKILL=no + +# Restart crashed server only, on-failure would also restart, for example, when +# my.cnf contains unknown option +Restart=on-abort +RestartSec=5s + +UMask=007 + +## +## USERs can override +## +## +## by creating a file in /etc/systemd/system/mariadb.service.d/MY_SPECIAL.conf +## and adding/setting the following will override this file's settings. + +# Useful options not previously available in [mysqld_safe] + +# Kernels like killing mysqld when out of memory because its big. +# Lets temper that preference a little. +OOMScoreAdjust=-600 + +# Explicitly start with high IO priority +# BlockIOWeight=1000 + +# Socket should be on /var/run/mysqld/mysqld.sock +# This will also make more difficult to do server-side imports and exports +PrivateTmp=true + +## +## Options previously available to be set via [mysqld_safe] +## that now needs to be set by systemd config files as mysqld_safe +## isn't executed. +## + +# Number of files limit. previously [mysqld_safe] open-file-limit +# Please set ulimits on a separate file, in particular th
[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Remove weird cli protection from make-wmf-branch
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399112 ) Change subject: Remove weird cli protection from make-wmf-branch .. Remove weird cli protection from make-wmf-branch Change-Id: I23059fd62dc2199ccd2f0357c921c965995a6fd2 --- D make-wmf-branch/cli.php M make-wmf-branch/make-wmf-branch 2 files changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/12/399112/1 diff --git a/make-wmf-branch/cli.php b/make-wmf-branch/cli.php deleted file mode 100644 index 531b166..000 --- a/make-wmf-branch/cli.php +++ /dev/null @@ -1,5 +0,0 @@ - -o [-p wmf-clone-path] -- To view, visit https://gerrit.wikimedia.org/r/399112 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23059fd62dc2199ccd2f0357c921c965995a6fd2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...release[master]: WIP: make-release: Rewrite make-branches as branch
Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399111 )
Change subject: WIP: make-release: Rewrite make-branches as branch
..
WIP: make-release: Rewrite make-branches as branch
Trying to fold make-wmf-branch into this
Change-Id: I67de657e4dd2544529ac7c78595b7524f1b2505c
---
A make-release/branch.py
D make-release/make-branches
M make-release/make-release.yaml
3 files changed, 110 insertions(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/11/399111/1
diff --git a/make-release/branch.py b/make-release/branch.py
new file mode 100755
index 000..024851a
--- /dev/null
+++ b/make-release/branch.py
@@ -0,0 +1,101 @@
+#!/usr/bin/python
+# vim:sw=4:ts=4:et:
+"""Stuff about making branches and so forth."""
+
+from __future__ import print_function
+
+import argparse
+import logging
+import sys
+
+from requests.auth import HTTPDigestAuth
+from requests.exceptions import HTTPError
+
+import yaml
+
+from pygerrit.rest import GerritRestAPI
+
+with open("make-release.yaml") as conf:
+CONFIG = yaml.load(conf)
+
+
+def _get_client():
+"""Get the client for making requests."""
+return GerritRestAPI(
+url=CONFIG['base_url'],
+auth=HTTPDigestAuth(CONFIG['username'], CONFIG['password']))
+
+
+def create_branch(repository, branch, revision='HEAD'):
+"""Create a branch for a given repo."""
+try:
+_get_client().put(
+'/projects/%s/branches/%s' % (
+repository.replace('/', '%2F'),
+branch.replace('/', '%2F')),
+data='{"revision":"%s"}' % revision
+)
+except HTTPError as httpe:
+# Gerrit responds 409 for edit conflicts
+# means we already have a branch
+if httpe.response.status_code != 409:
+raise
+
+
+def branch_core(branch, branch_point='HEAD'):
+"""Just branch core."""
+create_branch('core', branch, branch_point)
+
+
+def branch_everything(branch, branch_point='HEAD', bundle=None):
+"""Branch stuff."""
+if not bundle:
+repos_to_branch = get_star_bundle()
+
+for repo in repos_to_branch:
+try:
+branch_point = CONFIG['manual_branch_points'][branch][repo]
+except KeyError:
+pass
+
+print('Branching %s to %s from %s' % (
+repo, branch, branch_point))
+create_branch(repo, branch, branch_point)
+
+
+def get_star_bundle():
+"""Return the list of all extensions, skins, and vendor."""
+things_to_branch = []
+for stuff in ['skins', 'extensions', 'vendor']:
+projects = _get_client().get('/projects/?p=mediawiki/%s' % stuff)
+for proj in projects:
+if projects[proj]['state'] == 'ACTIVE':
+things_to_branch.append(proj)
+return things_to_branch
+
+
+def parse_args():
+"""Parse command line arguments and return options."""
+parser = argparse.ArgumentParser(
+description=__doc__,
+formatter_class=argparse.RawDescriptionHelpFormatter,
+)
+
+# Positional arguments:
+parser.add_argument('branch', nargs='?', help='Branch we want to make')
+parser.add_argument('--branchpoint', dest='branch_point', default='HEAD',
+help='Where to branch from')
+parser.add_argument('--submodules', dest='submodules', action='store_true',
+help='Add the newly branched repos as submodules?')
+parser.add_argument('--set-version', dest='set_version',
+help='Update $wgVersion?')
+
+return parser.parse_args()
+
+
+if __name__ == '__main__':
+OPTIONS = parse_args()
+logging.basicConfig(level=logging.INFO, stream=sys.stderr)
+
+branch_core(OPTIONS.branch, OPTIONS.branch_point)
+branch_everything(OPTIONS.branch, OPTIONS.branch_point)
diff --git a/make-release/make-branches b/make-release/make-branches
deleted file mode 100755
index f7cbe21..000
--- a/make-release/make-branches
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python2
-# vim:sw=4:ts=4:et:
-"""Stuff about making branches and so forth"""
-
-
-from __future__ import print_function
-from requests.auth import HTTPDigestAuth
-from requests.exceptions import HTTPError
-from pygerrit.rest import GerritRestAPI
-import yaml
-
-
-def main():
-"""Do the needful"""
-with open("make-release.yaml") as conf:
-config = yaml.load(conf)
-
-auth = HTTPDigestAuth(config['username'], config['password'])
-rest = GerritRestAPI(url='https://gerrit.wikimedia.org/r/', auth=auth)
-
-things_to_branch = ['mediawiki/core', 'mediawiki/vendor']
-manual_branch_points = {
-'mediawiki/core': '0cd28e19cb0f9385a2a1cc11a4d8c9c21ff0b830',
-'mediawiki/vendor': '68b54dbcd8d65de64225a4ccc9dceb94429ca42a',
-}
-shit_to_skip = ['mediawiki/extensions/BlueSpiceExtendedStatistics',
-'mediawiki
[MediaWiki-commits] [Gerrit] operations/puppet[production]: bigbrother: catch exceptions thrown during tool restarts
Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399104 )
Change subject: bigbrother: catch exceptions thrown during tool restarts
..
bigbrother: catch exceptions thrown during tool restarts
Currently if a single tool restart fails, bigbrother just gives
up and goes back to the top of the restart list. With this change
we're at least a little bit fault-tolerant.
Bug: T183171
Change-Id: I1c1bc58d4ae5eb4e8b21f69b99a8871db088f83a
---
M modules/toollabs/files/bigbrother.py
1 file changed, 27 insertions(+), 22 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
BryanDavis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/toollabs/files/bigbrother.py
b/modules/toollabs/files/bigbrother.py
index 3946d0d..1c1a8b4 100755
--- a/modules/toollabs/files/bigbrother.py
+++ b/modules/toollabs/files/bigbrother.py
@@ -250,30 +250,35 @@
with open(tmp_name, 'w') as sb:
print(datetime.datetime.utcnow(), file=sb)
for tool in self.watchdb:
-if 'jobs' not in self.watchdb[tool]:
-print('%s:-:-:-:-' % tool, file=sb)
-continue
-for job in self.watchdb[tool]['jobs'].values():
-if 'state' not in job:
-print('%s:%s:-:-:-' % (tool, job['jname']), file=sb)
+try:
+if 'jobs' not in self.watchdb[tool]:
+print('%s:-:-:-:-' % tool, file=sb)
continue
-if job['state'] == 'DEAD':
-self.start_job(tool, job)
-elif job['state'] in ['STARTING', 'THROTTLED']:
-if time.time() >= job.get('timeout', 0):
-self.log_event(
-tool, 'warn',
-"job '%s' failed to start" % job['jname'])
+for job in self.watchdb[tool]['jobs'].values():
+if 'state' not in job:
+print('%s:%s:-:-:-' % (tool, job['jname']),
file=sb)
+continue
+if job['state'] == 'DEAD':
self.start_job(tool, job)
-print(
-'%s:%s:%s:%s:%s' % (
-tool,
-job['jname'],
-job.get('state', 'UNKNOWN'),
-job.get('since', 0),
-job.get('timeout', 0)
-),
-file=sb)
+elif job['state'] in ['STARTING', 'THROTTLED']:
+if time.time() >= job.get('timeout', 0):
+self.log_event(
+tool, 'warn',
+"job '%s' failed to start" % job['jname'])
+self.start_job(tool, job)
+print(
+'%s:%s:%s:%s:%s' % (
+tool,
+job['jname'],
+job.get('state', 'UNKNOWN'),
+job.get('since', 0),
+job.get('timeout', 0)
+),
+file=sb)
+except Exception:
+logger.exception('Exception during restart of tool %s',
+ tool)
+
os.rename(tmp_name, self.scoreboard)
def run(self):
--
To view, visit https://gerrit.wikimedia.org/r/399104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c1bc58d4ae5eb4e8b21f69b99a8871db088f83a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Volans
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Use animation for dice in Randomizer
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398415 )
Change subject: Use animation for dice in Randomizer
..
Use animation for dice in Randomizer
- Added animated Vector for dice animation [portrait and landscape]
- Animates on click
Since the lint warning was suppressed, I have added a screencast of the change
working on all api levels, on the ticket
Bug: T180806
Change-Id: Ib1dd68daae1fc82d61a9c4d8cb7968e77a41bb8a
---
M app/src/main/java/org/wikipedia/random/RandomFragment.java
A app/src/main/res/drawable/animated_dice.xml
M app/src/main/res/layout-land/fragment_random.xml
M app/src/main/res/layout/fragment_random.xml
4 files changed, 96 insertions(+), 3 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
Cooltey: Looks good to me, but someone else must approve
diff --git a/app/src/main/java/org/wikipedia/random/RandomFragment.java
b/app/src/main/java/org/wikipedia/random/RandomFragment.java
index 5d155e5..5ca0ec5 100644
--- a/app/src/main/java/org/wikipedia/random/RandomFragment.java
+++ b/app/src/main/java/org/wikipedia/random/RandomFragment.java
@@ -1,9 +1,11 @@
package org.wikipedia.random;
import android.content.DialogInterface;
+import android.graphics.drawable.Animatable;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
@@ -37,7 +39,7 @@
public class RandomFragment extends Fragment {
@BindView(R.id.random_item_pager) ViewPager randomPager;
-@BindView(R.id.random_next_button) View nextButton;
+@BindView(R.id.random_next_button) FloatingActionButton nextButton;
@BindView(R.id.random_save_button) ImageView saveButton;
@BindView(R.id.random_back_button) View backButton;
private Unbinder unbinder;
@@ -84,6 +86,9 @@
}
@OnClick(R.id.random_next_button) void onNextClick() {
+if (nextButton.getDrawable() instanceof Animatable) {
+((Animatable) nextButton.getDrawable()).start();
+}
viewPagerListener.setNextPageSelectedAutomatic();
randomPager.setCurrentItem(randomPager.getCurrentItem() + 1, true);
if (funnel != null) {
diff --git a/app/src/main/res/drawable/animated_dice.xml
b/app/src/main/res/drawable/animated_dice.xml
new file mode 100644
index 000..5198039
--- /dev/null
+++ b/app/src/main/res/drawable/animated_dice.xml
@@ -0,0 +1,88 @@
+http://schemas.android.com/tools";
+xmlns:android="http://schemas.android.com/apk/res/android";
+xmlns:aapt="http://schemas.android.com/aapt";
+tools:ignore="NewApi">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout-land/fragment_random.xml
b/app/src/main/res/layout-land/fragment_random.xml
index 9c1bcf3..8b4de38 100644
--- a/app/src/main/res/layout-land/fragment_random.xml
+++ b/app/src/main/res/layout-land/fragment_random.xml
@@ -50,7 +50,7 @@
app:backgroundTint="@android:color/white"
app:borderWidth="0dp"
app:elevation="4dp"
-app:srcCompat="@drawable/ic_casino_accent50_24dp"
+app:srcCompat="@drawable/animated_dice"
android:tint="?attr/main_toolbar_color"/>
https://gerrit.wikimedia.org/r/398415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1dd68daae1fc82d61a9c4d8cb7968e77a41bb8a
Gerrit-PatchSet: 5
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Sharvaniharan
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Cooltey
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: Add scoring-team for alerts of ores-extension
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399109 )
Change subject: icinga: Add scoring-team for alerts of ores-extension
..
icinga: Add scoring-team for alerts of ores-extension
Bug: T154175
Change-Id: Ia5fcca14ac479ad55e555c7ce010f3f3abe3a10e
---
M modules/icinga/manifests/monitor/ores.pp
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/icinga/manifests/monitor/ores.pp
b/modules/icinga/manifests/monitor/ores.pp
index 00c9311..07d2e34 100644
--- a/modules/icinga/manifests/monitor/ores.pp
+++ b/modules/icinga/manifests/monitor/ores.pp
@@ -5,6 +5,11 @@
contact_group => 'team-scoring',
}
+# T154175
+monitoring::grafana_alert { 'db/ores-extension':
+contact_group => 'team-scoring',
+}
+
@monitoring::host { 'ores.wmflabs.org':
host_fqdn => 'ores.wmflabs.org',
}
--
To view, visit https://gerrit.wikimedia.org/r/399109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5fcca14ac479ad55e555c7ce010f3f3abe3a10e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ladsgroup
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Greetings fixes (already upstreamed)
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398190 )
Change subject: Greetings fixes (already upstreamed)
..
Greetings fixes (already upstreamed)
https://github.com/civicrm/civicrm-core/pull/11313/commits
CRM-21471 remove unused core function CRM_Core_Pseudoconstant::greetingDefaults
Bug: T156193
Change-Id: I26e7800e2ad1850aeda9731b989f2deeffe87b59
---
M CRM/Contact/BAO/Contact.php
M CRM/Core/PseudoConstant.php
2 files changed, 11 insertions(+), 75 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index f9edbba..5689082 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -2687,15 +2687,8 @@
*
* @param object $contact
* Contact object after save.
- * @param bool $useDefaults
- * Use default greeting values.
*/
- public static function processGreetings(&$contact, $useDefaults = FALSE) {
-if ($useDefaults) {
- //retrieve default greetings
- $defaultGreetings = CRM_Core_PseudoConstant::greetingDefaults();
- $contactDefaults = $defaultGreetings[$contact->contact_type];
-}
+ public static function processGreetings(&$contact) {
// note that contact object not always has required greeting related
// fields that are required to calculate greeting and
@@ -2729,14 +2722,7 @@
$updateQueryString[] = " email_greeting_custom = NULL ";
}
else {
- if ($useDefaults) {
-reset($contactDefaults['email_greeting']);
-$emailGreetingID = key($contactDefaults['email_greeting']);
-$emailGreetingString =
$contactDefaults['email_greeting'][$emailGreetingID];
-$updateQueryString[] = " email_greeting_id = $emailGreetingID ";
-$updateQueryString[] = " email_greeting_custom = NULL ";
- }
- elseif ($contact->email_greeting_custom) {
+ if ($contact->email_greeting_custom) {
$updateQueryString[] = " email_greeting_display = NULL ";
}
}
@@ -2765,14 +2751,7 @@
$updateQueryString[] = " postal_greeting_custom = NULL ";
}
else {
- if ($useDefaults) {
-reset($contactDefaults['postal_greeting']);
-$postalGreetingID = key($contactDefaults['postal_greeting']);
-$postalGreetingString =
$contactDefaults['postal_greeting'][$postalGreetingID];
-$updateQueryString[] = " postal_greeting_id = $postalGreetingID ";
-$updateQueryString[] = " postal_greeting_custom = NULL ";
- }
- elseif ($contact->postal_greeting_custom) {
+ if ($contact->postal_greeting_custom) {
$updateQueryString[] = " postal_greeting_display = NULL ";
}
}
@@ -2802,14 +2781,7 @@
$updateQueryString[] = " addressee_custom = NULL ";
}
else {
- if ($useDefaults) {
-reset($contactDefaults['addressee']);
-$addresseeID = key($contactDefaults['addressee']);
-$addresseeString = $contactDefaults['addressee'][$addresseeID];
-$updateQueryString[] = " addressee_id = $addresseeID ";
-$updateQueryString[] = " addressee_custom = NULL ";
- }
- elseif ($contact->addressee_custom) {
+ if ($contact->addressee_custom) {
$updateQueryString[] = " addressee_display = NULL ";
}
}
diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index abf51f1..96fa655 100644
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -156,12 +156,6 @@
private static $greeting;
/**
- * Default Greetings
- * @var array
- */
- private static $greetingDefaults;
-
- /**
* Extensions of type module
* @var array
*/
@@ -1679,6 +1673,10 @@
* array reference of all greetings.
*/
public static function greeting($filter, $columnName = 'label') {
+if (!isset(Civi::$statics[__CLASS__]['greeting'])) {
+ Civi::$statics[__CLASS__]['greeting'] = array();
+}
+
$index = $filter['greeting_type'] . '_' . $columnName;
// also add contactType to the array
@@ -1687,11 +1685,7 @@
$index .= '_' . $contactType;
}
-if (NULL === self::$greeting) {
- self::$greeting = array();
-}
-
-if (!CRM_Utils_Array::value($index, self::$greeting)) {
+if (!CRM_Utils_Array::value($index,
Civi::$statics[__CLASS__]['greeting'])) {
$filterCondition = NULL;
if ($contactType) {
$filterVal = 'v.filter =';
@@ -1711,40 +1705,10 @@
$filterCondition .= "AND (v.filter = 0 OR {$filterVal}) ";
}
- self::$greeting[$index] =
CRM_Core_OptionGroup::values($filter['greeting_type'], NULL, NULL, NULL,
$filterCondition, $columnName);
+ Civi::$statics[__CLASS__]['greeting'][$index] =
CRM_Core_OptionGroup::values($filter['greeting_type'], NULL, NULL, NULL,
$filterCondition, $columnName);
}
-return sel
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Improve LinkBeginHookHandler - use BCP47 language normalization
Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399110 )
Change subject: Improve LinkBeginHookHandler - use BCP47 language normalization
..
Improve LinkBeginHookHandler - use BCP47 language normalization
Also allow $labelText to be HtmlArmor'ed.
Change-Id: Id694ab605ec79c935f219eb88b4411134c21ea92
---
M repo/includes/Hooks/LinkBeginHookHandler.php
1 file changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/10/399110/1
diff --git a/repo/includes/Hooks/LinkBeginHookHandler.php
b/repo/includes/Hooks/LinkBeginHookHandler.php
index 9d6be96..6c8bf3f 100644
--- a/repo/includes/Hooks/LinkBeginHookHandler.php
+++ b/repo/includes/Hooks/LinkBeginHookHandler.php
@@ -4,7 +4,9 @@
use Action;
use DummyLinker;
+use HtmlArmor;
use Language;
+use LanguageCode;
use MediaWiki\Interwiki\InterwikiLookup;
use MediaWiki\Linker\LinkRenderer;
use MediaWiki\Linker\LinkTarget;
@@ -395,9 +397,9 @@
. '';
$labelHtml = ''
- . htmlspecialchars( $labelText )
+ . HtmlArmor::getHtml( $labelText )
. '';
return ''
@@ -408,6 +410,13 @@
. '';
}
+ /**
+* Get "title" attribute for the link.
+* @param Title $title
+* @param array|null $labelData
+* @param array|null $descriptionData
+* @return string
+*/
private function getTitleAttribute( Title $title, array $labelData =
null, array $descriptionData = null ) {
/** @var Language $labelLang */
/** @var Language $descriptionLang */
--
To view, visit https://gerrit.wikimedia.org/r/399110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id694ab605ec79c935f219eb88b4411134c21ea92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Smalyshev
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: Add scoring-team for alerts of ores-extension
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399109 )
Change subject: icinga: Add scoring-team for alerts of ores-extension
..
icinga: Add scoring-team for alerts of ores-extension
Bug: T154175
Change-Id: Ia5fcca14ac479ad55e555c7ce010f3f3abe3a10e
---
M modules/icinga/manifests/monitor/ores.pp
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/399109/1
diff --git a/modules/icinga/manifests/monitor/ores.pp
b/modules/icinga/manifests/monitor/ores.pp
index 00c9311..07d2e34 100644
--- a/modules/icinga/manifests/monitor/ores.pp
+++ b/modules/icinga/manifests/monitor/ores.pp
@@ -5,6 +5,11 @@
contact_group => 'team-scoring',
}
+# T154175
+monitoring::grafana_alert { 'db/ores-extension':
+contact_group => 'team-scoring',
+}
+
@monitoring::host { 'ores.wmflabs.org':
host_fqdn => 'ores.wmflabs.org',
}
--
To view, visit https://gerrit.wikimedia.org/r/399109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5fcca14ac479ad55e555c7ce010f3f3abe3a10e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ladsgroup
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Greetings fixes to support contact type change.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398188 )
Change subject: Greetings fixes to support contact type change.
..
Greetings fixes to support contact type change.
2 commits from https://github.com/civicrm/civicrm-core/pull/11310
CRM-21466 - Fix (obscure) enotice when updating greeting for contact, add test
CRM-21466 follow up, add unit test to ensure custom fields can be populated.
This involves fixing the caching to be flushed during testing
Change-Id: Ic296f2b37a8ea169b93df314b95d2502d2e2b3f1
---
M CRM/Core/OptionGroup.php
M CRM/Core/PseudoConstant.php
M CRM/Utils/Token.php
M api/v3/Contact.php
4 files changed, 16 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
index 89c8eb1..250c93c 100644
--- a/CRM/Core/OptionGroup.php
+++ b/CRM/Core/OptionGroup.php
@@ -676,6 +676,12 @@
);
}
+ /**
+ * Flush all the places where option values are cached.
+ *
+ * Note that this is called from CRM_Core_PseudoConstant::flush() so we
should resist
+ * the intuitive urge to flush that class.
+ */
public static function flushAll() {
self::$_values = array();
self::$_cache = array();
diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index 75793c8..abf51f1 100644
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -594,6 +594,9 @@
}
if ($name == 'cache') {
CRM_Core_OptionGroup::flushAll();
+ if (isset(\Civi::$statics[__CLASS__])) {
+unset(\Civi::$statics[__CLASS__]);
+ }
}
}
diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php
index 257a1b1..8e43fd2 100644
--- a/CRM/Utils/Token.php
+++ b/CRM/Utils/Token.php
@@ -657,17 +657,14 @@
$returnBlankToken = FALSE,
$escapeSmarty = FALSE
) {
+// Refresh contact tokens in case they have changed. There is heavy caching
+// in exportable fields so there is no benefit in doing this conditionally.
+self::$_tokens['contact'] = array_merge(
+ array_keys(CRM_Contact_BAO_Contact::exportableFields('All')),
+ array('checksum', 'contact_id')
+);
+
$key = 'contact';
-if (self::$_tokens[$key] == NULL) {
- // This should come from UF
-
- self::$_tokens[$key]
-= array_merge(
- array_keys(CRM_Contact_BAO_Contact::exportableFields('All')),
- array('checksum', 'contact_id')
-);
-}
-
// here we intersect with the list of pre-configured valid tokens
// so that we remove anything we do not recognize
// I hope to move this step out of here soon and
diff --git a/api/v3/Contact.php b/api/v3/Contact.php
index 2d1da21..b671106 100644
--- a/api/v3/Contact.php
+++ b/api/v3/Contact.php
@@ -623,7 +623,6 @@
$nullValue = FALSE;
$filter = array(
- 'contact_type' => $params['contact_type'],
'greeting_type' => "{$key}{$greeting}",
);
--
To view, visit https://gerrit.wikimedia.org/r/398188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic296f2b37a8ea169b93df314b95d2502d2e2b3f1
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Mepps
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update page-library to 4.7.11.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398856 )
Change subject: Update page-library to 4.7.11.
..
Update page-library to 4.7.11.
Change-Id: I7cd9b97c9ddf8148ea77746784577f7f4da0a217
---
M app/src/main/assets/bundle.js
M app/src/main/assets/preview.js
M app/src/main/assets/wikimedia-page-library.css
M www/package-lock.json
M www/package.json
5 files changed, 200 insertions(+), 46 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index 62658cc..806afb9 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -2523,7 +2523,7 @@
* @return {void}
*/
var updateSaveButtonForTitle = function updateSaveButtonForTitle(title, text,
isSaved, document) {
- var saveButton = document.getElementById('' + SAVE_BUTTON_ID_PREFIX + title);
+ var saveButton = document.getElementById('' + SAVE_BUTTON_ID_PREFIX +
encodeURI(title));
saveButton.innerText = text;
saveButton.title = text;
updateSaveButtonBookmarkIcon(saveButton, isSaved);
@@ -2815,7 +2815,8 @@
// Attributes copied from images to placeholders via data-* attributes for
later restoration. The
// image's classes and dimensions are also set on the placeholder.
-var COPY_ATTRIBUTES = ['class', 'style', 'src', 'srcset', 'width', 'height',
'alt'];
+// The 3 data-* items are used by iOS.
+var COPY_ATTRIBUTES = ['class', 'style', 'src', 'srcset', 'width', 'height',
'alt', 'data-file-width', 'data-file-height', 'data-image-gallery'];
// Small images, especially icons, are quickly downloaded and may appear in
many places. Lazily
// loading these images degrades the experience with little gain. Always
eagerly load these images.
@@ -3236,27 +3237,99 @@
};
/**
+ * Gets array of ancestors of element which need widening.
+ * @param {!HTMLElement} element
+ * @return {!Array.} Zero length array is returned if no elements
should be widened.
+ */
+var ancestorsToWiden = function ancestorsToWiden(element) {
+ var widenThese = [];
+ var el = element;
+ while (el.parentNode) {
+el = el.parentNode;
+// No need to walk above 'content_block'.
+if (el.classList.contains('content_block')) {
+ break;
+}
+widenThese.push(el);
+ }
+ return widenThese;
+};
+
+/**
+ * Sets style value.
+ * @param {!CSSStyleDeclaration} style
+ * @param {!string} key
+ * @param {*} value
+ * @return {void}
+ */
+var updateStyleValue = function updateStyleValue(style, key, value) {
+ style[key] = value;
+};
+
+/**
+ * Sets style value only if value for given key already exists.
+ * @param {CSSStyleDeclaration} style
+ * @param {!string} key
+ * @param {*} value
+ * @return {void}
+ */
+var updateExistingStyleValue = function updateExistingStyleValue(style, key,
value) {
+ var valueExists = Boolean(style[key]);
+ if (valueExists) {
+updateStyleValue(style, key, value);
+ }
+};
+
+/**
+ * Image widening CSS key/value pairs.
+ * @type {Object}
+ */
+var styleWideningKeysAndValues = {
+ width: '100%',
+ height: 'auto',
+ maxWidth: '100%',
+ float: 'none'
+};
+
+/**
+ * Perform widening on an element. Certain style properties are updated, but
only if existing values
+ * for these properties already exist.
+ * @param {!HTMLElement} element
+ * @return {void}
+ */
+var widenElementByUpdatingExistingStyles = function
widenElementByUpdatingExistingStyles(element) {
+ Object.keys(styleWideningKeysAndValues).forEach(function (key) {
+return updateExistingStyleValue(element.style, key,
styleWideningKeysAndValues[key]);
+ });
+};
+
+/**
+ * Perform widening on an element.
+ * @param {!HTMLElement} element
+ * @return {void}
+ */
+var widenElementByUpdatingStyles = function
widenElementByUpdatingStyles(element) {
+ Object.keys(styleWideningKeysAndValues).forEach(function (key) {
+return updateStyleValue(element.style, key,
styleWideningKeysAndValues[key]);
+ });
+};
+
+/**
* To widen an image element a css class called 'pagelib_widen_image_override'
is applied to the
* image element, however, ancestors of the image element can prevent the
widening from taking
* effect. This method makes minimal adjustments to ancestors of the image
element being widened so
* the image widening can take effect.
- * @param {!HTMLElement} el Element whose ancestors will be widened
+ * @param {!HTMLElement} element Element whose ancestors will be widened
* @return {void}
*/
-var widenAncestors = function widenAncestors(el) {
- for (var parentElement = el.parentElement; parentElement &&
!parentElement.classList.contains('content_block'); parentElement =
parentElement.parentElement) {
-if (parentElement.style.width) {
- parentElement.style.width = '100%';
-}
-if (parentElement.style.height) {
- parentElement.style.height = 'auto';
-}
-if (parentElem
[MediaWiki-commits] [Gerrit] operations/puppet[production]: standard: decom ganglia plugin everywhere by default
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382924 )
Change subject: standard: decom ganglia plugin everywhere by default
..
standard: decom ganglia plugin everywhere by default
Bug: T177225
Change-Id: Idcafe53ffde5e3000f68789532c633820b1ffb1b
---
M modules/standard/manifests/init.pp
1 file changed, 1 insertion(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/standard/manifests/init.pp
b/modules/standard/manifests/init.pp
index 17fcbe6..5bcd948 100644
--- a/modules/standard/manifests/init.pp
+++ b/modules/standard/manifests/init.pp
@@ -24,11 +24,7 @@
include ::standard::diamond
include ::standard::prometheus
-if $has_ganglia {
-include ::ganglia
-} else {
-include ::ganglia::monitor::decommission
-}
+include ::ganglia::monitor::decommission
# Some instances have their own exim definition that
# will conflict with this
--
To view, visit https://gerrit.wikimedia.org/r/382924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idcafe53ffde5e3000f68789532c633820b1ffb1b
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: gitignore docker-pkg-build.log
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399108 ) Change subject: gitignore docker-pkg-build.log .. gitignore docker-pkg-build.log Build logs generated by docker-pkg. Change-Id: I7b1020ef27a118a1e0711a94138e3f31fca7ea10 --- M .gitignore 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/08/399108/1 diff --git a/.gitignore b/.gitignore index 447fa83..e447325 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ /dockerfiles/*/cache /dockerfiles/*/.cache-buster + +# Generated by docker-pkg +docker-pkg-build.log -- To view, visit https://gerrit.wikimedia.org/r/399108 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b1020ef27a118a1e0711a94138e3f31fca7ea10 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate composer hhvm jobs to Docker
Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399107 )
Change subject: Migrate composer hhvm jobs to Docker
..
Migrate composer hhvm jobs to Docker
Keep operations-mw-config-composer-hhvm-jessie for now. It is a more
specific job.
Change-Id: Ic8bde0b0f726baeb8504da3708f64b0ad992ad8e
---
A dockerfiles/composer-hhvm/Dockerfile.template
A dockerfiles/composer-hhvm/changelog
A dockerfiles/composer-package-hhvm/Dockerfile.template
A dockerfiles/composer-package-hhvm/changelog
A dockerfiles/composer-test-hhvm/Dockerfile.template
A dockerfiles/composer-test-hhvm/changelog
M jjb/mediawiki.yaml
M jjb/php.yaml
M zuul/layout.yaml
9 files changed, 64 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/07/399107/1
diff --git a/dockerfiles/composer-hhvm/Dockerfile.template
b/dockerfiles/composer-hhvm/Dockerfile.template
new file mode 100644
index 000..783074a
--- /dev/null
+++ b/dockerfiles/composer-hhvm/Dockerfile.template
@@ -0,0 +1,14 @@
+FROM wmfreleng/composer:latest as composer
+
+FROM docker-registry.wikimedia.org/releng/hhvm:latest
+
+COPY --from=composer /srv/composer /srv/composer
+COPY --from=composer /.cache-buster-composer /.cache-buster-composer
+# Manually link since COPY copies symlink destination instead of the actual
symlink
+USER root
+RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
+
+USER nobody
+
+ENTRYPOINT ["/srv/composer/vendor/bin/composer"]
+CMD ["help"]
diff --git a/dockerfiles/composer-hhvm/changelog
b/dockerfiles/composer-hhvm/changelog
new file mode 100644
index 000..3683ef4
--- /dev/null
+++ b/dockerfiles/composer-hhvm/changelog
@@ -0,0 +1,5 @@
+composer-hhvm (0.1.0) wikimedia; urgency=medium
+
+ * Initial creation.
+
+ -- Antoine Musso Mon, 18 Dec 2017 23:24:10 +0100
diff --git a/dockerfiles/composer-package-hhvm/Dockerfile.template
b/dockerfiles/composer-package-hhvm/Dockerfile.template
new file mode 100644
index 000..a394acf
--- /dev/null
+++ b/dockerfiles/composer-package-hhvm/Dockerfile.template
@@ -0,0 +1,7 @@
+FROM wmfreleng/composer-package
+
+FROM docker-registry.wikimedia.org/releng/composer-hhvm:latest
+
+USER nobody
+COPY --from=wmfreleng/composer-package /run.sh /run.sh
+ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-package-hhvm/changelog
b/dockerfiles/composer-package-hhvm/changelog
new file mode 100644
index 000..550b6ea
--- /dev/null
+++ b/dockerfiles/composer-package-hhvm/changelog
@@ -0,0 +1,5 @@
+composer-package-hhvm (0.1.0) wikimedia; urgency=medium
+
+ * Initial creation based on wmfreleng/composer-package
+
+ -- Antoine Musso Mon, 18 Dec 2017 23:28:06 +0100
diff --git a/dockerfiles/composer-test-hhvm/Dockerfile.template
b/dockerfiles/composer-test-hhvm/Dockerfile.template
new file mode 100644
index 000..04a9ddc
--- /dev/null
+++ b/dockerfiles/composer-test-hhvm/Dockerfile.template
@@ -0,0 +1,7 @@
+FROM wmfreleng/composer-test
+
+FROM docker-registry.wikimedia.org/releng/composer-hhvm:latest
+
+USER nobody
+COPY --from=wmfreleng/composer-test /run.sh /run.sh
+ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-test-hhvm/changelog
b/dockerfiles/composer-test-hhvm/changelog
new file mode 100644
index 000..47ede56
--- /dev/null
+++ b/dockerfiles/composer-test-hhvm/changelog
@@ -0,0 +1,5 @@
+composer-test-hhvm (0.1.0) wikimedia; urgency=medium
+
+ * Initial creation.
+
+ -- Antoine Musso Mon, 18 Dec 2017 23:22:51 +0100
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 9277428..6b42c38 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -262,6 +262,8 @@
- '{name}-composer-{phpflavor}-{image}': *phpflavor_images
- '{name}-composer-package-{phpflavor}-docker': &phpflavor_docker
phpflavor:
+- hhvm:
+image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.0
- php55:
image:
docker-registry.wikimedia.org/releng/composer-package-php55:v0.1.0
- php70:
diff --git a/jjb/php.yaml b/jjb/php.yaml
index eae5c6e..c5e5f2b 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -202,12 +202,16 @@
jobs:
- 'composer-package-{phpflavor}-docker':
phpflavor:
+- hhvm:
+image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.0
- php55:
image:
docker-registry.wikimedia.org/releng/composer-package-php55:v0.1.0
- php70:
image: wmfreleng/composer-package:v2017.10.28.07.05
- 'composer-{phpflavor}-docker':
phpflavor:
+- hhvm:
+image:
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.1.0
- php55:
image:
docker-registry.wikimedia.org/releng/composer-test-php55:v
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Suppress phan warning for now
Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399106 ) Change subject: Suppress phan warning for now .. Suppress phan warning for now Probably needs update in that code, but shouldn't be blocking other builds. Change-Id: I4d939a48ee487e5e045297f3e568d7d91d00ec42 --- M includes/Api/QueryCirrusDoc.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/06/399106/1 diff --git a/includes/Api/QueryCirrusDoc.php b/includes/Api/QueryCirrusDoc.php index 76ecd3e..f1f3101 100644 --- a/includes/Api/QueryCirrusDoc.php +++ b/includes/Api/QueryCirrusDoc.php @@ -106,6 +106,7 @@ return [ $rev->getPage(), $hasRedirects ]; } $content = $handler->unserializeContent( + /** @suppress PhanDeprecatedFunction TODO move to new API */ $rev->getSerializedData(), $rev->getContentFormat() ); -- To view, visit https://gerrit.wikimedia.org/r/399106 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d939a48ee487e5e045297f3e568d7d91d00ec42 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[fundraising/REL1_27]: Update DonationInterface submodule
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398943 ) Change subject: Update DonationInterface submodule .. Update DonationInterface submodule Change-Id: I05503803266df2658644e6c2692a1e1b6dea5d33 --- M extensions/DonationInterface 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 07d5efb..7e7b8df 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface @@ -1 +1 @@ -Subproject commit 07d5efbc9c811094bbd5647705e84f04c6f32769 +Subproject commit 7e7b8dfcf1223cf3f5fbed2567a96d834e054e96 -- To view, visit https://gerrit.wikimedia.org/r/398943 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05503803266df2658644e6c2692a1e1b6dea5d33 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...source[master]: Add _REFINE_FAILED failure flag and skip refinement if it ex...
Ottomata has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399105 )
Change subject: Add _REFINE_FAILED failure flag and skip refinement if it exists
..
Add _REFINE_FAILED failure flag and skip refinement if it exists
Since JsonRefine selects targets well into the past, we need to not only
skip targets that previously succeeded, but also those that failed.
Keeping failure state in the _REFINE_FAILED flag allows us to do this.
_REFINE_FAILED works the same as the _REFINED flag, in that it stores
the mtime of the input target. If the input target's mtime changes,
it will be selected for (re) refinement, even if the _REFINE_FAILED
flag exists.
Change-Id: I69e344a7ea24631e446436b32623223f06123860
---
M
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/JsonRefine.scala
1 file changed, 170 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source
refs/changes/05/399105/1
diff --git
a/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/JsonRefine.scala
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/JsonRefine.scala
index f9abc66..055dcee 100644
---
a/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/JsonRefine.scala
+++
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/JsonRefine.scala
@@ -46,6 +46,8 @@
tableWhitelistRegex: Option[Regex] = None,
tableBlacklistRegex: Option[Regex] = None,
doneFlag: String = "_REFINED",
+failureFlag: String= "_REFINE_FAILED",
+shouldIgnoreFailureFlag: Boolean = false,
parallelism: Option[Int] = None,
compressionCodec: String = "snappy",
isSequenceFile: Boolean= true,
@@ -197,6 +199,22 @@
|data has changed meaning the partition needs to be re-refined.
|Default: _REFINED""".stripMargin.replace("\n", "\n\t") + "\n"
+opt[String]('X', "failure-flag") optional() valueName ""
action { (x, p) =>
+p.copy(failureFlag = x)
+} text
+"""When a partition fails refinement, this file will be created in
the
+ |output partition path with the binary timestamp of the input
source partition's
+ |modification timestamp. Any parititon with this flag will be
excluded
+ |from refinement if the input data data's modtime hasn't
changed. If the
+ |modtime has changed, this will re-attempt refinement anyway.
+ |Default: _REFINE_FAILED""".stripMargin.replace("\n", "\n\t") +
"\n"
+
+opt[Unit]('I', "ignore-failure-flag") optional() action { (_, p) =>
+p.copy(shouldIgnoreFailureFlag = true)
+} text
+"""Set this if you want all discovered partitions with
--failure-flag files to be
+ |(re)refined. Default: false""".stripMargin.replace("\n",
"\n\t") + "\n"
+
opt[Int]('P', "parallelism") optional() valueName ""
action { (x, p) =>
p.copy(parallelism = Some(x))
} text
@@ -317,6 +335,7 @@
new Path(params.outputBasePath),
params.databaseName,
params.doneFlag,
+params.failureFlag,
params.inputPathDateTimeFormat,
inputPathRegex,
params.sinceDateTime
@@ -324,7 +343,10 @@
// Filter for tables in whitelist, filter out tables in blacklist,
// and filter the remaining for targets that need refinement.
.filter(target => shouldRefineJsonTarget(
-target, params.tableWhitelistRegex, params.tableBlacklistRegex
+target,
+params.tableWhitelistRegex,
+params.tableBlacklistRegex,
+params.shouldIgnoreFailureFlag
))
// At this point, targetsToRefine will be a Seq of JsonTargets in our
targeted
@@ -447,7 +469,8 @@
def shouldRefineJsonTarget(
target: JsonTarget,
tableWhitelistRegex: Option[Regex],
-tableBlacklistRegex: Option[Regex]
+tableBlacklistRegex: Option[Regex],
+shouldIgnoreFailureFlag: Boolean
): Boolean = {
// Filter for targets that will refine to tables that match the
whitelist
@@ -471,11 +494,19 @@
false
}
// Finally filter for those that need to be refined (have new data).
-else if (!target.shouldRefine) {
-log.info(
-s"$target does not have new data since the last refine at " +
-s"${target.doneFlagMTime().getOrElse("_unknown_")}, skipping."
-)
+else if (!target.shouldRefine(shouldIgnoreFailureFlag)) {
+if (!shouldIgnoreFailureFlag && target.failureFlagExists()) {
+log.warn(
+
[MediaWiki-commits] [Gerrit] operations/puppet[production]: bigbrother: catch exceptions thrown during tool restarts
Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399104 )
Change subject: bigbrother: catch exceptions thrown during tool restarts
..
bigbrother: catch exceptions thrown during tool restarts
Currently if a single tool restart fails, bigbrother just gives
up and goes back to the top of the restart list. With this change
we're at least a little bit fault-tolerant.
Bug: T183171
Change-Id: I1c1bc58d4ae5eb4e8b21f69b99a8871db088f83a
---
M modules/toollabs/files/bigbrother.py
1 file changed, 31 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/399104/1
diff --git a/modules/toollabs/files/bigbrother.py
b/modules/toollabs/files/bigbrother.py
index 3946d0d..6454c9c 100755
--- a/modules/toollabs/files/bigbrother.py
+++ b/modules/toollabs/files/bigbrother.py
@@ -29,6 +29,7 @@
import smtplib
import subprocess
import time
+import traceback
import xml.etree.ElementTree as ET
@@ -250,30 +251,38 @@
with open(tmp_name, 'w') as sb:
print(datetime.datetime.utcnow(), file=sb)
for tool in self.watchdb:
-if 'jobs' not in self.watchdb[tool]:
-print('%s:-:-:-:-' % tool, file=sb)
-continue
-for job in self.watchdb[tool]['jobs'].values():
-if 'state' not in job:
-print('%s:%s:-:-:-' % (tool, job['jname']), file=sb)
+try:
+if 'jobs' not in self.watchdb[tool]:
+print('%s:-:-:-:-' % tool, file=sb)
continue
-if job['state'] == 'DEAD':
-self.start_job(tool, job)
-elif job['state'] in ['STARTING', 'THROTTLED']:
-if time.time() >= job.get('timeout', 0):
-self.log_event(
-tool, 'warn',
-"job '%s' failed to start" % job['jname'])
+for job in self.watchdb[tool]['jobs'].values():
+if 'state' not in job:
+print('%s:%s:-:-:-' % (tool, job['jname']),
file=sb)
+continue
+if job['state'] == 'DEAD':
self.start_job(tool, job)
-print(
-'%s:%s:%s:%s:%s' % (
-tool,
-job['jname'],
-job.get('state', 'UNKNOWN'),
-job.get('since', 0),
-job.get('timeout', 0)
-),
-file=sb)
+elif job['state'] in ['STARTING', 'THROTTLED']:
+if time.time() >= job.get('timeout', 0):
+self.log_event(
+tool, 'warn',
+"job '%s' failed to start" % job['jname'])
+self.start_job(tool, job)
+print(
+'%s:%s:%s:%s:%s' % (
+tool,
+job['jname'],
+job.get('state', 'UNKNOWN'),
+job.get('since', 0),
+job.get('timeout', 0)
+),
+file=sb)
+except:
+logger.exception('Exception during restart of tool %s',
+ tool)
+traceback.print_exc()
+print('--')
+traceback.print_stack()
+
os.rename(tmp_name, self.scoreboard)
def run(self):
--
To view, visit https://gerrit.wikimedia.org/r/399104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c1bc58d4ae5eb4e8b21f69b99a8871db088f83a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Fix --ids option
Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399103 )
Change subject: Fix --ids option
..
Fix --ids option
We should set the variable before we check it.
Bug: T183197
Change-Id: I9d067fc696de272944f400c23a9e22f9f572a0ba
---
M maintenance/forceSearchIndex.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/03/399103/1
diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index da3f1a2..8599e68 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -138,6 +138,7 @@
);
}
+ $this->indexUpdates = !$this->getOption( 'deletes', false );
// We need to check ids options early otherwise hasOption may
return
// true even if the user did not set the option on the
commandline
if ( $this->hasOption( 'ids' ) ) {
@@ -151,7 +152,6 @@
$this->toDate = new MWTimestamp( $this->getOption(
'to', false ) );
}
$this->toId = $this->getOption( 'toId' );
- $this->indexUpdates = !$this->getOption( 'deletes', false );
$this->archive = (bool)$this->getOption( 'archive', false );
if ( $this->archive ) {
// If we're indexing only for archive, this implies
deletes
--
To view, visit https://gerrit.wikimedia.org/r/399103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d067fc696de272944f400c23a9e22f9f572a0ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Add REL1_27 submodules for bundled extensions/skins/vendor
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399102 ) Change subject: Add REL1_27 submodules for bundled extensions/skins/vendor .. Add REL1_27 submodules for bundled extensions/skins/vendor Change-Id: Icb3192f81bd7c24f1a388f38feb17f6b68400330 --- A .gitmodules A extensions/Cite A extensions/CiteThisPage A extensions/ConfirmEdit A extensions/Gadgets A extensions/ImageMap A extensions/InputBox A extensions/Interwiki A extensions/LocalisationUpdate A extensions/Nuke A extensions/ParserFunctions A extensions/PdfHandler A extensions/Poem A extensions/Renameuser A extensions/SpamBlacklist A extensions/SyntaxHighlight_GeSHi A extensions/TitleBlacklist A extensions/WikiEditor A skins/CologneBlue A skins/Modern A skins/MonoBook A skins/Vector A vendor 23 files changed, 114 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/02/399102/1 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000..04f5d37 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,92 @@ +[submodule "extensions/Cite"] + path = extensions/Cite + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite + branch = REL1_27 +[submodule "extensions/CiteThisPage"] + path = extensions/CiteThisPage + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CiteThisPage + branch = REL1_27 +[submodule "extensions/ConfirmEdit"] + path = extensions/ConfirmEdit + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit + branch = REL1_27 +[submodule "extensions/Gadgets"] + path = extensions/Gadgets + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Gadgets + branch = REL1_27 +[submodule "extensions/ImageMap"] + path = extensions/ImageMap + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ImageMap + branch = REL1_27 +[submodule "extensions/InputBox"] + path = extensions/InputBox + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/InputBox + branch = REL1_27 +[submodule "extensions/Interwiki"] + path = extensions/Interwiki + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Interwiki + branch = REL1_27 +[submodule "extensions/LocalisationUpdate"] + path = extensions/LocalisationUpdate + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/LocalisationUpdate + branch = REL1_27 +[submodule "extengit"] + path = extengit + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Nuke + branch = REL1_27 +[submodule "extensions/Nuke"] + path = extensions/Nuke + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Nuke + branch = REL1_27 +[submodule "extensions/ParserFunctions"] + path = extensions/ParserFunctions + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ParserFunctions + branch = REL1_27 +[submodule "extensions/PdfHandler"] + path = extensions/PdfHandler + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PdfHandler + branch = REL1_27 +[submodule "extensions/Poem"] + path = extensions/Poem + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Poem + branch = REL1_27 +[submodule "extensions/Renameuser"] + path = extensions/Renameuser + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Renameuser + branch = REL1_27 +[submodule "extensions/SpamBlacklist"] + path = extensions/SpamBlacklist + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SpamBlacklist + branch = REL1_27 +[submodule "extensions/SyntaxHighlight_GeSHi"] + path = extensions/SyntaxHighlight_GeSHi + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SyntaxHighlight_GeSHi + branch = REL1_27 +[submodule "extensions/TitleBlacklist"] + path = extensions/TitleBlacklist + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/TitleBlacklist + branch = REL1_27 +[submodule "extensions/WikiEditor"] + path = extensions/WikiEditor + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiEditor + branch = REL1_27 +[submodule "skins/CologneBlue"] + path = skins/CologneBlue + url = https://gerrit.wikimedia.org/r/mediawiki/skins/CologneBlue + branch = REL1_27 +[submodule "skins/Modern"] + path = skins/Modern + url = https://gerrit.wikimedia.org/r/mediawiki/skins/Modern + branch = REL1_27 +[submodule "skins/MonoBook"] + path = skins/MonoBook + url = https://gerrit.wikimedia.org/r/mediawiki/skins/MonoBook + branch = REL1_27 +[submodule "skins/Vector"] + path = skins/Vector + url = https://gerrit.wikimedia.org/r/mediawiki/skins/Vector + branch = REL1_27 +[submodule "vendor"] + path = vendor + url = https://gerrit.wikimedia.org/r/m
[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: Allow librenms to write file in $install_dir
Ayounsi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399101 )
Change subject: LibreNMS: Allow librenms to write file in $install_dir
..
LibreNMS: Allow librenms to write file in $install_dir
The librenms user needs to write files such as sockets or lock files in
the root $install_dir.
As $install_dir is owned by deploy-librenms, this CR adds librenms to
the deploy-librenms group, then ensure that group can write to the
folder.
Change-Id: I16165153cbcdc22078a2240f455ad609dfe0c329
---
M modules/role/manifests/librenms.pp
1 file changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/399101/1
diff --git a/modules/role/manifests/librenms.pp
b/modules/role/manifests/librenms.pp
index 08dbec4..817ccc2 100644
--- a/modules/role/manifests/librenms.pp
+++ b/modules/role/manifests/librenms.pp
@@ -23,6 +23,20 @@
before => Class['::librenms'],
}
+# The following is required as librenms needs to write files (lock, socket)
+# In $install_dir.
+exec { 'Ensure user librenms is is group deploy-librenms':
+unless => '/bin/grep -q "deploy-librenms\\S*librenms" /etc/group',
+command => '/usr/sbin/usermod -aG deploy-librenms librenms',
+require => [ User['librenms']
+Scap::Target['librenms/librenms']],
+}
+file { $install_dir:
+mode=> 'g+w',
+require => Scap::Target['librenms/librenms'],
+}
+
+
$config = {
'title_image' =>
'//upload.wikimedia.org/wikipedia/commons/thumb/0/0c/Wikimedia_Foundation_logo_-_horizontal_%282012-2016%29.svg/140px-Wikimedia_Foundation_logo_-_horizontal_%282012-2016%29.svg.png',
--
To view, visit https://gerrit.wikimedia.org/r/399101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16165153cbcdc22078a2240f455ad609dfe0c329
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add issue count column to Special:Newsletters
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399096 )
Change subject: Add issue count column to Special:Newsletters
..
Add issue count column to Special:Newsletters
Bug: T180979
Change-Id: Id270d0004a6aaa21a459786c6b1c0d77868968cf
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/pagers/NewsletterTablePager.php
3 files changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/96/399096/1
diff --git a/i18n/en.json b/i18n/en.json
index 35df6a4..bc76064 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -117,6 +117,7 @@
"newsletter-header-name": "Name",
"newsletter-header-description": "Description",
"newsletter-header-subscriber_count": "Subscribers",
+ "newsletter-header-issue_count": "Issues",
"right-newsletter-create": "Create newsletters",
"action-newsletter-create": "create newsletters",
"right-newsletter-delete": "Delete newsletters",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5d54766..936d0a3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -123,6 +123,7 @@
"newsletter-header-name": "Label of the newsletter name column of table
in [[Special:Newsletters]] which lists the names of
newsletters\n{{Identical|Name}}",
"newsletter-header-description": "Label of the description column of
table in [[Special:Newsletters]] which displays a description about the
newsletter\n{{Identical|Description}}",
"newsletter-header-subscriber_count": "Label of the subscriber count
column of table in [[Special:Newsletters]] which gives the subscriber count of
corresponding newsletter\n{{Identical|Subscriber}}",
+ "newsletter-header-issue_count": "Label of the issue count column of
table in [[Special:Newsletters]] which displays how many issues of the
newsletter have been announces. {{Identical|Issue}}",
"right-newsletter-create": "{{doc-right|newsletter-create}}",
"action-newsletter-create": "{{doc-action|newsletter-create}}",
"right-newsletter-delete": "{{doc-right|newsletter-delete}}",
diff --git a/includes/specials/pagers/NewsletterTablePager.php
b/includes/specials/pagers/NewsletterTablePager.php
index d623a6e..0e9805f 100644
--- a/includes/specials/pagers/NewsletterTablePager.php
+++ b/includes/specials/pagers/NewsletterTablePager.php
@@ -44,6 +44,7 @@
'nl_name' => $this->msg(
'newsletter-header-name' )->text(),
'nl_desc' => $this->msg(
'newsletter-header-description' )->text(),
'subscriber_count' => $this->msg(
'newsletter-header-subscriber_count' )->text(),
+ 'issue_count' => $this->msg(
'newsletter-header-issue_count' )->text(),
];
if ( $this->getUser()->isLoggedIn() ) {
@@ -236,6 +237,8 @@
*/
public function getQueryInfo() {
$userId = $this->getUser()->getId();
+ $tblIssues = $this->mDb->tableName( 'nl_issues' );
+ $issueCountQuery = "( SELECT COUNT(*) from $tblIssues where
nli_newsletter_id = nl_id )";
$info = [
'tables' => [ 'nl_newsletters', 'nl_subscriptions' ],
'fields' => [
@@ -243,7 +246,8 @@
'nl_desc',
'nl_id',
"nl_subscriber_count",
- 'nls_subscriber_id'
+ 'nls_subscriber_id',
+ 'issue_count' => $issueCountQuery
],
];
$info['conds'] = [ 'nl_active' => 1 ];
@@ -302,6 +306,12 @@
[ 'id' => "nl-count-$id" ],
$wgContLang->formatNum(
-(int)$this->mCurrentRow->nl_subscriber_count )
);
+ case 'issue_count':
+ return Html::element(
+ 'span',
+ [ 'id' => "nl-count-$id" ],
+ $wgContLang->formatNum(
$this->mCurrentRow->issue_count )
+ );
case 'action' :
if ( $this->mCurrentRow->nls_subscriber_id ) {
$title = SpecialPage::getTitleFor(
--
To view, visit https://gerrit.wikimedia.org/r/399096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id270d0004a6aaa21a459786c6b1c0d77868968cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Replace PEAR with Packagist in README.md link
Ricordisamoa has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398945 ) Change subject: Replace PEAR with Packagist in README.md link .. Replace PEAR with Packagist in README.md link Compare with commit 83b4ab6bb9720393185bdfa691d4448a9ed759c6 which made installation instructions use Composer. Change-Id: Ie77281e69371fe45d927cb9f877d507e11903c0c --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer refs/changes/45/398945/1 diff --git a/README.md b/README.md index 3f370c2..0be5bc9 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,6 @@ * Migrate the old code-utils/check-vars.php --- -[0]: https://pear.php.net/package/PHP_CodeSniffer +[0]: https://packagist.org/packages/squizlabs/php_codesniffer [1]: https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP [2]: https://www.mediawiki.org/wiki/Continuous_integration/Entry_points#PHP -- To view, visit https://gerrit.wikimedia.org/r/398945 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie77281e69371fe45d927cb9f877d507e11903c0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: Ricordisamoa ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[REL1_28]: SECURITY: Fix escaping of description field
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398944 ) Change subject: SECURITY: Fix escaping of description field .. SECURITY: Fix escaping of description field Bug: T118682 Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111 (cherry picked from commit f6c8566aa34fdc074f92e3b8f53cc3cbd76ca310) --- M TemplateDataBlob.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php index b8c8078..826b438 100644 --- a/TemplateDataBlob.php +++ b/TemplateDataBlob.php @@ -817,7 +817,7 @@ 'mw-templatedata-doc-muted' => ( $paramObj->description === null ) ] ], - Html::rawElement( 'p', [], + Html::element( 'p', [], $paramObj->description !== null ? $paramObj->description : wfMessage( 'templatedata-doc-param-desc-empty' )->inLanguage( $lang )->text() -- To view, visit https://gerrit.wikimedia.org/r/398944 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateData Gerrit-Branch: REL1_28 Gerrit-Owner: Legoktm Gerrit-Reviewer: Brian Wolff Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[REL1_28]: SECURITY: Fix escaping of description field
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398944 ) Change subject: SECURITY: Fix escaping of description field .. SECURITY: Fix escaping of description field Bug: T118682 Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111 (cherry picked from commit f6c8566aa34fdc074f92e3b8f53cc3cbd76ca310) --- M TemplateDataBlob.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData refs/changes/44/398944/1 diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php index b8c8078..826b438 100644 --- a/TemplateDataBlob.php +++ b/TemplateDataBlob.php @@ -817,7 +817,7 @@ 'mw-templatedata-doc-muted' => ( $paramObj->description === null ) ] ], - Html::rawElement( 'p', [], + Html::element( 'p', [], $paramObj->description !== null ? $paramObj->description : wfMessage( 'templatedata-doc-param-desc-empty' )->inLanguage( $lang )->text() -- To view, visit https://gerrit.wikimedia.org/r/398944 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateData Gerrit-Branch: REL1_28 Gerrit-Owner: Legoktm Gerrit-Reviewer: Brian Wolff ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[fundraising/REL1_27]: Update DonationInterface submodule
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398943 ) Change subject: Update DonationInterface submodule .. Update DonationInterface submodule Change-Id: I05503803266df2658644e6c2692a1e1b6dea5d33 --- M extensions/DonationInterface 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/43/398943/1 diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 07d5efb..7e7b8df 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface @@ -1 +1 @@ -Subproject commit 07d5efbc9c811094bbd5647705e84f04c6f32769 +Subproject commit 7e7b8dfcf1223cf3f5fbed2567a96d834e054e96 -- To view, visit https://gerrit.wikimedia.org/r/398943 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05503803266df2658644e6c2692a1e1b6dea5d33 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Clean up logging config.
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398942 ) Change subject: Clean up logging config. .. Clean up logging config. Add modules we're interested in, as knobs to be turned when desired. Make the format string nicer, and provide a variant for debugging problems where threading would make it hard to read. Bug: T182614 Change-Id: Ie6f36290d2afef2a77e44bbd5d36f0994cc65a1a --- M logging_config.yaml 1 file changed, 23 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ores/deploy refs/changes/42/398942/1 diff --git a/logging_config.yaml b/logging_config.yaml index aff222d..68cfc82 100644 --- a/logging_config.yaml +++ b/logging_config.yaml @@ -1,21 +1,26 @@ version: 1 +root: + handlers: [file] + loggers: + revscoring: level: ERROR -handlers: [file] ores: level: ERROR -handlers: [file] + ores.metrics_collectors.logger: +level: ERROR celery: level: ERROR -handlers: [file] + requests: +level: ERROR + revscoring.dependencies.dependent: +level: ERROR + stopit: +level: ERROR handlers: - stdout: -class: logging.StreamHandler -formatter: basic_human -stream: ext://sys.stdout file: class: logging.handlers.TimedRotatingFileHandler filename: /srv/log/ores/app.log @@ -23,7 +28,15 @@ when: midnight backupCount: 7 -formatters: - basic_human: -format: "%(asctime)s %(levelname)s:%(name)s -- %(message)s" + syslog: +class: logging.handlers.SysLogHandler +formatter: basic_human +address: /dev/log +formatters: + basic_human: +format: "%(asctime)s %(levelname)s %(name)s: %(message)s" + + # Extra verbosity for untangling threads: + threaded: +format: "s%(asctime)s %(levelname)s %(name)s [P%(process)d T%(thread)d]: %(message)s" -- To view, visit https://gerrit.wikimedia.org/r/398942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6f36290d2afef2a77e44bbd5d36f0994cc65a1a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ores/deploy Gerrit-Branch: master Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: T183153: Removed Prometheus duplicate key output from Donati...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398894 )
Change subject: T183153: Removed Prometheus duplicate key output from
DonationStats
..
T183153: Removed Prometheus duplicate key output from DonationStats
Change-Id: Ic5d48ca6fecfeda202821bc28691eebda3c68836
---
M sites/all/modules/queue2civicrm/DonationStats.php
M sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsTest.php
2 files changed, 35 insertions(+), 26 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/queue2civicrm/DonationStats.php
b/sites/all/modules/queue2civicrm/DonationStats.php
index 1e930f4..5214003 100644
--- a/sites/all/modules/queue2civicrm/DonationStats.php
+++ b/sites/all/modules/queue2civicrm/DonationStats.php
@@ -103,29 +103,6 @@
}
/**
- * Export stats data to a Prometheus .prom out file using the
- * PrometheusStatsExporter exporter.
- *
- * @see PrometheusStatsExporter
- */
- protected function exportToPrometheus() {
-// get the output file name and file path
-if (isset($this->prometheusOutputFilePath)) {
- $path = $this->prometheusOutputFilePath;
-} else {
- $path = variable_get(
-'metrics_reporting_prometheus_path', '/var/spool/prometheus'
- );
-}
-$filename = $this->prometheusOutputFileName;
-
-// instantiate a Stats Collector Prometheus specific exporter and pass it
the current
-// instance of $statsCollector to then export all stats to
{$path}/{$filename}.prom
-$prometheusStatsExporter = new PrometheusStatsExporter($filename, $path);
-$prometheusStatsExporter->export($this->statsCollector);
- }
-
- /**
* Record a stat to count/increment the number of gateway specific donations
*
* @param string $paymentGateway
@@ -206,4 +183,39 @@
}
+ /**
+ * Export stats data to a Prometheus .prom out file using the
+ * PrometheusStatsExporter exporter.
+ *
+ * @see PrometheusStatsExporter
+ */
+ protected function exportToPrometheus() {
+// get the output file name and file path
+if (isset($this->prometheusOutputFilePath)) {
+ $path = $this->prometheusOutputFilePath;
+} else {
+ $path = variable_get(
+'metrics_reporting_prometheus_path', '/var/spool/prometheus'
+ );
+}
+$filename = $this->prometheusOutputFileName;
+
+$prometheusStatsExporter = new PrometheusStatsExporter($filename, $path);
+$donationStats = $this->getDonationStatsFromStatsCollector();
+$prometheusStatsExporter->export($donationStats);
+ }
+
+ /**
+ * We only want to pull the *unique* summary data when exporting to
Prometheus
+ *
+ * @return array|mixed
+ */
+ protected function getDonationStatsFromStatsCollector() {
+return $this->statsCollector->getWithKey([
+ 'donations.average.*',
+ 'donations.overall.*',
+ 'donations.gateway.*',
+]);
+ }
+
}
\ No newline at end of file
diff --git
a/sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsTest.php
b/sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsTest.php
index c4a2f83..cbefd52 100644
--- a/sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsTest.php
+++ b/sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsTest.php
@@ -121,7 +121,6 @@
'donations_overall_donations' => 1,
'donations_overall_average_transaction_age' => 3600, // should be -1
hour from now (3600 secs)
'donations_average_transaction_age_ACME_PAYMENTS' => 3600,
- 'donations_transaction_age_ACME_PAYMENTS' => 3600,
];
$statsFileFullPath = $this->statsFilePath . $this->statsFilename .
$this->statsFileExtension;
@@ -167,6 +166,4 @@
private function setupStatsCollector() {
\Statistics\Collector\Collector::tearDown(TRUE);
}
-
-
}
--
To view, visit https://gerrit.wikimedia.org/r/398894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5d48ca6fecfeda202821bc28691eebda3c68836
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Jgleeson
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Eileen
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Mepps
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibrenNMS IRC bot, config typo
Ayounsi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398940 ) Change subject: LibrenNMS IRC bot, config typo .. LibrenNMS IRC bot, config typo Change-Id: Ida424197244457fe7cd98fb2d2ae385d118de5db --- M modules/librenms/templates/config.php.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ayounsi: Looks good to me, approved diff --git a/modules/librenms/templates/config.php.erb b/modules/librenms/templates/config.php.erb index db786ef..d005025 100644 --- a/modules/librenms/templates/config.php.erb +++ b/modules/librenms/templates/config.php.erb @@ -18,7 +18,7 @@ # Workaround a bug where the puppet array value '+6697' is converted to "6697" # The plus is necessary to use TLS -$config['irc_port'] = "+6697" +$config['irc_port'] = "+6697"; $puppet_config = <%= scope.function_phpdump([@config]) %>; -- To view, visit https://gerrit.wikimedia.org/r/398940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida424197244457fe7cd98fb2d2ae385d118de5db Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ayounsi Gerrit-Reviewer: Ayounsi Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Move addRedLinks to DOMPostProcessor; allow async processors.
C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398941 )
Change subject: Move addRedLinks to DOMPostProcessor; allow async processors.
..
Move addRedLinks to DOMPostProcessor; allow async processors.
The forthcoming LanguageConverter pass will also be hooked into
DOMPostProcessor. This uses the 'yield' syntax (node 4 and up) to
allow asynchronous processing steps in DOMPostProcessor.
Change-Id: Id7d97a8c944c05177250adb31a22349f5db01943
---
M lib/parse.js
M lib/wt2html/DOMPostProcessor.js
2 files changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/41/398941/1
diff --git a/lib/parse.js b/lib/parse.js
index b7a2995..5df43ed 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -33,11 +33,6 @@
}
var handler = env.getContentHandler(obj.contentmodel);
return handler.toHTML(env)
- .tap(function(doc) {
- if (env.conf.parsoid.useBatchAPI) {
- return DU.addRedLinks(env, doc);
- }
- })
.then(function(doc) {
var out;
if (env.pageBundle) {
diff --git a/lib/wt2html/DOMPostProcessor.js b/lib/wt2html/DOMPostProcessor.js
index 113073f..6e509e6 100644
--- a/lib/wt2html/DOMPostProcessor.js
+++ b/lib/wt2html/DOMPostProcessor.js
@@ -11,6 +11,7 @@
var DU = require('../utils/DOMUtils.js').DOMUtils;
var DOMTraverser = require('../utils/DOMTraverser.js').DOMTraverser;
+var Promise = require('../utils/promise.js');
// processors
var requireProcessor = function(p) {
@@ -249,6 +250,13 @@
domVisitor.addHandler(null, CleanUp.cleanupAndSaveDataParsoid);
addPP('cleanupAndSaveDP', domVisitor.traverse.bind(domVisitor));
+ // (Optional) red links
+ addPP('addRedLinks', function(rootNode, env, options, atTopLevel) {
+ if (atTopLevel && env.conf.parsoid.useBatchAPI) {
+ // Async; returns promise for completion.
+ return DU.addRedLinks(env, rootNode.ownerDocument);
+ }
+ });
}
// Inherit from EventEmitter
@@ -466,7 +474,7 @@
document.body.classList.add('mw-parser-output');
};
-DOMPostProcessor.prototype.doPostProcess = function(document) {
+DOMPostProcessor.prototype.doPostProcess = Promise.async(function *(document) {
var env = this.env;
var psd = env.conf.parsoid;
@@ -510,7 +518,8 @@
ppStart = Date.now();
env.log(logLevel, prefix + "; " + ppName + "
start");
}
- pp.proc(document.body, env, this.options,
this.atTopLevel);
+ // Processors can return a Promise iff they need to be
async.
+ yield pp.proc(document.body, env, this.options,
this.atTopLevel);
if (tracePP) {
ppEnd = Date.now();
env.log(logLevel, prefix + "; " + ppName + "
end; time = " + (ppEnd - ppStart));
@@ -542,7 +551,7 @@
}
this.emit('document', document);
-};
+});
/**
* Register for the 'document' event, normally emitted from the HTML5 tree
--
To view, visit https://gerrit.wikimedia.org/r/398941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7d97a8c944c05177250adb31a22349f5db01943
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibrenNMS IRC bot, config typo
Ayounsi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398940 ) Change subject: LibrenNMS IRC bot, config typo .. LibrenNMS IRC bot, config typo Change-Id: Ida424197244457fe7cd98fb2d2ae385d118de5db --- M modules/librenms/templates/config.php.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/40/398940/1 diff --git a/modules/librenms/templates/config.php.erb b/modules/librenms/templates/config.php.erb index db786ef..d005025 100644 --- a/modules/librenms/templates/config.php.erb +++ b/modules/librenms/templates/config.php.erb @@ -18,7 +18,7 @@ # Workaround a bug where the puppet array value '+6697' is converted to "6697" # The plus is necessary to use TLS -$config['irc_port'] = "+6697" +$config['irc_port'] = "+6697"; $puppet_config = <%= scope.function_phpdump([@config]) %>; -- To view, visit https://gerrit.wikimedia.org/r/398940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida424197244457fe7cd98fb2d2ae385d118de5db Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ayounsi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: Revert "Merge branch 'master' into deployment"
Mepps has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398938 ) Change subject: Revert "Merge branch 'master' into deployment" .. Revert "Merge branch 'master' into deployment" This reverts commit fb24d0670738fc5d60accedccf94ce73975aeff5, reversing changes made to 114131713e566069575f481281c74349e6bba336. Change-Id: Iaa28765108a83338dd89e1d9d2b272c8e6e232ac --- A dist/css.manifest.json A dist/date-pickers-d41d8cd9.js M dist/favicon.ico A dist/font/lato-black.eot A dist/font/lato-black.svg A dist/font/lato-black.ttf A dist/font/lato-black.woff A dist/font/lato-blackitalic.eot A dist/font/lato-blackitalic.svg A dist/font/lato-blackitalic.ttf A dist/font/lato-blackitalic.woff A dist/font/lato-bold.eot A dist/font/lato-bold.svg A dist/font/lato-bold.ttf A dist/font/lato-bold.woff A dist/font/lato-bolditalic.eot A dist/font/lato-bolditalic.svg A dist/font/lato-bolditalic.ttf A dist/font/lato-bolditalic.woff A dist/font/lato-hairline.eot A dist/font/lato-hairline.svg A dist/font/lato-hairline.ttf A dist/font/lato-hairline.woff A dist/font/lato-hairlineitalic.eot A dist/font/lato-hairlineitalic.svg A dist/font/lato-hairlineitalic.ttf A dist/font/lato-hairlineitalic.woff A dist/font/lato-italic.eot A dist/font/lato-italic.svg A dist/font/lato-italic.ttf A dist/font/lato-italic.woff A dist/font/lato-light.eot A dist/font/lato-light.svg A dist/font/lato-light.ttf A dist/font/lato-light.woff A dist/font/lato-lightitalic.eot A dist/font/lato-lightitalic.svg A dist/font/lato-lightitalic.ttf A dist/font/lato-lightitalic.woff A dist/font/lato-regular.eot A dist/font/lato-regular.svg A dist/font/lato-regular.ttf A dist/font/lato-regular.woff A dist/fonts/FontAwesome.otf A dist/fonts/fontawesome-webfont.eot A dist/fonts/fontawesome-webfont.svg A dist/fonts/fontawesome-webfont.ttf A dist/fonts/fontawesome-webfont.woff M dist/images/amt-per-sec.png M dist/scripts-0875ff1e.js M persistence.js M routes/data.js M src/components/app-content/app-content.html M src/components/app-content/app-content.js M src/components/nav-bar/nav-bar.html M src/components/nav-bar/nav-bar.js M src/components/widgets/totals-earned-chart/totals-earned-chart.js M widgets/common-filters.js 58 files changed, 47,956 insertions(+), 110 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/38/398938/1 -- To view, visit https://gerrit.wikimedia.org/r/398938 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa28765108a83338dd89e1d9d2b272c8e6e232ac Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Mepps ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: Merge branch 'master' into deployment
Mepps has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398939 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 9ade8a3 Update readme with minify workaround Change-Id: Iec14dcd85b2a1ef1557c8913246ed3fe4cfc1ada --- M dist/scripts-0875ff1e.js 1 file changed, 29 insertions(+), 29 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/39/398939/1 -- To view, visit https://gerrit.wikimedia.org/r/398939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec14dcd85b2a1ef1557c8913246ed3fe4cfc1ada Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Mepps ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: IRCbot puppet fixes
Ayounsi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398922 )
Change subject: LibreNMS: IRCbot puppet fixes
..
LibreNMS: IRCbot puppet fixes
Change-Id: Icfff49b0477a1e211857f4fcb6760afc46d4d0e8
---
M modules/librenms/manifests/init.pp
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Ayounsi: Looks good to me, approved
diff --git a/modules/librenms/manifests/init.pp
b/modules/librenms/manifests/init.pp
index 9e3c60e..ba6b337 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -50,7 +50,7 @@
mode=> '0440',
content => template('librenms/config.php.erb'),
require => Group['librenms'],
-notify => Systemd::Service['librenms-ircbot'],
+notify => Service['librenms-ircbot'],
}
file { $rrd_dir:
@@ -124,11 +124,18 @@
}
systemd::service { 'librenms-ircbot':
-ensure => $ircbot_ensure,
+ensure => 'present',
content =>
template('librenms/initscripts/librenms-ircbot.systemd.erb'),
require => [File["${install_dir}/config.php"] ],
}
+service { 'librenms-ircbot':
+ensure => $ircbot_ensure,
+enable => true,
+require => Systemd::Service['librenms-ircbot'],
+}
+
+
cron { 'librenms-discovery-all':
ensure => $cron_ensure,
user=> 'librenms',
--
To view, visit https://gerrit.wikimedia.org/r/398922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icfff49b0477a1e211857f4fcb6760afc46d4d0e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi
Gerrit-Reviewer: Ayounsi
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Add quotes also for autogenerated reference name
Dvorapa has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398923 ) Change subject: [bugfix] Add quotes also for autogenerated reference name .. [bugfix] Add quotes also for autogenerated reference name Bug: T183186 Change-Id: I98b62a3c0dc5af92034eb1a537a2610747bb42c0 --- M scripts/reflinks.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/23/398923/1 diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 6553876..1d4d69f 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -354,7 +354,7 @@ continue name = v[0] if not name: -name = self.autogen + str(id) +name = '"%s%d"' % (self.autogen, id) id += 1 elif v[2]: name = u'"%s"' % name -- To view, visit https://gerrit.wikimedia.org/r/398923 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98b62a3c0dc5af92034eb1a537a2610747bb42c0 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dvorapa ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: IRCbot puppet fixes
Ayounsi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398922 )
Change subject: LibreNMS: IRCbot puppet fixes
..
LibreNMS: IRCbot puppet fixes
Change-Id: Icfff49b0477a1e211857f4fcb6760afc46d4d0e8
---
M modules/librenms/manifests/init.pp
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/398922/1
diff --git a/modules/librenms/manifests/init.pp
b/modules/librenms/manifests/init.pp
index 9e3c60e..ba6b337 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -50,7 +50,7 @@
mode=> '0440',
content => template('librenms/config.php.erb'),
require => Group['librenms'],
-notify => Systemd::Service['librenms-ircbot'],
+notify => Service['librenms-ircbot'],
}
file { $rrd_dir:
@@ -124,11 +124,18 @@
}
systemd::service { 'librenms-ircbot':
-ensure => $ircbot_ensure,
+ensure => 'present',
content =>
template('librenms/initscripts/librenms-ircbot.systemd.erb'),
require => [File["${install_dir}/config.php"] ],
}
+service { 'librenms-ircbot':
+ensure => $ircbot_ensure,
+enable => true,
+require => Systemd::Service['librenms-ircbot'],
+}
+
+
cron { 'librenms-discovery-all':
ensure => $cron_ensure,
user=> 'librenms',
--
To view, visit https://gerrit.wikimedia.org/r/398922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfff49b0477a1e211857f4fcb6760afc46d4d0e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: Add an IRCbot process
Ayounsi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398898 )
Change subject: LibreNMS: Add an IRCbot process
..
LibreNMS: Add an IRCbot process
Change-Id: I867cc13a08a3d58fa9fb303f6a3cb93a4bf15d28
---
M modules/librenms/manifests/init.pp
M modules/librenms/templates/config.php.erb
A modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb
M modules/role/manifests/librenms.pp
4 files changed, 26 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Ayounsi: Looks good to me, approved
diff --git a/modules/librenms/manifests/init.pp
b/modules/librenms/manifests/init.pp
index 1068252..9e3c60e 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -50,6 +50,7 @@
mode=> '0440',
content => template('librenms/config.php.erb'),
require => Group['librenms'],
+notify => Systemd::Service['librenms-ircbot'],
}
file { $rrd_dir:
@@ -116,8 +117,16 @@
if $active_server == $::fqdn {
$cron_ensure = 'present'
+$ircbot_ensure = 'running'
} else {
$cron_ensure = 'absent'
+$ircbot_ensure = 'stopped'
+}
+
+systemd::service { 'librenms-ircbot':
+ensure => $ircbot_ensure,
+content =>
template('librenms/initscripts/librenms-ircbot.systemd.erb'),
+require => [File["${install_dir}/config.php"] ],
}
cron { 'librenms-discovery-all':
diff --git a/modules/librenms/templates/config.php.erb
b/modules/librenms/templates/config.php.erb
index 3705187..db786ef 100644
--- a/modules/librenms/templates/config.php.erb
+++ b/modules/librenms/templates/config.php.erb
@@ -16,6 +16,10 @@
# All types of Junos Alarms that is not "off"/(no alarm)
$config['alert']['macros']['rule']['junos_alarm'] = '%sensors.sensor_class =
"state" && %sensors.sensor_type ~ "Jnx.*AlarmState" && %sensors.sensor_current
!= "2"';
+# Workaround a bug where the puppet array value '+6697' is converted to "6697"
+# The plus is necessary to use TLS
+$config['irc_port'] = "+6697"
+
$puppet_config = <%= scope.function_phpdump([@config]) %>;
$config = array_merge($config, $puppet_config);
diff --git a/modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb
b/modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb
new file mode 100644
index 000..e0bc2b6
--- /dev/null
+++ b/modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb
@@ -0,0 +1,11 @@
+[Unit]
+Description=LibreNMS IRCbot
+
+[Service]
+User=librenms
+Group=librenms
+ExecStart=/usr/bin/php /srv/deployment/librenms/librenms/irc.php
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/modules/role/manifests/librenms.pp
b/modules/role/manifests/librenms.pp
index 7bdcb63..08dbec4 100644
--- a/modules/role/manifests/librenms.pp
+++ b/modules/role/manifests/librenms.pp
@@ -41,11 +41,10 @@
'community' => [ $passwords::network::snmp_ro_community ],
},
'irc_host' => 'irc.freenode.org',
-'irc_port' => '+6697',
-'irc_chan' => '#wikimedia-netops',
+'irc_chan' => '#wikimedia-netops-test,#wikimedia-netops',
'irc_alert'=> true,
'irc_debug'=> false,
-'irc_alert_chan' => '#wikimedia-netops',
+'irc_alert_chan' => '#wikimedia-netops-test',
'irc_alert_utf8' => true,
'irc_nick' => 'librenms-wmf',
--
To view, visit https://gerrit.wikimedia.org/r/398898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I867cc13a08a3d58fa9fb303f6a3cb93a4bf15d28
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi
Gerrit-Reviewer: Ayounsi
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate composer php55 jobs to Docker
Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398920 )
Change subject: Migrate composer php55 jobs to Docker
..
Migrate composer php55 jobs to Docker
Change-Id: I1c34a1b5c2410e8bfbd0dc6e2415406ec47dc0e0
---
M jjb/mediawiki.yaml
M jjb/php.yaml
M zuul/layout.yaml
3 files changed, 39 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/20/398920/1
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 46efa98..9277428 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -260,6 +260,13 @@
name: 'mwgate'
jobs:
- '{name}-composer-{phpflavor}-{image}': *phpflavor_images
+- '{name}-composer-package-{phpflavor}-docker': &phpflavor_docker
+phpflavor:
+- php55:
+image:
docker-registry.wikimedia.org/releng/composer-package-php55:v0.1.0
+- php70:
+image: wmfreleng/composer-package:v2017.10.28.07.05
+- '{name}-composer-{phpflavor}-docker': *phpflavor_docker
- '{name}-composer-validate'
- '{name}-jsduck'
- '{name}-{phpflavor}lint':
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 4ae0ab5..eae5c6e 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -127,7 +127,7 @@
publishers:
- castor-save
-- job-template:
+- job-template: &composer-package-phpflavor-docker
name: 'composer-package-{phpflavor}-docker'
node: DebianJessieDocker
concurrent: true
@@ -146,6 +146,12 @@
logdir: '/log'
- job-template:
+!!merge : *composer-package-phpflavor-docker
+name: '{name}-composer-package-{phpflavor}-docker'
+triggers:
+ - zuul
+
+- job-template: &composer-phpflavor-docker
name: 'composer-{phpflavor}-docker'
node: DebianJessieDocker
concurrent: true
@@ -163,6 +169,12 @@
image: '{image}'
logdir: '/log'
+- job-template:
+!!merge : *composer-phpflavor-docker
+name: '{name}-composer-{phpflavor}-docker'
+triggers:
+ - zuul
+
# Couple jobs with a {name} prefix
- job-template:
!!merge : *job_composer-phpflavor-image
@@ -175,8 +187,6 @@
- project:
name: 'composer-flavored-on-nodepool'
phpflavor:
-- php55:
-image: jessie
- php56:
image: jessie
- php70:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4659a6d..222fb7f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1172,7 +1172,7 @@
experimental:
- mwgate-npm-node-6-docker
- mwgate-composer-hhvm-jessie
- - mwgate-composer-php55-jessie
+ - mwgate-composer-php55-docker
- mwgate-composer-php70-jessie
- name: composer-test
@@ -1180,10 +1180,10 @@
- php55lint
- composer-validate
test:
- - composer-php55-jessie
+ - composer-php55-docker
- composer-hhvm-jessie
gate-and-submit: &composer-test-gate-and-submit
- - composer-php55-jessie
+ - composer-php55-docker
- composer-hhvm-jessie
- composer-php70-docker
gate-and-submit-swat: *composer-test-gate-and-submit
@@ -1193,10 +1193,10 @@
- mwgate-php55lint
- mwgate-composer-validate
test:
- - mwgate-composer-php55-jessie
+ - mwgate-composer-php55-docker
- mwgate-composer-hhvm-jessie
gate-and-submit: &mwgate-composer-gate-and-submit
- - mwgate-composer-php55-jessie
+ - mwgate-composer-php55-docker
- mwgate-composer-hhvm-jessie
experimental:
- mwgate-composer-php70-jessie
@@ -1217,11 +1217,11 @@
- php55lint
test:
- composer-package-hhvm-jessie
- - composer-package-php55-jessie
+ - composer-package-php55-docker
- composer-package-php70-docker
gate-and-submit:
- composer-package-hhvm-jessie
- - composer-package-php55-jessie
+ - composer-package-php55-docker
- composer-package-php70-docker
- name: npm-docker
@@ -1475,13 +1475,13 @@
- mwgate-composer-validate
test:
- mwgate-composer-hhvm-jessie
- - mwgate-composer-php55-jessie
+ - mwgate-composer-php55-docker
- mediawiki-phpunit-hhvm-jessie
php5:
- mediawiki-phpunit-php55-jessie
gate-and-submit: &mediawiki-vendor-gate-and-submit
- mwgate-composer-hhvm-jessie
- - mwgate-composer-php55-jessie
+ - mwgate-composer-php55-docker
- mediawiki-phpunit-hhvm-jessie
- mediawiki-phpunit-php55-jessie
gate-and-submit-swat: *mediawiki-vendor-gate-and-submit
@@ -1740,10 +1740,10 @@
template:
- name: npm-docker
test:
- - composer-php55-jessie
+ - composer-php55-docker
- labs-tools-heritage-tox-docker
gate-and-submit:
- - composer-php55-jessie
+ - composer-php55-docker
- labs-tools-heritage-tox-docker
postmerge:
- tox-py27-coverage-publish
@@ -1816,9
[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate composer php70 jobs to Docker
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398921 ) Change subject: Migrate composer php70 jobs to Docker .. Migrate composer php70 jobs to Docker Change-Id: I0e30a38e13bfabf85b1f0dc668fe5a9e607650e5 --- M zuul/layout.yaml 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/21/398921/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 222fb7f..ee04040 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1001,7 +1001,7 @@ experimental: - mwext-qunit-composer-jessie - mwgate-npm-node-6-docker - - mwgate-composer-php70-jessie + - mwgate-composer-php70-docker - name: extension-unittests-composer-non-voting check: @@ -1021,7 +1021,7 @@ *extension-unittests-composer-non-voting-gate-and-submit experimental: - mwext-qunit-composer-jessie - - mwgate-composer-php70-jessie + - mwgate-composer-php70-docker - name: extension-unittests-generic check: @@ -1043,7 +1043,7 @@ - mediawiki-extensions-hhvm-jessie - mediawiki-extensions-qunit-jessie - mwgate-npm-node-6-docker - - mwgate-composer-php70-jessie + - mwgate-composer-php70-docker - mwext-php70-phan-docker - name: extension-unittests-non-voting @@ -1066,7 +1066,7 @@ - mediawiki-extensions-hhvm-jessie - mediawiki-extensions-qunit-jessie - mwgate-npm-node-6-docker - - mwgate-composer-php70-jessie + - mwgate-composer-php70-docker # Template to run per-patch selenium browser test # Intentionally not in gate because it's super slow @@ -1173,7 +1173,7 @@ - mwgate-npm-node-6-docker - mwgate-composer-hhvm-jessie - mwgate-composer-php55-docker - - mwgate-composer-php70-jessie + - mwgate-composer-php70-docker - name: composer-test check: @@ -1199,7 +1199,7 @@ - mwgate-composer-php55-docker - mwgate-composer-hhvm-jessie experimental: - - mwgate-composer-php70-jessie + - mwgate-composer-php70-docker gate-and-submit-swat: *mwgate-composer-gate-and-submit - name: php55lint @@ -1454,7 +1454,7 @@ - mediawiki-core-tag-doxygen-publish experimental: # Experimental php version - - mwgate-composer-php70-jessie + - mwgate-composer-php70-docker - mediawiki-phpunit-php70-jessie - mediawiki-extensions-php70-jessie @@ -1486,7 +1486,7 @@ - mediawiki-phpunit-php55-jessie gate-and-submit-swat: *mediawiki-vendor-gate-and-submit experimental: - - mwgate-composer-php70-jessie + - mwgate-composer-php70-docker - name: analytics/aggregator template: -- To view, visit https://gerrit.wikimedia.org/r/398921 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e30a38e13bfabf85b1f0dc668fe5a9e607650e5 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[REL1_27]: SECURITY: Fix escaping of description field
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398918 )
Change subject: SECURITY: Fix escaping of description field
..
SECURITY: Fix escaping of description field
Bug: T118682
Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
---
M TemplateDataBlob.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index cbfa4ed..ea4ddee 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -817,7 +817,7 @@
'mw-templatedata-doc-muted' =>
( $paramObj->description === null )
)
),
- Html::rawElement( 'p', array(),
+ Html::element( 'p', array(),
$paramObj->description !== null ?
$paramObj->description :
wfMessage(
'templatedata-doc-param-desc-empty' )->inLanguage( $lang )->text()
diff --git a/extension.json b/extension.json
index 3ce0957..8dfa2c2 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "TemplateData",
- "version": "0.1.1",
+ "version": "0.1.2",
"author": [
"Timo Tijhof",
"Moriel Schottlender",
--
To view, visit https://gerrit.wikimedia.org/r/398918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[REL1_30]: SECURITY: Fix escaping of description field
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398915 )
Change subject: SECURITY: Fix escaping of description field
..
SECURITY: Fix escaping of description field
Bug: T118682
Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
---
M TemplateDataBlob.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index e06bcd8..0b406cc 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -830,7 +830,7 @@
'mw-templatedata-doc-muted' =>
( $paramObj->description === null )
]
],
- Html::rawElement( 'p', [],
+ Html::element( 'p', [],
$paramObj->description !== null ?
$paramObj->description :
wfMessage(
'templatedata-doc-param-desc-empty' )->inLanguage( $lang )->text()
diff --git a/extension.json b/extension.json
index e8be290..010fdfc 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "TemplateData",
- "version": "0.1.1",
+ "version": "0.1.2",
"author": [
"Timo Tijhof",
"Moriel Schottlender",
--
To view, visit https://gerrit.wikimedia.org/r/398915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: REL1_30
Gerrit-Owner: Brian Wolff
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[REL1_29]: SECURITY: Fix escaping of description field
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398916 )
Change subject: SECURITY: Fix escaping of description field
..
SECURITY: Fix escaping of description field
Bug: T118682
Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
---
M TemplateDataBlob.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index 42e8b82..40b4639 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -831,7 +831,7 @@
'mw-templatedata-doc-muted' =>
( $paramObj->description === null )
]
],
- Html::rawElement( 'p', [],
+ Html::element( 'p', [],
$paramObj->description !== null ?
$paramObj->description :
wfMessage(
'templatedata-doc-param-desc-empty' )->inLanguage( $lang )->text()
diff --git a/extension.json b/extension.json
index 5ce0027..e5d56f8 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "TemplateData",
- "version": "0.1.1",
+ "version": "0.1.2",
"author": [
"Timo Tijhof",
"Moriel Schottlender",
--
To view, visit https://gerrit.wikimedia.org/r/398916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: REL1_29
Gerrit-Owner: Brian Wolff
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: [WIP] Bidi-embed user names
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398919 )
Change subject: [WIP] Bidi-embed user names
..
[WIP] Bidi-embed user names
TODO: Embed all the other user names too
TODO: Need a JS implementation of embedBidi() in MW core, there isn't
one yet.
Change-Id: I286c4fce073808780ee10a2404786f93593fc9d2
---
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_post_meta_actions.partial.handlebars
M includes/TemplateHelper.php
5 files changed, 17 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/19/398919/1
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 20cfdc8..297809d 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -20,6 +20,7 @@
'concat' => 'Flow\TemplateHelper::concat',
'linkWithReturnTo' => 'Flow\TemplateHelper::linkWithReturnTo',
'escapeContent' => 'Flow\TemplateHelper::escapeContent',
+'bidi' => 'Flow\TemplateHelper::bidi',
),
'blockhelpers' => array(),
'hbhelpers' => array('eachPost' =>
'Flow\TemplateHelper::eachPost',
@@ -88,13 +89,13 @@
'.$sp.'
title="'.htmlentities((string)((isset($in['actions']['thank']['title']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['title'] : null),
ENT_QUOTES,
'UTF-8').'">'.htmlentities((string)((isset($in['actions']['thank']['text']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['text'] : null),
ENT_QUOTES, 'UTF-8').'
'.$sp.'' : '').'
'.$sp.'
-'.$sp.'
+'.$sp.'
'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isOriginalContent']) &&
is_array($in)) ? $in['isOriginalContent'] : null))) ? '
'.$sp.''.LCRun3::ch($cx, 'uuidTimestamp',
array(array(((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),array()), 'encq').'
'.$sp.'
'.$sp.'' : '
'.$sp.''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['creator']['name']) && is_array($in['creator'])) ?
$in['creator']['name'] : null),'===',((isset($in['lastEditUser']['name']) &&
is_array($in['lastEditUser'])) ? $in['lastEditUser']['name'] : null)),array()),
$in, false, function($cx, $in)use($sp){return '
'.LCRun3::ch($cx, 'l10n', array(array('flow-edited'),array()), 'encq').'
-'.$sp.'';}, function($cx, $in)use($sp){return '
'.LCRun3::ch($cx, 'l10n',
array(array('flow-edited-by',((isset($in['lastEditUser']['name']) &&
is_array($in['lastEditUser'])) ? $in['lastEditUser']['name'] : null)),array()),
'encq').'
+'.$sp.'';}, function($cx, $in)use($sp){return '
'.LCRun3::ch($cx, 'l10n', array(array('flow-edited-by',LCRun3::ch($cx,
'bidi', array(array(((isset($in['lastEditUser']['name']) &&
is_array($in['lastEditUser'])) ? $in['lastEditUser']['name'] : null)),array()),
'raw')),array()), 'encq').'
'.$sp.'';}).'
'.$sp.''.LCRun3::ch($cx,
'uuidTimestamp', array(array(((isset($in['lastEditId']) && is_array($in)) ?
$in['lastEditId'] : null)),array()), 'encq').'
'.$sp.'').'
diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
index 3f590d5..56d2c78 100644
--- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
@@ -20,6 +20,7 @@
'concat' => 'Flow\TemplateHelper::concat',
'linkWithReturnTo' => 'Flow\TemplateHelper::linkWithReturnTo',
'escapeContent' => 'Flow\TemplateHelper::escapeContent',
+'bidi' => 'Flow\TemplateHelper::bidi',
),
'blockhelpers' => array(),
'hbhelpers' => array('eachPost' =>
'Flow\TemplateHelper::eachPost',
@@ -88,13 +89,13 @@
'.$sp.'
title="'.htmlentities((string)((isset($in['actions']['thank']['title']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['title'] : null),
ENT_QUOTES,
'UTF-8').'">'.htmlentities((string)((isset($in['actions']['thank']['text']) &&
is_array($in['actions']['thank'])) ? $in['actions']['thank']['text'] : null),
ENT_QUOTES, 'UTF-8').'
'.$sp.'' : '').'
'.$sp.'
-'.$sp.'
+'.$sp.'
'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isOriginalContent']) &&
is_array($in)) ? $in['isOriginalContent'] : nu
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[REL1_27]: SECURITY: Fix escaping of description field
Brian Wolff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398918 )
Change subject: SECURITY: Fix escaping of description field
..
SECURITY: Fix escaping of description field
Bug: T118682
Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
---
M TemplateDataBlob.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/18/398918/1
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index cbfa4ed..ea4ddee 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -817,7 +817,7 @@
'mw-templatedata-doc-muted' =>
( $paramObj->description === null )
)
),
- Html::rawElement( 'p', array(),
+ Html::element( 'p', array(),
$paramObj->description !== null ?
$paramObj->description :
wfMessage(
'templatedata-doc-param-desc-empty' )->inLanguage( $lang )->text()
diff --git a/extension.json b/extension.json
index 3ce0957..8dfa2c2 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "TemplateData",
- "version": "0.1.1",
+ "version": "0.1.2",
"author": [
"Timo Tijhof",
"Moriel Schottlender",
--
To view, visit https://gerrit.wikimedia.org/r/398918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: statsd: remove ganglia backend support
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382923 )
Change subject: statsd: remove ganglia backend support
..
statsd: remove ganglia backend support
The option to use statsd with a Ganglia backend was added
in be72e7dcd34fa9696a3f by Ori.
I am not sure whether we should remove or keep it
now that we will stop using Ganglia in WMF prod.
In theory the module could be used by others.
Bug: T177225
Change-Id: I6fad8663e6048a2c761b59f19be07ad65f426e44
---
D modules/statsd/files/backends/ganglia.js
M modules/statsd/manifests/init.pp
2 files changed, 0 insertions(+), 346 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/statsd/files/backends/ganglia.js
b/modules/statsd/files/backends/ganglia.js
deleted file mode 100644
index e06dfd7..000
--- a/modules/statsd/files/backends/ganglia.js
+++ /dev/null
@@ -1,341 +0,0 @@
-/**
- * Ganglia backend for StatsD
- * Author: Ori Livneh
- * Copyright (c) 2013 Wikimedia Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Ganglia-specific settings (for /etc/statsd/localConfig.js):
- *
- * {
- * "gangliaHost": "localhost",// Hostname of Ganglia server
- * "gangliaPort": 8649, // UDP port of Ganglia server
- * "gangliaMulticast": false, // Use multicast?
- * "gangliaSpoofHost": "slave", // Associate metrics w/this hostname
- * "gangliaGroup": "statsd", // Default metric group name
- * "gangliaFilters": [], // Array of module paths (see below)
- * "sendMetadataInterval": 6, // Same as send_metadata_interval
- * }
- *
- * Metric filters
- *
- * If you want to choose which metrics get sent to Ganglia, you may set
- * the "gangliaFilters" configuration to an array of module paths.
- * Each module should export a "filter" function which takes a metric
- * object. The function may modify the metric object or return false to
- * exclude it from Ganglia reporting. For example:
- *
- * exports.filter = function ( metric ) {
- * // Exclude counters from Ganglia reporting.
- * return /count/.test( metric.name ) ? false : metric;
- * };
- *
- */
-
-function Xdr( bufSize ) {
-this.b = new Buffer( bufSize );
-this.b.fill( 0 );
-this.ptr = 0;
-}
-
-Xdr.prototype.pack = function ( type, value ) {
-switch ( type ) {
-case 'int':
-this.b.writeInt32BE( value, this.ptr );
-this.ptr += 4;
-break;
-case 'string':
-this.pack( 'int', value.length );
-this.b.write( value, this.ptr );
-this.ptr += ( ( Buffer.byteLength( value ) + 3 ) & ~0x03 );
-break;
-case 'boolean':
-this.pack( 'int', value ? 1 : 0 );
-break;
-}
-};
-
-Xdr.prototype.getBytes = function () {
-return this.b.slice( 0, this.ptr );
-};
-
-Xdr.meta = function ( metric ) {
-var xdr = new Xdr( 1024 );
-
-xdr.pack( 'int', 128 );
-xdr.pack( 'string', metric.hostname );
-xdr.pack( 'string', metric.name );
-xdr.pack( 'boolean', metric.spoof );
-xdr.pack( 'string', metric.type );
-xdr.pack( 'string', metric.name );
-xdr.pack( 'string', metric.units );
-xdr.pack( 'int', metric.slope );
-xdr.pack( 'int', metric.tmax );
-xdr.pack( 'int', metric.dmax );
-xdr.pack( 'int', 1 );
-xdr.pack( 'string', 'GROUP' );
-xdr.pack( 'string', metric.group );
-return xdr.getBytes();
-};
-
-Xdr.data = function ( metric ) {
-var xdr = new Xdr( 512 );
-
-xdr.pack( 'int', 133 );
-xdr.pack( 'string', metric.hostname );
-xdr.pack( 'string', metric.name );
-xdr.pack( 'boolean', metric.spoof );
-xdr.pack( 'string', '%s' );
-xdr.pack( 'string', metric.value.toString() );
-return xdr.getBytes();
-};
-
-function logSocketError( err, bytes ) {
-if ( err ) console.log( err );
-}
-
-function add( a,
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[REL1_29]: SECURITY: Fix escaping of description field
Brian Wolff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398916 )
Change subject: SECURITY: Fix escaping of description field
..
SECURITY: Fix escaping of description field
Bug: T118682
Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
---
M TemplateDataBlob.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/16/398916/1
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index 42e8b82..40b4639 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -831,7 +831,7 @@
'mw-templatedata-doc-muted' =>
( $paramObj->description === null )
]
],
- Html::rawElement( 'p', [],
+ Html::element( 'p', [],
$paramObj->description !== null ?
$paramObj->description :
wfMessage(
'templatedata-doc-param-desc-empty' )->inLanguage( $lang )->text()
diff --git a/extension.json b/extension.json
index 5ce0027..e5d56f8 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "TemplateData",
- "version": "0.1.1",
+ "version": "0.1.2",
"author": [
"Timo Tijhof",
"Moriel Schottlender",
--
To view, visit https://gerrit.wikimedia.org/r/398916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: REL1_29
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[REL1_30]: SECURITY: Fix escaping of description field
Brian Wolff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398915 )
Change subject: SECURITY: Fix escaping of description field
..
SECURITY: Fix escaping of description field
Bug: T118682
Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
---
M TemplateDataBlob.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/15/398915/1
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index e06bcd8..0b406cc 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -830,7 +830,7 @@
'mw-templatedata-doc-muted' =>
( $paramObj->description === null )
]
],
- Html::rawElement( 'p', [],
+ Html::element( 'p', [],
$paramObj->description !== null ?
$paramObj->description :
wfMessage(
'templatedata-doc-param-desc-empty' )->inLanguage( $lang )->text()
diff --git a/extension.json b/extension.json
index e8be290..010fdfc 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "TemplateData",
- "version": "0.1.1",
+ "version": "0.1.2",
"author": [
"Timo Tijhof",
"Moriel Schottlender",
--
To view, visit https://gerrit.wikimedia.org/r/398915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic40d258964d526a66431f18d2d7f0a6ad2eca111
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: REL1_30
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[master]: Update readme with minify workaround
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394371 )
Change subject: Update readme with minify workaround
..
Update readme with minify workaround
And copy r.js build script to master.
Bug: T181467
Change-Id: I1f021bab5583b6e66564fba48e7029c08b4f4fd3
---
M Gruntfile.js
M README.md
A app.build.js
3 files changed, 88 insertions(+), 1 deletion(-)
Approvals:
Mepps: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index e13be47..4b25de3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -19,7 +19,8 @@
'**/*.js',
'!node_modules/**/*.js',
'!src/bower_modules/**/*.js',
- '!dist/**/*.js'
+ '!dist/**/*.js',
+ '!app.build.js'
]
},
jscs: {
diff --git a/README.md b/README.md
index 0a0cfd5..e2ad59a 100644
--- a/README.md
+++ b/README.md
@@ -139,3 +139,10 @@
Don't worry about the lint errors :(
Commit the dist/ output to the deployment branch and push for review.
+
+If you don't have that ancient version of node available and you just need to
minify javascript and html templates, you can run the requirejs optimiser
directly.
+
+```
+node node_modules/requirejs/bin/r.js -o app.build.js
+```
+Then copy the resulting scripts.js over the existing js file in the dist
folder.
diff --git a/app.build.js b/app.build.js
new file mode 100644
index 000..2cdcbe9
--- /dev/null
+++ b/app.build.js
@@ -0,0 +1,79 @@
+/* jshint -W098 */
+({
+ baseUrl: 'src',
+ paths: {
+ bootstrap: 'bower_modules/bootstrap/dist/js/bootstrap',
+ crossroads: 'bower_modules/crossroads/dist/crossroads.min',
+ hasher: 'bower_modules/hasher/dist/js/hasher.min',
+ jquery: 'bower_modules/jquery/dist/jquery',
+ noUISlider:
'bower_modules/nouislider/distribute/jquery.nouislider.all',
+ knockout: 'bower_modules/knockout/dist/knockout',
+ 'knockout-projections':
'bower_modules/knockout-projections/dist/knockout-projections',
+ d3: 'bower_modules/d3/d3',
+ text: 'bower_modules/requirejs-text/text',
+ chartjs: 'bower_modules/chartjs/Chart',
+ momentjs: 'bower_modules/moment/moment',
+ raphael: 'bower_modules/raphael/raphael',
+ gauge: 'bower_modules/gauge.js/dist/gauge',
+ 'bootstrap-datepicker':
'bower_modules/bootstrap-datepicker/js/bootstrap-datepicker',
+ 'bootstrap-timepicker':
'bower_modules/bootstrap-timepicker/js/bootstrap-timepicker',
+ select2: 'bower_modules/select2/select2',
+ signals: 'bower_modules/js-signals/dist/signals.min',
+ c3: 'bower_modules/c3/c3',
+ numeraljs: 'bower_modules/numeraljs/numeral',
+ WidgetBase: 'app/widgetBase',
+ Campaign: 'app/campaign',
+ operators: 'components/filters/operators',
+ requireLib: 'bower_modules/requirejs/require'
+ },
+ shim: {
+ bootstrap: {
+ deps: [
+ 'jquery'
+ ]
+ },
+ c3: {
+ deps: [
+ 'd3'
+ ]
+ },
+ momentjs: {
+ exports: 'moment'
+ },
+ noUISlider: {
+ deps: [
+ 'jquery'
+ ]
+ }
+ },
+ out: 'scripts.js',
+ name: 'app/startup',
+ include: [
+ 'requireLib',
+ 'components/app-content/app-content',
+ 'components/boards/generic-board/generic-board',
+ 'components/filters/filters',
+ 'components/filters/dropdown-filter/dropdown-filter',
+ 'components/filters/number-filter/number-filter',
+ 'components/filters/text-filter/text-filter',
+ 'components/nav-bar/nav-bar',
+ 'components/utils/date-pickers/date-pickers',
+ 'components/widgets/ab-testing/ab-testing',
+
'components/widgets/amt-per-second-chart/amt-per-second-chart',
+ 'components/widgets/cat-trombone/cat-trombone',
+
'components/widgets/distance-to-goal-chart/distance-to-goal-chart',
+ 'components/widgets/donation-age/donation-age',
+ 'components/widgets/fraud-gauge/fraud-gauge',
+
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Bump version for security release of extension
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398914 )
Change subject: Bump version for security release of extension
..
Bump version for security release of extension
Change-Id: I382b095ab78de2286b77d14daf0ce94df4230d22
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 38fb077..2f1a3f6 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "TemplateData",
- "version": "0.1.1",
+ "version": "0.1.2",
"author": [
"Timo Tijhof",
"Moriel Schottlender",
--
To view, visit https://gerrit.wikimedia.org/r/398914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I382b095ab78de2286b77d14daf0ce94df4230d22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Bump version for security release of extension
Brian Wolff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398914 )
Change subject: Bump version for security release of extension
..
Bump version for security release of extension
Change-Id: I382b095ab78de2286b77d14daf0ce94df4230d22
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/14/398914/1
diff --git a/extension.json b/extension.json
index 38fb077..2f1a3f6 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "TemplateData",
- "version": "0.1.1",
+ "version": "0.1.2",
"author": [
"Timo Tijhof",
"Moriel Schottlender",
--
To view, visit https://gerrit.wikimedia.org/r/398914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I382b095ab78de2286b77d14daf0ce94df4230d22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: remove unused Domino types
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398912 )
Change subject: Chore: remove unused Domino types
..
Chore: remove unused Domino types
These types are no longer in use but have been pushed upstream:
https://github.com/fgnass/domino/pull/108.
Change-Id: I56277a667758f0dfbc206602f0471d8d2620da3b
---
D src/common/types/domino.d.ts
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/12/398912/1
diff --git a/src/common/types/domino.d.ts b/src/common/types/domino.d.ts
deleted file mode 100644
index 8b69dc5..000
--- a/src/common/types/domino.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare module "domino" {
- function createDOMImplementation(): DOMImplementation;
- function createDocument(html?: string, force?: boolean): Document;
- function createWindow(html?: string, address?: string): Window;
-}
--
To view, visit https://gerrit.wikimedia.org/r/398912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56277a667758f0dfbc206602f0471d8d2620da3b
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
