[MediaWiki-commits] [Gerrit] mediawiki/debian[master]: Remove unused lintian overrides
Legoktm has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/392000 ) Change subject: Remove unused lintian overrides .. Remove unused lintian overrides Change-Id: I579eeb7d952a5e75f4c4ab32269286f847064cae --- M debian/changelog M debian/mediawiki.lintian-overrides 2 files changed, 2 insertions(+), 7 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index db3ef60..20c1b87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ * Bump Standards-Version to 4.1.1 * Set Rules-Requires-Root: no + * Remove unused lintian overrides - -- Kunal Mehta Thu, 16 Nov 2017 23:46:08 -0800 + -- Kunal Mehta Thu, 16 Nov 2017 23:52:43 -0800 mediawiki (1:1.27.4-1) unstable; urgency=medium diff --git a/debian/mediawiki.lintian-overrides b/debian/mediawiki.lintian-overrides index 68b407e..ed29747 100644 --- a/debian/mediawiki.lintian-overrides +++ b/debian/mediawiki.lintian-overrides @@ -1,9 +1,6 @@ # this is ok, a Conflicts is not needed mediawiki: breaks-without-version mediawiki-extensions-fckeditor -# this is a file conflict -mediawiki: conflicts-with-version mediawiki-extensions-base (<< 3.5~) - # this is not the same library even though the filename is the same mediawiki: embedded-javascript-library usr/share/mediawiki/resources/src/jquery/jquery.tablesorter.js please use libjs-jquery-tablesorter @@ -28,7 +25,4 @@ # COPYING files are needed for Special:Version mediawiki: extra-license-file - -# lintian bug #818962 -mediawiki: php-script-but-no-phpX-cli-dep -- To view, visit https://gerrit.wikimedia.org/r/392000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I579eeb7d952a5e75f4c4ab32269286f847064cae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian 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...CirrusSearch[REL1_30]: Don't try to report update metrics if the response is not valid
DCausse has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392001 )
Change subject: Don't try to report update metrics if the response is not valid
..
Don't try to report update metrics if the response is not valid
Seen in logs where a null $responseSet is being sent to reportUpdateMetrics.
The only case where it could happen is when we detect documentMissing
exceptions.
Bug: T180298
Change-Id: I6ca58270e2ab001fab02275636a237449c528fc8
(cherry picked from commit 81a99cd1478997d3b9764165511b14e9d4a13dff)
---
M includes/DataSender.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/01/392001/1
diff --git a/includes/DataSender.php b/includes/DataSender.php
index a539d5f..ac63484 100644
--- a/includes/DataSender.php
+++ b/includes/DataSender.php
@@ -207,10 +207,13 @@
$exception = $e;
}
+ // TODO: rewrite error handling, the logic here is hard to
follow
$validResponse = $responseSet !== null && count(
$responseSet->getBulkResponses() ) > 0;
if ( $exception === null && ( $justDocumentMissing ||
$validResponse ) ) {
$this->success();
- $this->reportUpdateMetrics( $responseSet, $indexType,
count( $data ) );
+ if ( $validResponse ) {
+ $this->reportUpdateMetrics( $responseSet,
$indexType, count( $data ) );
+ }
return Status::newGood();
} else {
$this->failure( $exception );
--
To view, visit https://gerrit.wikimedia.org/r/392001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ca58270e2ab001fab02275636a237449c528fc8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: REL1_30
Gerrit-Owner: DCausse
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/debian[master]: Bump Standards-Version to 4.1.1
Legoktm has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391998 ) Change subject: Bump Standards-Version to 4.1.1 .. Bump Standards-Version to 4.1.1 Change-Id: I5f38e73f089cd622f55376f2091273519dd1b883 --- M debian/changelog M debian/control 2 files changed, 7 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index d69355e..50d4d20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mediawiki (1:1.27.4-2) UNRELEASED; urgency=medium + + * Bump Standards-Version to 4.1.1 + + -- Kunal Mehta Thu, 16 Nov 2017 23:38:41 -0800 + mediawiki (1:1.27.4-1) unstable; urgency=medium * Imported Upstream version 1.27.4 (security release), fixing diff --git a/debian/control b/debian/control index 63a74d7..fff31c1 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ dh-buildinfo, apache2-dev Homepage: https://www.mediawiki.org/ -Standards-Version: 3.9.8 +Standards-Version: 4.1.1 Vcs-Git: https://gerrit.wikimedia.org/r/mediawiki/debian.git Vcs-Browser: https://phabricator.wikimedia.org/diffusion/MDEB/ -- To view, visit https://gerrit.wikimedia.org/r/391998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f38e73f089cd622f55376f2091273519dd1b883 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian 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...CirrusSearch[REL1_29]: Don't try to report update metrics if the response is not valid
DCausse has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392002 )
Change subject: Don't try to report update metrics if the response is not valid
..
Don't try to report update metrics if the response is not valid
Seen in logs where a null $responseSet is being sent to reportUpdateMetrics.
The only case where it could happen is when we detect documentMissing
exceptions.
Bug: T180298
Change-Id: I6ca58270e2ab001fab02275636a237449c528fc8
(cherry picked from commit 81a99cd1478997d3b9764165511b14e9d4a13dff)
---
M includes/DataSender.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/02/392002/1
diff --git a/includes/DataSender.php b/includes/DataSender.php
index 88c9206..6900bb1 100644
--- a/includes/DataSender.php
+++ b/includes/DataSender.php
@@ -203,10 +203,13 @@
$exception = $e;
}
+ // TODO: rewrite error handling, the logic here is hard to
follow
$validResponse = $responseSet !== null && count(
$responseSet->getBulkResponses() ) > 0;
if ( $exception === null && ( $justDocumentMissing ||
$validResponse ) ) {
$this->success();
- $this->reportUpdateMetrics( $responseSet, $indexType,
count( $data ) );
+ if ( $validResponse ) {
+ $this->reportUpdateMetrics( $responseSet,
$indexType, count( $data ) );
+ }
return Status::newGood();
} else {
$this->failure( $exception );
--
To view, visit https://gerrit.wikimedia.org/r/392002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ca58270e2ab001fab02275636a237449c528fc8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: REL1_29
Gerrit-Owner: DCausse
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/debian[master]: Set Rules-Requires-Root: no
Legoktm has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391999 ) Change subject: Set Rules-Requires-Root: no .. Set Rules-Requires-Root: no Change-Id: I3874752b5c60e6d7f01badbb3164b4648b41ed4d --- M debian/changelog M debian/control 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 50d4d20..db3ef60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ mediawiki (1:1.27.4-2) UNRELEASED; urgency=medium * Bump Standards-Version to 4.1.1 + * Set Rules-Requires-Root: no - -- Kunal Mehta Thu, 16 Nov 2017 23:38:41 -0800 + -- Kunal Mehta Thu, 16 Nov 2017 23:46:08 -0800 mediawiki (1:1.27.4-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index fff31c1..1552588 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Standards-Version: 4.1.1 Vcs-Git: https://gerrit.wikimedia.org/r/mediawiki/debian.git Vcs-Browser: https://phabricator.wikimedia.org/diffusion/MDEB/ +Rules-Requires-Root: no Package: mediawiki Architecture: all -- To view, visit https://gerrit.wikimedia.org/r/391999 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3874752b5c60e6d7f01badbb3164b4648b41ed4d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian 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/debian[master]: Set Rules-Requires-Root: no
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391999 ) Change subject: Set Rules-Requires-Root: no .. Set Rules-Requires-Root: no Change-Id: I3874752b5c60e6d7f01badbb3164b4648b41ed4d --- M debian/changelog M debian/control 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian refs/changes/99/391999/1 diff --git a/debian/changelog b/debian/changelog index 50d4d20..db3ef60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ mediawiki (1:1.27.4-2) UNRELEASED; urgency=medium * Bump Standards-Version to 4.1.1 + * Set Rules-Requires-Root: no - -- Kunal Mehta Thu, 16 Nov 2017 23:38:41 -0800 + -- Kunal Mehta Thu, 16 Nov 2017 23:46:08 -0800 mediawiki (1:1.27.4-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index fff31c1..1552588 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Standards-Version: 4.1.1 Vcs-Git: https://gerrit.wikimedia.org/r/mediawiki/debian.git Vcs-Browser: https://phabricator.wikimedia.org/diffusion/MDEB/ +Rules-Requires-Root: no Package: mediawiki Architecture: all -- To view, visit https://gerrit.wikimedia.org/r/391999 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3874752b5c60e6d7f01badbb3164b4648b41ed4d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian 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/debian[master]: Bump Standards-Version to 4.1.1
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391998 ) Change subject: Bump Standards-Version to 4.1.1 .. Bump Standards-Version to 4.1.1 Change-Id: I5f38e73f089cd622f55376f2091273519dd1b883 --- M debian/changelog M debian/control 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian refs/changes/98/391998/1 diff --git a/debian/changelog b/debian/changelog index d69355e..50d4d20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mediawiki (1:1.27.4-2) UNRELEASED; urgency=medium + + * Bump Standards-Version to 4.1.1 + + -- Kunal Mehta Thu, 16 Nov 2017 23:38:41 -0800 + mediawiki (1:1.27.4-1) unstable; urgency=medium * Imported Upstream version 1.27.4 (security release), fixing diff --git a/debian/control b/debian/control index 63a74d7..fff31c1 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ dh-buildinfo, apache2-dev Homepage: https://www.mediawiki.org/ -Standards-Version: 3.9.8 +Standards-Version: 4.1.1 Vcs-Git: https://gerrit.wikimedia.org/r/mediawiki/debian.git Vcs-Browser: https://phabricator.wikimedia.org/diffusion/MDEB/ -- To view, visit https://gerrit.wikimedia.org/r/391998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f38e73f089cd622f55376f2091273519dd1b883 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian 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/debian[master]: Remove unused lintian overrides
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/392000 ) Change subject: Remove unused lintian overrides .. Remove unused lintian overrides Change-Id: I579eeb7d952a5e75f4c4ab32269286f847064cae --- M debian/changelog M debian/mediawiki.lintian-overrides 2 files changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian refs/changes/00/392000/1 diff --git a/debian/changelog b/debian/changelog index db3ef60..20c1b87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ * Bump Standards-Version to 4.1.1 * Set Rules-Requires-Root: no + * Remove unused lintian overrides - -- Kunal Mehta Thu, 16 Nov 2017 23:46:08 -0800 + -- Kunal Mehta Thu, 16 Nov 2017 23:52:43 -0800 mediawiki (1:1.27.4-1) unstable; urgency=medium diff --git a/debian/mediawiki.lintian-overrides b/debian/mediawiki.lintian-overrides index 68b407e..ed29747 100644 --- a/debian/mediawiki.lintian-overrides +++ b/debian/mediawiki.lintian-overrides @@ -1,9 +1,6 @@ # this is ok, a Conflicts is not needed mediawiki: breaks-without-version mediawiki-extensions-fckeditor -# this is a file conflict -mediawiki: conflicts-with-version mediawiki-extensions-base (<< 3.5~) - # this is not the same library even though the filename is the same mediawiki: embedded-javascript-library usr/share/mediawiki/resources/src/jquery/jquery.tablesorter.js please use libjs-jquery-tablesorter @@ -28,7 +25,4 @@ # COPYING files are needed for Special:Version mediawiki: extra-license-file - -# lintian bug #818962 -mediawiki: php-script-but-no-phpX-cli-dep -- To view, visit https://gerrit.wikimedia.org/r/392000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I579eeb7d952a5e75f4c4ab32269286f847064cae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian 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...WikibaseQualityConstraints[master]: Import wikimedia-ui-base in SpecialConstraintReportPage.less
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390243 )
Change subject: Import wikimedia-ui-base in SpecialConstraintReportPage.less
..
Import wikimedia-ui-base in SpecialConstraintReportPage.less
This lets us drop the last hard-coded color values.
Change-Id: I4b332ad6adaee6e1d7e8c591c5749b88cc7b0933
---
M extension.json
M modules/SpecialConstraintReportPage.less
2 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/extension.json b/extension.json
index bf7f0e8..ea185f2 100644
--- a/extension.json
+++ b/extension.json
@@ -47,7 +47,10 @@
"ResourceModules": {
"SpecialConstraintReportPage": {
"styles": "modules/SpecialConstraintReportPage.less",
- "scripts": "modules/SpecialConstraintReportPage.js"
+ "scripts": "modules/SpecialConstraintReportPage.js",
+ "dependencies": [
+ "oojs-ui-core.styles"
+ ]
},
"wikibase.quality.constraints.icon": {
"class": "ResourceLoaderImageModule",
diff --git a/modules/SpecialConstraintReportPage.less
b/modules/SpecialConstraintReportPage.less
index e0b8467..448cfbe 100644
--- a/modules/SpecialConstraintReportPage.less
+++ b/modules/SpecialConstraintReportPage.less
@@ -1,7 +1,5 @@
@import 'mediawiki.ui/variables';
-
-/* named colors refer to the Wikimedia Style Guide,
https://wikimedia.github.io/WikimediaUI-Style-Guide/visual-style_colors.html */
-/* TODO use some Less import for those as well (not part of
'mediawiki.ui/variables') */
+@import '../../lib/oojs-ui/wikimedia-ui-base';
/* Entity id form */
form {
@@ -24,11 +22,11 @@
}
.wbqc-status-compliance {
- color: #00af89; /* Green50 */
+ color: @wmui-color-green50;
}
.wbqc-status-exception {
- color: #14866d; /* Green30 */
+ color: @wmui-color-green30;
}
.wbqc-status-violation {
@@ -49,7 +47,7 @@
}
.wbqc-status-warning {
- color: #ac6600; /* Yellow30 */
+ color: @wmui-color-yellow30;
}
/* Tooltip */
@@ -61,7 +59,7 @@
.wbqc-tooltip {
margin-top: -40px;
margin-left: -5px;
- background-color: #f8f9fa; /* Base90 */
+ background-color: @background-color-framed;
border: 1px solid @colorPlaceholder;
border-radius: 5px;
box-shadow: 2px 2px 1px rgba( 0, 0, 0, 0.2 );
--
To view, visit https://gerrit.wikimedia.org/r/390243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b332ad6adaee6e1d7e8c591c5749b88cc7b0933
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE)
Gerrit-Reviewer: Thiemo Mättig (WMDE)
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...WikibaseQualityConstraints[master]: Add option to remove detail fields from API response
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391864 )
Change subject: Add option to remove detail fields from API response
..
Add option to remove detail fields from API response
The option defaults to “true”, i. e. “keep”, so that with the default
configuration nothing changes. We can then later change the config on
Wikidata to false, and eventually remove the setting (removing the
fields unconditionally).
Bug: T180614
Change-Id: Ia104f1466b11532da42b1ad5a0817683e5c4dfb9
---
M api/CheckConstraints.php
M extension.json
M tests/phpunit/Api/CheckConstraintsTest.php
3 files changed, 13 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/api/CheckConstraints.php b/api/CheckConstraints.php
index 76d106e..798bb17 100644
--- a/api/CheckConstraints.php
+++ b/api/CheckConstraints.php
@@ -362,10 +362,14 @@
'type' => $typeItemId,
'typeLabel' => $typeLabel,
'link' => $link,
- 'detail' =>
$checkResult->getParameters(),
- 'detailHTML' =>
$this->constraintParameterRenderer->formatParameters(
$checkResult->getParameters() )
]
];
+ if ( $this->config->get(
'WBQualityConstraintsIncludeDetailInApi' ) ) {
+ $result['constraint'] += [
+ 'detail' =>
$checkResult->getParameters(),
+ 'detailHTML' =>
$this->constraintParameterRenderer->formatParameters(
$checkResult->getParameters() ),
+ ];
+ }
if ( $checkResult->getMessage() ) {
$result['message-html'] =
$checkResult->getMessage();
}
diff --git a/extension.json b/extension.json
index 48a173b..4bdc688 100644
--- a/extension.json
+++ b/extension.json
@@ -164,6 +164,11 @@
"description": "Size of the per-regex cache map for
format/regex check results. For each regex, up to this many values will have
cached whether they match the regex or not, on a least-recently-used basis.",
"public": true
},
+ "WBQualityConstraintsIncludeDetailInApi": {
+ "value": true,
+ "description": "Whether to include the 'detail' and
'detailHTML' fields in the response of the wbcheckconstraints API action.",
+ "public": true
+ },
"WBQualityConstraintsInstanceOfId": {
"value": "P31",
"description": "The property ID of the 'instance of'
property (data type: item), which specifies the class(es) of an item.",
diff --git a/tests/phpunit/Api/CheckConstraintsTest.php
b/tests/phpunit/Api/CheckConstraintsTest.php
index 280760b..6f2d070 100644
--- a/tests/phpunit/Api/CheckConstraintsTest.php
+++ b/tests/phpunit/Api/CheckConstraintsTest.php
@@ -104,12 +104,14 @@
);
$valueFormatter =
$valueFormatterFactory->getValueFormatter( SnakFormatter::FORMAT_HTML,
$formatterOptions );
+ // we can’t use the DefaultConfig trait because we’re
in a static method
$config = new HashConfig( [
'WBQualityConstraintsPropertyConstraintId' =>
'P1',
'WBQualityConstraintsExceptionToConstraintId'
=> 'P2',
'WBQualityConstraintsConstraintStatusId' =>
'P3',
'WBQualityConstraintsCheckDurationInfoSeconds'
=> 1.0,
'WBQualityConstraintsCheckDurationWarningSeconds' => 10.0,
+ 'WBQualityConstraintsIncludeDetailInApi' =>
true,
] );
$entityIdParser = new ItemIdParser();
$constraintParameterRenderer = new
ConstraintParameterRenderer( $entityIdFormatter, $valueFormatter );
--
To view, visit https://gerrit.wikimedia.org/r/391864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia104f1466b11532da42b1ad5a0817683e5c4dfb9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE)
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWi
[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Add user preference to allow setting a default uploader name
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334877 )
Change subject: Add user preference to allow setting a default uploader name
..
Add user preference to allow setting a default uploader name
Added user preference to set a default name to use for own works.
Defaults to username if left blank.
Bug: T154154
Change-Id: I81d1d8fbe39245fa3850f2a09f0dcd3a08945c30
---
M UploadWizardHooks.php
M i18n/en.json
M i18n/qqq.json
M resources/deed/uw.deed.OwnWork.js
4 files changed, 19 insertions(+), 3 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index 4ce046d..5d4625b 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -57,6 +57,13 @@
];
}
+ $preferences['upwiz_licensename'] = [
+ 'type' => 'text',
+ 'label-message' => 'mwe-upwiz-prefs-license-name',
+ 'help-message' => 'mwe-upwiz-prefs-license-name-help',
+ 'section' => 'uploads/upwiz-licensing'
+ ];
+
if ( UploadWizardConfig::getSetting( 'enableLicensePreference'
) ) {
$licenseConfig = UploadWizardConfig::getSetting(
'licenses' );
diff --git a/i18n/en.json b/i18n/en.json
index 4728339..80bbba3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -323,6 +323,8 @@
"mwe-upwiz-prefs-def-license-def": "Use whatever the default is",
"mwe-upwiz-prefs-def-license-custom": "Custom default license",
"mwe-upwiz-prefs-def-license-custom-help": "This field is only used if
you choose the last option above.",
+ "mwe-upwiz-prefs-license-name": "Author's name",
+ "mwe-upwiz-prefs-license-name-help": "Defaults to username if the field
is left empty",
"mwe-upwiz-prefs-license-own": "Own work - $1",
"mwe-upwiz-prefs-license-thirdparty": "Someone else's work - $1",
"mwe-upwiz-prefs-chunked": "Chunked uploads for files over $1 in Upload
Wizard - Increases maximum file upload size from $2 to $3",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 33fb323..7086a39 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -350,6 +350,8 @@
"mwe-upwiz-prefs-def-license-def": "Radio button option",
"mwe-upwiz-prefs-def-license-custom": "Label of preference used to
input wikitext for custom license, if selected.",
"mwe-upwiz-prefs-def-license-custom-help": "Additional label of
preference used to input wikitext for custom license, if selected. The text of
'last option above' is {{msg-mw|mwe-upwiz-license-custom}}",
+ "mwe-upwiz-prefs-license-name": "Label of preference used to input
default name to use for licensing own work.",
+ "mwe-upwiz-prefs-license-name-help": "Additional label of preference
used to input default name to use for licensing own work. This indicates the
default name if the preference field is empty.",
"mwe-upwiz-prefs-license-own": "Parameters:\n* $1 - license message.
e.g. {{msg-mw|Mwe-upwiz-license-cc-by-sa-3.0}}\nSee also:\n*
{{msg-mw|Mwe-upwiz-prefs-license-thirdparty}}",
"mwe-upwiz-prefs-license-thirdparty": "Parameters:\n* $1 - license
message. e.g. {{msg-mw|Mwe-upwiz-license-cc-by-sa-3.0}}\nSee also:\n*
{{msg-mw|Mwe-upwiz-prefs-license-own}}",
"mwe-upwiz-prefs-chunked": "Preference that enables chunked uploading.
Parameters:\n* $1 - size of each chunk, as configured on this wiki\n* $2 -
maximum upload size without preference\n* $3 - maximum upload size with
preference enabled",
diff --git a/resources/deed/uw.deed.OwnWork.js
b/resources/deed/uw.deed.OwnWork.js
index fc7e5f3..f5f008a 100644
--- a/resources/deed/uw.deed.OwnWork.js
+++ b/resources/deed/uw.deed.OwnWork.js
@@ -26,22 +26,27 @@
* @param {mw.Api} api API object - useful for doing previews
*/
uw.deed.OwnWork = function UWDeedOwnWork( config, uploads, api ) {
- var deed = this;
+ var deed = this,
+ prefAuthName = mw.user.options.get( 'upwiz_licensename'
);
uw.deed.Abstract.call( this, 'ownwork', config );
this.uploadCount = uploads.length;
+ if ( !prefAuthName ) {
+ prefAuthName = mw.config.get( 'wgUserName' );
+ }
+
// copyright holder
this.authorInput = new OO.ui.TextInputWidget( {
name: 'author',
title: mw.message( 'mwe-upwiz-tooltip-sign' ).text(),
- value: mw.config.get( 'wgUserName' ),
+ value: prefAuthName,
classes: [ 'mwe-upwiz-sign' ]
} );
this.fakeAuthorInput = new OO.ui.TextInputWidget( {
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Increase weight for some hosts
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391997 ) Change subject: db-eqiad.php: Increase weight for some hosts .. db-eqiad.php: Increase weight for some hosts Give more traffic to the hosts that were out after the schema change revert Bug: T180714 Change-Id: Ie7bb65a02d185ee8159cfd695eff4a2bc6a1f322 --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/97/391997/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index bb3c170..90d5388 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -148,12 +148,12 @@ # 'db1071' => 1, # D1 2.8TB 160GB, future s8 master 'db1082' => 300, # A2 3.6TB 512GB, api 'db1087' => 500, # C2 3.6TB 512GB - 'db1092' => 100, # D2 3.6TB 512GB + 'db1092' => 300, # D2 3.6TB 512GB 'db1096' => 1, # A6 3.6TB 512GB, watchlist, recentchanges, contributions, logpager #T174569 'db1099' => 1, # B2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager 'db1100' => 1, # C2 3.6TB 512GB, old master, vslow - 'db1104' => 200, # B3 3.6TB 512GB, api - 'db1106' => 200, # D3 3.6TB 512GB + 'db1104' => 300, # B3 3.6TB 512GB, api + 'db1106' => 300, # D3 3.6TB 512GB ], 's6' => [ 'db1061' => 0, # C3 2.8TB 128GB, master -- To view, visit https://gerrit.wikimedia.org/r/391997 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7bb65a02d185ee8159cfd695eff4a2bc6a1f322 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] operations/mediawiki-config[master]: db-eqiad.php: Start repooling all the hosts
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391995 ) Change subject: db-eqiad.php: Start repooling all the hosts .. db-eqiad.php: Start repooling all the hosts All the broken hosts are now up to date. Start repooling them back with a slighltly lower weight than usual as they have been out for hours. Bug: T180714 Change-Id: Ibe61f6723d9e77aa1fb2d1acc04b46f806d933a5 --- M wmf-config/db-eqiad.php 1 file changed, 21 insertions(+), 15 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified Jcrespo: Looks good to me, but someone else must approve diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index cf6fb41..bb3c170 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -143,17 +143,17 @@ 'db1103:3314' => 1, # A3 3.6TB 512GB # rc, log: s2 and s4 ], 's5' => [ - # 'db1063' => 0, # C5 2.8TB 128GB, master, down 'db1070' => 0, # D1 2.8TB 160GB, master + # 'db1063' => 0, # C5 2.8TB 128GB, master, crashed #T180714 # 'db1071' => 1, # D1 2.8TB 160GB, future s8 master - 'db1082' => 300, # A2 3.6TB 512GB, api, recentchanges, slow + 'db1082' => 300, # A2 3.6TB 512GB, api 'db1087' => 500, # C2 3.6TB 512GB - # 'db1092' => 500, # D2 3.6TB 512GB #T174569 - # 'db1096' => 1, # A6 3.6TB 512GB, watchlist, recentchanges, contributions, logpager #T174569 - # 'db1099' => 1, # B2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager - # 'db1100' => 1, # C2 3.6TB 512GB, old master - # 'db1104' => 100, # B3 3.6TB 512GB, api - # 'db1106' => 500, # D3 3.6TB 512GB + 'db1092' => 100, # D2 3.6TB 512GB + 'db1096' => 1, # A6 3.6TB 512GB, watchlist, recentchanges, contributions, logpager #T174569 + 'db1099' => 1, # B2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager + 'db1100' => 1, # C2 3.6TB 512GB, old master, vslow + 'db1104' => 200, # B3 3.6TB 512GB, api + 'db1106' => 200, # D3 3.6TB 512GB ], 's6' => [ 'db1061' => 0, # C3 2.8TB 128GB, master @@ -382,28 +382,34 @@ ], 's5' => [ 'vslow' => [ - 'db1082' => 1, + 'db1100' => 1, ], 'dump' => [ - 'db1082' => 1, + 'db1100' => 1, ], 'api' => [ 'db1082' => 1, + 'db1104' => 1, ], 'watchlist' => [ - 'db1082' => 1, + 'db1096' => 1, + 'db1099' => 1, ], 'recentchanges' => [ - 'db1082' => 1, + 'db1096' => 1, + 'db1099' => 1, ], 'recentchangeslinked' => [ - 'db1082' => 1, + 'db1096' => 1, + 'db1099' => 1, ], 'contributions' => [ - 'db1082' => 1, + 'db1096' => 1, + 'db1099' => 1, ], 'logpager' => [ - 'db1082' => 1, + 'db1096' => 1, + 'db1099' => 1, ], ], 's6' => [ -- To view, visit https://gerrit.wikimedia.org/r/391995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe61f6723d9e77aa1fb2d1acc04b46f806d933a5 Gerrit-PatchSet: 5 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] operations/software[master]: s5.hosts: db1070 is now the master
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391996 ) Change subject: s5.hosts: db1070 is now the master .. s5.hosts: db1070 is now the master Bug: T180714 Change-Id: I62798bd86fc34d56f22e4a2de88d80a4513e81b1 --- M dbtools/s5.hosts 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts index af90f6e..106ccb2 100644 --- a/dbtools/s5.hosts +++ b/dbtools/s5.hosts @@ -23,7 +23,6 @@ db1095.eqiad.wmnet 3306 dbstore1001.eqiad.wmnet3306 dbstore1002.eqiad.wmnet3306 -db1070.eqiad.wmnet 3306 db1071.eqiad.wmnet 3306 db1082.eqiad.wmnet 3306 db1087.eqiad.wmnet 3306 @@ -35,3 +34,4 @@ db1106.eqiad.wmnet 3306 db1101.eqiad.wmnet 3315 db1063.eqiad.wmnet 3306 +db1070.eqiad.wmnet 3306 -- To view, visit https://gerrit.wikimedia.org/r/391996 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62798bd86fc34d56f22e4a2de88d80a4513e81b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui 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/software[master]: s5.hosts: db1070 is now the master
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391996 ) Change subject: s5.hosts: db1070 is now the master .. s5.hosts: db1070 is now the master Bug: T180714 Change-Id: I62798bd86fc34d56f22e4a2de88d80a4513e81b1 --- M dbtools/s5.hosts 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software refs/changes/96/391996/1 diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts index af90f6e..106ccb2 100644 --- a/dbtools/s5.hosts +++ b/dbtools/s5.hosts @@ -23,7 +23,6 @@ db1095.eqiad.wmnet 3306 dbstore1001.eqiad.wmnet3306 dbstore1002.eqiad.wmnet3306 -db1070.eqiad.wmnet 3306 db1071.eqiad.wmnet 3306 db1082.eqiad.wmnet 3306 db1087.eqiad.wmnet 3306 @@ -35,3 +34,4 @@ db1106.eqiad.wmnet 3306 db1101.eqiad.wmnet 3315 db1063.eqiad.wmnet 3306 +db1070.eqiad.wmnet 3306 -- To view, visit https://gerrit.wikimedia.org/r/391996 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I62798bd86fc34d56f22e4a2de88d80a4513e81b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/software 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] operations/mediawiki-config[master]: db-eqiad.php: Start repooling all the hosts
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391995 ) Change subject: db-eqiad.php: Start repooling all the hosts .. db-eqiad.php: Start repooling all the hosts All the broken hosts are now up to date. Start repooling them back with a slighltly lower weight than usual as they have been out for outs. Bug: T180714 Change-Id: Ibe61f6723d9e77aa1fb2d1acc04b46f806d933a5 --- M wmf-config/db-eqiad.php 1 file changed, 20 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/95/391995/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index cf6fb41..9f54f1f 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -146,14 +146,14 @@ # 'db1063' => 0, # C5 2.8TB 128GB, master, down 'db1070' => 0, # D1 2.8TB 160GB, master # 'db1071' => 1, # D1 2.8TB 160GB, future s8 master - 'db1082' => 300, # A2 3.6TB 512GB, api, recentchanges, slow + 'db1082' => 300, # A2 3.6TB 512GB, api 'db1087' => 500, # C2 3.6TB 512GB - # 'db1092' => 500, # D2 3.6TB 512GB #T174569 - # 'db1096' => 1, # A6 3.6TB 512GB, watchlist, recentchanges, contributions, logpager #T174569 - # 'db1099' => 1, # B2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager - # 'db1100' => 1, # C2 3.6TB 512GB, old master - # 'db1104' => 100, # B3 3.6TB 512GB, api - # 'db1106' => 500, # D3 3.6TB 512GB + 'db1092' => 100, # D2 3.6TB 512GB + 'db1096' => 1, # A6 3.6TB 512GB, watchlist, recentchanges, contributions, logpager #T174569 + 'db1099' => 1, # B2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager + 'db1100' => 1, # C2 3.6TB 512GB, old master, vslow + 'db1104' => 100, # B3 3.6TB 512GB, api + 'db1106' => 100, # D3 3.6TB 512GB ], 's6' => [ 'db1061' => 0, # C3 2.8TB 128GB, master @@ -382,28 +382,34 @@ ], 's5' => [ 'vslow' => [ - 'db1082' => 1, + 'db1110' => 1, ], 'dump' => [ - 'db1082' => 1, + 'db1110' => 1, ], 'api' => [ 'db1082' => 1, + 'db1104' => 1, ], 'watchlist' => [ - 'db1082' => 1, + 'db1096' => 1, + 'db1099' => 1, ], 'recentchanges' => [ - 'db1082' => 1, + 'db1096' => 1, + 'db1099' => 1, ], 'recentchangeslinked' => [ - 'db1082' => 1, + 'db1096' => 1, + 'db1099' => 1, ], 'contributions' => [ - 'db1082' => 1, + 'db1096' => 1, + 'db1099' => 1, ], 'logpager' => [ - 'db1082' => 1, + 'db1096' => 1, + 'db1099' => 1, ], ], 's6' => [ -- To view, visit https://gerrit.wikimedia.org/r/391995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe61f6723d9e77aa1fb2d1acc04b46f806d933a5 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] operations/mediawiki-config[master]: labs: Clean up outdated wgProfiler config
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391982 )
Change subject: labs: Clean up outdated wgProfiler config
..
labs: Clean up outdated wgProfiler config
* Define $wgProfiler cleanly (not augmenting a predefined array).
* Remove `udphost`: No longer recognised by MediaWiki.
* Remove $wgDebugToolbar: Didn't actuall work.
https://test.wikimedia.beta.wmflabs.org/ shows profiling output
in an HTML comment, but not does show a debug toolbar because
MediaWiki forcefully disabled the debug toolbar if wgUseSquid
is used, which is it on Beta (just like prod).
Bug: T180766
Change-Id: Ieda5c29bcd68ba8fd0a14902a243bc0daac15da4
---
M wmf-config/CommonSettings-labs.php
1 file changed, 4 insertions(+), 5 deletions(-)
Approvals:
Tim Starling: Looks good to me, but someone else must approve
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 5d61866..5296b05 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -20,16 +20,15 @@
if ( $wmfRealm == 'labs' ) { # safe guard
// test wiki
if ( $wgDBname == 'testwiki' ) {
- $wgDebugToolbar = true;
- $wgProfiler['class'] = 'ProfilerXhprof';
- $wgProfiler['output'] = [ 'text' ];
+ $wgProfiler = [
+ 'class' => 'ProfilerXhprof',
+ 'output' => 'text',
+ ];
}
if ( file_exists( '/etc/wmflabs-instancename' ) ) {
$wgOverrideHostname = trim( file_get_contents(
'/etc/wmflabs-instancename' ) );
}
-
-$wgProfiler['udphost'] = 'labmon1001.eqiad.wmnet';
$wgDebugTimestamps = true;
--
To view, visit https://gerrit.wikimedia.org/r/391982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieda5c29bcd68ba8fd0a14902a243bc0daac15da4
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Tim Starling
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]: labs: Enable profiler based on same signals as production does
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391987 )
Change subject: labs: Enable profiler based on same signals as production does
..
labs: Enable profiler based on same signals as production does
Bug: T180766
Change-Id: I8179ed9ed3c7f0bc0ee951d2055514e00467d6d8
---
M wmf-config/CommonSettings-labs.php
1 file changed, 8 insertions(+), 2 deletions(-)
Approvals:
Tim Starling: Looks good to me, but someone else must approve
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 5296b05..633e84d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -18,8 +18,14 @@
#
if ( $wmfRealm == 'labs' ) { # safe guard
-// test wiki
-if ( $wgDBname == 'testwiki' ) {
+// Profiler (similar to wmf-config/profiler.php for production)
+// 1. Web request for https://test.wikimedia.beta.wmflabs.org/
+// 2. Web request with X-Wikimedia-Debug and ?forceprofile=1
+// 3. Maintenance script with --profiler=text
+if ( $wgDBname == 'testwiki'
+ || PHP_SAPI === 'cli'
+ || ( isset( $_GET['forceprofile'] ) && isset(
$_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ) )
+) {
$wgProfiler = [
'class' => 'ProfilerXhprof',
'output' => 'text',
--
To view, visit https://gerrit.wikimedia.org/r/391987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8179ed9ed3c7f0bc0ee951d2055514e00467d6d8
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Tim Starling
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...release[master]: Task Series scap plugin
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390429 )
Change subject: Task Series scap plugin
..
Task Series scap plugin
Usage example:
scap task-series blockers --count 2 --date 2017-12-25 1.31.0-wmf.14
Creates release blockers task for 1.31.0-wmf.14 and 1.31.0-wmf.15
Docs: https://wikitech.wikimedia.org/wiki/Deployments/Blocking_Tasks
Change-Id: If3d375d39c976788499737ab68fb281eb13dc2c5
---
A scap/plugins/task-series.py
1 file changed, 153 insertions(+), 0 deletions(-)
Approvals:
Greg Grossmeier: Looks good to me, but someone else must approve
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scap/plugins/task-series.py b/scap/plugins/task-series.py
new file mode 100644
index 000..b500ef9
--- /dev/null
+++ b/scap/plugins/task-series.py
@@ -0,0 +1,153 @@
+# This Python file uses the following encoding: utf-8
+
+from __future__ import print_function, unicode_literals
+
+import argparse
+import datetime
+import re
+
+from calendar import Calendar
+from phabricator import Phabricator
+from scap import cli, log
+from scap.utils import var_dump
+from datetime import timedelta
+
+
+ONEWEEK = timedelta(weeks=1)
+
+
+def trunc(len, string, ellipsis=" …"):
+return string[0:len] + ellipsis
+
+
+def action_arg(*args, **kwargs):
+kwargs['const'] = kwargs['action']
+kwargs['dest'] = 'action'
+kwargs['action'] = 'store_const'
+kwargs['metavar'] = 'ACTION'
+return cli.argument(*args, **kwargs)
+
+
+# function by jfs, see https://stackoverflow.com/a/8778548/1672995
+def totimestamp(dt, epoch=datetime.datetime(1970, 1, 1)):
+td = dt - epoch
+# return td.total_seconds()
+return (td.microseconds + (td.seconds + td.days * 86400) * 10**6) / 10**6
+
+
+def find_mondays(year, month):
+cal = Calendar()
+mondays = list()
+for week in cal.monthdays2calendar(year, month):
+for day in week:
+(monthday, weekday) = day
+if (weekday == 1 and monthday > 0):
+mondays.append(datetime.date(year=year,
+ month=month,
+ day=monthday))
+return mondays
+
+
+phab = Phabricator(host='https://phabricator.wikimedia.org/api/')
+
+
+def phab_taskid(taskid):
+if not taskid.startswith("T"):
+raise Exception("Invalid task id: %s", taskid)
+return taskid
+
+
+def mediawiki_version(ver):
+"""Validation our version number formats"""
+try:
+return re.match("(\d+\.\d+(\.\d+-)?wmf\.?\d+)", ver).group(0)
+except Exception:
+raise argparse.ArgumentTypeError(
+"Invalid wmf version '%s' expected: #.##.#-wmf.#" % ver)
+
+
+def date_str(datestr):
+formats = ['%x', '%m-%d-%Y', '%Y%m%d', '%Y-%m-%d']
+err = None
+date = None
+for format in formats:
+try:
+date = datetime.datetime.strptime(datestr, format)
+except Exception as ex:
+err = ex
+
+if date is None and err is not None:
+raise err
+
+return date
+
+
+def map_transactions(obj):
+trns = []
+
+for key, val in obj.items():
+trns.append({
+"type": key,
+"value": val
+})
+return trns
+
+
+@cli.command('task-series', subcommands=True)
+class ReleaseTagger(cli.Application):
+"""
+Create a series of phabricator tasks with content generated from a template
+"""
+action = None
+
+def _setup_loggers(self):
+"""Setup logging."""
+log.setup_loggers(self.config, self.arguments.loglevel + 10)
+
+def _process_arguments(self, args, extra_args):
+# print(args,extra_args)
+return args, extra_args
+
+@cli.argument('--count', help='Number of tasks to create, default=1',
+ metavar='NUM', default=1, type=int)
+@cli.argument('--date', help='Date of the first release,\
+ default=today\'s date', metavar='START',
+ type=date_str, default=datetime.datetime.utcnow())
+@cli.argument('release', help='Create tasks beginning with VERSION',
+ metavar='VERSION', type=mediawiki_version)
+@cli.subcommand('blockers')
+def blockers(self, *args):
+'''
+Create Release Blockers.
+
+Command Usage:
+
+ $ scap task-series blockers --count 10 --date 2017-01-01 1.30.0-wmf.1
+
+Creates 10 release-blocker tasks, beginning with version 1.30.0-wmf.1
+on 2017-01-01.
+'''
+v = self.arguments.release.split('-')
+wmfnum = int(v[-1].split('.')[-1])
+week = self.arguments.date
+weekday = week.weekday()
+if weekday:
+# ofset some days so that we always use monday of the given week:
+week -= timedelta(days=weekday)
+
+for n in range(wmfnum, wmfnum + self.arguments.count):
+
[MediaWiki-commits] [Gerrit] marvin[master]: Fix: improve audio player CSS presentation
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391994 )
Change subject: Fix: improve audio player CSS presentation
..
Fix: improve audio player CSS presentation
Change-Id: If28e87575f5a5c82aaed930dbc2ec067c9a11446
---
M src/common/components/content/styles/images.css
M src/common/components/content/styles/tables.css
2 files changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/94/391994/1
diff --git a/src/common/components/content/styles/images.css
b/src/common/components/content/styles/images.css
index 36f0ea8..50c4b78 100644
--- a/src/common/components/content/styles/images.css
+++ b/src/common/components/content/styles/images.css
@@ -1,5 +1,10 @@
/* Containers */
+/* http://localhost:3000/wiki/Girl_(Pharrell_Williams_album)/809904389#Singles
*/
+.Content figure {
+ margin: 0;
+}
+
/* http://localhost:3000/wiki/China/804850001#Landscape_and_climate */
.Content .thumbinner {
width: auto !important;
@@ -26,6 +31,12 @@
vertical-align: middle;
}
+/* http://localhost:3000/wiki/Girl_(Pharrell_Williams_album)/809904389#Singles
+
http://localhost:3000/wiki/The_Beatles/810732238#Beatles_for_Sale.2C_Help.21_and_Rubber_Soul
*/
+.Content .mbox-small-left video, .Content .mbox-small video {
+ height: 32px !important;
+}
+
/* Captions */
/* http://localhost:3000/wiki/Pablo_Picasso/804068218#Early_life */
diff --git a/src/common/components/content/styles/tables.css
b/src/common/components/content/styles/tables.css
index 869e668..252ea89 100644
--- a/src/common/components/content/styles/tables.css
+++ b/src/common/components/content/styles/tables.css
@@ -83,4 +83,16 @@
/* http://localhost:3000/wiki/Voodoo_Shoppe/443846926 */
.Content .navbox .navbox-inner {
width: 100%;
-}
\ No newline at end of file
+}
+
+/* http://localhost:3000/wiki/MediaWiki:Common.css/806220319
+ http://localhost:3000/wiki/Girl_(Pharrell_Williams_album)/809904389#Singles
*/
+.Content .mbox-small-left {
+ margin: var(--half-space) var(--space) 0 var(--space);
+ width: 400px;
+}
+
+/*
http://localhost:3000/wiki/The_Beatles/810732238#Beatles_for_Sale.2C_Help.21_and_Rubber_Soul
*/
+.Content .mbox-small {
+ margin: var(--half-space) 0;
+}
--
To view, visit https://gerrit.wikimedia.org/r/391994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If28e87575f5a5c82aaed930dbc2ec067c9a11446
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
[MediaWiki-commits] [Gerrit] analytics/wikimetrics-deploy[master]: Fix database access by pointing to new servers
Milimetric has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391993 )
Change subject: Fix database access by pointing to new servers
..
Fix database access by pointing to new servers
Bug: T180770
Change-Id: Ib6017b4e43af97c08dc8e5222d5ec75d5b52154e
---
M config_templates/db_config.yaml
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/config_templates/db_config.yaml b/config_templates/db_config.yaml
index 3f01017..2a2ecee 100644
--- a/config_templates/db_config.yaml
+++ b/config_templates/db_config.yaml
@@ -8,9 +8,9 @@
SQL_ECHO: False
WIKIMETRICS_ENGINE_URL :
'mysql://$DB_USER_WIKIMETRICS:$DB_PASSWORD_WIKIMETRICS@$DB_HOST_WIKIMETRICS/$DB_NAME_WIKIMETRICS'
WIKIMETRICS_POOL_SIZE : 100
-MEDIAWIKI_ENGINE_URL_TEMPLATE :
'mysql://$DB_USER_LABSDB:$DB_PASSWORD_LABSDB@labsdb1001.eqiad.wmnet/{0}_p'
+MEDIAWIKI_ENGINE_URL_TEMPLATE :
'mysql://$DB_USER_LABSDB:$db_password_lab...@s1.analytics.db.svc.eqiad.wmflabs/{0}_p'
MEDIAWIKI_POOL_SIZE : 200
-CENTRALAUTH_ENGINE_URL :
'mysql://$DB_USER_LABSDB:$DB_PASSWORD_LABSDB@labsdb1001.eqiad.wmnet/centralauth_p'
+CENTRALAUTH_ENGINE_URL :
'mysql://$DB_USER_LABSDB:$db_password_lab...@s1.analytics.db.svc.eqiad.wmflabs/centralauth_p'
REPLICATION_LAG_MW_PROJECTS : [ 'enwiki', 'eowiki', 'elwiki',
'commonswiki', 'dewiki', 'frwiki', 'eswiki' ]
REPLICATION_LAG_THRESHOLD : 3 # (measured in hours)
DEBUG : False
--
To view, visit https://gerrit.wikimedia.org/r/391993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6017b4e43af97c08dc8e5222d5ec75d5b52154e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics-deploy
Gerrit-Branch: master
Gerrit-Owner: Milimetric
Gerrit-Reviewer: Milimetric
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/wikimetrics-deploy[master]: Fix database access by pointing to new servers
Milimetric has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391993 )
Change subject: Fix database access by pointing to new servers
..
Fix database access by pointing to new servers
Bug: T180770
Change-Id: Ib6017b4e43af97c08dc8e5222d5ec75d5b52154e
---
M config_templates/db_config.yaml
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics-deploy
refs/changes/93/391993/1
diff --git a/config_templates/db_config.yaml b/config_templates/db_config.yaml
index 3f01017..2a2ecee 100644
--- a/config_templates/db_config.yaml
+++ b/config_templates/db_config.yaml
@@ -8,9 +8,9 @@
SQL_ECHO: False
WIKIMETRICS_ENGINE_URL :
'mysql://$DB_USER_WIKIMETRICS:$DB_PASSWORD_WIKIMETRICS@$DB_HOST_WIKIMETRICS/$DB_NAME_WIKIMETRICS'
WIKIMETRICS_POOL_SIZE : 100
-MEDIAWIKI_ENGINE_URL_TEMPLATE :
'mysql://$DB_USER_LABSDB:$DB_PASSWORD_LABSDB@labsdb1001.eqiad.wmnet/{0}_p'
+MEDIAWIKI_ENGINE_URL_TEMPLATE :
'mysql://$DB_USER_LABSDB:$db_password_lab...@s1.analytics.db.svc.eqiad.wmflabs/{0}_p'
MEDIAWIKI_POOL_SIZE : 200
-CENTRALAUTH_ENGINE_URL :
'mysql://$DB_USER_LABSDB:$DB_PASSWORD_LABSDB@labsdb1001.eqiad.wmnet/centralauth_p'
+CENTRALAUTH_ENGINE_URL :
'mysql://$DB_USER_LABSDB:$db_password_lab...@s1.analytics.db.svc.eqiad.wmflabs/centralauth_p'
REPLICATION_LAG_MW_PROJECTS : [ 'enwiki', 'eowiki', 'elwiki',
'commonswiki', 'dewiki', 'frwiki', 'eswiki' ]
REPLICATION_LAG_THRESHOLD : 3 # (measured in hours)
DEBUG : False
--
To view, visit https://gerrit.wikimedia.org/r/391993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6017b4e43af97c08dc8e5222d5ec75d5b52154e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics-deploy
Gerrit-Branch: master
Gerrit-Owner: Milimetric
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiAuth[master]: Local acct bypass, workaround mw bug, userrights import config
Skizzerz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391992 )
Change subject: Local acct bypass, workaround mw bug, userrights import config
..
Local acct bypass, workaround mw bug, userrights import config
Add a new userright mwa-createlocalaccount to create an account locally
without importing it from the remote wiki. Otherwise, existence checks
block local account creation with same usernames.
Add 2 new config options:
* $wgMediaWikiAuthAllowPasswordChange defaults false; if true it prompts
the user to change their password (or skip) after importing their
account. There appears to be a bug in MediaWiki where if this screen is
skipped entirely (rather than entering a new pw or choosing skip
button), the account creation partially fails and the user can no longer
log into their account until they reset their password.
* $wgMediaWikiAuthImportGroups defaults to true. It can be a boolean or
array of group names. If true, it imports all group memberships from the
foreign wiki. If false, it does not import any group memberships. If an
array, it only imports those specific groups (assuming they exist on
both sides).
Change-Id: I2e6cfe72b13c8ce5da63b3e9c0fb273b0ff33c26
---
M ExternalWikiPrimaryAuthenticationProvider.php
M extension.json
M i18n/en.json
M i18n/qqq.json
4 files changed, 31 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiAuth
refs/changes/92/391992/1
diff --git a/ExternalWikiPrimaryAuthenticationProvider.php
b/ExternalWikiPrimaryAuthenticationProvider.php
index c8fd679..e34ab6f 100644
--- a/ExternalWikiPrimaryAuthenticationProvider.php
+++ b/ExternalWikiPrimaryAuthenticationProvider.php
@@ -123,7 +123,9 @@
// Remote login was successful, an account will be
automatically created for the user by the system
// Mark them as (maybe) needing to reset their password as a
secondary auth step.
- $this->setPasswordResetFlag( $username, Status::newGood() );
+ if ( $this->config->get( 'MediaWikiAuthAllowPasswordChange' ) )
{
+ $this->setPasswordResetFlag( $username,
Status::newGood() );
+ }
return AuthenticationResponse::newPass( $username );
}
@@ -190,6 +192,15 @@
// groupmemberships contains groups and expiries, but is only
present in recent versions of MW. Fall back to groups if it doesn't exist.
$validGroups = array_diff( array_keys( $this->config->get(
'GroupPermissions' ) ), $this->config->get( 'ImplicitGroups' ) );
+ $importableGroups = $this->config->get(
'MediaWikiAuthImportGroups' );
+ if ( $importableGroups === false ) {
+ // do not import any groups
+ $validGroups = [];
+ } elseif ( is_array( $importableGroups ) ) {
+ // array_intersect has a mind-bogglingly stupid
implementation,
+ // in the sense that if the first array has dups, those
dups are returned even if subsequent arrays don't have that element at all
+ $validGroups = array_intersect( array_unique(
$validGroups ), $importableGroups );
+ }
if ( isset( $userInfo->query->userinfo->groupmemberships ) ) {
foreach ( $userInfo->query->userinfo->groupmemberships
as $group ) {
@@ -256,6 +267,13 @@
}
public function testUserExists( $username, $flags = User::READ_NORMAL )
{
+ // sadly we have no other way of getting at the context here
+ $user = \RequestContext::getMain()->getUser();
+ if ( $user->isAllowed( 'mwa-createlocalaccount' ) ) {
+ // bypass remote wiki checks; user can create local
accounts
+ return false;
+ }
+
if ( !isset( $this->userCache[$username] ) ) {
$resp = $this->apiRequest( 'GET', [
'action' => 'query',
@@ -351,7 +369,7 @@
public function accountCreationType() {
// while this creates accounts, it does not do so via the
Special:CreateAccount UI
- return TYPE_NONE;
+ return self::TYPE_NONE;
}
protected function getPasswordResetData( $username, $data ) {
diff --git a/extension.json b/extension.json
index c576116..73591cc 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "MediaWikiAuth",
- "version": "0.9.0",
+ "version": "0.10.0",
"author": [
"Laurence Parry",
"Jack Phoenix",
@@ -12,7 +12,9 @@
"license-name": "GPL-2.0+",
"type": "other",
"config": {
- "MediaWikiAuthApiUrl": ""
+ "MediaWikiAuthAllowPasswordCh
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: mw.MediaWikiPlayerSupport: Fix more .bind() deprecation warn...
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391991 )
Change subject: mw.MediaWikiPlayerSupport: Fix more .bind() deprecation warnings
..
mw.MediaWikiPlayerSupport: Fix more .bind() deprecation warnings
Bug: T169385
Change-Id: I241d1e3e3f400e812d10507b6b6aee7f9c4a1e7c
---
M resources/mw.MediaWikiPlayerSupport.js
1 file changed, 5 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/91/391991/1
diff --git a/resources/mw.MediaWikiPlayerSupport.js
b/resources/mw.MediaWikiPlayerSupport.js
index a382d62..f57eece 100644
--- a/resources/mw.MediaWikiPlayerSupport.js
+++ b/resources/mw.MediaWikiPlayerSupport.js
@@ -11,7 +11,7 @@
} );
// Add mediaWiki player support to target embedPlayer
- $( mw ).bind( 'EmbedPlayerNewPlayer', function ( event, embedPlayer ) {
+ $( mw ).on( 'EmbedPlayerNewPlayer', function ( event, embedPlayer ) {
mw.addMediaWikiPlayerSupport( embedPlayer );
} );
@@ -250,7 +250,7 @@
} );
// Show credits on clip complete:
- $( embedPlayer ).bind( 'onEndedDone', function ( event, id ) {
+ $( embedPlayer ).on( 'onEndedDone', function ( event, id ) {
var cb;
if ( embedPlayer.id !== id ) {
// possible event trigger error. ( skip )
@@ -268,7 +268,7 @@
cb.showMenuItem( 'credits' );
} );
- $( embedPlayer ).bind( 'showInlineDownloadLink', function () {
+ $( embedPlayer ).on( 'showInlineDownloadLink', function () {
// Add recommend HTML5 player if we have non-native
playback:
if ( embedPlayer.controlBuilder.checkNativeWarning() ) {
embedPlayer.controlBuilder.addWarningBinding(
@@ -286,7 +286,7 @@
}
} );
- $( embedPlayer ).bind( 'TimedText_BuildCCMenu', function (
event, $menu, id ) {
+ $( embedPlayer ).on( 'TimedText_BuildCCMenu', function ( event,
$menu, id ) {
var thisep,
pageTitle,
addTextPage,
@@ -362,7 +362,7 @@
} );
} );
- $( embedPlayer ).bind( 'getShareIframeSrc', function ( event,
callback, id ) {
+ $( embedPlayer ).on( 'getShareIframeSrc', function ( event,
callback, id ) {
var iframeUrl = false;
if ( id !== embedPlayer.id ) {
embedPlayer = $( '#' + id )[ 0 ];
--
To view, visit https://gerrit.wikimedia.org/r/391991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I241d1e3e3f400e812d10507b6b6aee7f9c4a1e7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391990 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 91626c731 Get rid of 'qqq' TY subject, link zh to zh-hans Change-Id: I705f2d650612c108ba198906521940f75876d016 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/391990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I705f2d650612c108ba198906521940f75876d016 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment 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] wikimedia...crm[master]: Get rid of 'qqq' TY subject, link zh to zh-hans
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391989 ) Change subject: Get rid of 'qqq' TY subject, link zh to zh-hans .. Get rid of 'qqq' TY subject, link zh to zh-hans The zh html seems to be zh-hans. Change-Id: If65c20ccf95ed49b06e39e5246b04bb0c3eb0c19 --- D sites/all/modules/thank_you/templates/subject/thank_you.qqq.subject A sites/all/modules/thank_you/templates/subject/thank_you.zh.subject 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/sites/all/modules/thank_you/templates/subject/thank_you.qqq.subject b/sites/all/modules/thank_you/templates/subject/thank_you.qqq.subject deleted file mode 100644 index f1300a9..000 --- a/sites/all/modules/thank_you/templates/subject/thank_you.qqq.subject +++ /dev/null @@ -1 +0,0 @@ -Subject line of thank you e-mail \ No newline at end of file diff --git a/sites/all/modules/thank_you/templates/subject/thank_you.zh.subject b/sites/all/modules/thank_you/templates/subject/thank_you.zh.subject new file mode 12 index 000..37ad3dc --- /dev/null +++ b/sites/all/modules/thank_you/templates/subject/thank_you.zh.subject @@ -0,0 +1 @@ +thank_you.zh-hans.subject \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/391989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If65c20ccf95ed49b06e39e5246b04bb0c3eb0c19 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master 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] wikimedia...crm[deployment]: Merge branch 'master' into deployment
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391990 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 91626c731 Get rid of 'qqq' TY subject, link zh to zh-hans Change-Id: I705f2d650612c108ba198906521940f75876d016 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/90/391990/1 -- To view, visit https://gerrit.wikimedia.org/r/391990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I705f2d650612c108ba198906521940f75876d016 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Get rid of 'qqq' TY subject, link zh to zh-hans
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391989 ) Change subject: Get rid of 'qqq' TY subject, link zh to zh-hans .. Get rid of 'qqq' TY subject, link zh to zh-hans The zh html seems to be zh-hans. Change-Id: If65c20ccf95ed49b06e39e5246b04bb0c3eb0c19 --- D sites/all/modules/thank_you/templates/subject/thank_you.qqq.subject A sites/all/modules/thank_you/templates/subject/thank_you.zh.subject 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/89/391989/1 diff --git a/sites/all/modules/thank_you/templates/subject/thank_you.qqq.subject b/sites/all/modules/thank_you/templates/subject/thank_you.qqq.subject deleted file mode 100644 index f1300a9..000 --- a/sites/all/modules/thank_you/templates/subject/thank_you.qqq.subject +++ /dev/null @@ -1 +0,0 @@ -Subject line of thank you e-mail \ No newline at end of file diff --git a/sites/all/modules/thank_you/templates/subject/thank_you.zh.subject b/sites/all/modules/thank_you/templates/subject/thank_you.zh.subject new file mode 12 index 000..37ad3dc --- /dev/null +++ b/sites/all/modules/thank_you/templates/subject/thank_you.zh.subject @@ -0,0 +1 @@ +thank_you.zh-hans.subject \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/391989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If65c20ccf95ed49b06e39e5246b04bb0c3eb0c19 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/private[master]: fake icinga contact secrets for testing
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391988 ) Change subject: fake icinga contact secrets for testing .. fake icinga contact secrets for testing Change-Id: I98f03464346219bedb539f2b16ab90e31d0f3eba --- M hieradata/common.yaml 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Dzahn: Verified; Looks good to me, approved diff --git a/hieradata/common.yaml b/hieradata/common.yaml index f9d8be4..07fb3c8 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -36,6 +36,17 @@ mm-wikidatatech-pass: pass mm-user: pass +# Icinga contact (fake) secrets +icinga_contact_secrets: + bblack: # Brandon Black +email: 't...@example.com' +pager: '15417543010' +address1: '5417543...@msg.fi.google.com' + dzahn: # Daniel Zahn +email: 'foo...@example.com' +pager: '1551234' +address1: '551...@msg.fi.google.com' + k8s_infrastructure_users: client-infrastructure: type: infrastructure-readwrite -- To view, visit https://gerrit.wikimedia.org/r/391988 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98f03464346219bedb539f2b16ab90e31d0f3eba Gerrit-PatchSet: 3 Gerrit-Project: labs/private Gerrit-Branch: master Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/private[master]: fake icinga contact secrets for testing
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391988 ) Change subject: fake icinga contact secrets for testing .. fake icinga contact secrets for testing Change-Id: I98f03464346219bedb539f2b16ab90e31d0f3eba --- M hieradata/common.yaml 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/private refs/changes/88/391988/1 diff --git a/hieradata/common.yaml b/hieradata/common.yaml index ca1a3f2..0b5da5a 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -36,6 +36,17 @@ mm-wikidatatech-pass: pass mm-user: pass +# Icinga contact (fake) secrets +icinga_contact_secrets: + bblack: # Brandon Black +email: 't...@example.com' +pager: '15417543010' +address1: '15417543...@msg.fi.google.com' + dzahn: # Daniel Zahn +email: 'foo...@example.com' +pager: '1551234' +address1: '551...@msg.fi.google.com' + k8s_infrastructure_users: client-infrastructure: type: infrastructure-readwrite -- To view, visit https://gerrit.wikimedia.org/r/391988 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98f03464346219bedb539f2b16ab90e31d0f3eba Gerrit-PatchSet: 1 Gerrit-Project: labs/private 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/mediawiki-config[master]: labs: Enable profiler based on same signals as production does
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391987 )
Change subject: labs: Enable profiler based on same signals as production does
..
labs: Enable profiler based on same signals as production does
Bug: T180766
Change-Id: I8179ed9ed3c7f0bc0ee951d2055514e00467d6d8
---
M wmf-config/CommonSettings-labs.php
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/87/391987/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 5296b05..75fbf66 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -18,8 +18,15 @@
#
if ( $wmfRealm == 'labs' ) { # safe guard
-// test wiki
-if ( $wgDBname == 'testwiki' ) {
+
+// Profiler (similar to wmf-config/profiler.php for production)
+// 1. Web request for https://test.wikimedia.beta.wmflabs.org/
+// 2. Web request with X-Wikimedia-Debug and ?forceprofile=1
+// 3. Maintenance script with --profiler=text
+if ( $wgDBname == 'testwiki'
+ || PHP_SAPI === 'cli'
+ || ( isset( $_GET['forceprofile'] ) && isset(
$_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ) )
+) {
$wgProfiler = [
'class' => 'ProfilerXhprof',
'output' => 'text',
--
To view, visit https://gerrit.wikimedia.org/r/391987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8179ed9ed3c7f0bc0ee951d2055514e00467d6d8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...trending-edits[master]: WIP: Fix eslint warnings
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391986 )
Change subject: WIP: Fix eslint warnings
..
WIP: Fix eslint warnings
Bug: T151395
Change-Id: I718800cfc99a682986a4fb4faa0a4bbe1368a27a
---
M lib/EventProcessor.js
M lib/EventSource.js
M lib/score-pages.js
M routes/trending-v1.js
4 files changed, 23 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits
refs/changes/86/391986/1
diff --git a/lib/EventProcessor.js b/lib/EventProcessor.js
index 9bd734a..4d0b6be 100644
--- a/lib/EventProcessor.js
+++ b/lib/EventProcessor.js
@@ -1,6 +1,4 @@
"use strict";
-
-/* eslint-disable */
const EventEmitter = require('events').EventEmitter;
/**
@@ -8,7 +6,7 @@
*
* @ignore
* @param {Map} pages
- * @param {Number} id
+ * @param {number} id
*/
function remove(pages, id) {
pages.delete(id);
@@ -67,7 +65,7 @@
* Return page with id from the store
*
* @ignore
- * @param {Number} id of page
+ * @param {number} id of page
* @param {Object} page
*/
getPage(id) {
diff --git a/lib/EventSource.js b/lib/EventSource.js
index 34f9f33..2c82247 100644
--- a/lib/EventSource.js
+++ b/lib/EventSource.js
@@ -1,6 +1,5 @@
"use strict";
-/* eslint-disable */
const kafka = require('node-rdkafka');
const EventEmitter = require('events').EventEmitter;
const os = require('os');
diff --git a/lib/score-pages.js b/lib/score-pages.js
index a5891ee..09d9521 100644
--- a/lib/score-pages.js
+++ b/lib/score-pages.js
@@ -1,21 +1,20 @@
"use strict";
-/* eslint-disable */
-var scorer = require('wikipedia-edits-scorer');
+const scorer = require('wikipedia-edits-scorer');
/**
* Score and sort pages
* @param {Date} date
* @param {Array} pages
- * @param {Number} [halflife] greater than 0, which causes scores to decay
over time.
+ * @param {number} [halflife] greater than 0, which causes scores to decay
over time.
* Will default to 1.5 if none given.
* @return {Array}
*/
function scoreAndSortPages(date, pages, halflife) {
halflife = halflife || 1.5;
-pages.forEach(function(candidate) {
-var contrs = candidate.contributors;
+pages.forEach((candidate) => {
+const contrs = candidate.contributors;
candidate.score = scorer.calculateScore(
date,
{
@@ -30,7 +29,7 @@
halflife
);
});
-return pages.sort(function(p1, p2) {
+return pages.sort((p1, p2) => {
return p1.score > p2.score ? -1 : 1;
});
}
diff --git a/routes/trending-v1.js b/routes/trending-v1.js
index aec72a6..01bbe82 100644
--- a/routes/trending-v1.js
+++ b/routes/trending-v1.js
@@ -1,41 +1,37 @@
'use strict';
-/* eslint-disable */
-var BBPromise = require('bluebird');
-var preq = require('preq');
-var domino = require('domino');
-var sUtil = require('../lib/util');
-var apiUtil = require('../lib/api-util');
-var filterPages = require('../lib/filter-pages');
-var scorePages = require('../lib/score-pages');
+
+const sUtil = require('../lib/util');
+const filterPages = require('../lib/filter-pages');
+const scorePages = require('../lib/score-pages');
// shortcut
-var HTTPError = sUtil.HTTPError;
+const HTTPError = sUtil.HTTPError;
/**
* The main router object
*/
-var router = sUtil.router();
+const router = sUtil.router();
/**
* The main application object reported when this module is require()d
*/
-var app;
+let app;
/**
/
* TRENDING ENDPOINTS *
/
-var ERROR_UNAVAILABLE = 'Trending is currently not available on this wiki.';
+const ERROR_UNAVAILABLE = 'Trending is currently not available on this wiki.';
function getRbPageSummaryUrl(domain, title) {
const request = app.restbase_tpl.expand({
request: {
params: {
-domain: domain,
-path: 'page/summary/' + encodeURIComponent(title) },
+domain,
+path: `page/summary/${encodeURIComponent(title)}` },
}
});
return request.uri;
@@ -45,7 +41,7 @@
* GET /feed/debug-trending-edits
* Debugging tools for private usage that expose the contents of the processor
*/
-router.get('/debug-trending-edits/:id?/:halflife?', function(req, res) {
+router.get('/debug-trending-edits/:id?/:halflife?', (req, res) => {
const processor = app.processor;
if (req.params.id) {
const page = processor.getPage(parseInt(req.params.id, 10));
@@ -75,7 +71,7 @@
* GET /feed/trending-edits
* Gets the body of a given page.
*/
-router.get('/trending-edits/:period?', function(req, res) {
+router.get('/trending-edits/:period?', (req, res) => {
const domain = req.params.domain;
const period = req.params.period ? parseInt(req.params.period, 10) : 24;
const date = new Date();
@@ -95,8 +91,9 @@
const
[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update donation-interface for PayPal EC debugging
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391983 )
Change subject: Update donation-interface for PayPal EC debugging
..
Update donation-interface for PayPal EC debugging
Change-Id: If5a30f0f841eb348bbe3acd37994973cf66c686c
---
M composer/installed.json
M wikimedia/donation-interface/DonationInterface.class.php
M wikimedia/donation-interface/README.txt
M wikimedia/donation-interface/amazon_gateway/amazon.adapter.php
A wikimedia/donation-interface/astropay_gateway/i18n/cs.json
M wikimedia/donation-interface/gateway_common/gateway.adapter.php
M wikimedia/donation-interface/gateway_common/i18n/interface/be-tarask.json
M wikimedia/donation-interface/gateway_common/i18n/interface/de.json
M wikimedia/donation-interface/gateway_common/i18n/interface/el.json
M wikimedia/donation-interface/gateway_common/i18n/interface/es.json
M wikimedia/donation-interface/gateway_common/i18n/interface/et.json
M wikimedia/donation-interface/gateway_common/i18n/interface/fr.json
M wikimedia/donation-interface/gateway_common/i18n/interface/it.json
M wikimedia/donation-interface/gateway_common/i18n/interface/jv.json
M wikimedia/donation-interface/gateway_common/i18n/interface/lb.json
M wikimedia/donation-interface/gateway_common/i18n/interface/sl.json
M wikimedia/donation-interface/gateway_common/i18n/interface/zh-hans.json
M wikimedia/donation-interface/tests/phpunit/Adapter/Amazon/AmazonApiTest.php
M wikimedia/donation-interface/tests/phpunit/Adapter/Amazon/AmazonTest.php
M wikimedia/donation-interface/tests/phpunit/DonationInterfaceApiTestCase.php
M wikimedia/donation-interface/tests/phpunit/DonationInterfaceTestCase.php
M wikimedia/donation-interface/tests/phpunit/TestConfiguration.php
D wikimedia/donation-interface/tests/phpunit/includes/MockAmazonClient.php
D wikimedia/donation-interface/tests/phpunit/includes/MockAmazonResponse.php
D
wikimedia/donation-interface/tests/phpunit/includes/test_gateway/TestingAmazonAdapter.php
25 files changed, 102 insertions(+), 294 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer/installed.json b/composer/installed.json
index d94b8df..196e534 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2274,7 +2274,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "81b12c1166d91c689b4b7a9dad0f845f97ccecc1"
+"reference": "0b70d246f754b456d6f04180f9bb02f528910f0d"
},
"require": {
"addshore/psr-6-mediawiki-bagostuff-adapter": "0.1",
@@ -2294,7 +2294,7 @@
"mediawiki/mediawiki-codesniffer": "0.11.0",
"wikimedia/testing-access-wrapper": "~1.0"
},
-"time": "2017-10-17T15:40:59+00:00",
+"time": "2017-11-16T16:31:29+00:00",
"type": "library",
"installation-source": "source",
"autoload": {
diff --git a/wikimedia/donation-interface/DonationInterface.class.php
b/wikimedia/donation-interface/DonationInterface.class.php
index 84d72a3..44821e1 100644
--- a/wikimedia/donation-interface/DonationInterface.class.php
+++ b/wikimedia/donation-interface/DonationInterface.class.php
@@ -70,10 +70,7 @@
$wgAutoloadClasses['DonationInterfaceTestCase'] = $testDir .
'DonationInterfaceTestCase.php';
$wgAutoloadClasses['DonationInterfaceApiTestCase'] = $testDir .
'DonationInterfaceApiTestCase.php';
$wgAutoloadClasses['BaseIngenicoTestCase'] = $testDir .
'BaseIngenicoTestCase.php';
- $wgAutoloadClasses['MockAmazonClient'] = $testDir .
'includes/MockAmazonClient.php';
- $wgAutoloadClasses['MockAmazonResponse'] = $testDir .
'includes/MockAmazonResponse.php';
$wgAutoloadClasses['TestingAdyenAdapter'] = $testDir .
'includes/test_gateway/TestingAdyenAdapter.php';
- $wgAutoloadClasses['TestingAmazonAdapter'] = $testDir .
'includes/test_gateway/TestingAmazonAdapter.php';
$wgAutoloadClasses['TestingAstroPayAdapter'] = $testDir .
'includes/test_gateway/TestingAstroPayAdapter.php';
$wgAutoloadClasses['TestingDonationLogger'] = $testDir .
'includes/TestingDonationLogger.php';
$wgAutoloadClasses['TestingGatewayPage'] = $testDir .
'includes/TestingGatewayPage.php';
diff --git a/wikimedia/donation-interface/README.txt
b/wikimedia/donation-interface/README.txt
index c9f16e1..1781e10 100644
--- a/wikimedia/donation-interface/README.txt
+++ b/wikimedia/donation-interface/README.txt
@@ -223,22 +223,22 @@
'' => 100, //No code returned. All the points.
)
-# $wgAmazonGatewayAccountInfo['example'] = array(
-# 'SellerID' => '', // 13 or so uppercase letters
-# 'ClientID' => '', // app or site-specific, starts wit
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391981 )
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
face89d71 Remove useless subject line setting
43f82b750 Don't create CiviMail mailing record in make_thank_you
37edc27b3 Add thank you subject generator
0f491988a Add thank you email subject templates
4164a0a31 Get thank you email subject from template files
Change-Id: Ieaf8af09a30e585693309ab49c5a66c2394f779e
---
D sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
1 file changed, 0 insertions(+), 169 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
deleted file mode 100644
index 3379d50..000
--- a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<<< HEAD (899871 Remove vendor from deploy branch .gitignore)
-===
-message = array(
- 'city' => 'Somerville',
- 'country' => 'US',
- 'currency' => 'USD',
- 'date' => time(),
- 'email' => 'generousdo...@example.org',
- 'first_name' => 'Test',
- 'last_name' => 'Es',
- 'language' => 'en',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'postal_code' => '02144',
- 'state_province' => 'MA',
- 'street_address' => '1 Davis Square',
- );
- $this->old_civimail = variable_get(
'thank_you_add_civimail_records', 'false' );
- $this->old_civimail_rate = variable_get(
'thank_you_civimail_rate', 1.0 );
-
- $contribution = wmf_civicrm_contribution_message_import(
$this->message );
-
- $this->contact_id = $contribution['contact_id'];
- $this->contribution_id = $contribution['id'];
- }
-
- public function tearDown() {
- parent::cleanUpContact( $this->contact_id );
- variable_set( 'thank_you_add_civimail_records',
$this->old_civimail );
- variable_get( 'thank_you_civimail_rate',
$this->old_civimail_rate );
- parent::tearDown();
- }
-
- /**
-* FIXME: This test has to be first, because we have to make sure
-* those tags exist before anyone calls the helper function, which
-* stashes stuff in a function-level staticvar
-*
-* @throws \CiviCRM_API3_Exception
-*/
- public function testGetEntityTagDetail() {
- $tag1 = $this->ensureTagExists( 'smurfy' );
- $tag2 = $this->ensureTagExists( 'smurfalicious' );
-
- $this->callAPISuccess(
- 'EntityTag',
- 'create',
- array(
- 'entity_id' => $this->contribution_id,
- 'entity_table' => 'civicrm_contribution',
- 'tag_id' => 'smurfy'
- )
- );
- $this->callAPISuccess(
- 'EntityTag',
- 'create',
- array(
- 'entity_id' => $this->contribution_id,
- 'entity_table' => 'civicrm_contribution',
- 'tag_id' => 'smurfalicious'
- )
- );
-
- $smurfiestTags = wmf_thank_you_get_tag_names(
$this->contribution_id );
- $this->assertEquals( array( 'smurfy', 'smurfalicious' ),
$smurfiestTags );
-
- $this->callAPISuccess( 'Tag', 'delete', array( 'id' => $tag1 )
);
- $this->callAPISuccess( 'Tag', 'delete', array( 'id' => $tag2 )
);
- }
-
- public function testSendThankYou() {
- variable_set( 'thank_you_add_civimail_records', 'false' );
- $result = thank_you_for_contribution( $this->contribution_id );
- $this->assertTrue( $result );
- $this->assertEquals( 1, TestMailer::countMailings() );
- $sent = TestMailer::getMailing( 0 );
- $this->assertEquals( $this->message['email'],
$sent['to_address'] );
- $this->assertEquals(
- "{$this->message['first_name']}
{$this->message['last_name']}",
- $sent['to_name']
- );
- $expectedBounce =
"ty.{$this->contact_id}.{$this->contribution_id}" .
-
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update vendor for paypal debugging
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391984 ) Change subject: Update vendor for paypal debugging .. Update vendor for paypal debugging Change-Id: I2fa7d101c633f8e466cae0ebcd37bd987ccea210 --- M vendor 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/vendor b/vendor index 49c9168..bc7a828 16 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit 49c91683753ae79fec6f633af461e06f0b6318cc +Subproject commit bc7a8289659754c7fd06c2f2d0eb12fd87947a52 -- To view, visit https://gerrit.wikimedia.org/r/391984 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2fa7d101c633f8e466cae0ebcd37bd987ccea210 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment 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] wikimedia...crm[deployment]: Update vendor for paypal debugging
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391984 ) Change subject: Update vendor for paypal debugging .. Update vendor for paypal debugging Change-Id: I2fa7d101c633f8e466cae0ebcd37bd987ccea210 --- M vendor 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/84/391984/1 diff --git a/vendor b/vendor index 49c9168..bc7a828 16 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit 49c91683753ae79fec6f633af461e06f0b6318cc +Subproject commit bc7a8289659754c7fd06c2f2d0eb12fd87947a52 -- To view, visit https://gerrit.wikimedia.org/r/391984 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2fa7d101c633f8e466cae0ebcd37bd987ccea210 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update donation-interface for PayPal EC debugging
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391983 )
Change subject: Update donation-interface for PayPal EC debugging
..
Update donation-interface for PayPal EC debugging
Change-Id: If5a30f0f841eb348bbe3acd37994973cf66c686c
---
M composer/installed.json
M wikimedia/donation-interface/DonationInterface.class.php
M wikimedia/donation-interface/README.txt
M wikimedia/donation-interface/amazon_gateway/amazon.adapter.php
A wikimedia/donation-interface/astropay_gateway/i18n/cs.json
M wikimedia/donation-interface/gateway_common/gateway.adapter.php
M wikimedia/donation-interface/gateway_common/i18n/interface/be-tarask.json
M wikimedia/donation-interface/gateway_common/i18n/interface/de.json
M wikimedia/donation-interface/gateway_common/i18n/interface/el.json
M wikimedia/donation-interface/gateway_common/i18n/interface/es.json
M wikimedia/donation-interface/gateway_common/i18n/interface/et.json
M wikimedia/donation-interface/gateway_common/i18n/interface/fr.json
M wikimedia/donation-interface/gateway_common/i18n/interface/it.json
M wikimedia/donation-interface/gateway_common/i18n/interface/jv.json
M wikimedia/donation-interface/gateway_common/i18n/interface/lb.json
M wikimedia/donation-interface/gateway_common/i18n/interface/sl.json
M wikimedia/donation-interface/gateway_common/i18n/interface/zh-hans.json
M wikimedia/donation-interface/tests/phpunit/Adapter/Amazon/AmazonApiTest.php
M wikimedia/donation-interface/tests/phpunit/Adapter/Amazon/AmazonTest.php
M wikimedia/donation-interface/tests/phpunit/DonationInterfaceApiTestCase.php
M wikimedia/donation-interface/tests/phpunit/DonationInterfaceTestCase.php
M wikimedia/donation-interface/tests/phpunit/TestConfiguration.php
D wikimedia/donation-interface/tests/phpunit/includes/MockAmazonClient.php
D wikimedia/donation-interface/tests/phpunit/includes/MockAmazonResponse.php
D
wikimedia/donation-interface/tests/phpunit/includes/test_gateway/TestingAmazonAdapter.php
25 files changed, 102 insertions(+), 294 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor
refs/changes/83/391983/1
diff --git a/composer/installed.json b/composer/installed.json
index d94b8df..196e534 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2274,7 +2274,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "81b12c1166d91c689b4b7a9dad0f845f97ccecc1"
+"reference": "0b70d246f754b456d6f04180f9bb02f528910f0d"
},
"require": {
"addshore/psr-6-mediawiki-bagostuff-adapter": "0.1",
@@ -2294,7 +2294,7 @@
"mediawiki/mediawiki-codesniffer": "0.11.0",
"wikimedia/testing-access-wrapper": "~1.0"
},
-"time": "2017-10-17T15:40:59+00:00",
+"time": "2017-11-16T16:31:29+00:00",
"type": "library",
"installation-source": "source",
"autoload": {
diff --git a/wikimedia/donation-interface/DonationInterface.class.php
b/wikimedia/donation-interface/DonationInterface.class.php
index 84d72a3..44821e1 100644
--- a/wikimedia/donation-interface/DonationInterface.class.php
+++ b/wikimedia/donation-interface/DonationInterface.class.php
@@ -70,10 +70,7 @@
$wgAutoloadClasses['DonationInterfaceTestCase'] = $testDir .
'DonationInterfaceTestCase.php';
$wgAutoloadClasses['DonationInterfaceApiTestCase'] = $testDir .
'DonationInterfaceApiTestCase.php';
$wgAutoloadClasses['BaseIngenicoTestCase'] = $testDir .
'BaseIngenicoTestCase.php';
- $wgAutoloadClasses['MockAmazonClient'] = $testDir .
'includes/MockAmazonClient.php';
- $wgAutoloadClasses['MockAmazonResponse'] = $testDir .
'includes/MockAmazonResponse.php';
$wgAutoloadClasses['TestingAdyenAdapter'] = $testDir .
'includes/test_gateway/TestingAdyenAdapter.php';
- $wgAutoloadClasses['TestingAmazonAdapter'] = $testDir .
'includes/test_gateway/TestingAmazonAdapter.php';
$wgAutoloadClasses['TestingAstroPayAdapter'] = $testDir .
'includes/test_gateway/TestingAstroPayAdapter.php';
$wgAutoloadClasses['TestingDonationLogger'] = $testDir .
'includes/TestingDonationLogger.php';
$wgAutoloadClasses['TestingGatewayPage'] = $testDir .
'includes/TestingGatewayPage.php';
diff --git a/wikimedia/donation-interface/README.txt
b/wikimedia/donation-interface/README.txt
index c9f16e1..1781e10 100644
--- a/wikimedia/donation-interface/README.txt
+++ b/wikimedia/donation-interface/README.txt
@@ -223,22 +223,22 @@
'' => 100, //No code returned. All the points.
)
-# $wgAmazonGatewayAccountInfo['example'] = array(
-# 'SellerID' => '', // 13 or so uppercase letters
-# 'ClientID' => '', // app or site-spe
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: labs: Clean up outdated wgProfiler config
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391982 )
Change subject: labs: Clean up outdated wgProfiler config
..
labs: Clean up outdated wgProfiler config
* Define $wgProfiler cleanly (not augmenting a predefined array).
* Remove `udphost` (no longer recognised by MediaWiki).
Bug: T180766
Change-Id: Ieda5c29bcd68ba8fd0a14902a243bc0daac15da4
---
M wmf-config/CommonSettings-labs.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/82/391982/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 5d61866..6db69a8 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -21,15 +21,15 @@
// test wiki
if ( $wgDBname == 'testwiki' ) {
$wgDebugToolbar = true;
- $wgProfiler['class'] = 'ProfilerXhprof';
- $wgProfiler['output'] = [ 'text' ];
+ $wgProfiler = [
+ 'class' => 'ProfilerXhprof'
+ 'output' => 'text',
+ ];
}
if ( file_exists( '/etc/wmflabs-instancename' ) ) {
$wgOverrideHostname = trim( file_get_contents(
'/etc/wmflabs-instancename' ) );
}
-
-$wgProfiler['udphost'] = 'labmon1001.eqiad.wmnet';
$wgDebugTimestamps = true;
--
To view, visit https://gerrit.wikimedia.org/r/391982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieda5c29bcd68ba8fd0a14902a243bc0daac15da4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391981 )
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
face89d71 Remove useless subject line setting
43f82b750 Don't create CiviMail mailing record in make_thank_you
37edc27b3 Add thank you subject generator
0f491988a Add thank you email subject templates
4164a0a31 Get thank you email subject from template files
Change-Id: Ieaf8af09a30e585693309ab49c5a66c2394f779e
---
D sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
1 file changed, 0 insertions(+), 169 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/81/391981/1
diff --git a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
deleted file mode 100644
index 3379d50..000
--- a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<<< HEAD (899871 Remove vendor from deploy branch .gitignore)
-===
-message = array(
- 'city' => 'Somerville',
- 'country' => 'US',
- 'currency' => 'USD',
- 'date' => time(),
- 'email' => 'generousdo...@example.org',
- 'first_name' => 'Test',
- 'last_name' => 'Es',
- 'language' => 'en',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'postal_code' => '02144',
- 'state_province' => 'MA',
- 'street_address' => '1 Davis Square',
- );
- $this->old_civimail = variable_get(
'thank_you_add_civimail_records', 'false' );
- $this->old_civimail_rate = variable_get(
'thank_you_civimail_rate', 1.0 );
-
- $contribution = wmf_civicrm_contribution_message_import(
$this->message );
-
- $this->contact_id = $contribution['contact_id'];
- $this->contribution_id = $contribution['id'];
- }
-
- public function tearDown() {
- parent::cleanUpContact( $this->contact_id );
- variable_set( 'thank_you_add_civimail_records',
$this->old_civimail );
- variable_get( 'thank_you_civimail_rate',
$this->old_civimail_rate );
- parent::tearDown();
- }
-
- /**
-* FIXME: This test has to be first, because we have to make sure
-* those tags exist before anyone calls the helper function, which
-* stashes stuff in a function-level staticvar
-*
-* @throws \CiviCRM_API3_Exception
-*/
- public function testGetEntityTagDetail() {
- $tag1 = $this->ensureTagExists( 'smurfy' );
- $tag2 = $this->ensureTagExists( 'smurfalicious' );
-
- $this->callAPISuccess(
- 'EntityTag',
- 'create',
- array(
- 'entity_id' => $this->contribution_id,
- 'entity_table' => 'civicrm_contribution',
- 'tag_id' => 'smurfy'
- )
- );
- $this->callAPISuccess(
- 'EntityTag',
- 'create',
- array(
- 'entity_id' => $this->contribution_id,
- 'entity_table' => 'civicrm_contribution',
- 'tag_id' => 'smurfalicious'
- )
- );
-
- $smurfiestTags = wmf_thank_you_get_tag_names(
$this->contribution_id );
- $this->assertEquals( array( 'smurfy', 'smurfalicious' ),
$smurfiestTags );
-
- $this->callAPISuccess( 'Tag', 'delete', array( 'id' => $tag1 )
);
- $this->callAPISuccess( 'Tag', 'delete', array( 'id' => $tag2 )
);
- }
-
- public function testSendThankYou() {
- variable_set( 'thank_you_add_civimail_records', 'false' );
- $result = thank_you_for_contribution( $this->contribution_id );
- $this->assertTrue( $result );
- $this->assertEquals( 1, TestMailer::countMailings() );
- $sent = TestMailer::getMailing( 0 );
- $this->assertEquals( $this->message['email'],
$sent['to_address'] );
- $this->assertEquals(
- "{$this->message['first_name']}
{$this->message['last_name']}",
- $sent['to_name']
- );
- $expectedBounce =
"ty.{$this->contact_id}.{$this->contribution_id}" .
-
[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: test creating individual contact secrets
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391980 )
Change subject: icinga: test creating individual contact secrets
..
icinga: test creating individual contact secrets
Change-Id: If8f40bd63d5b5aa3d73ad4a75b6125fd0f28814e
---
M modules/nagios_common/manifests/contacts.pp
M modules/nagios_common/templates/contacts-new.cfg.erb
2 files changed, 15 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/391980/1
diff --git a/modules/nagios_common/manifests/contacts.pp
b/modules/nagios_common/manifests/contacts.pp
index a767645..9c00228 100644
--- a/modules/nagios_common/manifests/contacts.pp
+++ b/modules/nagios_common/manifests/contacts.pp
@@ -62,14 +62,15 @@
show_diff => false,
}
+$contacts = hiera('icinga_contact_secrets')
# This 'new' file exists only temp during careful transition of
contacts
# from private repo and is not actually included by Icinga. --dz
20170505
-#file { "${config_dir}/contacts-new.cfg":
-#ensure => $ensure,
-#content => template('nagios_common/contacts-new.cfg.erb'),
-#owner => $owner,
-#group => $group,
-#mode=> '0400',
-#}
+file { "${config_dir}/contacts-new.cfg":
+ensure => $ensure,
+content => template('nagios_common/contacts-new.cfg.erb'),
+owner => $owner,
+group => $group,
+mode=> '0400',
+}
}
}
diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb
b/modules/nagios_common/templates/contacts-new.cfg.erb
index 9da04d9..89a3754 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -24,7 +24,6 @@
service_notification_commands notify-service-by-irc-wikidata
}
-<%- contact = 'dzahn' -%>
define contact{
contact_namedzahn
alias daniel_zahn
@@ -32,9 +31,9 @@
service_notification_period PST_awake_hours
host_notification_options d,r,f
service_notification_optionsc,r,f
-email <%=
scope.function_hiera(['icinga::contacts::dzahn::email']) %>
-pager <%=
scope.function_hiera(['icinga::contacts::dzahn::pager']) %>
-address1<%=
scope.function_hiera(['icinga::contacts::dzahn::address1']) %>
+email <%= contacts['dzahn']['email'] %>
+pager <%= contacts['dzahn']['pager'] %>
+address1<%= contacts['dzahn']['address1'] %>
host_notification_commands
host-notify-by-email,host-notify-by-sms-gateway
service_notification_commands notify-by-email,notify-by-sms-gateway
}
@@ -46,10 +45,10 @@
service_notification_period 24x7
host_notification_options d,r,f
service_notification_optionsc,r,f
-email <%=
scope.function_hiera(['icinga::contacts::bblack::email']) %>
-pager <%=
scope.function_hiera(['icinga::contacts::bblack::pager']) %>
-address1<%=
scope.function_hiera(['icinga::contacts::bblack::address1']) %>
-host_notification_commands
host-notify-by-email,host-notify-by-sms-gateway
+email <%= contacts['bblack']['email'] %>
+pager <%= contacts['bblack']['pager'] %>
+address1<%= contacts['bblack']['address1'] %>
+ host_notification_commands
host-notify-by-email,host-notify-by-sms-gateway
service_notification_commands notify-by-email,notify-by-sms-gateway
}
--
To view, visit https://gerrit.wikimedia.org/r/391980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8f40bd63d5b5aa3d73ad4a75b6125fd0f28814e
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]: toolforge: Replace /usr/local/bin/crontab with oge-crontab
BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391979 )
Change subject: toolforge: Replace /usr/local/bin/crontab with oge-crontab
..
toolforge: Replace /usr/local/bin/crontab with oge-crontab
Replace the /usr/local/bin/crontab PERL script with the
/usr/bin/oge-crontab Python script provisioned by our misctools debian
package.
Bug: T156174
Change-Id: Id67b20f0e36633d2d9b1709f9aa3bb1bcdb9d55e
---
M modules/toollabs/manifests/bastion.pp
D modules/toollabs/templates/crontab.erb
2 files changed, 6 insertions(+), 210 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/391979/1
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 43dada5..633038f 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -204,20 +204,17 @@
include ::ldap::role::config::labs
$ldapconfig = $ldap::role::config::labs::ldapconfig
-$cron_host = hiera('active_cronrunner')
-file { '/usr/local/bin/crontab':
-ensure => file,
-owner => 'root',
-group => 'root',
-mode=> '0755',
-content => template('toollabs/crontab.erb'),
-}
file { '/etc/toollabs-cronhost':
ensure => file,
owner => 'root',
group => 'root',
mode=> '0644',
-content => $cron_host,
+content => hiera('active_cronrunner'),
+}
+file { '/usr/local/bin/crontab':
+ensure => 'link',
+target => '/usr/bin/oge-crontab',
+require => Package['misctools'],
}
file { '/usr/local/bin/killgridjobs.sh':
diff --git a/modules/toollabs/templates/crontab.erb
b/modules/toollabs/templates/crontab.erb
deleted file mode 100755
index dbd056e..000
--- a/modules/toollabs/templates/crontab.erb
+++ /dev/null
@@ -1,201 +0,0 @@
-#! /usr/bin/perl
-#
-# Copyright © 2013 Marc-André Pelletier
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-# This goes in /usr/local/bin to override the system crontab (which will
-# have its permissions restricted).
-
-# THIS FILE IS MANAGED BY PUPPET
-#
-# This goes in /usr/local/bin to override the system crontab (which will
-# have its permissions restricted).
-#
-# Source: modules/toollabs/templates/crontab.erb
-# From: toollabs::submit
-
-use strict;
-use warnings;
-use Getopt::Std;
-use File::Temp qw(tempfile);
-
-sub submit(@) {
- exec { '/usr/bin/ssh' } 'ssh', '<%= @cron_host %>', '/usr/bin/crontab', @_;
- die "$0: unable to execute remote crontab command\n";
-}
-
-# Save original command line arguments as getopts() changes
-# @ARGV.
-my @SavedARGV = @ARGV;
-
-my %opts = ( e => 0, l => 0, r => 0, i => 0 );
-getopts('ielru:', \%opts);
-
-my $num = $opts{'e'}+$opts{'l'}+$opts{'r'};
-
-die "$0: usage error: only one operation permitted\n" if $num > 1;
-
-my @args;
-my $uid = $<;
-my $target = $uid;
-my $uname = getpwuid $uid;
-my $dashu = '';
-
-if(defined $opts{'u'}) {
-$uname = $opts{'u'};
-$target = getpwnam $uname;
-die "$0: user '$uname' unknown\n" unless defined $target;
-die "must be privileged to use -u\n" unless $uid==0 or $uid == $target;
-push @args, '-u', $uname if $uid != $target;
-$dashu = " -u $uname" if $uid != $target;
-}
-
-# If the target user is not managed in LDAP and thus likely
-# a system user, invoke the original crontab instead.
-if ($target < <%= @ldapconfig["nss_min_uid"] %>) {
-exec ('/usr/bin/crontab', @SavedARGV);
-}
-
-die "$0: only tools are allowed crontabs\n" unless $uid==0 or $target>3;
-
-push @args, '-i' if $opts{'i'} and $opts{'r'};
-
-submit @args, '-r' if $opts{'r'};
-submit @args, '-l' if $opts{'l'};
-
-my $default_crontab = < /usr/bin/crontab$dashu -l
2>/dev/null |") {
-$crontab = '';
-while() {
-$crontab .= $_;
-}
-close OLD;
-}
-$crontab = $default_crontab if $crontab eq '';
-
-my($fh, $filename) = tempfile();
-print $fh $crontab;
-close $fh;
-
-my $newfile = '';
-system { '/usr/bin/sensible-editor' } 'editor', $filename;
-
-if(open OLD, $filename) {
-while() {
-push @crontab, $_;
-
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Split profile.php from StartProfiler, and create PhpAutoPrep...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391162 )
Change subject: Split profile.php from StartProfiler, and create
PhpAutoPrepend.php
..
Split profile.php from StartProfiler, and create PhpAutoPrepend.php
Bug: T180183
Change-Id: I60cce0eb51101d9e3fed7a65890c101ddd39e7d0
---
A wmf-config/PhpAutoPrepend.php
M wmf-config/StartProfiler.php
A wmf-config/profiler.php
3 files changed, 279 insertions(+), 245 deletions(-)
Approvals:
Tim Starling: Looks good to me, but someone else must approve
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/PhpAutoPrepend.php b/wmf-config/PhpAutoPrepend.php
new file mode 100644
index 000..acb19ff
--- /dev/null
+++ b/wmf-config/PhpAutoPrepend.php
@@ -0,0 +1,17 @@
+https://secure.php.net/manual/en/ini.core.php#ini.auto-prepend-file
+ */
+
+require_once __DIR__ . '/profiler.php';
diff --git a/wmf-config/StartProfiler.php b/wmf-config/StartProfiler.php
index a11cecf..031831c 100644
--- a/wmf-config/StartProfiler.php
+++ b/wmf-config/StartProfiler.php
@@ -12,250 +12,8 @@
# DefaultSettings.php, and wmf-config CommonSettings or InitialiseSettings.
# ##
-/**
- * File overview:
- *
- * 1. Parse X-Wikimedia-Header
- * 2. One-off profile to stdout (via MediaWiki)
- * 3. One-off profile to /tmp (from localhost)
- * 4. Sampling profiler for production traffic
- * 5. One-off profile to XHGui.
- */
+// profiler.php defines $wmgProfiler
+require_once __DIR__ . '/profiler.php';
-/**
- * 1) Parse X-Wikimedia-Header
- *
- * If the X-Wikimedia-Header is present, parse it into an associative array.
- *
- * See https://wikitech.wikimedia.org/wiki/X-Wikimedia-Debug
- */
-$XWD = false;
-if ( isset( $_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ) ) {
- parse_str( preg_replace( '/; ?/', '&',
$_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ), $XWD );
-}
+$wgProfiler = $wmgProfiler;
-if ( ini_get( 'hhvm.stats.enable_hot_profiler' ) ) {
- /**
-* 2) One-off profile to stdout
-*
-* MediaWiki's Profiler class can output raw profile data directly to
the output
-* of a web response (web), or in stdout (CLI).
-*
-* For web: Set X-Wikimedia-Debug (to bypass cache) and query param
'forceprofile=1'.
-* For CLI: Set CLI option '--profiler=text'.
-*
-* See https://www.mediawiki.org/wiki/Manual:Profiling
-*/
- if (
- ( isset( $_GET['forceprofile'] ) && isset(
$_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ) )
- || PHP_SAPI === 'cli'
- ) {
- $wgProfiler = [
- 'class' => 'ProfilerXhprof',
- 'flags' => XHPROF_FLAGS_NO_BUILTINS,
- 'output' => 'text',
- ];
-
- /**
-* 3) One-off profile to /tmp
-*
-* When making requests to the local server using shell access,
-* setting the 'Force-Local-XHProf: 1' header will write raw profile
data
-* directly to a local file in /tmp/xhprof/.
-*
-* Note: This is only allowed for requests within the same server.
-*/
- } elseif (
- isset( $_SERVER['HTTP_FORCE_LOCAL_XHPROF'] )
- && isset( $_SERVER['REMOTE_ADDR'] )
- && $_SERVER['REMOTE_ADDR'] == '127.0.0.1'
- && is_writable( '/tmp/xhprof' )
- ) {
- xhprof_enable();
- register_shutdown_function( function () {
- $prof = xhprof_disable();
- $titleFormat = "%-75s %6s %13s %13s %13s\n";
- $format = "%-75s %6d %13.3f %13.3f %13.3f%%\n";
- $out = sprintf( $titleFormat, 'Name', 'Calls', 'Total',
'Each', '%' );
- if ( empty( $prof['main()']['wt'] ) ) {
- return;
- }
- $total = $prof['main()']['wt'];
- uksort( $prof, function ( $a, $b ) use ( $prof ) {
- if ( $prof[$a]['wt'] < $prof[$b]['wt'] ) {
- return 1;
- } elseif ( $prof[$a]['wt'] > $prof[$b]['wt'] ) {
- return -1;
- } else {
- return 0;
- }
- } );
-
- foreach ( $prof as $name => $info ) {
- $out .= sprintf( $format, $name, $info['ct'],
$info['wt'] / 1000,
- $info['wt'] / $info['ct'] / 1000,
- $info['wt'] / $total * 100 );
- }
- file_put_contents( '/tmp/xhprof/' . date(
'Y-m-d\
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (cca896ac3)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391978 ) Change subject: Update VE core submodule to master (cca896ac3) .. Update VE core submodule to master (cca896ac3) New changes: c7ef30a30 Get a ve.ce.BranchNode position's corresponding DOM position 5f9b3f5d1 Localisation updates from https://translatewiki.net. Change-Id: I3456a20420153b1c31fa39b0541f6b93b7d582ec --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/78/391978/1 diff --git a/lib/ve b/lib/ve index 7d7966d..cca896a 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 7d7966df9c7135dcb78a24dfc2a81f0dd76da7b5 +Subproject commit cca896ac37fe2b8c9c049542fb1ec9062d158062 -- To view, visit https://gerrit.wikimedia.org/r/391978 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3456a20420153b1c31fa39b0541f6b93b7d582ec Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Create new MP3 Uploaders group on Commons
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390131 ) Change subject: Create new MP3 Uploaders group on Commons .. Create new MP3 Uploaders group on Commons ...and allow sysops to assign users to the group. Bug: T180002 Change-Id: Ifd4adffc9911cb3454a87f4c63730bf7b899c8cc Dependencies: I74021aa --- M wmf-config/InitialiseSettings.php 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 70c76ec..7d0486c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8243,6 +8243,7 @@ 'autopatrolled' => [ 'autopatrol' => true ], 'filemover' => [ 'movefile' => true ], 'Image-reviewer' => [ 'autopatrol' => true, 'upload_by_url' => true ], + 'mp3-uploader' => [ 'autoconfirmed' => true, 'upload' => true, 'reupload' => true ], 'sysop' => [ 'changetags' => true, // T134196 'upload_by_url' => true, @@ -9906,7 +9907,16 @@ 'accountcreator', // T144689 ], 'checkuser' => [ 'ipblock-exempt' ], - 'sysop' => [ 'rollbacker', 'confirmed', 'patroller', 'autopatrolled', 'filemover', 'Image-reviewer', 'upwizcampeditors' ], + 'sysop' => [ + 'rollbacker', + 'confirmed', + 'patroller', + 'autopatrolled', + 'filemover', + 'Image-reviewer', + 'mp3-uploader', // T180002 + 'upwizcampeditors' + ], 'Image-reviewer' => [ 'Image-reviewer' ], ], '+dawiki' => [ -- To view, visit https://gerrit.wikimedia.org/r/390131 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd4adffc9911cb3454a87f4c63730bf7b899c8cc Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Kaldari Gerrit-Reviewer: MaxSem 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] wikimedia...crm[master]: Add thank you email subject templates
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391973 ) Change subject: Add thank you email subject templates .. Add thank you email subject templates These include the new "We're here for you" in English, and the old subject for all the other languages. Bug: T167806 Change-Id: I4b249308bdd4bd521f66739587b3226897f0 --- A sites/all/modules/thank_you/templates/subject/thank_you.af.subject A sites/all/modules/thank_you/templates/subject/thank_you.ar.subject A sites/all/modules/thank_you/templates/subject/thank_you.ast.subject A sites/all/modules/thank_you/templates/subject/thank_you.ba.subject A sites/all/modules/thank_you/templates/subject/thank_you.be-tarask.subject A sites/all/modules/thank_you/templates/subject/thank_you.be.subject A sites/all/modules/thank_you/templates/subject/thank_you.bg.subject A sites/all/modules/thank_you/templates/subject/thank_you.bn.subject A sites/all/modules/thank_you/templates/subject/thank_you.br.subject A sites/all/modules/thank_you/templates/subject/thank_you.ca.subject A sites/all/modules/thank_you/templates/subject/thank_you.cs.subject A sites/all/modules/thank_you/templates/subject/thank_you.cy.subject A sites/all/modules/thank_you/templates/subject/thank_you.da.subject A sites/all/modules/thank_you/templates/subject/thank_you.de.subject A sites/all/modules/thank_you/templates/subject/thank_you.dsb.subject A sites/all/modules/thank_you/templates/subject/thank_you.el.subject A sites/all/modules/thank_you/templates/subject/thank_you.en.subject A sites/all/modules/thank_you/templates/subject/thank_you.eo.subject A sites/all/modules/thank_you/templates/subject/thank_you.es.subject A sites/all/modules/thank_you/templates/subject/thank_you.et.subject A sites/all/modules/thank_you/templates/subject/thank_you.fa.subject A sites/all/modules/thank_you/templates/subject/thank_you.fi.subject A sites/all/modules/thank_you/templates/subject/thank_you.fr.subject A sites/all/modules/thank_you/templates/subject/thank_you.frp.subject A sites/all/modules/thank_you/templates/subject/thank_you.gl.subject A sites/all/modules/thank_you/templates/subject/thank_you.gsw.subject A sites/all/modules/thank_you/templates/subject/thank_you.he.subject A sites/all/modules/thank_you/templates/subject/thank_you.hi.subject A sites/all/modules/thank_you/templates/subject/thank_you.hr.subject A sites/all/modules/thank_you/templates/subject/thank_you.hsb.subject A sites/all/modules/thank_you/templates/subject/thank_you.hu.subject A sites/all/modules/thank_you/templates/subject/thank_you.ia.subject A sites/all/modules/thank_you/templates/subject/thank_you.id.subject A sites/all/modules/thank_you/templates/subject/thank_you.it.subject A sites/all/modules/thank_you/templates/subject/thank_you.ja.subject A sites/all/modules/thank_you/templates/subject/thank_you.jv.subject A sites/all/modules/thank_you/templates/subject/thank_you.ka.subject A sites/all/modules/thank_you/templates/subject/thank_you.kk-cyrl.subject A sites/all/modules/thank_you/templates/subject/thank_you.ko.subject A sites/all/modules/thank_you/templates/subject/thank_you.ksh.subject A sites/all/modules/thank_you/templates/subject/thank_you.lb.subject A sites/all/modules/thank_you/templates/subject/thank_you.lij.subject A sites/all/modules/thank_you/templates/subject/thank_you.lt.subject A sites/all/modules/thank_you/templates/subject/thank_you.lv.subject A sites/all/modules/thank_you/templates/subject/thank_you.map-bms.subject A sites/all/modules/thank_you/templates/subject/thank_you.mk.subject A sites/all/modules/thank_you/templates/subject/thank_you.ml.subject A sites/all/modules/thank_you/templates/subject/thank_you.mr.subject A sites/all/modules/thank_you/templates/subject/thank_you.ms.subject A sites/all/modules/thank_you/templates/subject/thank_you.mt.subject A sites/all/modules/thank_you/templates/subject/thank_you.nb.subject A sites/all/modules/thank_you/templates/subject/thank_you.nl-informal.subject A sites/all/modules/thank_you/templates/subject/thank_you.nl.subject A sites/all/modules/thank_you/templates/subject/thank_you.or.subject A sites/all/modules/thank_you/templates/subject/thank_you.pl.subject A sites/all/modules/thank_you/templates/subject/thank_you.pms.subject A sites/all/modules/thank_you/templates/subject/thank_you.pt-br.subject A sites/all/modules/thank_you/templates/subject/thank_you.pt.subject A sites/all/modules/thank_you/templates/subject/thank_you.qqq.subject A sites/all/modules/thank_you/templates/subject/thank_you.qu.subject A sites/all/modules/thank_you/templates/subject/thank_you.ro.subject A sites/all/modules/thank_you/templates/subject/thank_you.roa-tara.subject A sites/all/modules/thank_you/templates/subject/thank_you.ru.subject A sites/all/modules/thank_you/templates/subject/thank_you.sh.subject A sites/all/modules/thank_you/templates/subject/thank_you.si.subject A sites/all/modules/thank_yo
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Get thank you email subject from template files
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391975 )
Change subject: Get thank you email subject from template files
..
Get thank you email subject from template files
This lets us deliberately deploy updates instead of just getting
whatever's been translated in DonationInterface.
Bug: T167806
Change-Id: I9f52affe4f2d198866d7551411019e06e095fa31
---
M sites/all/modules/thank_you/generators/FindUnconsumedTokens.php
M sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
M sites/all/modules/thank_you/thank_you.module
3 files changed, 12 insertions(+), 13 deletions(-)
Approvals:
XenoRyet: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/thank_you/generators/FindUnconsumedTokens.php
b/sites/all/modules/thank_you/generators/FindUnconsumedTokens.php
index ead9583..f102d2a 100644
--- a/sites/all/modules/thank_you/generators/FindUnconsumedTokens.php
+++ b/sites/all/modules/thank_you/generators/FindUnconsumedTokens.php
@@ -57,7 +57,7 @@
// TODO: refactor out of this class
static function renderLanguage( $lang ) {
$params = FindUnconsumedTokens::getRandomTemplateParams( $lang );
-$buf = thank_you_render( $params );
+list($buf, $subj) = thank_you_render( $params );
return $buf;
}
diff --git a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
index 03acdda..6bd0e9c 100644
--- a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
+++ b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
@@ -110,6 +110,11 @@
'@donate.wikimedia.org';
$this->assertEquals( $expectedBounce, $sent['reply_to'] );
$this->assertRegExp( '/\$ 1.23/', $sent['html'] );
+ $expectedSubject = file_get_contents(
+ __DIR__ .
+ "/../../templates/subject/thank_you.{$this->message['language']}.subject"
+);
+ $this->assertEquals( $expectedSubject, $sent['subject']);
}
public function testSendThankYouAddCiviMailActivity() {
diff --git a/sites/all/modules/thank_you/thank_you.module
b/sites/all/modules/thank_you/thank_you.module
index 32bc11c..0a84e32 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -458,14 +458,14 @@
'locale' => $params['locale'],
);
- $email['html'] = thank_you_render( $params );
-
- if( $email['html'] == false ){
+ list($html, $subject) = thank_you_render($params);
+ if(!$html || !$subject){
$msg = "HTML rendering of template failed in
{$params['locale']}.";
throw new WmfException( 'UNKNOWN', $msg,
array('thank_you_params' => $params) );
}
- $email['subject'] = thank_you_get_subject( $params['locale'] );
+ $email['html'] = $html;
+ $email['subject'] = $subject;
$mailer = Mailer::getDefault();
@@ -608,13 +608,6 @@
);
}
return $civi_queue_record;
-}
-/**
- * Get the translated email subject
- */
-function thank_you_get_subject( $locale ) {
- $subj_msg = "donate_interface-email-subject";
- return Translation::get_translated_message( $subj_msg, $locale );
}
function thank_you_settings_form() {
@@ -911,7 +904,8 @@
$page_content = $template->render( 'html' );
$page_content = str_replace( '', '', $page_content );
-return $page_content;
+$subject = $template->render( 'subject' );
+return array($page_content, $subject);
}
function build_unsub_link( $contributionId, $emailAddr, $language ) {
--
To view, visit https://gerrit.wikimedia.org/r/391975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f52affe4f2d198866d7551411019e06e095fa31
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
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] wikimedia...crm[master]: Add thank you subject generator
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391971 )
Change subject: Add thank you subject generator
..
Add thank you subject generator
This version just writes files from the same mediawiki json we were
already using.
TODO: move the content to metawiki along with the body templates
Bug: T167806
Change-Id: Iec81e2a8f853b7d4bd432de186ea8630bfbe8ada
---
A sites/all/modules/thank_you/generators/ThankYouSubject.php
M sites/all/modules/thank_you/make_thank_you.drush.inc
M sites/all/modules/thank_you/thank_you.info
3 files changed, 41 insertions(+), 0 deletions(-)
Approvals:
XenoRyet: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/thank_you/generators/ThankYouSubject.php
b/sites/all/modules/thank_you/generators/ThankYouSubject.php
new file mode 100644
index 000..59fd40a
--- /dev/null
+++ b/sites/all/modules/thank_you/generators/ThankYouSubject.php
@@ -0,0 +1,39 @@
+proto_file}'",
+ NULL,
+ WATCHDOG_INFO
+);
+$messages = MediaWikiMessages::getInstance();
+if (empty($wantedLangs)) {
+ $wantedLangs = $messages->languageList();
+ watchdog('make-thank-you', 'Trying all possible languages', NULL,
WATCHDOG_INFO);
+}
+foreach ($wantedLangs as $lang) {
+ if (!$messages->msgExists($this->key, $lang)) {
+watchdog('make-thank-you', "$lang -- {$this->key} is not available!",
NULL, WATCHDOG_ERROR);
+continue;
+ }
+
+ $subject = $messages->getMsg($this->key, $lang);
+ $file = str_replace('$1', $lang, $this->proto_file);
+
+ if (file_put_contents($file, $subject)) {
+watchdog('make-thank-you', "$lang -- Wrote translation into $file",
NULL, WATCHDOG_INFO);
+ }
+ else {
+watchdog('make-thank-you', "$lang -- Could not open $file for
writing!", NULL, WATCHDOG_ERROR);
+ }
+}
+ }
+}
diff --git a/sites/all/modules/thank_you/make_thank_you.drush.inc
b/sites/all/modules/thank_you/make_thank_you.drush.inc
index 7e3370a..b542966 100644
--- a/sites/all/modules/thank_you/make_thank_you.drush.inc
+++ b/sites/all/modules/thank_you/make_thank_you.drush.inc
@@ -46,6 +46,7 @@
function get_thank_you_generators() {
return array(
'generic' => '\thank_you\generators\ThankYou',
+'subject' => '\thank_you\generators\ThankYouSubject',
);
}
diff --git a/sites/all/modules/thank_you/thank_you.info
b/sites/all/modules/thank_you/thank_you.info
index 1ed382e..0ff9b10 100644
--- a/sites/all/modules/thank_you/thank_you.info
+++ b/sites/all/modules/thank_you/thank_you.info
@@ -10,3 +10,4 @@
files[] = generators/FindUnconsumedTokens.php
files[] = generators/RenderTranslatedPage.php
files[] = generators/ThankYou.php
+files[] = generators/ThankYouSubject.php
--
To view, visit https://gerrit.wikimedia.org/r/391971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iec81e2a8f853b7d4bd432de186ea8630bfbe8ada
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
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] wikimedia...crm[master]: Remove useless subject line setting
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391952 ) Change subject: Remove useless subject line setting .. Remove useless subject line setting We immediately overwrite the subject, so this is a useless database query. Might make sending TY mails a smidge faster! Change-Id: Id984d88904fbdace9c8294e079be2b39a3b6210b --- M sites/all/modules/thank_you/thank_you.module 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: XenoRyet: Looks good to me, approved jenkins-bot: Verified diff --git a/sites/all/modules/thank_you/thank_you.module b/sites/all/modules/thank_you/thank_you.module index 4d88386..32bc11c 100644 --- a/sites/all/modules/thank_you/thank_you.module +++ b/sites/all/modules/thank_you/thank_you.module @@ -455,8 +455,6 @@ 'to_name' => $params['name'], 'to_address' => $params['recipient_address'], - 'subject' => variable_get( 'thank_you_subject', 'Thank you from the Wikimedia Foundation' ), - 'locale' => $params['locale'], ); -- To view, visit https://gerrit.wikimedia.org/r/391952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id984d88904fbdace9c8294e079be2b39a3b6210b Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Ejegg 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] wikimedia...crm[master]: Don't create CiviMail mailing record in make_thank_you
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391951 )
Change subject: Don't create CiviMail mailing record in make_thank_you
..
Don't create CiviMail mailing record in make_thank_you
We don't run make_thank_you on production, so it's pointless.
Also, it's a weird place for it if we want to make subject templates
the same way.
Bug: T167806
Change-Id: If940368f3688555236382c74f8c572b43f4511a0
---
M sites/all/modules/thank_you/generators/RenderTranslatedPage.php
1 file changed, 0 insertions(+), 7 deletions(-)
Approvals:
XenoRyet: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
b/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
index f13922c..5650b62 100644
--- a/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
+++ b/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
@@ -1,6 +1,4 @@
addMailing(
'thank_you', $template_name, $page_content, $subject, $published_revision );
} else {
watchdog( 'make-thank-you', "$lang --
Could not open $file for writing!", null, WATCHDOG_ERROR );
@@ -85,8 +80,6 @@
}
} catch ( TranslationException $ex ) {
watchdog( 'make-thank-you', "$lang --
{$ex->getMessage()}", null, WATCHDOG_INFO );
- } catch ( CiviMailingInsertException $ex ) {
- watchdog( 'make-thank-you', "Could not insert
CiviMail Mailing for $lang -- {$ex->getMessage()}", null, WATCHDOG_ERROR );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/391951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If940368f3688555236382c74f8c572b43f4511a0
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
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] mediawiki...MinervaNeue[master]: If timestamp is null load revision time
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391977 )
Change subject: If timestamp is null load revision time
..
If timestamp is null load revision time
Passing null to wfTimestamp will result in the current time.
Protect against that happening
Bug: T180103
Change-Id: I6ef9577bf52609bf387b0146f1d8a4a53be58cd7
---
M includes/skins/SkinMinerva.php
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/77/391977/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 344bc06..fa2ede2 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -729,6 +729,11 @@
$isMainPage = $title->isMainPage();
// Get rev_timestamp of current revision (preloaded by
MediaWiki core)
$timestamp = $this->getOutput()->getRevisionTimestamp();
+ # No cached timestamp, load it from the database
+ if ( $timestamp === null ) {
+ $timestamp = Revision::getTimestampFromId(
$this->getTitle(), $this->getRevisionId() );
+ }
+
// Main pages tend to include transclusions (see bug 51924)
if ( $isMainPage ) {
$lastModified = $this->msg( 'mobile-frontend-history'
)->plain();
--
To view, visit https://gerrit.wikimedia.org/r/391977
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ef9577bf52609bf387b0146f1d8a4a53be58cd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Fix: Mocha TypeScript project reference
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391976 )
Change subject: Fix: Mocha TypeScript project reference
..
Fix: Mocha TypeScript project reference
It's unclear why but running with the Mocha TypeScript project set as
server causes failing tests under test/ to report success locally and
fail on CI. This patch addresses the symptom and removes the TypeScript
project from Mocha, allowing it to default to the root project.
https://gerrit.wikimedia.org/r/#/c/391898/1
Change-Id: I8519aa1ba7de42122905541e09017bae4f899136
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/76/391976/1
diff --git a/package.json b/package.json
index 8f120d0..99c2f37 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"lint": "eslint --cache --max-warnings 0
--report-unused-disable-directives --ext ts,tsx,js,json .",
"test": "npm-run-all --silent -p lint build mocha -s bundlesize",
"--- SECONDARY ---": "# Useful but rarely used scripts.",
-"mocha": "TS_NODE_PROJECT=src/server mocha
'{src,test}/**/*.test.{ts,tsx,js}'",
+"mocha": "mocha '{src,test}/**/*.test.{ts,tsx,js}'",
"bundlesize": "bundlesize",
"--- HOOKS ---": "# Triggered scripts.",
"precommit": "npm test -s",
--
To view, visit https://gerrit.wikimedia.org/r/391976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8519aa1ba7de42122905541e09017bae4f899136
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
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Get thank you email subject from template files
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391975 )
Change subject: Get thank you email subject from template files
..
Get thank you email subject from template files
This lets us deliberately deploy updates instead of just getting
whatever's been translated in DonationInterface.
Bug: T167806
Change-Id: I9f52affe4f2d198866d7551411019e06e095fa31
---
M sites/all/modules/thank_you/generators/FindUnconsumedTokens.php
M sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
M sites/all/modules/thank_you/thank_you.module
3 files changed, 12 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/75/391975/1
diff --git a/sites/all/modules/thank_you/generators/FindUnconsumedTokens.php
b/sites/all/modules/thank_you/generators/FindUnconsumedTokens.php
index ead9583..f102d2a 100644
--- a/sites/all/modules/thank_you/generators/FindUnconsumedTokens.php
+++ b/sites/all/modules/thank_you/generators/FindUnconsumedTokens.php
@@ -57,7 +57,7 @@
// TODO: refactor out of this class
static function renderLanguage( $lang ) {
$params = FindUnconsumedTokens::getRandomTemplateParams( $lang );
-$buf = thank_you_render( $params );
+list($buf, $subj) = thank_you_render( $params );
return $buf;
}
diff --git a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
index 03acdda..6bd0e9c 100644
--- a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
+++ b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
@@ -110,6 +110,11 @@
'@donate.wikimedia.org';
$this->assertEquals( $expectedBounce, $sent['reply_to'] );
$this->assertRegExp( '/\$ 1.23/', $sent['html'] );
+ $expectedSubject = file_get_contents(
+ __DIR__ .
+ "/../../templates/subject/thank_you.{$this->message['language']}.subject"
+);
+ $this->assertEquals( $expectedSubject, $sent['subject']);
}
public function testSendThankYouAddCiviMailActivity() {
diff --git a/sites/all/modules/thank_you/thank_you.module
b/sites/all/modules/thank_you/thank_you.module
index 32bc11c..0a84e32 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -458,14 +458,14 @@
'locale' => $params['locale'],
);
- $email['html'] = thank_you_render( $params );
-
- if( $email['html'] == false ){
+ list($html, $subject) = thank_you_render($params);
+ if(!$html || !$subject){
$msg = "HTML rendering of template failed in
{$params['locale']}.";
throw new WmfException( 'UNKNOWN', $msg,
array('thank_you_params' => $params) );
}
- $email['subject'] = thank_you_get_subject( $params['locale'] );
+ $email['html'] = $html;
+ $email['subject'] = $subject;
$mailer = Mailer::getDefault();
@@ -608,13 +608,6 @@
);
}
return $civi_queue_record;
-}
-/**
- * Get the translated email subject
- */
-function thank_you_get_subject( $locale ) {
- $subj_msg = "donate_interface-email-subject";
- return Translation::get_translated_message( $subj_msg, $locale );
}
function thank_you_settings_form() {
@@ -911,7 +904,8 @@
$page_content = $template->render( 'html' );
$page_content = str_replace( '', '', $page_content );
-return $page_content;
+$subject = $template->render( 'subject' );
+return array($page_content, $subject);
}
function build_unsub_link( $contributionId, $emailAddr, $language ) {
--
To view, visit https://gerrit.wikimedia.org/r/391975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f52affe4f2d198866d7551411019e06e095fa31
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Show last modified bar without relative time for old revisions
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391974 )
Change subject: Show last modified bar without relative time for old revisions
..
Show last modified bar without relative time for old revisions
If FlaggedRevisions is being used then older revisions will be
shown as if they are the current revision of the page. This causes
problems as it makes it hard to give a true indication of when
something was last modified - do you show the last time someone
made an edit or the last time someone approved an edit?
The same issue applies on revisions and we attempted to fix this
earlier in T153125 but in doing so caused this problem.
Bug: T180116
Change-Id: I6d47adf272c99791d4af9f97afa02799d495887e
---
M includes/skins/SkinMinerva.php
1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/74/391974/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 344bc06..ac13ff9 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -722,15 +722,16 @@
* 2013, at 23:31'. This message is different for the main page since
main page
* content is typically transcuded rather than edited directly.
* @param Title $title The Title object of the page being viewed
+* @param Boolean $doNotShowRelativeTime (optional) when passed will
use a generic
+* label which makes no reference to the time the page was edited.
* @return array
*/
- protected function getHistoryLink( Title $title ) {
+ protected function getHistoryLink( Title $title, $doNotShowRelativeTime
) {
$user = $this->getUser();
- $isMainPage = $title->isMainPage();
// Get rev_timestamp of current revision (preloaded by
MediaWiki core)
$timestamp = $this->getOutput()->getRevisionTimestamp();
// Main pages tend to include transclusions (see bug 51924)
- if ( $isMainPage ) {
+ if ( $doNotShowRelativeTime ) {
$lastModified = $this->msg( 'mobile-frontend-history'
)->plain();
} else {
$lastModified = $this->msg(
@@ -754,7 +755,7 @@
}
return [
// Use $edit['timestamp'] (Unix format) instead of
$timestamp (MW format)
- 'data-timestamp' => $isMainPage ? '' : wfTimestamp(
TS_UNIX, $timestamp ),
+ 'data-timestamp' => $doNotShowRelativeTime ? '' :
wfTimestamp( TS_UNIX, $timestamp ),
'href' => $historyUrl,
'text' => $lastModified,
'data-user-name' => $editor ? $editor['name'] : '',
@@ -887,8 +888,9 @@
// The last modified bar is only rendered on the latest
revision.
// For older revisions the last modified
// information appears at the top of the page.
- if ( $this->getWikiPage()->exists() &&
$isLatestRevision ) {
- $tpl->set( 'historyLink',
$this->getHistoryLink( $title ) );
+ if ( $this->getWikiPage()->exists() ) {
+ $tpl->set( 'historyLink',
$this->getHistoryLink( $title,
+ !$isLatestRevision ||
$title->isMainPage() ) );
}
}
$tpl->set( 'headinghtml', $this->getHeadingHtml() );
--
To view, visit https://gerrit.wikimedia.org/r/391974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d47adf272c99791d4af9f97afa02799d495887e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Archive the ActivityMonitor extension
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391902 ) Change subject: Archive the ActivityMonitor extension .. Archive the ActivityMonitor extension Bug: T180631 Change-Id: I2697522af51f43ff992273a8621da914b078cc42 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index fa7da86..236d958 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2752,8 +2752,7 @@ - name: mediawiki/extensions/ActivityMonitor template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/AddMessages template: -- To view, visit https://gerrit.wikimedia.org/r/391902 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2697522af51f43ff992273a8621da914b078cc42 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: Hashar Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Paladox 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]: nfs_mount: Remove showmount based blocking check for nfs shares
Madhuvishy has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391970 )
Change subject: nfs_mount: Remove showmount based blocking check for nfs shares
..
nfs_mount: Remove showmount based blocking check for nfs shares
This change removes the check, the block parameter, and references
to it. It also removes the block-for-export script.
Bug: T171508
Change-Id: I321c0316e3118eeffea24e79978985bad45d249f
---
D modules/labstore/files/block-for-export
M modules/labstore/manifests/nfs_mount.pp
M modules/role/manifests/labs/nfsclient.pp
3 files changed, 0 insertions(+), 60 deletions(-)
Approvals:
Madhuvishy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labstore/files/block-for-export
b/modules/labstore/files/block-for-export
deleted file mode 100644
index dd8c9e7..000
--- a/modules/labstore/files/block-for-export
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# This file is installed by puppet.
-#
-# Block until a specified volume is available. This
-# is used during a puppet run to prevent premature config
-# of a non-existent volume.
-#
-# Args are server, volpath, timeout in seconds. Example:
-#
-# block-for-export labstore.svc.eqiad.wmnet project/testlabs 120
-#
-set -u
-
-NFS_SERVER=$1
-VOLUME=$2
-TIMEOUT=$3
-
-if [ "$#" -ne 3 ]; then
-echo "Usage: ${0} "
-exit 1
-fi
-
-# query openstack metadata service
-ip=`curl http://169.254.169.254/1.0/meta-data/local-ipv4 2> /dev/null`
-domain=`hostname -d | sed -r 's/.*\.([^.]+\.[^.]+)$/\1/'`
-for i in `seq 1 ${TIMEOUT}`; do
-prod_domain=`echo $domain | sed 's/wmflabs/wmnet/'`
-echo $(showmount -e ${NFS_SERVER} | egrep ^/exp/${VOLUME}\\s), | fgrep -q
$ip,
-if [ $? -eq 0 ]; then
-exit 0
-fi
-sleep 1
-done
-
-exit 2
diff --git a/modules/labstore/manifests/nfs_mount.pp
b/modules/labstore/manifests/nfs_mount.pp
index a722f89..094f8de 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -27,9 +27,6 @@
# [*options]
# Array of options to combine with the standard options
#
-# [*block]
-# boolean to determine if we should block to wait for share
-#
# [*block_timeout]
# timeout to block for share availability
@@ -41,7 +38,6 @@
$share_path = undef,
$server = undef,
$options = [],
-$block=false,
$block_timeout = 180,
$lookupcache='none',
)
@@ -129,24 +125,6 @@
}
if ($ensure == 'present') and mount_nfs_volume($project, $mount_name) {
-
-if $block {
-if !defined(File['/usr/local/sbin/block-for-export']) {
-# This script will block until the NFS volume is available
-file { '/usr/local/sbin/block-for-export':
-ensure => present,
-owner => 'root',
-group => 'root',
-mode => '0555',
-source => 'puppet:///modules/labstore/block-for-export',
-}
-}
-exec { "block-for-nfs-${name}":
-command => "/usr/local/sbin/block-for-export ${server}
project/${project} ${block_timeout}",
-require => [File['/etc/modprobe.d/nfs-no-idmap.conf'],
File['/usr/local/sbin/block-for-export']],
-unless => "/bin/mountpoint -q ${mount_path}",
-}
-}
# 'present' is meant to manage only the status of entries in /etc/fstab
# a notable exception to this is in the case of an entry managed as
'present'
diff --git a/modules/role/manifests/labs/nfsclient.pp
b/modules/role/manifests/labs/nfsclient.pp
index baa33db..28cfcc9 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -10,7 +10,6 @@
mount_path => '/mnt/nfs/labstore-secondary-project',
share_path => "/project/${::labsproject}/project",
server => 'nfs-tools-project.svc.eqiad.wmnet',
-block => true,
lookupcache => $lookupcache,
}
@@ -21,7 +20,6 @@
mount_path => '/mnt/nfs/labstore-secondary-home',
share_path => "/project/${::labsproject}/home",
server => 'nfs-tools-project.svc.eqiad.wmnet',
-block => true,
lookupcache => $lookupcache,
}
--
To view, visit https://gerrit.wikimedia.org/r/391970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I321c0316e3118eeffea24e79978985bad45d249f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Madhuvishy
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]: Preferences: Improve visual appearance by “unboxing” sections
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391445 )
Change subject: Preferences: Improve visual appearance by “unboxing” sections
..
Preferences: Improve visual appearance by “unboxing” sections
Instead let's work with whitespace, which also saves virtual space and
makes the appearance not as jarring.
Bug: T180538
Depends-on: I39088107e6ab07399f9826dd925df9e1b8dda006
Change-Id: I24d21eb3c0d188004dacbce8a9bc1ac3ad7e2a8f
---
M resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
1 file changed, 16 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git
a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
b/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
index 294dcd0..f87036f 100644
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
@@ -44,6 +44,14 @@
transform: none;
}
+#preferences .oo-ui-panelLayout-framed .oo-ui-panelLayout-framed {
+ border-color: #c8ccd1;
+ border-width: 1px 0 0;
+ border-radius: 0;
+ padding-left: 0;
+ padding-right: 0;
+}
+
/* Tweak the margins to reduce the shifting of form contents
* after JS code loads and rearranges the page */
.client-js #preferences > .oo-ui-panelLayout {
@@ -54,15 +62,18 @@
margin-left: 0.25em;
}
-.client-js #preferences .oo-ui-panelLayout-framed .oo-ui-tabPanelLayout
.oo-ui-panelLayout-framed {
- margin-left: 0;
-}
-
-.client-js #preferences .oo-ui-panelLayout-framed .oo-ui-tabPanelLayout {
+.client-js #preferences .oo-ui-tabPanelLayout {
padding-top: 0.5em;
padding-bottom: 0.5em;
}
+.client-js #preferences .oo-ui-tabPanelLayout .oo-ui-panelLayout-framed {
+ margin-left: 0;
+ margin-bottom: 0;
+ border: 0;
+ padding-top: 0;
+}
+
.client-js #preferences > .oo-ui-panelLayout > .oo-ui-fieldsetLayout >
.oo-ui-fieldsetLayout-header {
margin-bottom: 1em;
}
--
To view, visit https://gerrit.wikimedia.org/r/391445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24d21eb3c0d188004dacbce8a9bc1ac3ad7e2a8f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add thank you email subject templates
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391973 ) Change subject: Add thank you email subject templates .. Add thank you email subject templates These include the new "We're here for you" in English, and the old subject for all the other languages. Bug: T167806 Change-Id: I4b249308bdd4bd521f66739587b3226897f0 --- A sites/all/modules/thank_you/templates/subject/thank_you.af.subject A sites/all/modules/thank_you/templates/subject/thank_you.ar.subject A sites/all/modules/thank_you/templates/subject/thank_you.ast.subject A sites/all/modules/thank_you/templates/subject/thank_you.ba.subject A sites/all/modules/thank_you/templates/subject/thank_you.be-tarask.subject A sites/all/modules/thank_you/templates/subject/thank_you.be.subject A sites/all/modules/thank_you/templates/subject/thank_you.bg.subject A sites/all/modules/thank_you/templates/subject/thank_you.bn.subject A sites/all/modules/thank_you/templates/subject/thank_you.br.subject A sites/all/modules/thank_you/templates/subject/thank_you.ca.subject A sites/all/modules/thank_you/templates/subject/thank_you.cs.subject A sites/all/modules/thank_you/templates/subject/thank_you.cy.subject A sites/all/modules/thank_you/templates/subject/thank_you.da.subject A sites/all/modules/thank_you/templates/subject/thank_you.de.subject A sites/all/modules/thank_you/templates/subject/thank_you.dsb.subject A sites/all/modules/thank_you/templates/subject/thank_you.el.subject A sites/all/modules/thank_you/templates/subject/thank_you.en.subject A sites/all/modules/thank_you/templates/subject/thank_you.eo.subject A sites/all/modules/thank_you/templates/subject/thank_you.es.subject A sites/all/modules/thank_you/templates/subject/thank_you.et.subject A sites/all/modules/thank_you/templates/subject/thank_you.fa.subject A sites/all/modules/thank_you/templates/subject/thank_you.fi.subject A sites/all/modules/thank_you/templates/subject/thank_you.fr.subject A sites/all/modules/thank_you/templates/subject/thank_you.frp.subject A sites/all/modules/thank_you/templates/subject/thank_you.gl.subject A sites/all/modules/thank_you/templates/subject/thank_you.gsw.subject A sites/all/modules/thank_you/templates/subject/thank_you.he.subject A sites/all/modules/thank_you/templates/subject/thank_you.hi.subject A sites/all/modules/thank_you/templates/subject/thank_you.hr.subject A sites/all/modules/thank_you/templates/subject/thank_you.hsb.subject A sites/all/modules/thank_you/templates/subject/thank_you.hu.subject A sites/all/modules/thank_you/templates/subject/thank_you.ia.subject A sites/all/modules/thank_you/templates/subject/thank_you.id.subject A sites/all/modules/thank_you/templates/subject/thank_you.it.subject A sites/all/modules/thank_you/templates/subject/thank_you.ja.subject A sites/all/modules/thank_you/templates/subject/thank_you.jv.subject A sites/all/modules/thank_you/templates/subject/thank_you.ka.subject A sites/all/modules/thank_you/templates/subject/thank_you.kk-cyrl.subject A sites/all/modules/thank_you/templates/subject/thank_you.ko.subject A sites/all/modules/thank_you/templates/subject/thank_you.ksh.subject A sites/all/modules/thank_you/templates/subject/thank_you.lb.subject A sites/all/modules/thank_you/templates/subject/thank_you.lij.subject A sites/all/modules/thank_you/templates/subject/thank_you.lt.subject A sites/all/modules/thank_you/templates/subject/thank_you.lv.subject A sites/all/modules/thank_you/templates/subject/thank_you.map-bms.subject A sites/all/modules/thank_you/templates/subject/thank_you.mk.subject A sites/all/modules/thank_you/templates/subject/thank_you.ml.subject A sites/all/modules/thank_you/templates/subject/thank_you.mr.subject A sites/all/modules/thank_you/templates/subject/thank_you.ms.subject A sites/all/modules/thank_you/templates/subject/thank_you.mt.subject A sites/all/modules/thank_you/templates/subject/thank_you.nb.subject A sites/all/modules/thank_you/templates/subject/thank_you.nl-informal.subject A sites/all/modules/thank_you/templates/subject/thank_you.nl.subject A sites/all/modules/thank_you/templates/subject/thank_you.or.subject A sites/all/modules/thank_you/templates/subject/thank_you.pl.subject A sites/all/modules/thank_you/templates/subject/thank_you.pms.subject A sites/all/modules/thank_you/templates/subject/thank_you.pt-br.subject A sites/all/modules/thank_you/templates/subject/thank_you.pt.subject A sites/all/modules/thank_you/templates/subject/thank_you.qqq.subject A sites/all/modules/thank_you/templates/subject/thank_you.qu.subject A sites/all/modules/thank_you/templates/subject/thank_you.ro.subject A sites/all/modules/thank_you/templates/subject/thank_you.roa-tara.subject A sites/all/modules/thank_you/templates/subject/thank_you.ru.subject A sites/all/modules/thank_you/templates/subject/thank_you.sh.subject A sites/all/modules/thank_you/templates/subject/thank_you.si.subject A sites/all/modules/thank_you/templates/su
[MediaWiki-commits] [Gerrit] mediawiki...BatchUserRights[master]: Follow-up on I5688099c
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391932 )
Change subject: Follow-up on I5688099c
..
Follow-up on I5688099c
Add COPYING and license statements for BatchUserRights
Change-Id: Ifec87114ac49091565be61841de13e1f4e4d2169
---
M BatchUserRights.alias.php
M BatchUserRights.php
M BatchUserRights_body.php
A COPYING
4 files changed, 731 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/BatchUserRights.alias.php b/BatchUserRights.alias.php
index 19e2d25..e74199e 100644
--- a/BatchUserRights.alias.php
+++ b/BatchUserRights.alias.php
@@ -1,5 +1,24 @@
http://www.gnu.org/licenses/>.
+ */
+
+/**
* Aliases for Special:BatchUserRights
*
* @file
diff --git a/BatchUserRights.php b/BatchUserRights.php
index 5995da3..50ecf1e 100644
--- a/BatchUserRights.php
+++ b/BatchUserRights.php
@@ -1,5 +1,24 @@
http://www.gnu.org/licenses/>.
+ */
+
+/**
* Special page to allow adding user group membership to a large number of
users at once.
* (such as adding a couple of hundred people to the "beta" user group).
*
@@ -9,7 +28,6 @@
* @author Sean Colombo
* @link http://www.mediawiki.org/wiki/Extension:BatchUserRights Documentation
*/
-
if ( function_exists( 'wfLoadExtension' ) ) {
wfLoadExtension( 'BatchUserRights' );
// Keep i18n globals so mergeMessageFileList.php doesn't break
diff --git a/BatchUserRights_body.php b/BatchUserRights_body.php
index 08b5efd..cadef15 100644
--- a/BatchUserRights_body.php
+++ b/BatchUserRights_body.php
@@ -1,5 +1,24 @@
http://www.gnu.org/licenses/>.
+ */
+
+/**
* A class to manage user levels rights.
*
* @file
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..1f62cce
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Cleanup, removed space
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/388045 )
Change subject: Cleanup, removed space
..
Cleanup, removed space
Removed a space in class to follow the same style as the others.
Edit is pure cleanup.
Change-Id: I0810e2cf5929dd8ac039e6ae2eff0d7b07f14196
---
M includes/mail/MailAddress.php
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/mail/MailAddress.php b/includes/mail/MailAddress.php
index ce1df0d..1686bbb 100644
--- a/includes/mail/MailAddress.php
+++ b/includes/mail/MailAddress.php
@@ -30,7 +30,6 @@
* header format when requested.
*/
class MailAddress {
-
/**
* @var string
*/
--
To view, visit https://gerrit.wikimedia.org/r/388045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0810e2cf5929dd8ac039e6ae2eff0d7b07f14196
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: SimmeD
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove redundant default generator call
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391972 )
Change subject: Remove redundant default generator call
..
Remove redundant default generator call
Change-Id: Ie98c12b336874e61b6996426b57156394973b531
---
M sites/all/modules/thank_you/make_thank_you.drush.inc
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/72/391972/1
diff --git a/sites/all/modules/thank_you/make_thank_you.drush.inc
b/sites/all/modules/thank_you/make_thank_you.drush.inc
index 7e3370a..a805774 100644
--- a/sites/all/modules/thank_you/make_thank_you.drush.inc
+++ b/sites/all/modules/thank_you/make_thank_you.drush.inc
@@ -17,7 +17,6 @@
function drush_make_thank_you() {
$generators = get_thank_you_generators();
-$default_gen = get_default_thank_you_generator();
if (drush_get_option('listgen', false)) {
drush_print(t('Available thank you generators'));
--
To view, visit https://gerrit.wikimedia.org/r/391972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie98c12b336874e61b6996426b57156394973b531
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Get a ve.ce.BranchNode position's corresponding DOM position
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383404 )
Change subject: Get a ve.ce.BranchNode position's corresponding DOM position
..
Get a ve.ce.BranchNode position's corresponding DOM position
Change-Id: I8c9a24dc877a530c9fa421e63caf73f78d79d04c
---
M src/ce/ve.ce.BranchNode.js
M tests/ce/ve.ce.BranchNode.test.js
2 files changed, 113 insertions(+), 39 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git a/src/ce/ve.ce.BranchNode.js b/src/ce/ve.ce.BranchNode.js
index b1a3131..8caf00a 100644
--- a/src/ce/ve.ce.BranchNode.js
+++ b/src/ce/ve.ce.BranchNode.js
@@ -174,16 +174,8 @@
* @param {...ve.dm.BranchNode} [nodes] Variadic list of nodes to insert
*/
ve.ce.BranchNode.prototype.onSplice = function ( index ) {
- var i, j,
- length,
- args = [],
- anchorCeNode,
- prevCeNode,
- anchorDomNode,
- afterAnchor,
- node,
- parentNode,
- removals;
+ var i, length, removals, position, j,
+ args = [];
for ( i = 0, length = arguments.length; i < length; i++ ) {
args.push( arguments[ i ] );
@@ -205,37 +197,14 @@
removals[ i ].$element.detach();
}
if ( args.length >= 3 ) {
- if ( index > 0 ) {
- // Get the element before the insertion
- anchorCeNode = this.children[ index - 1 ];
- // If the CE node is a text node, its $element will be
empty
- // Look at its previous sibling, which cannot be a text
node
- if ( anchorCeNode.getType() === 'text' ) {
- prevCeNode = this.children[ index - 2 ];
- if ( prevCeNode ) {
- anchorDomNode =
prevCeNode.$element.last()[ 0 ].nextSibling;
- } else {
- anchorDomNode = this.$element[ 0
].firstChild;
- }
- } else {
- anchorDomNode = anchorCeNode.$element.last()[ 0
];
- }
- }
+ position = this.getDomPosition( index );
for ( i = args.length - 1; i >= 2; i-- ) {
args[ i ].attach( this );
- if ( anchorDomNode ) {
- // DOM equivalent of $( anchorDomNode ).after(
args[i].$element );
- afterAnchor = anchorDomNode.nextSibling;
- parentNode = anchorDomNode.parentNode;
- for ( j = 0, length = args[ i
].$element.length; j < length; j++ ) {
- parentNode.insertBefore( args[ i
].$element[ j ], afterAnchor );
- }
- } else {
- // DOM equivalent of this.$element.prepend(
args[j].$element );
- node = this.$element[ 0 ];
- for ( j = args[ i ].$element.length - 1; j >=
0; j-- ) {
- node.insertBefore( args[ i ].$element[
j ], node.firstChild );
- }
+ for ( j = 0, length = args[ i ].$element.length; j <
length; j++ ) {
+ position.node.insertBefore(
+ args[ i ].$element[ j ],
+ position.node.children[ position.offset
]
+ );
}
if ( this.live !== args[ i ].isLive() ) {
args[ i ].setLive( this.live );
@@ -386,3 +355,66 @@
// Parent method
ve.ce.BranchNode.super.prototype.destroy.call( this );
};
+
+/**
+ * Get the DOM position (node and offset) corresponding to a position in this
node
+ *
+ * The node/offset have the same semantics as a DOM Selection
focusNode/focusOffset
+ *
+ * @param {number} offset The offset inside this node of the required position
+ * @return {Object|null} The DOM position
+ * @return {Node} return.node DOM node; guaranteed to be this node's final DOM
node
+ * @return {number} return.offset DOM offset
+ */
+ve.ce.BranchNode.prototype.getDomPosition = function ( offset ) {
+ var i, ceNode,
+ domNode = this.$element.last()[ 0 ];
+
+ // Step backwards past empty nodes
+ i = offset - 1;
+ while ( true ) {
+ ceNode = this.children[ i-- ];
+ if ( !ceNode ) {
+ // No preceding c
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add thank you subject generator
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391971 )
Change subject: Add thank you subject generator
..
Add thank you subject generator
This version just writes files from the same mediawiki json we were
already using.
TODO: move the content to metawiki along with the body templates
Bug: T167806
Change-Id: Iec81e2a8f853b7d4bd432de186ea8630bfbe8ada
---
A sites/all/modules/thank_you/generators/ThankYouSubject.php
M sites/all/modules/thank_you/make_thank_you.drush.inc
2 files changed, 30 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/71/391971/1
diff --git a/sites/all/modules/thank_you/generators/ThankYouSubject.php
b/sites/all/modules/thank_you/generators/ThankYouSubject.php
new file mode 100644
index 000..5f89699
--- /dev/null
+++ b/sites/all/modules/thank_you/generators/ThankYouSubject.php
@@ -0,0 +1,29 @@
+proto_file}'",
+ NULL,
+ WATCHDOG_INFO
+);
+foreach ($wantedLangs as $lang) {
+ $subject = Translation::get_translated_message(
+'donate_interface-email-subject', $lang
+ );
+ $file = str_replace('$1', $lang, $this->proto_file);
+ if (file_put_contents($file, $subject)) {
+watchdog('make-thank-you', "$lang -- Wrote translation into $file",
NULL, WATCHDOG_INFO);
+ }
+ else {
+watchdog('make-thank-you', "$lang -- Could not open $file for
writing!", NULL, WATCHDOG_ERROR);
+ }
+}
+ }
+}
diff --git a/sites/all/modules/thank_you/make_thank_you.drush.inc
b/sites/all/modules/thank_you/make_thank_you.drush.inc
index 7e3370a..b542966 100644
--- a/sites/all/modules/thank_you/make_thank_you.drush.inc
+++ b/sites/all/modules/thank_you/make_thank_you.drush.inc
@@ -46,6 +46,7 @@
function get_thank_you_generators() {
return array(
'generic' => '\thank_you\generators\ThankYou',
+'subject' => '\thank_you\generators\ThankYouSubject',
);
}
--
To view, visit https://gerrit.wikimedia.org/r/391971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec81e2a8f853b7d4bd432de186ea8630bfbe8ada
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: nfs_mount: Remove showmount based blocking check for nfs shares
Madhuvishy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391970 )
Change subject: nfs_mount: Remove showmount based blocking check for nfs shares
..
nfs_mount: Remove showmount based blocking check for nfs shares
This change removes the check, the block parameter, and references
to it. It also removes the block-for-export script.
Bug: T171508
Change-Id: I321c0316e3118eeffea24e79978985bad45d249f
---
D modules/labstore/files/block-for-export
M modules/labstore/manifests/nfs_mount.pp
M modules/role/manifests/labs/nfsclient.pp
3 files changed, 0 insertions(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/391970/1
diff --git a/modules/labstore/files/block-for-export
b/modules/labstore/files/block-for-export
deleted file mode 100644
index dd8c9e7..000
--- a/modules/labstore/files/block-for-export
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# This file is installed by puppet.
-#
-# Block until a specified volume is available. This
-# is used during a puppet run to prevent premature config
-# of a non-existent volume.
-#
-# Args are server, volpath, timeout in seconds. Example:
-#
-# block-for-export labstore.svc.eqiad.wmnet project/testlabs 120
-#
-set -u
-
-NFS_SERVER=$1
-VOLUME=$2
-TIMEOUT=$3
-
-if [ "$#" -ne 3 ]; then
-echo "Usage: ${0} "
-exit 1
-fi
-
-# query openstack metadata service
-ip=`curl http://169.254.169.254/1.0/meta-data/local-ipv4 2> /dev/null`
-domain=`hostname -d | sed -r 's/.*\.([^.]+\.[^.]+)$/\1/'`
-for i in `seq 1 ${TIMEOUT}`; do
-prod_domain=`echo $domain | sed 's/wmflabs/wmnet/'`
-echo $(showmount -e ${NFS_SERVER} | egrep ^/exp/${VOLUME}\\s), | fgrep -q
$ip,
-if [ $? -eq 0 ]; then
-exit 0
-fi
-sleep 1
-done
-
-exit 2
diff --git a/modules/labstore/manifests/nfs_mount.pp
b/modules/labstore/manifests/nfs_mount.pp
index a722f89..094f8de 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -27,9 +27,6 @@
# [*options]
# Array of options to combine with the standard options
#
-# [*block]
-# boolean to determine if we should block to wait for share
-#
# [*block_timeout]
# timeout to block for share availability
@@ -41,7 +38,6 @@
$share_path = undef,
$server = undef,
$options = [],
-$block=false,
$block_timeout = 180,
$lookupcache='none',
)
@@ -129,24 +125,6 @@
}
if ($ensure == 'present') and mount_nfs_volume($project, $mount_name) {
-
-if $block {
-if !defined(File['/usr/local/sbin/block-for-export']) {
-# This script will block until the NFS volume is available
-file { '/usr/local/sbin/block-for-export':
-ensure => present,
-owner => 'root',
-group => 'root',
-mode => '0555',
-source => 'puppet:///modules/labstore/block-for-export',
-}
-}
-exec { "block-for-nfs-${name}":
-command => "/usr/local/sbin/block-for-export ${server}
project/${project} ${block_timeout}",
-require => [File['/etc/modprobe.d/nfs-no-idmap.conf'],
File['/usr/local/sbin/block-for-export']],
-unless => "/bin/mountpoint -q ${mount_path}",
-}
-}
# 'present' is meant to manage only the status of entries in /etc/fstab
# a notable exception to this is in the case of an entry managed as
'present'
diff --git a/modules/role/manifests/labs/nfsclient.pp
b/modules/role/manifests/labs/nfsclient.pp
index baa33db..28cfcc9 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -10,7 +10,6 @@
mount_path => '/mnt/nfs/labstore-secondary-project',
share_path => "/project/${::labsproject}/project",
server => 'nfs-tools-project.svc.eqiad.wmnet',
-block => true,
lookupcache => $lookupcache,
}
@@ -21,7 +20,6 @@
mount_path => '/mnt/nfs/labstore-secondary-home',
share_path => "/project/${::labsproject}/home",
server => 'nfs-tools-project.svc.eqiad.wmnet',
-block => true,
lookupcache => $lookupcache,
}
--
To view, visit https://gerrit.wikimedia.org/r/391970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I321c0316e3118eeffea24e79978985bad45d249f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: phab: remove obsolete portions of email handler
Rush has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391969 )
Change subject: phab: remove obsolete portions of email handler
..
phab: remove obsolete portions of email handler
I confirmed with rob this is not used anymore as it is
either:
* replaced by phab native functionality
* legacy process
Change-Id: I5cb64bad35ae94550a728be1c129a01a99cadc81
---
M modules/phabricator/files/phab_epipe.py
M modules/phabricator/templates/phab_epipe.conf.erb
M modules/profile/manifests/phabricator/main.pp
3 files changed, 2 insertions(+), 354 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/69/391969/1
diff --git a/modules/phabricator/files/phab_epipe.py
b/modules/phabricator/files/phab_epipe.py
index a2afa31..da2f6f5 100644
--- a/modules/phabricator/files/phab_epipe.py
+++ b/modules/phabricator/files/phab_epipe.py
@@ -4,11 +4,7 @@
This script acts as an intermediary between an MTA and phabricator providing
some extra functionality and raw email piping.
-* default behavior is to deliver to phabricator handler
-* address routing allows redirecting an email address
- to create new tasks in project
-* direct comments allows non-phabricator recognized emails to attach comments
- to a ticket for a specific project from allowed domains
+* deliver to phabricator handler
Looks for configuration file: /etc/phab_epipe.conf
@@ -21,25 +17,6 @@
# saves particular messages from a comma
# separated list of users
debug =
-# email that phab is set to accept new tasks on
-taskcreation =
-
-# Direct route an email to new tasks associated with
-# a project.
-[address_routing]
- =
-
-[direct_comments_allowed]
- =
-
-[phab_bot]
-# Notice attachments to direct tasks will be permissioned as the
-# phab_bot user
-root_dir =
-certificate =
-host=
-
"""
import os
import re
@@ -55,18 +32,6 @@
os.environ['PHABRICATOR_ENV'] = 'mail'
-
-
-def extract_direct_task(list_of_dests):
-"""returns a dest ticket number of available
-:param list_of_dests: list of dest email strings
-:returns: string
-"""
-for dest in [m.strip() for m in list_of_dests]:
-task = re.search('[T|t](\d+)@phabricator', dest)
-if task:
-return int(task.group(1))
-return ''
def output(msg, verbose):
@@ -106,183 +71,11 @@
for name, value in parser.items('default'):
defaults[name] = value
-address_routing = {}
-for name, value in parser.items('address_routing'):
-address_routing[name] = value
-
-direct_com = {}
-for name, value in parser.items('direct_comments_allowed'):
-direct_com[name] = value.split(',')
-
-def sanitize_email(email):
-"""make an email str worthy of crawlers
-:param email: str
-"""
-if '@' not in email:
-return ''
-u, e = email.split('@')
-u = u.lstrip('<')
-return '<%s at %s>' % (u, e.split('.')[0])
-
-def get_proj_by_name(name):
-"""return json response
-:param name: str of project name
-"""
-return phab.project.query(names=[name])
-
-def get_proj_by_phid(phid):
-"""return json response
-:param phid: str of project phid
-"""
-return phab.phid.query(phids=[phid])[phid]
-
-def external_user_comment(task, text):
-"""update a task with a comment by id
-:param task: int id
-:param email: address of source user
-:param text: main comment string
-:returns: json
-"""
-return phab.maniphest.update(id=task, comments=text)
-
-def mail2comment(task, name, date, subject, body, uploads):
-"""update a task with a comment by id
-:param task: int id
-:param name: sender str
-:param date: str
-:param subject: str
-:param body: st
-:param uploads: list of phab attachment id's
-:returns: json
-"""
-block = "**`%s`** replied via email on `%s`\n\n" % (name, date)
-block += "`%s`\n\n" % (subject)
-
-sane_body = []
-for l in body.splitlines():
-if l.strip() == '--':
-sane_body.append('> ~~')
-else:
-sane_body.append('> %s' % (l.strip(),))
-
-block += '\n'.join(sane_body)
-
-if uploads:
-block += '\n\n--\n'
-for ref in uploads:
-block += "\n{%s}" % (ref,)
-return external_user_comment(task, block)
-
-def mail2task(sender, src_addy, date, subject, body, project, security):
-block = "**`%s`** //%s// created via email on `%s`\n\n" % (sender,
- src_addy,
- date)
-
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Don't create CiviMail mailing record in make_thank_you
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391951 )
Change subject: Don't create CiviMail mailing record in make_thank_you
..
Don't create CiviMail mailing record in make_thank_you
We don't run make_thank_you on production, so it's pointless.
Also, it's a weird place for it if we want to make subject templates
the same way.
Bug: T167806
Change-Id: If940368f3688555236382c74f8c572b43f4511a0
---
M sites/all/modules/thank_you/generators/RenderTranslatedPage.php
A sites/all/modules/thank_you/generators/ThankYouSubject.php
2 files changed, 42 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/51/391951/1
diff --git a/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
b/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
index f13922c..8d8a619 100644
--- a/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
+++ b/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
@@ -40,7 +40,6 @@
}
civicrm_initialize();
- $civimail_store = new CiviMailStore();
foreach( $languages as $lang ) {
try {
@@ -74,8 +73,6 @@
if (file_put_contents( $file, $page_content )) {
watchdog( 'make-thank-you', "$lang --
Wrote translation into $file", null, WATCHDOG_INFO );
- $subject = thank_you_get_subject( $lang
);
- $civimail_store->addMailing(
'thank_you', $template_name, $page_content, $subject, $published_revision );
} else {
watchdog( 'make-thank-you', "$lang --
Could not open $file for writing!", null, WATCHDOG_ERROR );
diff --git a/sites/all/modules/thank_you/generators/ThankYouSubject.php
b/sites/all/modules/thank_you/generators/ThankYouSubject.php
new file mode 100644
index 000..d93cba1
--- /dev/null
+++ b/sites/all/modules/thank_you/generators/ThankYouSubject.php
@@ -0,0 +1,42 @@
+title =
'Fundraising/Translation/Thank_you_email_20171019';
+ $this->proto_file = __DIR__ .
'/../templates/html/thank_you.$1.html';
+
+ $this->substitutions = array(
+ // FIXME: The whitespace coming out of MediaWiki's
parser is
+ // unreliable and shouldn't be second-guessed. We need
to be more
+ // robust here.
+ "/\xc2\xa0/" => ' ', // no-break spaces confuse the
rest of the replacements
+ '/()?\[ifFirstnameAndLastname\]\s*/' => "{% if
first_name and last_name %}\n\\1",
+ '/()?\[elseifFirstnameAndLastname\]\s*/' => "{% else
%}\n\\1",
+ '/\s*\[endifFirstnameAndLastname\](<\/p>)?/' =>
"\\1\n{% endif %}",
+
+ '/\[given name\]/' => '{{ first_name }}',
+ '/\[first name\]/' => '{{ first_name }}',
+ '/\[family name\]/' => '{{ last_name }}',
+ '/\[last name\]/' => '{{ last_name }}',
+
+ '/\[date\]/' => '{{ receive_date }}',
+
+ '/\$date/' => '{{ receive_date }}',
+ '/\[amount\]/' => '{{ (currency ~ " " ~ amount) |
l10n_currency(locale) }}',
+ '/\[contributionId\]/' => '{{ transaction_id }}',
+
+ '/()?\[ifRecurringProblem\]/' => "{% if
\"RecurringRestarted\" in contribution_tags %}\n\\1",
+ '/\[endifRecurringProblem\]<\/p>/' => "\n{% endif
%}",
+ '/()?\[ifRecurring\]\s*/' => "{% if recurring
%}\n\\1",
+ '/\s*\[endifRecurring\]\s*(<\/p>)?/' => "\\1\n{% endif
%}",
+ '/\[#?unsubscribe ((?:(?!\]).)*)\]/' => '$1',
+ // All of the thank you letter's if...endif blocks
should be outside p tags, not inside
+ '/\s*({%\s*if [^}]+})\s*/i' => "\\1\n",
+ '/\s*{%\s*endif\s*%}\s*<\/p>/i' => "\n{% endif %}",
+ // Delete paragraphs that just have a break tag
+ '/\s*\s*\s*<\/p>/i' => '',
+ '/\[#recurringCancel ((?:(?!\]).)*)\]/' => 'https://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Cancel_or_change_recurring_payments&basic=true&language={{
locale }}">$1',
+ );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/391951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If940368f3688555236382c74f8c572b43f4511a0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
_
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove useless subject line setting
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391952 ) Change subject: Remove useless subject line setting .. Remove useless subject line setting We immediately overwrite the subject, so this is a useless database query. Might make sending TY mails a smidge faster! Change-Id: Id984d88904fbdace9c8294e079be2b39a3b6210b --- M sites/all/modules/thank_you/thank_you.module 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/52/391952/1 diff --git a/sites/all/modules/thank_you/thank_you.module b/sites/all/modules/thank_you/thank_you.module index 4d88386..32bc11c 100644 --- a/sites/all/modules/thank_you/thank_you.module +++ b/sites/all/modules/thank_you/thank_you.module @@ -455,8 +455,6 @@ 'to_name' => $params['name'], 'to_address' => $params['recipient_address'], - 'subject' => variable_get( 'thank_you_subject', 'Thank you from the Wikimedia Foundation' ), - 'locale' => $params['locale'], ); -- To view, visit https://gerrit.wikimedia.org/r/391952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id984d88904fbdace9c8294e079be2b39a3b6210b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Restore the message box styles on old revisions
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391944 )
Change subject: Restore the message box styles on old revisions
..
Restore the message box styles on old revisions
While looking at this code, I discovered a dead code path which
is responsible for a lack of styling of this box on old revisions
e.g.
https://en.m.wikipedia.org/wiki/Colony_of_Virginia?oldid=3122112
Change-Id: If66a36e5f08272ea8f6c0d65e7bc75b24b7628c7
---
M includes/MobileFrontend.hooks.php
1 file changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/44/391944/1
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 2887bde..258fe48 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -760,16 +760,12 @@
// We load mobile.init so that lazy loading images
works on all skins
$out->addModules( [ 'mobile.site', 'mobile.init' ] );
- if ( $out->getRequest()->getText( 'oldid' ) ) {
- $styles[] = 'mobile.messageBox.styles';
- }
-
// Allow modifications in mobile only mode
Hooks::run( 'BeforePageDisplayMobile', [ &$out, &$sk ]
);
// add fallback editor styles to action=edit page
$requestAction = $out->getRequest()->getVal( 'action' );
- if ( $requestAction === 'edit' || $requestAction ===
'submit' ) {
+ if ( $out->getRequest()->getText( 'oldid' ) ||
$requestAction === 'edit' || $requestAction === 'submit' ) {
$out->addModuleStyles( [
'mobile.messageBox.styles'
] );
--
To view, visit https://gerrit.wikimedia.org/r/391944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If66a36e5f08272ea8f6c0d65e7bc75b24b7628c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...stewardbots[master]: Fix flake8 'do not use bare except'
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390951 )
Change subject: Fix flake8 'do not use bare except'
..
Fix flake8 'do not use bare except'
[SULWatcher/ini2mysql.py]
The config file regex might be invalid utf8 which would causes unicode()
to raise an UnicodeDecodeError exception.
[StewardBot/StewardBot.py]
On bot disconnect, we dont really care of exceptions.
In __main__ the bot was never shutdown. Move the teardown calls to a
finally statement in order to have them always run.
[SULWatcher/SULWatcher.py]
Fix a couple "ambiguous variable name 'l'"
Usually want to catch all Exception bu
time.strftime() raises a ValueError
Bug: T180283
Change-Id: I5b39b7a974d344ca7d137c755ecc45a5a4d25251
---
M SULWatcher/SULWatcher.py
M SULWatcher/ini2mysql.py
M StewardBot/StewardBot.py
3 files changed, 26 insertions(+), 27 deletions(-)
Approvals:
MarcoAurelio: Looks good to me, approved
BryanDavis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/SULWatcher/SULWatcher.py b/SULWatcher/SULWatcher.py
index 0bf893f..6112b9a 100755
--- a/SULWatcher/SULWatcher.py
+++ b/SULWatcher/SULWatcher.py
@@ -53,7 +53,7 @@
self.cursor = self.db.cursor()
try:
self.cursor.execute(*args, **kwargs)
-except:
+except Exception:
# Nothing we can do now.
return None
@@ -192,7 +192,7 @@
self.msg('You have to follow the proper syntax. See '
'\x0302https://tools.wmflabs.org/stewardbots/'
'SULWatcher\x03', nick) # Make this translatable
-except:
+except Exception:
exceptionType, exceptionValue, exceptionTraceback =
sys.exc_info()
traceback.print_exception(
exceptionType, exceptionValue, exceptionTraceback)
@@ -234,7 +234,7 @@
self.msg('You have to follow the proper syntax. See '
'\x0302https://tools.wmflabs.org/stewardbots'
'/SULWatcher\x03', target)
-except:
+except Exception:
exceptionType, exceptionValue, exceptionTraceback =
sys.exc_info()
traceback.print_exception(
exceptionType, exceptionValue, exceptionTraceback)
@@ -288,7 +288,7 @@
sql = ('SELECT l_regex,l_user,l_timestamp FROM '
'logging ORDER BY l_id DESC LIMIT 1;')
result = db.do(sql)
-except:
+except Exception:
result = None
if result:
@@ -296,7 +296,7 @@
try:
timestamp = time.strftime('%H:%M, %d %B %Y',
time.strptime(r['l_timestamp'], '%Y%m%d%H%M%S'))
-except:
+except ValueError:
timestamp = r['l_timestamp']
self.msg(u'MySQL connection seems to be fine. Last hit '
'was %s matching %s at %s.'
@@ -470,19 +470,19 @@
rcreader.connection.part(rcreader.rcfeed)
rcreader.connection.quit()
rcreader.disconnect()
-except:
+except Exception:
raise BotConnectionError("RC reader didn't disconnect")
try:
bot1.connection.part(bot1.channel, rawquitmsg)
bot1.connection.quit(rawquitmsg)
bot1.disconnect()
-except:
+except Exception:
raise BotConnectionError("bot1 didn't disconnect")
try:
bot2.connection.part(bot2.channel, rawquitmsg)
bot2.connection.quit(rawquitmsg)
bot2.disconnect()
-except:
+except Exception:
raise BotConnectionError("bot2 didn't disconnect")
print 'Killed. Now exiting...'
# sys.exit(0) # 0 is a normal exit status
@@ -501,7 +501,7 @@
rcreader.connection.quit()
rcreader.disconnect()
BotThread(rcreader).start()
-except:
+except Exception:
raise BotConnectionError("rcreader didn't recover: %s
%s %s"
% (sys.exc_info()[1],
sys.exc_info()[1],
@@ -511,7 +511,7 @@
bot1.connection.quit()
bot1.disconnect()
Bo
[MediaWiki-commits] [Gerrit] mediawiki...BatchUserRights[master]: Follow-up on I5688099c
MarcoAurelio has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391932 )
Change subject: Follow-up on I5688099c
..
Follow-up on I5688099c
Add COPYING and license statements for BatchUserRights
Change-Id: Ifec87114ac49091565be61841de13e1f4e4d2169
---
M BatchUserRights.alias.php
M BatchUserRights.php
M BatchUserRights_body.php
A COPYING
4 files changed, 731 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BatchUserRights
refs/changes/32/391932/1
diff --git a/BatchUserRights.alias.php b/BatchUserRights.alias.php
index 19e2d25..e74199e 100644
--- a/BatchUserRights.alias.php
+++ b/BatchUserRights.alias.php
@@ -1,5 +1,24 @@
http://www.gnu.org/licenses/>.
+ */
+
+/**
* Aliases for Special:BatchUserRights
*
* @file
diff --git a/BatchUserRights.php b/BatchUserRights.php
index 5995da3..50ecf1e 100644
--- a/BatchUserRights.php
+++ b/BatchUserRights.php
@@ -1,5 +1,24 @@
http://www.gnu.org/licenses/>.
+ */
+
+/**
* Special page to allow adding user group membership to a large number of
users at once.
* (such as adding a couple of hundred people to the "beta" user group).
*
@@ -9,7 +28,6 @@
* @author Sean Colombo
* @link http://www.mediawiki.org/wiki/Extension:BatchUserRights Documentation
*/
-
if ( function_exists( 'wfLoadExtension' ) ) {
wfLoadExtension( 'BatchUserRights' );
// Keep i18n globals so mergeMessageFileList.php doesn't break
diff --git a/BatchUserRights_body.php b/BatchUserRights_body.php
index 08b5efd..cadef15 100644
--- a/BatchUserRights_body.php
+++ b/BatchUserRights_body.php
@@ -1,5 +1,24 @@
http://www.gnu.org/licenses/>.
+ */
+
+/**
* A class to manage user levels rights.
*
* @file
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..1f62cce
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "nfsmount: Add temporary exception to the block-for-e...
Madhuvishy has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391906 )
Change subject: Revert "nfsmount: Add temporary exception to the
block-for-export check"
..
Revert "nfsmount: Add temporary exception to the block-for-export check"
This reverts commit bf8557d4450b1cecf33577c5cea743b5be1d74dd.
Change-Id: Ib4ce462fcdd0b9a1fbafa47eb3d67b82ec7052a9
---
M modules/labstore/manifests/nfs_mount.pp
1 file changed, 15 insertions(+), 21 deletions(-)
Approvals:
Madhuvishy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labstore/manifests/nfs_mount.pp
b/modules/labstore/manifests/nfs_mount.pp
index 6fc0af6..a722f89 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -130,30 +130,24 @@
if ($ensure == 'present') and mount_nfs_volume($project, $mount_name) {
-# This project!=testlabs check is a super temporary check put in place
to
-# test new VM images that include alternative functionality to block
until
-# all the mounts are available, that would deprecate the following
showmount
-# based mechanism if it works correctly.
-# TODO: Revert this check after testing (T174590)
-if ($project != 'testlabs') {
-if $block {
-if !defined(File['/usr/local/sbin/block-for-export']) {
-# This script will block until the NFS volume is available
-file { '/usr/local/sbin/block-for-export':
-ensure => present,
-owner => 'root',
-group => 'root',
-mode => '0555',
-source =>
'puppet:///modules/labstore/block-for-export',
-}
-}
-exec { "block-for-nfs-${name}":
-command => "/usr/local/sbin/block-for-export ${server}
project/${project} ${block_timeout}",
-require => [File['/etc/modprobe.d/nfs-no-idmap.conf'],
File['/usr/local/sbin/block-for-export']],
-unless => "/bin/mountpoint -q ${mount_path}",
+if $block {
+if !defined(File['/usr/local/sbin/block-for-export']) {
+# This script will block until the NFS volume is available
+file { '/usr/local/sbin/block-for-export':
+ensure => present,
+owner => 'root',
+group => 'root',
+mode => '0555',
+source => 'puppet:///modules/labstore/block-for-export',
}
}
+exec { "block-for-nfs-${name}":
+command => "/usr/local/sbin/block-for-export ${server}
project/${project} ${block_timeout}",
+require => [File['/etc/modprobe.d/nfs-no-idmap.conf'],
File['/usr/local/sbin/block-for-export']],
+unless => "/bin/mountpoint -q ${mount_path}",
+}
}
+
# 'present' is meant to manage only the status of entries in /etc/fstab
# a notable exception to this is in the case of an entry managed as
'present'
# puppet will attempt to remount that entry when options change /but/
only
--
To view, visit https://gerrit.wikimedia.org/r/391906
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4ce462fcdd0b9a1fbafa47eb3d67b82ec7052a9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy
Gerrit-Reviewer: Madhuvishy
Gerrit-Reviewer: Rush
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...crm[deployment]: Remove vendor from deploy branch .gitignore
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391919 ) Change subject: Remove vendor from deploy branch .gitignore .. Remove vendor from deploy branch .gitignore Change-Id: I69c035641d39fa2168c7972bb286fb096bd2dc22 --- M .gitignore 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 05da681..4b6290c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ sites/default/*settings.php !sites/default/default.settings.php sites/default/files -vendor .version-stamp sites/default/civicrm/extensions/cache sites/default/civicrm/extensions/org.wikimedia.omnimail/vendor -- To view, visit https://gerrit.wikimedia.org/r/391919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I69c035641d39fa2168c7972bb286fb096bd2dc22 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: 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] wikimedia...crm[deployment]: Remove vendor from deploy branch .gitignore
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391919 ) Change subject: Remove vendor from deploy branch .gitignore .. Remove vendor from deploy branch .gitignore Change-Id: I69c035641d39fa2168c7972bb286fb096bd2dc22 --- M .gitignore 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/19/391919/1 diff --git a/.gitignore b/.gitignore index 05da681..4b6290c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ sites/default/*settings.php !sites/default/default.settings.php sites/default/files -vendor .version-stamp sites/default/civicrm/extensions/cache sites/default/civicrm/extensions/org.wikimedia.omnimail/vendor -- To view, visit https://gerrit.wikimedia.org/r/391919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I69c035641d39fa2168c7972bb286fb096bd2dc22 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Summary: Use underlying page tid when constructing etag
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391917 )
Change subject: Summary: Use underlying page tid when constructing etag
..
Summary: Use underlying page tid when constructing etag
Change-Id: Ica53c871a68c07944f79e227b80a225274eba4f3
---
M routes/mobile-sections.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index b61484d..2196f41 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -411,7 +411,7 @@
res.status(summary.code);
if (summary.code === 200) {
delete summary.code;
-mUtil.setETag(res, summary.revision);
+mUtil.setETag(res, summary.revision, summary.tid);
mUtil.setContentType(res, mUtil.CONTENT_TYPES.summary);
res.send(JSON.stringify(summary));
}
--
To view, visit https://gerrit.wikimedia.org/r/391917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica53c871a68c07944f79e227b80a225274eba4f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway
Gerrit-Reviewer: BearND
Gerrit-Reviewer: Fjalapeno
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Mhurd
Gerrit-Reviewer: Ppchelko
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...mobileapps[master]: Media: allow revision and tid params
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391918 )
Change subject: Media: allow revision and tid params
..
Media: allow revision and tid params
Also use the underlying page tid in the etag.
Change-Id: I986543a4c5996e6f97435c78bc4c9e2ca9179bb1
---
M routes/media.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/18/391918/1
diff --git a/routes/media.js b/routes/media.js
index 7275d50..cba003b 100644
--- a/routes/media.js
+++ b/routes/media.js
@@ -14,7 +14,7 @@
* GET {domain}/v1/page/media/{title}
* Gets the media items associated with the given page.
*/
-router.get('/media/:title', (req, res) => {
+router.get('/media/:title/:revision?/:tid?', (req, res) => {
return BBPromise.props({
page: parsoid.pageHtmlPromise(app, req),
media: media.collectionPromise(app, req),
@@ -24,7 +24,7 @@
media.sort(response.page.html, response.media, response.siteinfo);
}
res.status(200);
-mUtil.setETag(res, response.page.meta.revision);
+mUtil.setETag(res, response.page.meta.revision,
response.page.meta.tid);
mUtil.setContentType(res, mUtil.CONTENT_TYPES.unpublished);
res.json(response.media).end();
});
--
To view, visit https://gerrit.wikimedia.org/r/391918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I986543a4c5996e6f97435c78bc4c9e2ca9179bb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update civicrm to match deployment
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391915 ) Change subject: Update civicrm to match deployment .. Update civicrm to match deployment Oops, only updated the submodule on deployment on Tuesday. Change-Id: I32bc5a8ea6c978e2150045a8e63227771dcdcf1d --- M civicrm 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/civicrm b/civicrm index 456c342..c07b083 16 --- a/civicrm +++ b/civicrm @@ -1 +1 @@ -Subproject commit 456c34246ba8c90caa5c13a66196fb2b455f5bca +Subproject commit c07b083b5f7221febaba0133a2360869f1ef6022 -- To view, visit https://gerrit.wikimedia.org/r/391915 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32bc5a8ea6c978e2150045a8e63227771dcdcf1d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master 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] wikimedia...crm[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391916 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 0afb394 Update donation-interface with debug code for orphanslayer Change-Id: I2f4d0927731ee9e12c7b1d8e5f0136c921cfe0f6 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/391916 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2f4d0927731ee9e12c7b1d8e5f0136c921cfe0f6 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Mepps 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] mediawiki...mobileapps[master]: Summary: Use underlying page tid when constructing etag
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391917 )
Change subject: Summary: Use underlying page tid when constructing etag
..
Summary: Use underlying page tid when constructing etag
Change-Id: Ica53c871a68c07944f79e227b80a225274eba4f3
---
M routes/mobile-sections.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/17/391917/1
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index b61484d..2196f41 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -411,7 +411,7 @@
res.status(summary.code);
if (summary.code === 200) {
delete summary.code;
-mUtil.setETag(res, summary.revision);
+mUtil.setETag(res, summary.revision, summary.tid);
mUtil.setContentType(res, mUtil.CONTENT_TYPES.summary);
res.send(JSON.stringify(summary));
}
--
To view, visit https://gerrit.wikimedia.org/r/391917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica53c871a68c07944f79e227b80a225274eba4f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
Mepps has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391916 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 0afb394 Update donation-interface with debug code for orphanslayer Change-Id: I2f4d0927731ee9e12c7b1d8e5f0136c921cfe0f6 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/16/391916/1 -- To view, visit https://gerrit.wikimedia.org/r/391916 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f4d0927731ee9e12c7b1d8e5f0136c921cfe0f6 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm 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...crm[master]: Update civicrm to match deployment
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391915 ) Change subject: Update civicrm to match deployment .. Update civicrm to match deployment Oops, only updated the submodule on deployment on Tuesday. Change-Id: I32bc5a8ea6c978e2150045a8e63227771dcdcf1d --- M civicrm 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/15/391915/1 diff --git a/civicrm b/civicrm index 456c342..c07b083 16 --- a/civicrm +++ b/civicrm @@ -1 +1 @@ -Subproject commit 456c34246ba8c90caa5c13a66196fb2b455f5bca +Subproject commit c07b083b5f7221febaba0133a2360869f1ef6022 -- To view, visit https://gerrit.wikimedia.org/r/391915 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32bc5a8ea6c978e2150045a8e63227771dcdcf1d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update donation-interface with debug code for orphanslayer
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391913 )
Change subject: Update donation-interface with debug code for orphanslayer
..
Update donation-interface with debug code for orphanslayer
Change-Id: I53063d3e67998e1696dcdaa690e1e5b06dde
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mepps: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 34f7606..9336700 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2045,7 +2045,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "39a903423d7c430e7c6c684eeb24d29d4f071999"
+"reference": "0b70d246f754b456d6f04180f9bb02f528910f0d"
},
"require": {
"addshore/psr-6-mediawiki-bagostuff-adapter": "0.1",
@@ -2087,7 +2087,7 @@
"GPL-2.0"
],
"description": "Wikimedia Foundation payment processing library",
-"time": "2017-11-07T15:32:55+00:00"
+"time": "2017-11-16 16:31:29"
},
{
"name": "wikimedia/omnimail-silverpop",
--
To view, visit https://gerrit.wikimedia.org/r/391913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I53063d3e67998e1696dcdaa690e1e5b06dde
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Mepps
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] translatewiki[master]: Archive the ActivityMonitor extension
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391903 ) Change subject: Archive the ActivityMonitor extension .. Archive the ActivityMonitor extension Bug: T180631 Change-Id: Id78519347b6afca74b255e2c2c869c37b52d9ddc --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index ecf9035..e6d8c58 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -42,9 +42,6 @@ Active Abstract -Activity Monitor -aliasfile = ActivityMonitor/ActivityMonitor.i18n.alias.php - Ad Manager aliasfile = AdManager/AdManager.alias.php -- To view, visit https://gerrit.wikimedia.org/r/391903 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id78519347b6afca74b255e2c2c869c37b52d9ddc Gerrit-PatchSet: 2 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: Raimond Spekking 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...crm[master]: Update donation-interface with debug code for orphanslayer
Mepps has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391913 )
Change subject: Update donation-interface with debug code for orphanslayer
..
Update donation-interface with debug code for orphanslayer
Change-Id: I53063d3e67998e1696dcdaa690e1e5b06dde
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/13/391913/1
diff --git a/composer.lock b/composer.lock
index 34f7606..9336700 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2045,7 +2045,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "39a903423d7c430e7c6c684eeb24d29d4f071999"
+"reference": "0b70d246f754b456d6f04180f9bb02f528910f0d"
},
"require": {
"addshore/psr-6-mediawiki-bagostuff-adapter": "0.1",
@@ -2087,7 +2087,7 @@
"GPL-2.0"
],
"description": "Wikimedia Foundation payment processing library",
-"time": "2017-11-07T15:32:55+00:00"
+"time": "2017-11-16 16:31:29"
},
{
"name": "wikimedia/omnimail-silverpop",
--
To view, visit https://gerrit.wikimedia.org/r/391913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53063d3e67998e1696dcdaa690e1e5b06dde
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Mepps
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: API: Fix extmetadatafilter
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391910 )
Change subject: API: Fix extmetadatafilter
..
API: Fix extmetadatafilter
Filtering extmetadata values with extmetadatafilter currently isn't
working[1] because ApiQueryVideoInfo isn't correctly passing through
options when calling parent::getInfo. This brings them into harmony.
[1] Compare:
https://en.wikipedia.org/w/api.php?action=query&titles=File:Folgers.ogv&prop=imageinfo&iiprop=extmetadata&iiextmetadatafilter=DateTime
vs.
https://en.wikipedia.org/w/api.php?action=query&titles=File:Folgers.ogv&prop=videoinfo&viprop=extmetadata&viextmetadatafilter=DateTime
Change-Id: I57305524419caea316466aefb22b4e43fc8f9727
---
M ApiQueryVideoInfo.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/10/391910/1
diff --git a/ApiQueryVideoInfo.php b/ApiQueryVideoInfo.php
index 0acf987..76d57e9 100644
--- a/ApiQueryVideoInfo.php
+++ b/ApiQueryVideoInfo.php
@@ -21,8 +21,8 @@
parent::__construct( $query, $moduleName, $prefix );
}
- public static function getInfo( $file, $prop, $result, $thumbParams =
null, $version = 'latest' ) {
- $vals = parent::getInfo( $file, $prop, $result, $thumbParams );
+ public static function getInfo( $file, $prop, $result, $thumbParams =
null, $opts = false ) {
+ $vals = parent::getInfo( $file, $prop, $result, $thumbParams,
$opts );
if ( isset( $prop['derivatives'] ) ) {
if ( $file->getHandler() && $file->getHandler()
instanceof TimedMediaHandler ) {
$vals['derivatives'] =
WebVideoTranscode::getSources( $file, [ 'fullurl' ] );
--
To view, visit https://gerrit.wikimedia.org/r/391910
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57305524419caea316466aefb22b4e43fc8f9727
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Mholloway
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Duplicator[master]: Fixed specialpage messages not getting rendered correctly
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/379493 )
Change subject: Fixed specialpage messages not getting rendered correctly
..
Fixed specialpage messages not getting rendered correctly
=> Needs cherry-picks to REL1_30, REL1_29, REL1_28, REL1_27
Change-Id: Icc8a7db7c3ed2106dd6bf0abba03f8300db9c555
---
M Duplicator.page.php
1 file changed, 13 insertions(+), 13 deletions(-)
Approvals:
Mglaser: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Duplicator.page.php b/Duplicator.page.php
index d41bce0..56c290b 100644
--- a/Duplicator.page.php
+++ b/Duplicator.page.php
@@ -116,13 +116,13 @@
$num = $this->duplicate( $this->sourceTitle, $this->destTitle,
$this->history );
if( $num ) {
$success = Html::openElement( 'ul' ) .
- Html::element( 'li',
+ Html::rawElement( 'li',
array(),
$this->msg( 'duplicator-success',
$this->sourceTitle->getPrefixedText(),
$this->destTitle->getPrefixedText()
- )->plain() . ' ' .
- $this->msg(
'duplicator-success-revisions' )->numParams( $num )->plain()
+ )->parse() . ' ' .
+ $this->msg(
'duplicator-success-revisions' )->numParams( $num )->text()
);
# If there are subpages and we've been asked to
duplicate them, do so
@@ -135,20 +135,20 @@
$dt = $this->destTitle->getTalkPage();
$num = $this->duplicate( $st, $dt,
$this->history );
if ( $num ) {
- $success .= Html::element( 'li',
+ $success .= Html::rawElement( 'li',
array(),
$this->msg(
'duplicator-success',
$st->getPrefixedText(),
$dt->getPrefixedText()
- )->plain() . ' ' .
- $this->msg(
'duplicator-success-revisions' )->numParams( $num )->plain()
+ )->parse() . ' ' .
+ $this->msg(
'duplicator-success-revisions' )->numParams( $num )->text()
);
if ( $this->subpages ) {
$success .=
$this->duplicateSubpages( $st, $dt, $this->history );
}
} else {
- $success .= Html::element( 'li',
array(), $this->msg( 'duplicator-success-talknotcopied' )->plain() );
+ $success .= Html::rawElement( 'li',
array(), $this->msg( 'duplicator-success-talknotcopied' )->text() );
}
}
@@ -255,29 +255,29 @@
$destSub = Title::makeTitleSafe( $ns, $dest . substr(
$sub->getText(), $len ) );
if ( $destSub ) {
if ( $destSub->exists() ) {
- $success .= Html::element( 'li',
+ $success .= Html::rawElement( 'li',
array(),
$this->msg(
'duplicator-failed-dest-exists',
$sub->getPrefixedText(),
$destSub->getPrefixedText()
- )->plain()
+ )->parse()
);
} else {
$num = $this->duplicate( $sub,
$destSub, $this->history );
- $success .= Html::element( 'li',
+ $success .= Html::rawElement( 'li',
array(),
$this->msg(
'duplicator-success',
$sub->getPrefixedText(),
$destSub->getPrefix
[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update wikimedia/equivset (1.0.0 => 1.2.0)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391875 ) Change subject: Update wikimedia/equivset (1.0.0 => 1.2.0) .. Update wikimedia/equivset (1.0.0 => 1.2.0) Version bumped to make use of new character mappings Bug: T179834 Change-Id: I7f74ec4b282ee3e888cf58b86fba1cca1d57e1c8 --- M composer.json M composer.lock M composer/autoload_classmap.php M composer/autoload_static.php M composer/installed.json M wikimedia/equivset/COPYING R wikimedia/equivset/README.md M wikimedia/equivset/data/equivset.in M wikimedia/equivset/dist/equivset.json M wikimedia/equivset/dist/equivset.ser M wikimedia/equivset/dist/equivset.txt D wikimedia/equivset/phpunit.xml M wikimedia/equivset/src/Command/GenerateEquivset.php M wikimedia/equivset/src/Equivset.php A wikimedia/equivset/src/EquivsetInterface.php 15 files changed, 491 insertions(+), 255 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified Dbarratt: Looks good to me, but someone else must approve -- To view, visit https://gerrit.wikimedia.org/r/391875 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f74ec4b282ee3e888cf58b86fba1cca1d57e1c8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Dmaza Gerrit-Reviewer: Dbarratt Gerrit-Reviewer: Dmaza Gerrit-Reviewer: Kaldari Gerrit-Reviewer: Legoktm Gerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[fundraising/REL1_27]: Updated DI with latest commits
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391894 ) Change subject: Updated DI with latest commits .. Updated DI with latest commits Change-Id: I2c547dc7d9e394c52d5e4b0e05a64e8aefa16699 --- M extensions/DonationInterface 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/DonationInterface b/extensions/DonationInterface index e46f409..f03cbc2 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface @@ -1 +1 @@ -Subproject commit e46f40932dab08a49b6fca8ca913d5d748416a1e +Subproject commit f03cbc2c9431624afcac7ef60d1ce1a6ac7cc408 -- To view, visit https://gerrit.wikimedia.org/r/391894 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2c547dc7d9e394c52d5e4b0e05a64e8aefa16699 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Mepps 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] operations/puppet[production]: add rsync settings for labstore1007, fallback web/rsyncer
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391909 ) Change subject: add rsync settings for labstore1007, fallback web/rsyncer .. add rsync settings for labstore1007, fallback web/rsyncer Change-Id: I60f858aaa0682019c0351ab8e24d77afc4d59169 --- A hieradata/hosts/labstore1007.yaml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/labstore1007.yaml b/hieradata/hosts/labstore1007.yaml new file mode 100644 index 000..c74bbdb --- /dev/null +++ b/hieradata/hosts/labstore1007.yaml @@ -0,0 +1,5 @@ +profile::dumps::rsyncer: + dumps_user: 'dumpsgen' + dumps_group: 'dumpsgen' + dumps_deploygroup: 'wikidev' + dumps_mntpoint: '/srv/dumps' -- To view, visit https://gerrit.wikimedia.org/r/391909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I60f858aaa0682019c0351ab8e24d77afc4d59169 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn Gerrit-Reviewer: ArielGlenn 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]: add rsync settings for labstore1007, fallback web/rsyncer
ArielGlenn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391909 ) Change subject: add rsync settings for labstore1007, fallback web/rsyncer .. add rsync settings for labstore1007, fallback web/rsyncer Change-Id: I60f858aaa0682019c0351ab8e24d77afc4d59169 --- A hieradata/hosts/labstore1007.yaml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/09/391909/1 diff --git a/hieradata/hosts/labstore1007.yaml b/hieradata/hosts/labstore1007.yaml new file mode 100644 index 000..c74bbdb --- /dev/null +++ b/hieradata/hosts/labstore1007.yaml @@ -0,0 +1,5 @@ +profile::dumps::rsyncer: + dumps_user: 'dumpsgen' + dumps_group: 'dumpsgen' + dumps_deploygroup: 'wikidev' + dumps_mntpoint: '/srv/dumps' -- To view, visit https://gerrit.wikimedia.org/r/391909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I60f858aaa0682019c0351ab8e24d77afc4d59169 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Allow users to cancel/pause/resume the downloading process w...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/388269 )
Change subject: Allow users to cancel/pause/resume the downloading process when
syncing - Use BroadcastReceiver to receive the actions from notification bar
- For < API19, use regular activity to receive the cancel action from
notification bar - When login / syncing,
..
Allow users to cancel/pause/resume the downloading process when syncing
- Use BroadcastReceiver to receive the actions from notification bar
- For < API19, use regular activity to receive the cancel action from
notification bar
- When login / syncing, the notification bar will be displayed.
Please follow the QA steps on Phabricator
Bug: T177518
Change-Id: If53a948051a30fe76e3a164b03c1167271fa7f1a
---
M app/src/main/AndroidManifest.xml
M app/src/main/java/org/wikipedia/Constants.java
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/login/LoginActivity.java
M app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java
M app/src/main/java/org/wikipedia/readinglist/page/ReadingListPage.java
M
app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
M app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
A app/src/main/java/org/wikipedia/savedpages/SavedPageSyncBroadcastReceiver.java
A app/src/main/java/org/wikipedia/savedpages/SavedPageSyncNotification.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
M app/src/main/java/org/wikipedia/util/MathUtil.java
A app/src/main/res/drawable/ic_cancel_black_24dp.xml
A app/src/main/res/drawable/ic_file_download_white_24dp.xml
A app/src/main/res/drawable/ic_pause_black_24dp.xml
A app/src/main/res/drawable/ic_play_arrow_black_24dp.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
19 files changed, 454 insertions(+), 23 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 02b4856..e01cd5d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -346,5 +346,9 @@
android:name=".savedpages.SavedPageSyncService"
android:permission="android.permission.BIND_JOB_SERVICE" />
+
+
+
+
diff --git a/app/src/main/java/org/wikipedia/Constants.java
b/app/src/main/java/org/wikipedia/Constants.java
index 8d42d6e..8f26db9 100644
--- a/app/src/main/java/org/wikipedia/Constants.java
+++ b/app/src/main/java/org/wikipedia/Constants.java
@@ -36,6 +36,9 @@
public static final String INTENT_EXTRA_REVERT_QNUMBER = "revertQNumber";
public static final String INTENT_EXTRA_DELETE_READING_LIST =
"deleteReadingList";
+public static final String INTENT_EXTRA_NOTIFICATION_SYNC_PAUSE =
"syncPause";
+public static final String INTENT_EXTRA_NOTIFICATION_SYNC_CANCEL =
"syncCancel";
+
public static final int PROGRESS_BAR_MAX_VALUE = 10_000;
public static final int MAX_SUGGESTION_RESULTS = 3;
diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index 0e805cf..1b0a2e9 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -198,7 +198,7 @@
public void onReceive(Context context, Intent intent) {
if (DeviceUtil.isOnline()) {
onGoOnline();
-ReadingListSynchronizer.instance().syncSavedPages();
+ReadingListSynchronizer.instance().syncSavedPages(true);
} else {
onGoOffline();
}
@@ -220,7 +220,7 @@
}
@Subscribe public void on(NetworkConnectEvent event) {
-ReadingListSynchronizer.instance().syncSavedPages();
+ReadingListSynchronizer.instance().syncSavedPages(false);
}
@Subscribe public void on(ThemeChangeEvent event) {
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index afacfa9..e4ba419 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -154,7 +154,7 @@
getCallback().updateToolbarElevation(shouldElevateToolbar());
}
-ReadingListSynchronizer.instance().sync();
+ReadingListSynchronizer.instance().sync(true);
return view;
}
diff --git a/app/src/main/java/org/wikipedia/login/LoginActivity.java
b/app/src/main/java/org/wikipedia/login/LoginActivity.java
index 5960daa..dc0c012 100644
--- a/app/src/main/java/org/wikipedia/login/LoginActivity.java
+++ b/app/src/main/
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Follow-up to reading list sync notification.
Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391908 )
Change subject: Follow-up to reading list sync notification.
..
Follow-up to reading list sync notification.
Sorry, it started with a few tweaks, but then got a little more extensive...
This simplifies the logic and the code. Just a little bit.
Please take note of the changes for future tasks.
Change-Id: I2272e629d8248620b03f98404ca7afbc8a7d47b0
---
M app/src/main/AndroidManifest.xml
M app/src/main/java/org/wikipedia/Constants.java
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/login/LoginActivity.java
M app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java
M
app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
M app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
D app/src/main/java/org/wikipedia/savedpages/SavedPageSyncBroadcastReceiver.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncNotification.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
M app/src/main/res/values/strings.xml
12 files changed, 165 insertions(+), 318 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/08/391908/1
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e01cd5d..b8b4e95 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -346,9 +346,7 @@
android:name=".savedpages.SavedPageSyncService"
android:permission="android.permission.BIND_JOB_SERVICE" />
-
-
-
+
diff --git a/app/src/main/java/org/wikipedia/Constants.java
b/app/src/main/java/org/wikipedia/Constants.java
index 8f26db9..96846f2 100644
--- a/app/src/main/java/org/wikipedia/Constants.java
+++ b/app/src/main/java/org/wikipedia/Constants.java
@@ -36,7 +36,7 @@
public static final String INTENT_EXTRA_REVERT_QNUMBER = "revertQNumber";
public static final String INTENT_EXTRA_DELETE_READING_LIST =
"deleteReadingList";
-public static final String INTENT_EXTRA_NOTIFICATION_SYNC_PAUSE =
"syncPause";
+public static final String INTENT_EXTRA_NOTIFICATION_SYNC_PAUSE_RESUME =
"syncPauseResume";
public static final String INTENT_EXTRA_NOTIFICATION_SYNC_CANCEL =
"syncCancel";
public static final int PROGRESS_BAR_MAX_VALUE = 10_000;
diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index 1b0a2e9..0e805cf 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -198,7 +198,7 @@
public void onReceive(Context context, Intent intent) {
if (DeviceUtil.isOnline()) {
onGoOnline();
-ReadingListSynchronizer.instance().syncSavedPages(true);
+ReadingListSynchronizer.instance().syncSavedPages();
} else {
onGoOffline();
}
@@ -220,7 +220,7 @@
}
@Subscribe public void on(NetworkConnectEvent event) {
-ReadingListSynchronizer.instance().syncSavedPages(false);
+ReadingListSynchronizer.instance().syncSavedPages();
}
@Subscribe public void on(ThemeChangeEvent event) {
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index e4ba419..afacfa9 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -154,7 +154,7 @@
getCallback().updateToolbarElevation(shouldElevateToolbar());
}
-ReadingListSynchronizer.instance().sync(true);
+ReadingListSynchronizer.instance().sync();
return view;
}
diff --git a/app/src/main/java/org/wikipedia/login/LoginActivity.java
b/app/src/main/java/org/wikipedia/login/LoginActivity.java
index dc0c012..5960daa 100644
--- a/app/src/main/java/org/wikipedia/login/LoginActivity.java
+++ b/app/src/main/java/org/wikipedia/login/LoginActivity.java
@@ -242,7 +242,7 @@
hideSoftKeyboard(LoginActivity.this);
setResult(RESULT_LOGIN_SUCCESS);
-ReadingListSynchronizer.instance().sync(true);
+ReadingListSynchronizer.instance().sync();
finish();
} else if (result.fail()) {
String message = result.getMessage();
diff --git
a/app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java
b/app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java
index dda7fbd..0dd886b 100644
--- a/app/src/main/jav
[MediaWiki-commits] [Gerrit] operations...dcat[master]: Add PHP linter
Hashar has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390999 )
Change subject: Add PHP linter
..
Add PHP linter
Hapilly pass 'php -l' against all .php files.
Also prevent unwanted executable flag on files (minus-x).
Usage:
composer install
composer test
Bug: T180328
Depends-On: I817e6f8eca26bd4669818219faba86aaf5338100
Change-Id: I0b3f5a62dcc0ba4978cce8ad0cc46f9700843726
---
M .gitignore
M README.md
A composer.json
3 files changed, 33 insertions(+), 0 deletions(-)
Approvals:
Lokal Profil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 2ccbe46..47e36d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/node_modules/
+/vendor/
+/composer.lock
diff --git a/README.md b/README.md
index 6c7d169..9deab40 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,20 @@
file.
* To lint translations files: npm install && npm test.
+## Linting
+
+We use various utilities to lint this repository. You would first want to get
+the dependencies:
+```
+composer install
+npm install
+```
+Then run the tests:
+```
+composer test
+npm test
+```
+
## Config
Below follows a key by key explanation of the config file.
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..d6ff8c8
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,17 @@
+{
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "mediawiki/mediawiki-codesniffer": "14.1.0",
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "mediawiki/minus-x": "0.2.0"
+ },
+ "scripts": {
+ "fix": [
+ "minus-x fix ."
+ ],
+ "test": [
+ "parallel-lint . --exclude vendor --exclude
node_modules",
+ "minus-x check ."
+ ]
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/390999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b3f5a62dcc0ba4978cce8ad0cc46f9700843726
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/dcat
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: ArielGlenn
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Lokal Profil
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]: Set blocker in unit tests
Anomie has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391907 ) Change subject: Set blocker in unit tests .. Set blocker in unit tests MediaWiki core is going to start rejecting blocks without a valid blocker, so make sure one is supplied. Change-Id: I9293fd6e0f958d87e52965de925046f1bb8f8a50 --- M tests/phpunit/Collection/RevisionCollectionPermissionsTest.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/07/391907/1 diff --git a/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php b/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php index 2bfb688..84b12d0 100644 --- a/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php +++ b/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php @@ -89,6 +89,7 @@ $blockedUser = $this->blockedUser(); $this->block = new Block( [ 'address' => $blockedUser->getName(), + 'by' => $this->getTestSysop()->getUser()->getId(), 'user' => $blockedUser->getID() ] ); $this->block->insert(); -- To view, visit https://gerrit.wikimedia.org/r/391907 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9293fd6e0f958d87e52965de925046f1bb8f8a50 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Anomie ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "nfsmount: Add temporary exception to the block-for-e...
Hello Rush, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/391906
to review the following change.
Change subject: Revert "nfsmount: Add temporary exception to the
block-for-export check"
..
Revert "nfsmount: Add temporary exception to the block-for-export check"
This reverts commit bf8557d4450b1cecf33577c5cea743b5be1d74dd.
Change-Id: Ib4ce462fcdd0b9a1fbafa47eb3d67b82ec7052a9
---
M modules/labstore/manifests/nfs_mount.pp
1 file changed, 15 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/391906/1
diff --git a/modules/labstore/manifests/nfs_mount.pp
b/modules/labstore/manifests/nfs_mount.pp
index 5ee1bad..c0ad900 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -130,30 +130,24 @@
if ($ensure == 'present') and mount_nfs_volume($project, $mount_name) {
-# This project!=testlabs check is a super temporary check put in place
to
-# test new VM images that include alternative functionality to block
until
-# all the mounts are available, that would deprecate the following
showmount
-# based mechanism if it works correctly.
-# TODO: Revert this check after testing (T174590)
-if ($project != 'testlabs') {
-if $block {
-if !defined(File['/usr/local/sbin/block-for-export']) {
-# This script will block until the NFS volume is available
-file { '/usr/local/sbin/block-for-export':
-ensure => present,
-owner => 'root',
-group => 'root',
-mode => '0555',
-source =>
'puppet:///modules/labstore/block-for-export',
-}
-}
-exec { "block-for-nfs-${name}":
-command => "/usr/local/sbin/block-for-export ${server}
project/${project} ${block_timeout}",
-require => [File['/etc/modprobe.d/nfs-no-idmap.conf'],
File['/usr/local/sbin/block-for-export']],
-unless => "/bin/mountpoint -q ${mount_path}",
+if $block {
+if !defined(File['/usr/local/sbin/block-for-export']) {
+# This script will block until the NFS volume is available
+file { '/usr/local/sbin/block-for-export':
+ensure => present,
+owner => 'root',
+group => 'root',
+mode => '0555',
+source => 'puppet:///modules/labstore/block-for-export',
}
}
+exec { "block-for-nfs-${name}":
+command => "/usr/local/sbin/block-for-export ${server}
project/${project} ${block_timeout}",
+require => [File['/etc/modprobe.d/nfs-no-idmap.conf'],
File['/usr/local/sbin/block-for-export']],
+unless => "/bin/mountpoint -q ${mount_path}",
+}
}
+
# 'present' is meant to manage only the status of entries in /etc/fstab
# a notable exception to this is in the case of an entry managed as
'present'
# puppet will attempt to remount that entry when options change /but/
only
--
To view, visit https://gerrit.wikimedia.org/r/391906
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4ce462fcdd0b9a1fbafa47eb3d67b82ec7052a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy
Gerrit-Reviewer: Rush
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[fundraising/REL1_27]: Merge branch 'REL1_27' into fundraising/REL1_27
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391904 ) Change subject: Merge branch 'REL1_27' into fundraising/REL1_27 .. Merge branch 'REL1_27' into fundraising/REL1_27 9c035bdba9 Add missing ComposerVendorHtaccessCreator class to autoload.php 1d43e13ec7 Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71 225ddf757c Shorten git hashes for eval-stdin.php d859f3441f Fix phpcs issues from LanguageConverter patches 3d7debe94c Ignore long git hashes for eval-stdin.php c29fb9ac5c Fix LanguageSrTest for language converter f68f9cf3f7 Fix langauge converter parser test with self-close tags cc61b621e3 Remove $wgAuth usage from wrapOldPasswords.php Change-Id: I318c59b4e7cbaf21a536506836e5c0f000168061 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/391904 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I318c59b4e7cbaf21a536506836e5c0f000168061 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] operations/puppet[production]: add labstore1006 to list of hosts for rolling rsync of xml/s...
ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391905 )
Change subject: add labstore1006 to list of hosts for rolling rsync of xml/sql
dumps
..
add labstore1006 to list of hosts for rolling rsync of xml/sql dumps
Bug: T171541
Change-Id: I0f2de0c7c1e50f367af32211a9e8a3024c9117f0
---
M modules/profile/manifests/dumps/generation/server/primary.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/391905/1
diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp
b/modules/profile/manifests/dumps/generation/server/primary.pp
index 5f516ca..b5d48b7 100644
--- a/modules/profile/manifests/dumps/generation/server/primary.pp
+++ b/modules/profile/manifests/dumps/generation/server/primary.pp
@@ -8,6 +8,6 @@
class { '::dumps::generation::server::rsyncer':
dumpsdir => '/data/xmldatadumps',
-remotedirs =>
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/',
+remotedirs =>
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/,labstore1006.wikimedia.org::data/xmldatadumps/public/',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/391905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f2de0c7c1e50f367af32211a9e8a3024c9117f0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn
___
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]: Merge branch 'REL1_27' into fundraising/REL1_27
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391904 ) Change subject: Merge branch 'REL1_27' into fundraising/REL1_27 .. Merge branch 'REL1_27' into fundraising/REL1_27 9c035bdba9 Add missing ComposerVendorHtaccessCreator class to autoload.php 1d43e13ec7 Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71 225ddf757c Shorten git hashes for eval-stdin.php d859f3441f Fix phpcs issues from LanguageConverter patches 3d7debe94c Ignore long git hashes for eval-stdin.php c29fb9ac5c Fix LanguageSrTest for language converter f68f9cf3f7 Fix langauge converter parser test with self-close tags cc61b621e3 Remove $wgAuth usage from wrapOldPasswords.php Change-Id: I318c59b4e7cbaf21a536506836e5c0f000168061 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/04/391904/1 -- To view, visit https://gerrit.wikimedia.org/r/391904 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I318c59b4e7cbaf21a536506836e5c0f000168061 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] translatewiki[master]: Archive the ActivityMonitor extension
MarcoAurelio has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391903 ) Change subject: Archive the ActivityMonitor extension .. Archive the ActivityMonitor extension Bug: T180631 Change-Id: Id78519347b6afca74b255e2c2c869c37b52d9ddc --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/03/391903/1 -- To view, visit https://gerrit.wikimedia.org/r/391903 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id78519347b6afca74b255e2c2c869c37b52d9ddc Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: MarcoAurelio ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: enable dump rsyncs to/from labstore1006
ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391263 )
Change subject: enable dump rsyncs to/from labstore1006
..
enable dump rsyncs to/from labstore1006
Prep for labstore1006 to become the public datasets
webserver.
While this will configure labstore1006 so that it may
receive rsync requests (pulls or pushes) for various
misc datasets, it does not enable them now.
The only thing that will be rsynced to the host at this
stage are the xml/sql dumps.
Bug: T171541
Change-Id: Iee2e5a70cd3181568dd3bf47507a45887b004fc5
---
A hieradata/hosts/labstore1006.yaml
M modules/role/manifests/dumps/public/server.pp
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/labstore1006.yaml
b/hieradata/hosts/labstore1006.yaml
new file mode 100644
index 000..c74bbdb
--- /dev/null
+++ b/hieradata/hosts/labstore1006.yaml
@@ -0,0 +1,5 @@
+profile::dumps::rsyncer:
+ dumps_user: 'dumpsgen'
+ dumps_group: 'dumpsgen'
+ dumps_deploygroup: 'wikidev'
+ dumps_mntpoint: '/srv/dumps'
diff --git a/modules/role/manifests/dumps/public/server.pp
b/modules/role/manifests/dumps/public/server.pp
index 9f15bb6..e4bb83d 100644
--- a/modules/role/manifests/dumps/public/server.pp
+++ b/modules/role/manifests/dumps/public/server.pp
@@ -2,6 +2,7 @@
system::role { 'dumps::public::server': description => 'labstore host in
the public VLAN that serves Dumps to clients via NFS/Web/Rsync' }
include ::standard
-
+include ::profile::base::firewall
include ::profile::dumps::public_server
+include ::profile::dumps::rsyncer
}
--
To view, visit https://gerrit.wikimedia.org/r/391263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee2e5a70cd3181568dd3bf47507a45887b004fc5
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn
Gerrit-Reviewer: ArielGlenn
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Madhuvishy
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]: Archive the ActivityMonitor extension
MarcoAurelio has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391902 ) Change subject: Archive the ActivityMonitor extension .. Archive the ActivityMonitor extension Bug: T180631 Change-Id: I2697522af51f43ff992273a8621da914b078cc42 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/02/391902/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index fa7da86..236d958 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2752,8 +2752,7 @@ - name: mediawiki/extensions/ActivityMonitor template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/AddMessages template: -- To view, visit https://gerrit.wikimedia.org/r/391902 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2697522af51f43ff992273a8621da914b078cc42 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use Remex in Sanitizer::stripAllTags()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391348 )
Change subject: Use Remex in Sanitizer::stripAllTags()
..
Use Remex in Sanitizer::stripAllTags()
Using a real HTML tokenizer fixes bugs when < or > appear in attribute
values. The old implementation used delimiterReplace(), which didn't
handle this case:
> print Sanitizer::stripAllTags( 'Hello' );
c">Hello
We also can't use PHP's built-in strip_tags() because it doesn't handle
print strip_tags('123');
1
> print strip_tags('123');
1
Bug: T179978
Change-Id: I53b98e6c877c00c03ff110914168b398559c9c3e
---
M autoload.php
A includes/parser/RemexStripTagHandler.php
M includes/parser/Sanitizer.php
M tests/phpunit/includes/parser/SanitizerTest.php
4 files changed, 57 insertions(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/autoload.php b/autoload.php
index 2f6fbda..3f5a3c1 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1218,6 +1218,7 @@
'RefreshLinks' => __DIR__ . '/maintenance/refreshLinks.php',
'RefreshLinksJob' => __DIR__ .
'/includes/jobqueue/jobs/RefreshLinksJob.php',
'RegexlikeReplacer' => __DIR__ .
'/includes/libs/replacers/RegexlikeReplacer.php',
+ 'RemexStripTagHandler' => __DIR__ .
'/includes/parser/RemexStripTagHandler.php',
'RemoveInvalidEmails' => __DIR__ .
'/maintenance/removeInvalidEmails.php',
'RemoveUnusedAccounts' => __DIR__ .
'/maintenance/removeUnusedAccounts.php',
'RenameDbPrefix' => __DIR__ . '/maintenance/renameDbPrefix.php',
diff --git a/includes/parser/RemexStripTagHandler.php
b/includes/parser/RemexStripTagHandler.php
new file mode 100644
index 000..2839147
--- /dev/null
+++ b/includes/parser/RemexStripTagHandler.php
@@ -0,0 +1,40 @@
+text;
+ }
+
+ function startDocument( Tokenizer $t, $fns, $fn ) {
+ // Do nothing.
+ }
+ function endDocument( $pos ) {
+ // Do nothing.
+ }
+ function error( $text, $pos ) {
+ // Do nothing.
+ }
+ function characters( $text, $start, $length, $sourceStart,
$sourceLength ) {
+ $this->text .= substr( $text, $start, $length );
+ }
+ function startTag( $name, Attributes $attrs, $selfClose, $sourceStart,
$sourceLength ) {
+ // Do nothing.
+ }
+ function endTag( $name, $sourceStart, $sourceLength ) {
+ // Do nothing.
+ }
+ function doctype( $name, $public, $system, $quirks, $sourceStart,
$sourceLength ) {
+ // Do nothing.
+ }
+ function comment( $text, $sourceStart, $sourceLength ) {
+ // Do nothing.
+ }
+}
diff --git a/includes/parser/Sanitizer.php b/includes/parser/Sanitizer.php
index 4c99677..7c9f563 100644
--- a/includes/parser/Sanitizer.php
+++ b/includes/parser/Sanitizer.php
@@ -1967,17 +1967,22 @@
* Warning: this return value must be further escaped for literal
* inclusion in HTML output as of 1.10!
*
-* @param string $text HTML fragment
+* @param string $html HTML fragment
* @return string
*/
- static function stripAllTags( $text ) {
- # Actual
- $text = StringUtils::delimiterReplace( '<', '>', '', $text );
+ static function stripAllTags( $html ) {
+ // Use RemexHtml to tokenize $html and extract the text
+ $handler = new RemexStripTagHandler;
+ $tokenizer = new RemexHtml\Tokenizer\Tokenizer( $handler,
$html, [
+ 'ignoreErrors' => true,
+ // don't ignore char refs, we want them to be decoded
+ 'ignoreNulls' => true,
+ 'skipPreprocess' => true,
+ ] );
+ $tokenizer->execute();
+ $text = $handler->getResult();
- # Normalize &entities and whitespace
- $text = self::decodeCharReferences( $text );
$text = self::normalizeWhitespace( $text );
-
return $text;
}
diff --git a/tests/phpunit/includes/parser/SanitizerTest.php
b/tests/phpunit/includes/parser/SanitizerTest.php
index 269575b..d7e72e1 100644
--- a/tests/phpunit/includes/parser/SanitizerTest.php
+++ b/tests/phpunit/includes/parser/SanitizerTest.php
@@ -530,11 +530,10 @@
[ 'FooBar', 'FooBar' ],
[ "Foo\nBar", 'Foo Bar' ],
[ 'Hello world
café', 'Hello world café' ],
- // This one is broken, see T179978
- //[
- // 'quux\'>Bar Whee!',
- // 'Bar Whee!'
- //],
+ [
+ 'quux\'>Bar Whee!',
+
