[MediaWiki-commits] [Gerrit] Break up DataSender query types by cluster - change (mediawiki...CirrusSearch)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265221
Change subject: Break up DataSender query types by cluster
..
Break up DataSender query types by cluster
I'm not entirely sure if this makes sense, but send_data_write accounts
for the largest % of time of any particular query type on the cluster.
I was thinking it might be more clear if/what is an issue if we break
it up by cluster.
Change-Id: I197eb36c5d9d2b61833d378e0207ccf4f163a3e0
---
M includes/DataSender.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/21/265221/1
diff --git a/includes/DataSender.php b/includes/DataSender.php
index 14f687e..223e026 100644
--- a/includes/DataSender.php
+++ b/includes/DataSender.php
@@ -161,7 +161,7 @@
$this->start( "sending {numBulk} documents to the
{indexType} index", array(
'numBulk' => $documentCount,
'indexType' => $indexType,
- 'queryType' => 'send_data_write',
+ 'queryType' => 'send_data_write_' .
$this->connection->getClusterName(),
) );
$bulk = new \Elastica\Bulk(
$this->connection->getClient() );
if ( $shardTimeout ) {
@@ -228,7 +228,7 @@
$this->start( "deleting {numIds} from
{indexType}", array(
'numIds' => $idCount,
'indexType' => $indexType,
- 'queryType' => 'send_deletes',
+ 'queryType' => 'send_deletes_'
. $this->connection->getClusterName(),
) );
$this->connection->getPageType(
wfWikiId(), $indexType )->deleteIds( $ids );
$this->success();
@@ -288,7 +288,7 @@
try {
$this->start( "updating {numBulk} documents in
other indexes", array(
'numBulk' => count( $updates ),
- 'queryType' =>
'send_data_other_idx_write',
+ 'queryType' =>
'send_data_other_idx_write_' . $this->connection->getClusterName(),
) );
$bulk->send();
} catch ( \Elastica\Exception\Bulk\ResponseException $e
) {
--
To view, visit https://gerrit.wikimedia.org/r/265221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I197eb36c5d9d2b61833d378e0207ccf4f163a3e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update SemanticMediaWiki for Id90fc09a - change (mediawiki/core)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/265220 Change subject: Update SemanticMediaWiki for Id90fc09a .. Update SemanticMediaWiki for Id90fc09a Change-Id: Iefd7d86423000ba080d0db0500dbf79ee3e81901 --- M extensions/SemanticMediaWiki 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/20/265220/1 diff --git a/extensions/SemanticMediaWiki b/extensions/SemanticMediaWiki index fe26107..11b78aa 16 --- a/extensions/SemanticMediaWiki +++ b/extensions/SemanticMediaWiki -Subproject commit fe261079e43003f0f67be71ec210e7c699f5dcd4 +Subproject commit 11b78aaee54050341b977333f55a27410c054a0e -- To view, visit https://gerrit.wikimedia.org/r/265220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefd7d86423000ba080d0db0500dbf79ee3e81901 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.27.0-wmf.10 Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace wfMsg*() usages in 1.8.x branch for WMF usages - change (mediawiki...SemanticMediaWiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace wfMsg*() usages in 1.8.x branch for WMF usages
..
Replace wfMsg*() usages in 1.8.x branch for WMF usages
Bug: T123583
Bug: T123599
Change-Id: Id90fc09a3fc88cbf52e666c10784a6efae432800
---
M includes/articlepages/SMW_ConceptPage.php
M includes/articlepages/SMW_PropertyPage.php
M includes/datavalues/SMW_DataValue.php
M specials/QueryPages/SMW_SpecialTypes.php
M specials/Statistics/SMW_SpecialStatistics.php
5 files changed, 12 insertions(+), 10 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/articlepages/SMW_ConceptPage.php
b/includes/articlepages/SMW_ConceptPage.php
index c518f05..e28162f 100644
--- a/includes/articlepages/SMW_ConceptPage.php
+++ b/includes/articlepages/SMW_ConceptPage.php
@@ -59,7 +59,7 @@
$result = "\n" .
'' . wfMessage( 'smw_concept_header', $titleText
)->text() . "\n" .
- wfMsgExt( 'smw_conceptarticlecount', array( 'parsemag'
), $resultNumber ) .
+ wfMessage( 'smw_conceptarticlecount' )->numParams(
$resultNumber )->text() .
smwfEncodeMessages( $errors ) . "\n" .
$navigation . $pageLister->formatList() . $navigation .
"\n";
diff --git a/includes/articlepages/SMW_PropertyPage.php
b/includes/articlepages/SMW_PropertyPage.php
index 8eaf305..637b946 100644
--- a/includes/articlepages/SMW_PropertyPage.php
+++ b/includes/articlepages/SMW_PropertyPage.php
@@ -61,7 +61,7 @@
$result .= wfMessage( 'smw_isspecprop'
)->text() . ' ';
}
-$result .= wfMsgExt( 'smw_subpropertyarticlecount',
array( 'parsemag' ), $resultCount ) . "\n";
+$result .= wfMessage( 'smw_subpropertyarticlecount'
)->numParams( $resultCount )->text() . "\n";
if ( $resultCount < 6 ) {
$result .= SMWPageLister::getShortList( 0,
$resultCount, $subproperties, null );
@@ -111,7 +111,7 @@
$result .= wfMessage( 'smw_isspecprop'
)->text() . ' ';
}
- $result .= wfMsgExt( 'smw_attributearticlecount',
array( 'parsemag' ), $resultNumber ) . "\n" .
+ $result .= wfMessage( 'smw_attributearticlecount'
)->numParams( $resultNumber )->text() . "\n" .
$navigation . $this->subjectObjectList(
$diWikiPages ) . $navigation . "\n";
}
diff --git a/includes/datavalues/SMW_DataValue.php
b/includes/datavalues/SMW_DataValue.php
index fbbf29b..9abe78d 100644
--- a/includes/datavalues/SMW_DataValue.php
+++ b/includes/datavalues/SMW_DataValue.php
@@ -286,8 +286,7 @@
}
$args[0] = 'smw_service_' . str_replace( ' ', '_',
$dataItem->getString() ); // messages distinguish ' ' from '_'
- // @todo FIXME: Use wfMessage/Message class here.
- $text = call_user_func_array( 'wfMsgForContent', $args
);
+ $text = call_user_func_array( 'wfMessage', $args
)->inContentLanguage()->text();
$links = preg_split( "/[\n][\s]?/u", $text );
foreach ( $links as $link ) {
diff --git a/specials/QueryPages/SMW_SpecialTypes.php
b/specials/QueryPages/SMW_SpecialTypes.php
index 1250489..66bc8b8 100644
--- a/specials/QueryPages/SMW_SpecialTypes.php
+++ b/specials/QueryPages/SMW_SpecialTypes.php
@@ -91,7 +91,7 @@
$result .= "\n" .
'' . wfMessage( 'smw_type_header',
$typeName )->text() . "\n" .
- wfMsgExt( 'smw_typearticlecount',
array( 'parsemag' ), $resultNumber ) . "\n" .
+ wfMessage( 'smw_typearticlecount'
)->numParams( $resultNumber )->text() . "\n" .
$navigation . $pageLister->formatList() .
$navigation . "\n";
}
diff --git a/specials/Statistics/SMW_SpecialStatistics.php
b/specials/Statistics/SMW_SpecialStatistics.php
index 789e560..8bcd07a 100644
--- a/specials/Statistics/SMW_SpecialStatistics.php
+++ b/specials/Statistics/SMW_SpecialStatistics.php
@@ -33,10 +33,13 @@
)
);
- $out = wfMsgExt( 'smw_semstats_text', array( 'parse' ),
- $wgLang->formatNum( $semanticStatistics['PROPUSES'] ),
$wgLang->formatNum( $semanticStatistics['USEDPROPS'] ),
- $wgLang->formatNum( $propertyPageAmount ),
$wgLang->formatNum( $semanticStatistics['DECLPROPS'] )
- );
+ $out = wfMessage( 'smw_semstats_text' )
+ ->numParams(
+
[MediaWiki-commits] [Gerrit] [Flow] Update message key to ignore - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [Flow] Update message key to ignore .. [Flow] Update message key to ignore https://gerrit.wikimedia.org/r/#/c/263795/6/i18n/en.json,unified Change-Id: I120d4b8db1649e85784e68c2cd42eb9bf31c6653 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 5310aa0..4f618a8 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1048,7 +1048,8 @@ ignored = flow-rev-message-edit-post-recentchanges, flow-rev-message-edit-post-contributions ignored = flow-rev-message-reply-recentchanges, flow-rev-message-reply-contributions ignored = flow-rev-message-new-post-recentchanges, flow-rev-message-new-post-contributions -ignored = notification-header-flow-new-topic, notification-header-flow-post-reply, notification-header-flow-post-edited +ignored = notification-body-flow-new-topic-v2, notification-body-flow-post-reply-v2, notification-body-flow-post-edited-v2 +ignored = notification-body-flow-mention optional = flow-post-interaction-separator Flv Handler -- To view, visit https://gerrit.wikimedia.org/r/265218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I120d4b8db1649e85784e68c2cd42eb9bf31c6653 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove getCustomPrinter() from ApiJsonSchema - change (mediawiki...EventLogging)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265219
Change subject: Remove getCustomPrinter() from ApiJsonSchema
..
Remove getCustomPrinter() from ApiJsonSchema
Bug: T91454
Change-Id: If280a4056aa6a816774da25cc641dfbee2ac504e
---
M includes/ApiJsonSchema.php
M includes/RemoteSchema.php
2 files changed, 1 insertion(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/19/265219/1
diff --git a/includes/ApiJsonSchema.php b/includes/ApiJsonSchema.php
index ab4dea2..55f8a15 100644
--- a/includes/ApiJsonSchema.php
+++ b/includes/ApiJsonSchema.php
@@ -17,20 +17,6 @@
*/
class ApiJsonSchema extends ApiBase {
- /**
-* Restrict the set of valid formatters to just 'json' and 'jsonfm'.
Other
-* requested formatters are instead treated as 'json'.
-* @return ApiFormatJson
-*/
- public function getCustomPrinter() {
- if ( $this->getMain()->getVal( 'format' ) === 'jsonfm' ) {
- $format = 'jsonfm';
- } else {
- $format = 'json';
- }
- return $this->getMain()->createPrinterByName( $format );
- }
-
public function getAllowedParams() {
return array(
'revid' => array(
diff --git a/includes/RemoteSchema.php b/includes/RemoteSchema.php
index d4e3588..e952faf 100644
--- a/includes/RemoteSchema.php
+++ b/includes/RemoteSchema.php
@@ -125,6 +125,7 @@
'action' => 'jsonschema',
'revid' => $this->revision,
'formatversion' => 2,
+ 'format' => 'json',
) );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/265219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If280a4056aa6a816774da25cc641dfbee2ac504e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: wmf/1.27.0-wmf.11
Gerrit-Owner: Florianschmidtwelzow
Gerrit-Reviewer: IoannisKydonis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Flow] Update message key to ignore - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/265218 Change subject: [Flow] Update message key to ignore .. [Flow] Update message key to ignore https://gerrit.wikimedia.org/r/#/c/263795/6/i18n/en.json,unified Change-Id: I120d4b8db1649e85784e68c2cd42eb9bf31c6653 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/18/265218/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 5310aa0..4f618a8 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1048,7 +1048,8 @@ ignored = flow-rev-message-edit-post-recentchanges, flow-rev-message-edit-post-contributions ignored = flow-rev-message-reply-recentchanges, flow-rev-message-reply-contributions ignored = flow-rev-message-new-post-recentchanges, flow-rev-message-new-post-contributions -ignored = notification-header-flow-new-topic, notification-header-flow-post-reply, notification-header-flow-post-edited +ignored = notification-body-flow-new-topic-v2, notification-body-flow-post-reply-v2, notification-body-flow-post-edited-v2 +ignored = notification-body-flow-mention optional = flow-post-interaction-separator Flv Handler -- To view, visit https://gerrit.wikimedia.org/r/265218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I120d4b8db1649e85784e68c2cd42eb9bf31c6653 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Validator for I32b11c10 - change (mediawiki/core)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/265217 Change subject: Update Validator for I32b11c10 .. Update Validator for I32b11c10 Change-Id: I3729fd89919875a13c69a832d2d68ace1dd25fb9 --- M extensions/Validator 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/17/265217/1 diff --git a/extensions/Validator b/extensions/Validator index 1370a0e..1a49880 16 --- a/extensions/Validator +++ b/extensions/Validator -Subproject commit 1370a0ee1bf6f6b6f5bbb4fc58e21740006448ec +Subproject commit 1a49880cf68c8a890ca688156a53d19fc1a84ac3 -- To view, visit https://gerrit.wikimedia.org/r/265217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3729fd89919875a13c69a832d2d68ace1dd25fb9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.27.0-wmf.10 Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace wfMsg*() usages in 0.5.x branch for WMF usages - change (mediawiki...Validator)
Florianschmidtwelzow has submitted this change and it was merged.
Change subject: Replace wfMsg*() usages in 0.5.x branch for WMF usages
..
Replace wfMsg*() usages in 0.5.x branch for WMF usages
Bug: T123583
Bug: T123599
Change-Id: I32b11c1084d823e41d493b14c8dc9dd1c6178a9f
---
M includes/IParamDefinition.php
M includes/ItemParameterCriterion.php
M includes/Parameter.php
M includes/ParserHook.php
M includes/Validator.php
M includes/criteria/CriterionHasLength.php
M includes/criteria/CriterionInArray.php
M includes/criteria/CriterionInRange.php
M includes/criteria/CriterionIsFloat.php
M includes/criteria/CriterionIsInteger.php
M includes/criteria/CriterionIsNumeric.php
M includes/criteria/CriterionIsTitle.php
M includes/criteria/CriterionMatchesRegex.php
M includes/criteria/CriterionNotEmpty.php
M includes/definitions/ParamDefinition.php
M includes/parserHooks/Validator_Describe.php
M includes/parserHooks/Validator_ListErrors.php
17 files changed, 90 insertions(+), 105 deletions(-)
Approvals:
Florianschmidtwelzow: Verified; Looks good to me, approved
diff --git a/includes/IParamDefinition.php b/includes/IParamDefinition.php
index e5f0cf2..cb58ad9 100644
--- a/includes/IParamDefinition.php
+++ b/includes/IParamDefinition.php
@@ -220,7 +220,7 @@
/**
* Sets a message for the parameter that will act as description.
* This should be a message key, ie something that can be passed
-* to wfMsg. Not an actual text. If you do not have a message key,
+* to wfMessage. Not an actual text. If you do not have a message key,
* but only a text, use setDescription instead.
*
* @since 0.5
@@ -273,4 +273,4 @@
*/
public function trimDuringClean();
-}
\ No newline at end of file
+}
diff --git a/includes/ItemParameterCriterion.php
b/includes/ItemParameterCriterion.php
index 239a680..477cd31 100644
--- a/includes/ItemParameterCriterion.php
+++ b/includes/ItemParameterCriterion.php
@@ -144,7 +144,7 @@
* @return string
*/
protected function getFullListErrorMessage( Parameter $parameter ) {
- return wfMsgExt( 'validator-error-problem', 'parsemag',
$parameter->getOriginalName() );
+ return wfMessage( 'validator-error-problem',
$parameter->getOriginalName() )->text();
}
/**
@@ -163,12 +163,10 @@
global $wgLang;
return $this->getFullListErrorMessage( $parameter ) .
- wfMsgExt(
+ wfMessage(
'validator-error-omitted',
- 'parsemag',
- $wgLang->listToText( $invalidItems ),
- count( $invalidItems )
- );
+ $wgLang->listToText( $invalidItems )
+ )->numParams( count( $invalidItems ) )->text();
}
-}
\ No newline at end of file
+}
diff --git a/includes/Parameter.php b/includes/Parameter.php
index 0a051ee..8c0a78a 100644
--- a/includes/Parameter.php
+++ b/includes/Parameter.php
@@ -305,13 +305,12 @@
// TODO: fatal error
/*
$this->registerError(
- wfMsgExt(
+ wfMessage(
'validator-error-override-argument',
- 'parsemag',
$paramName,
$this->mParameters[$mainName]['original-value'],
is_array( $paramData )
? $paramData['original-value'] : $paramData
- ),
+ )->text(),
'override'
);
*/
@@ -492,9 +491,9 @@
public function getTypeMessage() {
global $wgLang;
- $message = wfMsg( 'validator-type-' . $this->type );
+ $message = wfMessage( 'validator-type-' . $this->type )->text();
return $this->isList() ?
- wfMsgExt( 'validator-describe-listtype', 'parsemag',
$message )
+ wfMessage( 'validator-describe-listtype', $message
)->text()
: $wgLang->ucfirst( $message );
}
@@ -799,7 +798,7 @@
*/
public function getDescription() {
if ( $this->description === false and $this->message !== false
) {
- return wfMsg( $this->mess
[MediaWiki-commits] [Gerrit] Fix Lybuns report logic to rely more on updated core report ... - change (wikimedia...crm)
Eileen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265216
Change subject: Fix Lybuns report logic to rely more on updated core report &
untilise enhancements
..
Fix Lybuns report logic to rely more on updated core report & untilise
enhancements
Details of this commit are hopefully well covered in the code comments and in
https://gerrit.wikimedia.org/r/#/c/265143/10
Bug: T123671
Change-Id: Ie4d970c6fbafb9dfb2137f408db806a49a02723a
---
M sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/WmfLybunt.php
1 file changed, 68 insertions(+), 339 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/16/265216/1
diff --git
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/WmfLybunt.php
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/WmfLybunt.php
index 54fbd49..3d6ade6 100644
--- a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/WmfLybunt.php
+++ b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/WmfLybunt.php
@@ -33,354 +33,83 @@
*/
/**
- * Extended LYBUNT report
+ * Extended LYBUNS report
*
- * Lots of extra columns,
- * TODO:
- * - do lybunt after limiting by contact group and other filters
+ * The functionality of this report is to alter the initial filtering query
such that the date
+ * calculation is based on the custom field last date not the last
contribution date.
+ *
+ * This field incorporates soft credits and direct donations so gives a more
nuanced result.
+ *
+ * However, in doing so it sacrifices it's Lybuntness and becomes a Lybuns.
Since we
+ * are looking at the last given date we cannot use this historically as a
Lybunt - although
+ * for the current year there will be no difference. ie. if I gave in 2013 and
2015 in a Lybunt
+ * I would show up on the 2014 and 2016 reports. For a Lybuns I would only
show up on the 2016 report
+ * because i gave since 2014.
+ *
+ * If this limitation is significant the options are to
+ * 1) accept Lybuns for Fiscal year and make this do a Lybunt for calendar
year - we have the
+ * custom fields already for that OR
+ * 2) create a new set of custom fields for fiscal years ie is_2014_5_donor.
+ * 3) Enhance the core Lybunt report to allow soft credits to be considered
when calculating last donation.
*/
class CRM_Report_Form_Contribute_WmfLybunt extends
CRM_Report_Form_Contribute_Lybunt {
+
+ /**
+ * Class constructor.
+ *
+ * Unset contribution related filters since we are restricted to the
pre-filtered custom fields.
+ */
public function __construct() {
-$yearsInPast = 10;
-$yearsInFuture = 1;
-$date = CRM_Core_SelectValues::date('custom', NULL, $yearsInPast,
$yearsInFuture);
-$count = $date['maxYear'];
-while ($date['minYear'] <= $count) {
- $optionYear[$date['minYear']] = $date['minYear'];
- $date['minYear']++;
-}
-
-$this->_columns = array(
- 'civicrm_contact' => array(
-'dao' => 'CRM_Contact_DAO_Contact',
-'grouping' => 'contact-field',
-'fields' => array(
- 'first_name' => array(
-'default' => TRUE,
- ),
- 'last_name' => array(
-'default' => TRUE,
- ),
- 'organization_name' => array(
-'default' => TRUE,
- ),
- 'do_not_email' => array(
-'default' => TRUE,
- ),
- 'do_not_phone' => array(
-'default' => TRUE,
- ),
- 'do_not_mail' => array(
-'default' => TRUE,
- ),
- 'do_not_sms' => array(
-'title' => ts('Do Not SMS'),
-'default' => TRUE,
- ),
- 'is_opt_out' => array(
-'title' => ts('No Bulk Emails'),
-'default' => TRUE,
- ),
- 'is_deceased' => array(
-'default' => TRUE,
- ),
-),
- ),
- 'civicrm_email' => array(
-'dao' => 'CRM_Core_DAO_Email',
-'grouping' => 'contact-field',
-'fields' => array(
- 'email' => array(
-'default' => TRUE,
- ),
- 'on_hold' => array(
-'default' => TRUE,
- ),
-),
- ),
- 'civicrm_address' => array(
-'dao' => 'CRM_Core_DAO_Address',
-'grouping' => 'contact-field',
-'fields' => array(
- 'street_address' => array(
-'default' => TRUE,
- ),
- 'city' => array(
-'default' => TRUE,
- ),
- 'postal_code' => array(
-'default' => TRUE,
- )
-),
- ),
- 'civicrm_state_province' => array(
-'dao' => 'CRM_Core_DAO_StateProvince',
-'fields' => array(
- 'name' => array(
-'title' => 'State/Province',
-'default' => TRUE,
- ),
-),
-'grouping' =>
[MediaWiki-commits] [Gerrit] Add support for showing warning messages in the header - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Add support for showing warning messages in the header
..
Add support for showing warning messages in the header
We used to have only error and success. But the message about
page already existing are warnings.
Change-Id: Ib882cfda33851ae8728db05f2cde87f546f5b0d3
---
M modules/header/ext.cx.header.js
M modules/header/styles/ext.cx.header.less
2 files changed, 18 insertions(+), 2 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/header/ext.cx.header.js b/modules/header/ext.cx.header.js
index 489338d..c0f3e38 100644
--- a/modules/header/ext.cx.header.js
+++ b/modules/header/ext.cx.header.js
@@ -76,6 +76,15 @@
};
/**
+* Show a warning message in the info bar.
+*
+* @param {mediawiki.Message|string} message Message objects are
parsed, strings are plain text.
+*/
+ ContentTranslationHeader.prototype.showWarning = function ( message ) {
+ this.showMessage( 'cx-warning', message );
+ };
+
+ /**
* Show an error message in the info bar.
* TODO: This error handling and display deserve its own module. Header
module is inappropriate.
*
@@ -107,7 +116,7 @@
this.$infoBar.find( '.details' ).empty().hide();
}
this.$infoBar
- .removeClass( 'cx-success cx-error' )
+ .removeClass( 'cx-success cx-error cx-warning' )
.addClass( type )
.show();
};
@@ -132,7 +141,7 @@
return;
}
- mw.hook( 'mw.cx.error' ).fire( mw.message(
+ mw.hook( 'mw.cx.warning' ).fire( mw.message(
'cx-translation-target-page-exists',
viewTargetUrl,
mw.cx.targetTitle
@@ -152,6 +161,7 @@
mw.hook( 'mw.cx.progress' ).add( $.proxy(
this.setPublishButtonState, this ) );
mw.hook( 'mw.cx.error' ).add( $.proxy( this.showError, this ) );
+ mw.hook( 'mw.cx.warning' ).add( $.proxy( this.showWarning, this
) );
mw.hook( 'mw.cx.success' ).add( $.proxy( this.showSuccess, this
) );
mw.hook( 'mw.cx.error.anonuser' ).add( $.proxy(
this.showLoginMessage, this ) );
mw.hook( 'mw.cx.translation.ready' ).add( $.proxy(
this.checkTargetTitle, this ) );
diff --git a/modules/header/styles/ext.cx.header.less
b/modules/header/styles/ext.cx.header.less
index 23f46b4..65d81ec 100644
--- a/modules/header/styles/ext.cx.header.less
+++ b/modules/header/styles/ext.cx.header.less
@@ -86,6 +86,12 @@
background-color: #e1fddf;
}
+ &.cx-warning {
+ color: #705000;
+ border-color: #fde29b;
+ background-color: #fdf1d1;
+ }
+
border-bottom: 1px solid #ddd;
font-size: large;
--
To view, visit https://gerrit.wikimedia.org/r/260547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib882cfda33851ae8728db05f2cde87f546f5b0d3
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ChangesListSpecialPage::getLegend caller - change (mediawiki...RecentActivityFeed)
jenkins-bot has submitted this change and it was merged. Change subject: Update ChangesListSpecialPage::getLegend caller .. Update ChangesListSpecialPage::getLegend caller Change-Id: Ia73ed94e0cc1a212c009670dd4e62307ac12c477 Depends-On: I1044c0f019daf27c5ce83d6c1363aaab499115bc --- M SpecialRecentActivityFeed.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialRecentActivityFeed.php b/SpecialRecentActivityFeed.php index 135938a..49c377f 100644 --- a/SpecialRecentActivityFeed.php +++ b/SpecialRecentActivityFeed.php @@ -147,7 +147,7 @@ $nondefaults = $opts->getChangedValues(); $panel = array(); - $panel[] = self::makeLegend( $this->getContext() ); + $panel[] = $this->makeLegend(); $panel[] = $this->optionsPanel( $defaults, $nondefaults ); $panelString = implode( "\n", $panel ); -- To view, visit https://gerrit.wikimedia.org/r/265020 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia73ed94e0cc1a212c009670dd4e62307ac12c477 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RecentActivityFeed Gerrit-Branch: master Gerrit-Owner: Reedy Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make ChangesListSpecialPage::getLegend non static - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Make ChangesListSpecialPage::getLegend non static
..
Make ChangesListSpecialPage::getLegend non static
Change-Id: I1044c0f019daf27c5ce83d6c1363aaab499115bc
---
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialWatchlist.php
3 files changed, 4 insertions(+), 6 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index 74842aa..13dffb4 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -421,13 +421,11 @@
/**
* Return the legend displayed within the fieldset
-* @todo This should not be static, then we can drop the parameter
-* @todo Not called by anything, should be called by doHeader()
*
-* @param IContextSource $context The object available as $this in
non-static functions
* @return string
*/
- public static function makeLegend( IContextSource $context ) {
+ public function makeLegend() {
+ $context = $this->getContext();
$user = $context->getUser();
# The legend showing what the letters and stuff mean
$legend = Html::openElement( 'dl' ) . "\n";
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index 4848d01..f030231 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -396,7 +396,7 @@
$nondefaults = $opts->getChangedValues();
$panel = array();
- $panel[] = self::makeLegend( $this->getContext() );
+ $panel[] = $this->makeLegend();
$panel[] = $this->optionsPanel( $defaults, $nondefaults,
$numRows );
$panel[] = '';
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index c894a79..7ab6578 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -605,7 +605,7 @@
array( 'id' => 'mw-watchlist-options' )
);
- $form .= SpecialRecentChanges::makeLegend( $this->getContext()
);
+ $form .= $this->makeLegend();
$this->getOutput()->addHTML( $form );
}
--
To view, visit https://gerrit.wikimedia.org/r/265017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1044c0f019daf27c5ce83d6c1363aaab499115bc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SelectFileWidget: Order name and type spans in the order the... - change (oojs/ui)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265215
Change subject: SelectFileWidget: Order name and type spans in the order they
are shown
..
SelectFileWidget: Order name and type spans in the order they are shown
Change-Id: Icbc7a5e05afcd742dab6d82050515e0e5317232f
---
M src/styles/widgets/SelectFileWidget.less
M src/widgets/SelectFileWidget.js
2 files changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/15/265215/1
diff --git a/src/styles/widgets/SelectFileWidget.less
b/src/styles/widgets/SelectFileWidget.less
index c3cb91c..7017681 100644
--- a/src/styles/widgets/SelectFileWidget.less
+++ b/src/styles/widgets/SelectFileWidget.less
@@ -54,6 +54,10 @@
right: 0;
text-overflow: ellipsis;
+ > .oo-ui-selectFileWidget-fileName {
+ float: left;
+ }
+
> .oo-ui-selectFileWidget-fileType {
float: right;
}
diff --git a/src/widgets/SelectFileWidget.js b/src/widgets/SelectFileWidget.js
index b7b0b35..d121dd4 100644
--- a/src/widgets/SelectFileWidget.js
+++ b/src/widgets/SelectFileWidget.js
@@ -209,10 +209,18 @@
if ( this.currentFile ) {
this.$element.removeClass(
'oo-ui-selectFileWidget-empty' );
$label = $( [] );
+ $label = $label.add(
+ $( '' )
+ .addClass(
'oo-ui-selectFileWidget-fileName' )
+ .text( this.currentFile.name )
+ );
if ( this.currentFile.type !== '' ) {
- $label = $label.add( $( '' ).addClass(
'oo-ui-selectFileWidget-fileType' ).text( this.currentFile.type ) );
+ $label = $label.add(
+ $( '' )
+ .addClass(
'oo-ui-selectFileWidget-fileType' )
+ .text( this.currentFile.type )
+ );
}
- $label = $label.add( $( '' ).text(
this.currentFile.name ) );
this.setLabel( $label );
} else {
this.$element.addClass( 'oo-ui-selectFileWidget-empty'
);
--
To view, visit https://gerrit.wikimedia.org/r/265215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbc7a5e05afcd742dab6d82050515e0e5317232f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add reference list to section preview if missing - change (mediawiki...Cite)
jenkins-bot has submitted this change and it was merged.
Change subject: Add reference list to section preview if missing
..
Add reference list to section preview if missing
For a section preview with missing tag,
add reference lists for each group.
Bug: T7984
Change-Id: I2ca1b62fc068b20b7df4b0af2e3e79535e656259
---
M Cite_body.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 27 insertions(+), 10 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Cite_body.php b/Cite_body.php
index e10d810..b40a12e 100644
--- a/Cite_body.php
+++ b/Cite_body.php
@@ -1073,6 +1073,8 @@
* section, if refs were used without a main references tag. If there
are references
* in a custom group, and there is no references tag for it, show an
error
* message for that group.
+* If we are processing a section preview, this adds the missing
+* references tags and does not add the errors.
*
* @param $afterParse bool true if called from the ParserAfterParse
hook
* @param $parser Parser
@@ -1094,15 +1096,12 @@
return true;
}
- if ( $parser->getOptions()->getIsSectionPreview() ) {
- return true;
- }
-
+ $isSectionPreview =
$parser->getOptions()->getIsSectionPreview();
foreach ( $this->mRefs as $group => $refs ) {
if ( !$refs ) {
continue;
}
- if ( $group === self::DEFAULT_GROUP ) {
+ if ( $group === self::DEFAULT_GROUP ||
$isSectionPreview ) {
$text .= $this->referencesFormat( $group, '',
'' );
} else {
$text .= "\n" .
@@ -1162,6 +1161,16 @@
* @return string XHTML or wikitext ready for output
*/
function error( $key, $param = null, $parse = 'parse' ) {
+ $decreaseToWarning = false;
+ if (
+ $this->mParser->getOptions()->getIsSectionPreview() &&
+ $key === 'cite_error_references_no_text'
+ ) {
+ // ref may be defined somewhere else on the page so use
distinct message
+ // and be less intrusive than in a real error
+ $key = 'cite_warning_sectionpreview_no_text';
+ $decreaseToWarning = true;
+ }
# We rely on the fact that PHP is okay with passing unused argu-
# ments to functions. If $1 is not used in the message,
wfMessage will
# just ignore the extra parameter.
@@ -1169,15 +1178,19 @@
# use the user language and split the parser cache.
$lang = $this->mParser->getOptions()->getUserLangObj();
$msg = wfMessage(
- 'cite_error',
+ $decreaseToWarning ? 'cite_warning' : 'cite_error',
wfMessage( $key, $param )->inLanguage( $lang )->plain()
)
->inLanguage( $lang )
->plain();
- $this->mParser->addTrackingCategory(
'cite-tracking-category-cite-error' );
+ if ( $decreaseToWarning ) {
+ $ret = '' .
$msg . '';
+ } else {
+ $this->mParser->addTrackingCategory(
'cite-tracking-category-cite-error' );
- $ret = '' . $msg .
'';
+ $ret = '' .
$msg . '';
+ }
if ( $parse === 'parse' ) {
$ret = $this->mParser->recursiveTagParse( $ret );
diff --git a/i18n/en.json b/i18n/en.json
index f47898f..2731396 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -52,5 +52,7 @@
"cite_references_link_accessibility_label": "Jump up",
"cite_references_link_many_accessibility_label": "Jump up to:",
"cite_references_prefix": "",
- "cite_references_suffix": ""
+ "cite_references_suffix": "",
+ "cite_warning": "Cite warning: $1",
+ "cite_warning_sectionpreview_no_text": " tag
with name $1 cannot be previewed because it is defined outside the
current section or not defined at all."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b9b3b2d..2f8bb3e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -52,5 +52,7 @@
"cite_references_link_accessibility_label": "Text for screen readers to
describe the jump to citation link (\"↑\").\n\nSee also:\n* {{msg-mw|Cite
references link many accessibility label}} - if the citation is used multiple
times",
"cite_references_link_many_accessibility_label": "Text for screen
readers to describe the jump to citation links (a b c ...
[MediaWiki-commits] [Gerrit] Fix npm link command - change (mediawiki...cxserver)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265214
Change subject: Fix npm link command
..
Fix npm link command
Reported at:
https://lists.wikimedia.org/pipermail/mediawiki-l/2016-January/045291.html
Change-Id: Ib86c687c4ede81501f857347e5ccf08e52bdcf78
---
M package.json
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver
refs/changes/14/265214/1
diff --git a/package.json b/package.json
index 13cdc49..c31c34a 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,9 @@
"docker-test": "service-runner docker-test",
"build": "service-runner build"
},
+ "bin": {
+ "cxserver": "./server.js"
+ },
"main": "./app.js",
"deploy": {
"target": "ubuntu",
--
To view, visit https://gerrit.wikimedia.org/r/265214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib86c687c4ede81501f857347e5ccf08e52bdcf78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update hostnames to analytics-store - change (analytics/geowiki)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265213
Change subject: Update hostnames to analytics-store
..
Update hostnames to analytics-store
Change-Id: I9b54b0898b2c99173f20edc66c23eda2d1c2dfd2
---
M geowiki/mysql_config.py
1 file changed, 8 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/geowiki
refs/changes/13/265213/1
diff --git a/geowiki/mysql_config.py b/geowiki/mysql_config.py
index efdfd1a..2b10d05 100644
--- a/geowiki/mysql_config.py
+++ b/geowiki/mysql_config.py
@@ -132,16 +132,15 @@
'kowiki': 's7',
}
-# new CNAME system.
-# TODO: abstract mapping to a use just number and then autogenerate CNAMES
aliases
+# all databases can be found on analytics-store
db_mapping = {
-'s1': 's1-analytics-slave.eqiad.wmnet',
-'s2': 's2-analytics-slave.eqiad.wmnet',
-'s3': 's3-analytics-slave.eqiad.wmnet',
-'s4': 's4-analytics-slave.eqiad.wmnet',
-'s5': 's5-analytics-slave.eqiad.wmnet',
-'s6': 's6-analytics-slave.eqiad.wmnet',
-'s7': 's7-analytics-slave.eqiad.wmnet',
+'s1': 'analytics-store.eqiad.wmnet',
+'s2': 'analytics-store.eqiad.wmnet',
+'s3': 'analytics-store.eqiad.wmnet',
+'s4': 'analytics-store.eqiad.wmnet',
+'s5': 'analytics-store.eqiad.wmnet',
+'s6': 'analytics-store.eqiad.wmnet',
+'s7': 'analytics-store.eqiad.wmnet',
}
--
To view, visit https://gerrit.wikimedia.org/r/265213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b54b0898b2c99173f20edc66c23eda2d1c2dfd2
Gerrit-PatchSet: 1
Gerrit-Project: analytics/geowiki
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] Deprecate and empty PHP entry point - change (mediawiki...BlueSky)
MtDu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265212
Change subject: Deprecate and empty PHP entry point
..
Deprecate and empty PHP entry point
Bug: T87875
Change-Id: I9e22abc91da068de9821582698a8df5efd0175a3
---
M BlueSky.php
1 file changed, 12 insertions(+), 192 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSky
refs/changes/12/265212/1
diff --git a/BlueSky.php b/BlueSky.php
index de8c6ff..c6eb8fd 100644
--- a/BlueSky.php
+++ b/BlueSky.php
@@ -1,193 +1,13 @@
- * @date 26 June 2015
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
- *
- * To install place the BlueSky folder (the folder containing this file!) into
- * skins/ and add this line to your wiki's LocalSettings.php:
- * require_once("$IP/skins/BlueSky/BlueSky.php");
- */
-
-// Skin credits that will show up on Special:Version
-$wgExtensionCredits['skin'][] = array(
- 'path' => __FILE__,
- 'name' => 'BlueSky',
- 'version' => '1.1',
- 'author' => array( 'wikiHow', 'Jack Phoenix' ),
- // @todo To be moved into the i18n file eventually once i18n is stable
enough.
- // No need to cause translators unnecessary extra work before I finalize
- // the description. (Suggestions for a better desc? Let me know!)
- 'description' => 'Skin based on the current version (late 2013-) of
wikiHow\'s skin',
- 'url' => 'https://www.mediawiki.org/wiki/Skin:BlueSky',
-);
-
-// The first instance must be strtolower()ed so that useskin=bluesky works and
-// so that it does *not* force an initial capital (i.e. we do NOT want
-// useskin=Bluesky) and the second instance is used to determine the name of
-// *this* file.
-$wgValidSkinNames['bluesky'] = 'BlueSky';
-
-// Autoload the skin class, set up i18n, set up CSS & JS (via ResourceLoader)
-$wgAutoloadClasses['SkinBlueSky'] = __DIR__ . '/BlueSky.skin.php';
-$wgAutoloadClasses['BlueSkyTemplate'] = __DIR__ . '/BlueSky.skin.php';
-$wgAutoloadClasses['SkinBlueSkyHooks'] = __DIR__ . '/BlueSky.hooks.php';
-
-$wgMessagesDirs['SkinBlueSky'] = __DIR__ . '/i18n';
-
-// Main CSS ResourceLoader module
-$wgResourceModules['skins.bluesky'] = array(
- 'styles' => array(
- // MonoBook also loads these
- 'resources/src/mediawiki.skinning/interface.css' => array(
'media' => 'screen' ),
- // Styles custom to this skin
- 'skins/BlueSky/resources/css/nonarticle.css' => array( 'media'
=> 'screen' ),
- 'skins/BlueSky/resources/css/searchresults.css' => array(
'media' => 'screen' ),
- 'skins/BlueSky/resources/css/special.css' => array( 'media' =>
'screen' ),
- 'skins/BlueSky/resources/css/printable.css' => array( 'media'
=> 'print' ),
- #'skins/BlueSky/resources/css/iphone.css' => array( 'media' =>
'only screen and (max-device-width: 480px)' ),
- ),
- 'position' => 'top'
-);
-
-// zzz prefix is a hack to ensure that this module is loaded after the main
-// skins.bluesky module
-$wgResourceModules['zzzskins.bluesky.mainpage'] = array(
- 'styles' => array(
- 'skins/BlueSky/resources/css/home.css' => array( 'media' =>
'screen' ),
- ),
- 'position' => 'top'
-);
-
-// LESS versions of things that used to be PHP-side core hacks
-$wgResourceModules['skins.bluesky.hacks.general'] = array(
- 'styles' => 'skins/BlueSky/resources/css/hacks/general.less',
- 'position' => 'top'
-);
-
-// Action-specific LESS hacks
-$wgResourceModules['skins.bluesky.hacks.action.delete'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.action.delete.less',
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.hacks.action.edit'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.action.edit.less',
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.hacks.action.history'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.action.history.less',
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.hacks.action.protect'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.action.protect.less',
- 'position' => 'top'
-);
-
-// Namespace-specific LESS hacks
-$wgResourceModules['skins.bluesky.hacks.filepage'] = array(
- 'styles' => 'skins/BlueSky/resources/css/hacks/mediawiki.filepage.less',
- 'position' => 'top'
-);
-
-// (Special) page-specific LESS hacks
-$wgResourceModules['skins.bluesky.hacks.special.log'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.special.log.less',
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.hacks.special.movepage'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.special.movepage.less',
- 'position' => 'to
[MediaWiki-commits] [Gerrit] Update dependencies - change (mediawiki...citoid)
Mobrovac has submitted this change and it was merged.
Change subject: Update dependencies
..
Update dependencies
Change-Id: I931b8c5f2ff12b1b307dbf69c80d5e222ac173bc
---
M package.json
1 file changed, 15 insertions(+), 15 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index b3d7a65..bd81e86 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
"coverage": "istanbul cover _mocha -- -R spec"
},
"dependencies": {
-"bluebird": "2.8.2",
-"body-parser": "1.14.1",
+"bluebird": "3.1.1",
+"body-parser": "1.14.2",
"bunyan": "1.5.1",
"cassandra-uuid": "0.0.2",
"cheerio": "0.19.0",
@@ -20,22 +20,22 @@
"content-type": "1.0.1",
"express": "4.13.3",
"extend": "3.0.0",
-"html-metadata": "1.2.1",
-"iconv-lite": "0.4.11",
-"ip": "1.0.1",
-"js-yaml": "3.4.3",
-"preq": "0.4.4",
-"request": "^2.58.0",
-"service-runner": "0.3.1",
-"tough-cookie": "2.0.0",
-"striptags": "2.0.3"
+"html-metadata": "1.4.1",
+"iconv-lite": "0.4.13",
+"ip": "1.1.0",
+"js-yaml": "3.5.2",
+"preq": "0.4.8",
+"request": "^2.67.0",
+"service-runner": "0.3.8",
+"tough-cookie": "2.2.1",
+"striptags": "2.1.1"
},
"devDependencies": {
-"istanbul": "0.3.22",
-"mocha": "2.3.3",
-"mocha-jshint": "2.2.3",
+"istanbul": "^0.4.2",
+"mocha": "^2.3.4",
+"mocha-jshint": "^2.2.6",
"mocha-lcov-reporter": "1.0.0",
-"swagger-router": "0.2.0"
+"swagger-router": "^0.3.4"
},
"deploy": {
"target": "ubuntu",
--
To view, visit https://gerrit.wikimedia.org/r/265211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I931b8c5f2ff12b1b307dbf69c80d5e222ac173bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: Mvolz
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update dependencies - change (mediawiki...citoid)
Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265211
Change subject: Update dependencies
..
Update dependencies
Change-Id: I931b8c5f2ff12b1b307dbf69c80d5e222ac173bc
---
M package.json
1 file changed, 15 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/11/265211/1
diff --git a/package.json b/package.json
index b3d7a65..bd81e86 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
"coverage": "istanbul cover _mocha -- -R spec"
},
"dependencies": {
-"bluebird": "2.8.2",
-"body-parser": "1.14.1",
+"bluebird": "3.1.1",
+"body-parser": "1.14.2",
"bunyan": "1.5.1",
"cassandra-uuid": "0.0.2",
"cheerio": "0.19.0",
@@ -20,22 +20,22 @@
"content-type": "1.0.1",
"express": "4.13.3",
"extend": "3.0.0",
-"html-metadata": "1.2.1",
-"iconv-lite": "0.4.11",
-"ip": "1.0.1",
-"js-yaml": "3.4.3",
-"preq": "0.4.4",
-"request": "^2.58.0",
-"service-runner": "0.3.1",
-"tough-cookie": "2.0.0",
-"striptags": "2.0.3"
+"html-metadata": "1.4.1",
+"iconv-lite": "0.4.13",
+"ip": "1.1.0",
+"js-yaml": "3.5.2",
+"preq": "0.4.8",
+"request": "^2.67.0",
+"service-runner": "0.3.8",
+"tough-cookie": "2.2.1",
+"striptags": "2.1.1"
},
"devDependencies": {
-"istanbul": "0.3.22",
-"mocha": "2.3.3",
-"mocha-jshint": "2.2.3",
+"istanbul": "^0.4.2",
+"mocha": "^2.3.4",
+"mocha-jshint": "^2.2.6",
"mocha-lcov-reporter": "1.0.0",
-"swagger-router": "0.2.0"
+"swagger-router": "^0.3.4"
},
"deploy": {
"target": "ubuntu",
--
To view, visit https://gerrit.wikimedia.org/r/265211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I931b8c5f2ff12b1b307dbf69c80d5e222ac173bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add sanity check to ensure mwscript is used in multiwiki setups - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Add sanity check to ensure mwscript is used in multiwiki setups
..
Add sanity check to ensure mwscript is used in multiwiki setups
Bug: T123143
Change-Id: Iaf9bf8d02d6e76dbe83d77cad9079cdf73ac844d
---
M puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
1 file changed, 17 insertions(+), 4 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
index 0039687..fdf8dfd 100644
--- a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
+++ b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
@@ -9,11 +9,26 @@
ini_set( 'error_append_string', ' (' . $_SERVER['SERVER_ADDR'] . ')' );
}
+include_once __DIR__ . '/LoadWgConf.php';
require_once '<%= @script_dir %>/MWMultiVersion.php';
+
+if ( count( $wgLocalDatabases ) > 1 && !class_exists( 'MWMultiVersion' ) ) {
+ print "The mwscript command must be used for maintenance scripts in
multiwiki setups.\n\n" .
+ "Try: mwscript " . $argv[0] . " --wiki=wiki " . implode( " ",
array_slice( $argv, 1 ) ) .
+ "\n";
+ exit(1);
+}
+
$multiVersion = MWMultiVersion::getInstance();
-if ( $multiVersion === null ) {
+// Use $_SERVER['argv'] here since $argv is modified by MWScript.php
+if ( $multiVersion === null && basename( $_SERVER['argv'][0] ) ===
'MWScript.php' ) {
// If MWMultiVersion has not been configured at this point,
- // setup configuration for the default wiki.
+ // the database was not found
+ print "Nonexistent database was specified.\n";
+ exit(1);
+}
+
+if ( $multiVersion === null ) {
$multiVersion = MWMultiVersion::initializeForWiki( '<%=
scope['::mediawiki::db_name'] %>' );
}
@@ -33,8 +48,6 @@
// This must be set *after* the DefaultSettings.php inclusion
$wgDBname = $multiVersion->getDatabase();
-
-include_once __DIR__ . '/LoadWgConf.php';
foreach(
array_merge(
--
To view, visit https://gerrit.wikimedia.org/r/264717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf9bf8d02d6e76dbe83d77cad9079cdf73ac844d
Gerrit-PatchSet: 13
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Unicornisaurous
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: Gergő Tisza
Gerrit-Reviewer: Unicornisaurous
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Search box can now be clicked on from pages which use Mobile... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Search box can now be clicked on from pages which use
MobileFrontend.js
..
Search box can now be clicked on from pages which use MobileFrontend.js
If the skin is minerva then carry out mobile specific code.
Bug: T108432
Change-Id: I956d5a042638deb3e36b640d70382389a059be8c
---
M resources/skins.minerva.scripts/search.js
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/skins.minerva.scripts/search.js
b/resources/skins.minerva.scripts/search.js
index c47665e..c068630 100644
--- a/resources/skins.minerva.scripts/search.js
+++ b/resources/skins.minerva.scripts/search.js
@@ -37,6 +37,12 @@
} );
}
+ // Only continue on mobile devices as it breaks desktop search
+ // See https://phabricator.wikimedia.org/T108432
+ if ( mw.config.get( 'skin' ) !== 'minerva' ) {
+ return;
+ }
+
// change the placeholder text for javascript enabled browsers
if ( context.isBetaGroupMember() ) {
searchPlaceholderMsg = 'mobile-frontend-placeholder-beta';
--
To view, visit https://gerrit.wikimedia.org/r/265124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I956d5a042638deb3e36b640d70382389a059be8c
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Mhutti1
Gerrit-Reviewer: D3r1ck
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support LocalUserCreated hook - change (mediawiki...NewUserMessage)
Dereckson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265210
Change subject: Support LocalUserCreated hook
..
Support LocalUserCreated hook
The AuthPluginAutoCreate hook is to be replaced by LocalUserCreated
(see T110282 for more context).
This change provides support for both manual and automatic accounts
created through the up to come AuthManager.
Bug: T110456
Change-Id: If4a435a74d7b30ef55e2c0d40d6e764e5b858a63
---
M NewUserMessage.class.php
M NewUserMessage.php
M extension.json
3 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NewUserMessage
refs/changes/10/265210/1
diff --git a/NewUserMessage.class.php b/NewUserMessage.class.php
index 6dce58a..8fc8cd0 100644
--- a/NewUserMessage.class.php
+++ b/NewUserMessage.class.php
@@ -205,12 +205,13 @@
/**
* Hook function to create a message on an auto-created user
* @param $user User object of the user
+* @param $autocreated bool
* @return bool
*/
- static function createNewUserMessageAutoCreated( $user ) {
+ static function onLocalUserCreated ( $user, $autocreated ) {
global $wgNewUserMessageOnAutoCreate;
- if ( $wgNewUserMessageOnAutoCreate ) {
+ if ( $wgNewUserMessageOnAutoCreate || !$autocreated ) {
self::createNewUserPages();
}
diff --git a/NewUserMessage.php b/NewUserMessage.php
index 6902ddb..096d5ce 100644
--- a/NewUserMessage.php
+++ b/NewUserMessage.php
@@ -13,5 +13,5 @@
wfLoadExtension( 'NewUserMessage' );
$wgMessagesDirs['NewUserMessage'] = __DIR__ . '/i18n';
} else {
- die( 'This version of the NewUserMessage extension requires MediaWiki
1.25+' );
+ die( 'This version of the NewUserMessage extension requires MediaWiki
1.26+' );
}
diff --git a/extension.json b/extension.json
index 3ed4a26..f434b0f 100644
--- a/extension.json
+++ b/extension.json
@@ -20,8 +20,8 @@
"AddNewAccount": [
"NewUserMessage::createNewUserPages"
],
- "AuthPluginAutoCreate": [
- "NewUserMessage::createNewUserMessageAutoCreated"
+ "LocalUserCreated": [
+ "NewUserMessage::onLocalUserCreated"
],
"UserGetReservedNames": [
"NewUserMessage::onUserGetReservedNames"
--
To view, visit https://gerrit.wikimedia.org/r/265210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4a435a74d7b30ef55e2c0d40d6e764e5b858a63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NewUserMessage
Gerrit-Branch: master
Gerrit-Owner: Dereckson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor: Allow fixDate() to swallow ISO dates as well - change (mediawiki...citoid)
Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265209
Change subject: Minor: Allow fixDate() to swallow ISO dates as well
..
Minor: Allow fixDate() to swallow ISO dates as well
Sometimes the results return ISO-styled dates, but these would not be
accepted because of the extra 'GMT+00' that we add at the end. This
patch does not add this suffix in case an ISO-style date is detected.
Change-Id: If1e9b1ed4a25014ba058d9ceae06eb626bf2e2df
---
M lib/Exporter.js
M test/features/unit/exporter.js
2 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/09/265209/1
diff --git a/lib/Exporter.js b/lib/Exporter.js
index 79bccfa..68b3214 100644
--- a/lib/Exporter.js
+++ b/lib/Exporter.js
@@ -485,7 +485,8 @@
*/
function fixDate(citation){
if (citation.date){
-var d = new Date(citation.date + ' GMT+00'); // Explicitly set TZ to
GMT for servers not running in GMT
+// Explicitly set TZ to GMT for servers not running in GMT
+var d = new Date(citation.date + (/[0-9]T[0-9]/.test(citation.date) ?
'' : ' GMT+00'));
if (isFinite(d)) {
citation.date = d.toISOString().split('T').shift();
} else {
diff --git a/test/features/unit/exporter.js b/test/features/unit/exporter.js
index 47239b9..4899e8d 100644
--- a/test/features/unit/exporter.js
+++ b/test/features/unit/exporter.js
@@ -66,6 +66,13 @@
result = exporter.fixDate({date:date});
assert.deepEqual(result, expected);
});
+
+it('ISO format in different TZ', function() {
+date = '2013-04-02T20:00:03-07:00';
+expected = {date: '2013-04-03'};
+result = exporter.fixDate({date:date});
+assert.deepEqual(result, expected);
+});
});
describe('fixISBN function: ', function() {
--
To view, visit https://gerrit.wikimedia.org/r/265209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1e9b1ed4a25014ba058d9ceae06eb626bf2e2df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Remove role inheritance from gridengine shadow - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265208
Change subject: toollabs: Remove role inheritance from gridengine shadow
..
toollabs: Remove role inheritance from gridengine shadow
Added include in the gridengine class instead
Change-Id: Ia8093cebeac53eb27a295bbafe862c50a3a04028
---
M manifests/role/labstools.pp
M modules/gridengine/manifests/shadow_master.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/265208/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 8da9543..d74dd09 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -23,7 +23,7 @@
system::role { 'role::labs::tools::master': description => 'Tool Labs
gridengine master' }
}
-class shadow inherits role::labs::tools::common {
+class shadow {
system::role { 'role::labs::tools::shadow': description => 'Tool Labs
gridengine shadow (backup) master' }
class { 'toollabs::shadow':
diff --git a/modules/gridengine/manifests/shadow_master.pp
b/modules/gridengine/manifests/shadow_master.pp
index ea6a7ef..bdd63fb 100644
--- a/modules/gridengine/manifests/shadow_master.pp
+++ b/modules/gridengine/manifests/shadow_master.pp
@@ -5,6 +5,7 @@
$sgeroot = '/var/lib/gridengine',
) {
+include ::gridengine
package { 'gridengine-master':
ensure => latest,
require => Package['gridengine-common'],
@@ -58,4 +59,3 @@
require => File['/etc/init/gridengine-shadow.conf',
"${sgeroot}/default/common/shadow_masters"],
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/265208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8093cebeac53eb27a295bbafe862c50a3a04028
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Remove inheritance from gridengine master role - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265207
Change subject: toollabs: Remove inheritance from gridengine master role
..
toollabs: Remove inheritance from gridengine master role
Add it to gridengine::master instead, since clearly you can't
have a gridengine master without gridengine
Change-Id: Ie9e00cb4b7c3b61664b06ab275d2dd393a3660c3
---
M manifests/role/labstools.pp
M modules/gridengine/manifests/master.pp
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/265207/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 5c39a9a..8da9543 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -17,7 +17,7 @@
system::role { 'role::labs::tools::compute': description => 'Tool Labs
compute node' }
}
-class master inherits role::labs::tools::common {
+class master {
include toollabs::master
system::role { 'role::labs::tools::master': description => 'Tool Labs
gridengine master' }
diff --git a/modules/gridengine/manifests/master.pp
b/modules/gridengine/manifests/master.pp
index 81b9344..5c46e63 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -1,7 +1,9 @@
# gridengine/master.pp
-class gridengine::master
-{
+class gridengine::master {
+
+include ::gridengine
+
package { 'gridengine-master':
ensure => latest,
require => Package['gridengine-common'],
--
To view, visit https://gerrit.wikimedia.org/r/265207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9e00cb4b7c3b61664b06ab275d2dd393a3660c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Move toolwatcher to services - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265206
Change subject: toollabs: Move toolwatcher to services
..
toollabs: Move toolwatcher to services
Bug: T123873
Change-Id: Iead399b3334063ae4c872f7f66272a74449ae41d
---
M manifests/role/labstools.pp
M modules/toollabs/manifests/toolwatcher.pp
2 files changed, 8 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/265206/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 96ea968..5c39a9a 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -49,6 +49,10 @@
class { 'toollabs::updatetools':
active => ($::fqdn == $active_host),
}
+
+class { 'toollabs::toolwatcher':
+active => ($::fqdn == $active_host)
+}
}
class checker {
@@ -104,14 +108,6 @@
include toollabs::redis
}
-
-class toolwatcher inherits role::labs::tools::common {
-system::role { 'role::labs::tools::toolwatcher':
-description => 'Tool Labs directory structure creator for new
tools',
-}
-include toollabs::toolwatcher
-}
-
##
## NOTE: Those roles are transitional, and should be removed
## from Wikitech entirely in favor of role::labs::tools::compute
diff --git a/modules/toollabs/manifests/toolwatcher.pp
b/modules/toollabs/manifests/toolwatcher.pp
index c5f86e1..9374773 100644
--- a/modules/toollabs/manifests/toolwatcher.pp
+++ b/modules/toollabs/manifests/toolwatcher.pp
@@ -3,7 +3,9 @@
# yet. For each such tool account, the toolwatcher creates the home
# directory with the subdirectory public_html owned by the tool
# account and its group and sets the permissions to g+srwx,o+rx.
-class toollabs::toolwatcher inherits toollabs {
+class toollabs::toolwatcher(
+$active,
+) inherits toollabs {
file { '/usr/local/sbin/toolwatcher':
source => 'puppet:///modules/toollabs/toolwatcher',
owner => 'root',
@@ -21,7 +23,7 @@
}
service { 'toolwatcher':
-ensure=> running,
+ensure=> ensure_service($active),
provider => 'upstart',
subscribe => File['/etc/init/toolwatcher.conf'],
}
--
To view, visit https://gerrit.wikimedia.org/r/265206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iead399b3334063ae4c872f7f66272a74449ae41d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Remove role inheritance from static hosts - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265202
Change subject: tools: Remove role inheritance from static hosts
..
tools: Remove role inheritance from static hosts
These don't even need gridengine
Change-Id: I287fc3ff4b3b7d1ee96483f80d2862fb74e620a8
---
M manifests/role/labstools.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/265202/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 5823901..3e0a289 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -82,7 +82,7 @@
system::role { 'role::labs::tools::proxy': description => 'Tool labs
generic web proxy' }
}
-class static inherits role::labs::tools::common {
+class static {
include toollabs::static
system::role { 'role::labs::tools::static':
--
To view, visit https://gerrit.wikimedia.org/r/265202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I287fc3ff4b3b7d1ee96483f80d2862fb74e620a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Remove inheritance in role from compute - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265204
Change subject: toollabs: Remove inheritance in role from compute
..
toollabs: Remove inheritance in role from compute
Move to an include in the class instead
Change-Id: Ic5aa8e17cb984d329b26a50a1d252795fc1540c2
---
M manifests/role/labstools.pp
M modules/toollabs/manifests/compute.pp
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/265204/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 0cfeceb..2381042 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -11,7 +11,7 @@
system::role { 'role::labs::tools::bastion': description => 'Tool Labs
bastion' }
}
-class compute inherits role::labs::tools::common {
+class compute {
include toollabs::compute
system::role { 'role::labs::tools::compute': description => 'Tool Labs
compute node' }
diff --git a/modules/toollabs/manifests/compute.pp
b/modules/toollabs/manifests/compute.pp
index 861af30..262f931 100644
--- a/modules/toollabs/manifests/compute.pp
+++ b/modules/toollabs/manifests/compute.pp
@@ -17,7 +17,8 @@
class toollabs::compute inherits toollabs {
include toollabs::exec_environ,
-toollabs::hba
+toollabs::hba,
+gridengine
motd::script { 'exechost-banner':
ensure => present,
--
To view, visit https://gerrit.wikimedia.org/r/265204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5aa8e17cb984d329b26a50a1d252795fc1540c2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Remove inheritance from bastion role - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265203
Change subject: toollabs: Remove inheritance from bastion role
..
toollabs: Remove inheritance from bastion role
Not needed
Change-Id: I61d8189859a7caf52a2d04cc8bc1ff28653b25ad
---
M manifests/role/labstools.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/265203/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 3e0a289..0cfeceb 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -5,7 +5,7 @@
include ::gridengine
}
-class bastion inherits role::labs::tools::common {
+class bastion {
include toollabs::bastion
system::role { 'role::labs::tools::bastion': description => 'Tool Labs
bastion' }
--
To view, visit https://gerrit.wikimedia.org/r/265203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61d8189859a7caf52a2d04cc8bc1ff28653b25ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Remove inheritance from mailrelay - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265205
Change subject: toollabs: Remove inheritance from mailrelay
..
toollabs: Remove inheritance from mailrelay
the submit_host makes sure that gridengine is included
Change-Id: I5f1ff90154a97080a65236fcd6c897a71c50f0df
---
M manifests/role/labstools.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/265205/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 2381042..96ea968 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -90,7 +90,7 @@
}
}
-class mailrelay inherits role::labs::tools::common {
+class mailrelay {
system::role { 'role::labs::tools::mailrelay': description => 'Tool
Labs mail relay' }
include toollabs::mailrelay
--
To view, visit https://gerrit.wikimedia.org/r/265205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f1ff90154a97080a65236fcd6c897a71c50f0df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: API changes for AuthManager - change (mediawiki/core)
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/265201 Change subject: WIP: API changes for AuthManager .. WIP: API changes for AuthManager Changes here are: * action=login is deprecated for use other than bot passwords * Added action=query&meta=authmanagerinfo * Added action=clientlogin is to be used to log into the main account * action=createaccount is changed in a non-BC manner * Added action=linkaccount TODO: * Add action=unlinkaccount (or just make part of removeauthenticationdata?) * Add action=resetpassword * Add action=changeauthenticationdata * Add action=removeauthenticationdata * Write RELEASE-NOTES Bug: T110276 Bug: T110747 Bug: T110751 Bug: T32788 Bug: T67857 Bug: T28597 Change-Id: I244fa9b1e0623247d6d9fa30990411c6df94a496 --- M autoload.php A includes/api/ApiAuthManagerHelper.php A includes/api/ApiClientLogin.php M includes/api/ApiCreateAccount.php M includes/api/ApiFormatJson.php A includes/api/ApiLinkAccount.php M includes/api/ApiLogin.php M includes/api/ApiMain.php M includes/api/ApiPageSet.php M includes/api/ApiQuery.php A includes/api/ApiQueryAuthManagerInfo.php M includes/api/i18n/en.json M includes/api/i18n/qqq.json M includes/auth/AuthManager.php M tests/phpunit/MediaWikiTestCase.php D tests/phpunit/includes/api/ApiCreateAccountTest.php M tests/phpunit/includes/api/ApiLoginTest.php M tests/phpunit/includes/api/ApiTestCase.php 18 files changed, 915 insertions(+), 454 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/01/265201/1 diff --git a/autoload.php b/autoload.php index e81cfc9..a693fa5 100644 --- a/autoload.php +++ b/autoload.php @@ -17,10 +17,12 @@ 'AlterSharedConstraints' => __DIR__ . '/maintenance/oracle/alterSharedConstraints.php', 'AncientPagesPage' => __DIR__ . '/includes/specials/SpecialAncientpages.php', 'AnsiTermColorer' => __DIR__ . '/maintenance/term/MWTerm.php', + 'ApiAuthManagerHelper' => __DIR__ . '/includes/api/ApiAuthManagerHelper.php', 'ApiBase' => __DIR__ . '/includes/api/ApiBase.php', 'ApiBlock' => __DIR__ . '/includes/api/ApiBlock.php', 'ApiCheckToken' => __DIR__ . '/includes/api/ApiCheckToken.php', 'ApiClearHasMsg' => __DIR__ . '/includes/api/ApiClearHasMsg.php', + 'ApiClientLogin' => __DIR__ . '/includes/api/ApiClientLogin.php', 'ApiComparePages' => __DIR__ . '/includes/api/ApiComparePages.php', 'ApiContinuationManager' => __DIR__ . '/includes/api/ApiContinuationManager.php', 'ApiCreateAccount' => __DIR__ . '/includes/api/ApiCreateAccount.php', @@ -48,6 +50,7 @@ 'ApiImageRotate' => __DIR__ . '/includes/api/ApiImageRotate.php', 'ApiImport' => __DIR__ . '/includes/api/ApiImport.php', 'ApiImportReporter' => __DIR__ . '/includes/api/ApiImport.php', + 'ApiLinkAccount' => __DIR__ . '/includes/api/ApiLinkAccount.php', 'ApiLogin' => __DIR__ . '/includes/api/ApiLogin.php', 'ApiLogout' => __DIR__ . '/includes/api/ApiLogout.php', 'ApiMain' => __DIR__ . '/includes/api/ApiMain.php', @@ -73,6 +76,7 @@ 'ApiQueryAllPages' => __DIR__ . '/includes/api/ApiQueryAllPages.php', 'ApiQueryAllRevisions' => __DIR__ . '/includes/api/ApiQueryAllRevisions.php', 'ApiQueryAllUsers' => __DIR__ . '/includes/api/ApiQueryAllUsers.php', + 'ApiQueryAuthManagerInfo' => __DIR__ . '/includes/api/ApiQueryAuthManagerInfo.php', 'ApiQueryBacklinks' => __DIR__ . '/includes/api/ApiQueryBacklinks.php', 'ApiQueryBacklinksprop' => __DIR__ . '/includes/api/ApiQueryBacklinksprop.php', 'ApiQueryBase' => __DIR__ . '/includes/api/ApiQueryBase.php', diff --git a/includes/api/ApiAuthManagerHelper.php b/includes/api/ApiAuthManagerHelper.php new file mode 100644 index 000..9591ba1 --- /dev/null +++ b/includes/api/ApiAuthManagerHelper.php @@ -0,0 +1,316 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * + * @file + * @since 1.27 + */ + +use MediaWiki\Auth\AuthManager; +use MediaWiki\Auth\AuthenticationRequest; +use MediaWiki\Auth\AuthenticationResponse; +use MediaWiki\Auth\CreateFromLoginAuthenticationRequest; + +/** + * Helper class for AuthManager
[MediaWiki-commits] [Gerrit] [WIP] Allow users to select cite template - change (mediawiki...Citoid)
Mvolz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265200
Change subject: [WIP] Allow users to select cite template
..
[WIP] Allow users to select cite template
Bug: T97936
Change-Id: I0b4a2d6191efbf920abedf3932677050f1ce80e1
---
M modules/ve.ui.CiteFromIdInspector.js
1 file changed, 27 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid
refs/changes/00/265200/1
diff --git a/modules/ve.ui.CiteFromIdInspector.js
b/modules/ve.ui.CiteFromIdInspector.js
index 472d0a6..bd7b03c 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -575,7 +575,7 @@
* or is rejected if there are any problems with the template name or the
internal item.
*/
ve.ui.CiteFromIdInspector.prototype.buildTemplateResults = function (
searchResults ) {
- var i, templateName, citation, result, refWidget,
+ var i, item, templateName, citation, result, refWidget,
originalTemplate,
renderPromises = [],
partPromises = [],
inspector = this;
@@ -607,6 +607,32 @@
);
}
+ // Add other template options to results
+ originalTemplate = this.results[ 0 ]; // Model all template options
after first template
+ if ( originalTemplate ) { // Only create results if a template was
successfully made
+ citation = searchResults[ 0 ]; // Use citation from first
element of search results
+ for ( i = 0; i < inspector.citeTools.length; i++ ) {
+ item = this.citeTools[ i ];
+ if ( item.template !== originalTemplate.templateName )
{ // Add any template from cite tools that isn't the original template type
+ // Create models for this result
+ this.results.push( {
+ templateName: item.template,
+ template: null,
+ transclusionModel: new
ve.dm.MWTransclusionModel()
+ } );
+ result = this.results[ this.results.length - 1
];
+
+ result.template =
ve.dm.MWTemplateModel.newFromName( result.transclusionModel, item.template );
+
+ partPromises.push(
+ result.transclusionModel.addPart(
result.template )
+ // Fill in the details for the
individual template
+ .then(
ve.ui.CiteFromIdInspector.static.populateTemplate.bind( this, result.template,
citation ) )
+ );
+ }
+ }
+ }
+
return $.when.apply( $, partPromises )
.then( function () {
var optionWidgets = [];
--
To view, visit https://gerrit.wikimedia.org/r/265200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b4a2d6191efbf920abedf3932677050f1ce80e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Mvolz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Remove inheritance from services role - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265198
Change subject: toollabs: Remove inheritance from services role
..
toollabs: Remove inheritance from services role
Not needed since submit_host includes the gridengine role
anyway
Change-Id: Ibf535a4286b3baf8635c312a4e91e565079ae76e
---
M manifests/role/labstools.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/265198/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index c38d555..e9111f2 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -33,7 +33,7 @@
class services(
$active_host = 'tools-services-01.eqiad.wmflabs',
-) inherits role::labs::tools::common {
+) {
system::role { 'role::labs::tools::services':
description => 'Tool Labs manifest based services',
}
--
To view, visit https://gerrit.wikimedia.org/r/265198
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf535a4286b3baf8635c312a4e91e565079ae76e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Remove unneeded inheritance in checker role - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265197
Change subject: toollabs: Remove unneeded inheritance in checker role
..
toollabs: Remove unneeded inheritance in checker role
Not needed since submit_host includes gridengine anyway
Change-Id: I73448cf0912d07a278e5596c438c25b86995dc87
---
M manifests/role/labstools.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/265197/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 1f1e0f5..c38d555 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -51,7 +51,7 @@
}
}
-class checker inherits role::labs::tools::common {
+class checker {
include toollabs::checker
system::role { 'role::labs::tools::checker':
--
To view, visit https://gerrit.wikimedia.org/r/265197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73448cf0912d07a278e5596c438c25b86995dc87
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Point shadow to correct master host - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265199
Change subject: toollabs: Point shadow to correct master host
..
toollabs: Point shadow to correct master host
Change-Id: I2f2d629d26175eced48eddd18da1a132cf19a129
---
M manifests/role/labstools.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/265199/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index e9111f2..5823901 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -27,7 +27,7 @@
system::role { 'role::labs::tools::shadow': description => 'Tool Labs
gridengine shadow (backup) master' }
class { 'toollabs::shadow':
-gridmaster => $role::labs::tools::common::gridmaster,
+gridmaster => hiera('gridengine::gridmaster'),
}
}
--
To view, visit https://gerrit.wikimedia.org/r/265199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f2d629d26175eced48eddd18da1a132cf19a129
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow to create user page - change (mediawiki...NewUserMessage)
Dereckson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265190
Change subject: Allow to create user page
..
Allow to create user page
We offer the opportunity to left a message on the user page
on top or instead of the talk page message.
This change introduces two new settings:
- NewUserCreateTalkPage: create a NS_TALK page (default: true)
- NewUserCreateUserPage: create a NS_USER page (default: false)
These default values keep the current extension behavior.
The following templates are used for the NS_USER page:
- newusermessage-template-subject-user: the page subject
- newusermessage-template-body-user: the page title
The page subject could be left blank, to avoid to add a title.
Bug: T117957
Change-Id: I19a9270308761ce5d00510ea2c50ead8c78757ea
---
M NewUserMessage.class.php
M extension.json
M i18n/en.json
3 files changed, 82 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NewUserMessage
refs/changes/90/265190/3
diff --git a/NewUserMessage.class.php b/NewUserMessage.class.php
index 68ec474..6dce58a 100644
--- a/NewUserMessage.class.php
+++ b/NewUserMessage.class.php
@@ -75,18 +75,23 @@
/**
* Produce a subject for the message.
+* @param string $suffix The subject template's system message suffix
* @return String
*/
- static function fetchSubject() {
- return self::fetchTemplateIfExists( self::getMsg(
'newusermessage-template-subject' )->text() );
+ static function fetchSubject( $suffix = '' ) {
+ $message = 'newusermessage-template-subject' . $suffix;
+ $template = self::getMsg( $message )->text();
+ return self::fetchTemplateIfExists( $template );
}
/**
* Produce the template that contains the text of the message.
+* @param string $suffix The body template's system message suffix
* @return String
*/
- static function fetchText() {
- $template = self::getMsg( 'newusermessage-template-body'
)->text();
+ static function fetchText( $suffix = '' ) {
+ $message = 'newusermessage-template-body' . $suffix;
+ $template = self::getMsg( $message )->text();
$title = Title::newFromText( $template );
if ( $title && $title->exists() && $title->getLength() ) {
@@ -116,11 +121,11 @@
* @param $str string
* @param $user User
* @param $editor User
-* @param $talk Title
+* @param $title Title
* @param $preparse bool If provided, then preparse the string using a
Parser
* @return string
*/
- static private function substString( $str, $user, $editor, $talk,
$preparse = null ) {
+ static private function substString( $str, $user, $editor, $title,
$preparse = null ) {
$realName = $user->getRealName();
$name = $user->getName();
@@ -137,46 +142,64 @@
if ( $preparse ) {
global $wgParser;
- $str = $wgParser->preSaveTransform( $str, $talk,
$editor, new ParserOptions );
+ $str = $wgParser->preSaveTransform( $str, $title,
$editor, new ParserOptions );
}
return $str;
}
/**
-* Add the message if the users talk page does not already exist
+* Add the message if the user's talk page does not already exist
* @param $user User object
-* @return bool
*/
static function createNewUserMessage( $user ) {
- $talk = $user->getTalkPage();
+ $pageTitle = $user->getTalkPage();
+ self::createUserPage( $user, $pageTitle );
+ }
- // Only leave message if user doesn't have a talk page yet
- if ( !$talk->exists() ) {
- $wikiPage = WikiPage::factory( $talk );
- $subject = self::fetchSubject();
- $text = self::fetchText();
- $signature = self::fetchSignature();
- $editSummary = self::getMsg( 'newuseredit-summary'
)->text();
- $editor = self::fetchEditor();
- $flags = self::fetchFlags();
+ /**
+* Add the message if the user's page does not already exist
+* @param $user User object
+*/
+ static function createNewUserPage( $user ) {
+ $pageTitle = $user->getUserPage();
+ self::createUserPage( $user, $pageTitle, '-user' );
+ }
- # Do not add a message if the username is invalid or if
the account that adds it, is blocked
- if ( !$editor || $editor->isBlocked() ) {
- retur
[MediaWiki-commits] [Gerrit] Use American English in messages - replace 'behaviour' with ... - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Use American English in messages - replace 'behaviour' with 'behavior' .. Use American English in messages - replace 'behaviour' with 'behavior' Thread: https://translatewiki.net/wiki/Thread:Support/British_English_in_Mediawiki_messages Change-Id: If6c20aead2bee45584e93c80059b31bb3c4dbe2d --- M i18n/qqq.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Gergő Tisza: Looks good to me, approved Nemo bis: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/i18n/qqq.json b/i18n/qqq.json index 4e4b90f..3bb568a 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -139,8 +139,8 @@ "multimediaviewer-options-text-header": "Text explaining the changes that happen when a user disables media viewer.", "multimediaviewer-options-text-body": "Text explaining how to re-enable the media viewer after disabling.", "multimediaviewer-options-learn-more": "Text for a link to more information about the media viewer.", - "multimediaviewer-option-submit-button": "Button for submitting a preference change that modifies the default behaviour for image clicks - disables the viewer.", - "multimediaviewer-option-cancel-button": "Button for canceling an action on a preference change that modifies the default behaviour for image clicks - closes the dialog with no action.", + "multimediaviewer-option-submit-button": "Button for submitting a preference change that modifies the default behavior for image clicks - disables the viewer.", + "multimediaviewer-option-cancel-button": "Button for canceling an action on a preference change that modifies the default behavior for image clicks - closes the dialog with no action.", "multimediaviewer-disable-confirmation-header": "Header on a dialog that informs the user they've successfully disabled the media viewer.", "multimediaviewer-disable-confirmation-text": "Text informing the user that they've successfully disabled the media viewer. $1 is the wiki's name.", "multimediaviewer-enable-dialog-header": "Header for a dialog that allows users to re-enable media viewer.", -- To view, visit https://gerrit.wikimedia.org/r/265110 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If6c20aead2bee45584e93c80059b31bb3c4dbe2d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: IoannisKydonis Gerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: Nemo bis Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update SemanticResultFormats for I4c28907d - change (mediawiki/core)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/265196 Change subject: Update SemanticResultFormats for I4c28907d .. Update SemanticResultFormats for I4c28907d Bug: T123583 Bug: T123599 Change-Id: Ib137b094088f53f5a08389c23a0038ec2606b33a --- M extensions/SemanticResultFormats 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/96/265196/1 diff --git a/extensions/SemanticResultFormats b/extensions/SemanticResultFormats index 377f460..dde60f6 16 --- a/extensions/SemanticResultFormats +++ b/extensions/SemanticResultFormats -Subproject commit 377f460fa2ce3b740a2eb647910c291df7e5d2e8 +Subproject commit dde60f615c001a1209984013ee50edc7669e554f -- To view, visit https://gerrit.wikimedia.org/r/265196 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib137b094088f53f5a08389c23a0038ec2606b33a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.27.0-wmf.10 Gerrit-Owner: Alex Monk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Backup crontabs from cronrunner - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Backup crontabs from cronrunner
..
toollabs: Backup crontabs from cronrunner
Bug: T123873
Change-Id: Ie68b64b29519bcfbc86fe8dd547628776c32ccd4
---
M modules/toollabs/manifests/cronrunner.pp
1 file changed, 16 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/cronrunner.pp
b/modules/toollabs/manifests/cronrunner.pp
index 6931aab..2d911f2 100644
--- a/modules/toollabs/manifests/cronrunner.pp
+++ b/modules/toollabs/manifests/cronrunner.pp
@@ -24,4 +24,20 @@
group => 'root',
mode => '0555',
}
+
+# Backup crontabs! See https://phabricator.wikimedia.org/T95798
+file { '/data/project/.system/crontabs':
+ensure => directory,
+owner => 'root',
+group => "${::labsproject}.admin",
+mode => '0770',
+}
+file { "/data/project/.system/crontabs/${::fqdn}":
+ensure => directory,
+source => '/var/spool/cron/crontabs',
+owner => 'root',
+group => "${::labsproject}.admin",
+mode=> '0440',
+recurse => true,
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/265194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie68b64b29519bcfbc86fe8dd547628776c32ccd4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: coren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Move updatetools to run on services host - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265195
Change subject: toollabs: Move updatetools to run on services host
..
toollabs: Move updatetools to run on services host
Bug: T123873
Change-Id: If61dab96f84edc78839ff3deff22b6082163538f
---
M manifests/role/labstools.pp
M modules/toollabs/manifests/submit.pp
A modules/toollabs/manifests/updatetools.pp
3 files changed, 29 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/265195/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index d3278b8..1f1e0f5 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -45,6 +45,10 @@
class { 'toollabs::bigbrother':
active => ($::fqdn == $active_host),
}
+
+class { 'toollabs::updatetools':
+active => ($::fqdn == $active_host),
+}
}
class checker inherits role::labs::tools::common {
diff --git a/modules/toollabs/manifests/submit.pp
b/modules/toollabs/manifests/submit.pp
index 537d967..3aa3748 100644
--- a/modules/toollabs/manifests/submit.pp
+++ b/modules/toollabs/manifests/submit.pp
@@ -47,30 +47,6 @@
mode => '0555',
}
-# Service to update the tools and users tables.
-file { '/usr/local/bin/updatetools':
-ensure => file,
-owner => 'root',
-group => 'root',
-mode => '0555',
-source => 'puppet:///modules/toollabs/updatetools',
-}
-
-file { '/etc/init/updatetools.conf':
-ensure => file,
-owner => 'root',
-group => 'root',
-mode=> '0444',
-content => template('toollabs/updatetools.conf.erb'),
-}
-
-service { 'updatetools':
-ensure=> running,
-enable=> true,
-subscribe => [File['/etc/init/updatetools.conf'],
- File['/usr/local/bin/updatetools']],
-}
-
# Backup crontabs! See https://phabricator.wikimedia.org/T95798
file { '/data/project/.system/crontabs':
ensure => directory,
diff --git a/modules/toollabs/manifests/updatetools.pp
b/modules/toollabs/manifests/updatetools.pp
new file mode 100644
index 000..07f9e89
--- /dev/null
+++ b/modules/toollabs/manifests/updatetools.pp
@@ -0,0 +1,25 @@
+class toollabs::updatetools {
+# Service to update the tools and users tables.
+file { '/usr/local/bin/updatetools':
+ensure => file,
+owner => 'root',
+group => 'root',
+mode => '0555',
+source => 'puppet:///modules/toollabs/updatetools',
+}
+
+file { '/etc/init/updatetools.conf':
+ensure => file,
+owner => 'root',
+group => 'root',
+mode=> '0444',
+content => template('toollabs/updatetools.conf.erb'),
+}
+
+service { 'updatetools':
+ensure=> ensure_service($active),
+enable=> true,
+subscribe => [File['/etc/init/updatetools.conf'],
+ File['/usr/local/bin/updatetools']],
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/265195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If61dab96f84edc78839ff3deff22b6082163538f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Backup crontabs from cronrunner - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265194
Change subject: toollabs: Backup crontabs from cronrunner
..
toollabs: Backup crontabs from cronrunner
Bug: T123873
Change-Id: Ie68b64b29519bcfbc86fe8dd547628776c32ccd4
---
M modules/toollabs/manifests/cronrunner.pp
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/265194/1
diff --git a/modules/toollabs/manifests/cronrunner.pp
b/modules/toollabs/manifests/cronrunner.pp
index 6931aab..2d911f2 100644
--- a/modules/toollabs/manifests/cronrunner.pp
+++ b/modules/toollabs/manifests/cronrunner.pp
@@ -24,4 +24,20 @@
group => 'root',
mode => '0555',
}
+
+# Backup crontabs! See https://phabricator.wikimedia.org/T95798
+file { '/data/project/.system/crontabs':
+ensure => directory,
+owner => 'root',
+group => "${::labsproject}.admin",
+mode => '0770',
+}
+file { "/data/project/.system/crontabs/${::fqdn}":
+ensure => directory,
+source => '/var/spool/cron/crontabs',
+owner => 'root',
+group => "${::labsproject}.admin",
+mode=> '0440',
+recurse => true,
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/265194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie68b64b29519bcfbc86fe8dd547628776c32ccd4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Move bigbrother to services nodes - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265193
Change subject: toollabs: Move bigbrother to services nodes
..
toollabs: Move bigbrother to services nodes
Bug: T123873
Change-Id: Ia176352060537c6df05d5f9e60beef187919b983
---
M modules/toollabs/manifests/services.pp
M modules/toollabs/manifests/submit.pp
2 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/265193/1
diff --git a/modules/toollabs/manifests/services.pp
b/modules/toollabs/manifests/services.pp
index a54466a..ad2c8f5 100644
--- a/modules/toollabs/manifests/services.pp
+++ b/modules/toollabs/manifests/services.pp
@@ -21,6 +21,27 @@
subscribe => Package['tools-manifest'],
}
+file { '/usr/local/sbin/bigbrother':
+ensure => file,
+owner => 'root',
+group => 'root',
+mode => '0555',
+source => 'puppet:///modules/toollabs/bigbrother',
+}
+
+file { '/etc/init/bigbrother.conf':
+ensure => file,
+owner => 'root',
+group => 'root',
+mode => '0444',
+source => 'puppet:///modules/toollabs/bigbrother.conf',
+}
+
+service { 'bigbrother':
+ensure=> ensure_service($active),
+subscribe => File['/usr/local/sbin/bigbrother',
'/etc/init/bigbrother.conf'],
+}
+
file { '/usr/local/bin/webservice':
ensure => present,
source => 'puppet:///modules/toollabs/webservice2',
diff --git a/modules/toollabs/manifests/submit.pp
b/modules/toollabs/manifests/submit.pp
index df79f1b..537d967 100644
--- a/modules/toollabs/manifests/submit.pp
+++ b/modules/toollabs/manifests/submit.pp
@@ -39,27 +39,6 @@
content => "${::ipaddress}\n",
}
-file { '/usr/local/sbin/bigbrother':
-ensure => file,
-owner => 'root',
-group => 'root',
-mode => '0555',
-source => 'puppet:///modules/toollabs/bigbrother',
-}
-
-file { '/etc/init/bigbrother.conf':
-ensure => file,
-owner => 'root',
-group => 'root',
-mode => '0444',
-source => 'puppet:///modules/toollabs/bigbrother.conf',
-}
-
-service { 'bigbrother':
-ensure=> running,
-subscribe => File['/usr/local/sbin/bigbrother',
'/etc/init/bigbrother.conf'],
-}
-
file { '/usr/local/bin/webservice2':
ensure => present,
source => 'puppet:///modules/toollabs/webservice2',
--
To view, visit https://gerrit.wikimedia.org/r/265193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia176352060537c6df05d5f9e60beef187919b983
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace wfMsg*() usages in 1.8.x branch for WMF usages - change (mediawiki...SemanticResultFormats)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace wfMsg*() usages in 1.8.x branch for WMF usages
..
Replace wfMsg*() usages in 1.8.x branch for WMF usages
Bug: T123583
Bug: T123599
Change-Id: I4c28907d851e218db93c70611ccaeb45a0d2b27b
---
M formats/Filtered/views/SRF_FV_Calendar.php
M formats/Filtered/views/SRF_FV_List.php
M formats/incoming/SRF_Incoming.php
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/formats/Filtered/views/SRF_FV_Calendar.php
b/formats/Filtered/views/SRF_FV_Calendar.php
index 90ee798..dc3667b 100644
--- a/formats/Filtered/views/SRF_FV_Calendar.php
+++ b/formats/Filtered/views/SRF_FV_Calendar.php
@@ -235,7 +235,7 @@
return
$this->getParamHashes( $this->getQueryResults(),
$this->getActualParameters()) +
array(
- 'firstDay' => ($wgAmericanDates?'0':wfMsg(
'srf-filtered-firstdayofweek' )),
+ 'firstDay' => ($wgAmericanDates?'0':wfMessage(
'srf-filtered-firstdayofweek' )->text()),
'isRTL' => wfGetLangObj( true )->isRTL(),
);
}
@@ -280,7 +280,7 @@
* @return String the selector label
*/
public function getSelectorLabel() {
- return wfMsg('srf-filtered-selectorlabel-calendar');
+ return wfMessage('srf-filtered-selectorlabel-calendar')->text();
}
}
diff --git a/formats/Filtered/views/SRF_FV_List.php
b/formats/Filtered/views/SRF_FV_List.php
index c5c4174..9f58c0e 100644
--- a/formats/Filtered/views/SRF_FV_List.php
+++ b/formats/Filtered/views/SRF_FV_List.php
@@ -248,7 +248,7 @@
* @return String the selector label
*/
public function getSelectorLabel() {
- return wfMsg('srf-filtered-selectorlabel-list');
+ return wfMessage('srf-filtered-selectorlabel-list')->text();
}
}
diff --git a/formats/incoming/SRF_Incoming.php
b/formats/incoming/SRF_Incoming.php
index 735a4eb..8d62774 100644
--- a/formats/incoming/SRF_Incoming.php
+++ b/formats/incoming/SRF_Incoming.php
@@ -33,7 +33,7 @@
* @return string
*/
public function getName() {
- return wfMsg( 'srf-printername-incoming' );
+ return wfMessage( 'srf-printername-incoming' )->text();
}
/**
@@ -55,7 +55,7 @@
if ( $this->params['default'] !== '' ) {
return $this->escapeText(
$this->params['default'], $outputmode );
} else {
- return $result->addErrors( array(
wfMsgForContent( 'smw_result_noresults' ) ) );
+ return $result->addErrors( array( wfMessage(
'smw_result_noresults' )->inContentLanguage()->text() ) );
}
} else {
return $this->getFormatOutput( $data );
@@ -210,4 +210,4 @@
return $params;
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/265166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4c28907d851e218db93c70611ccaeb45a0d2b27b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticResultFormats
Gerrit-Branch: 1.8.x
Gerrit-Owner: Reedy
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Use hiera to figure out where cron runner host is - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Use hiera to figure out where cron runner host is
..
toollabs: Use hiera to figure out where cron runner host is
Bug: T123873
Change-Id: I0699455b2d6da425df8baba681d645cbc40298f7
---
M modules/toollabs/manifests/bastion.pp
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 15fc282..73e002c 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -10,9 +10,7 @@
#
# Sample Usage:
#
-class toollabs::bastion(
-$cron_host = 'tools-submit',
-) inherits toollabs {
+class toollabs::bastion inherits toollabs {
include gridengine::submit_host,
gridengine::admin_host,
@@ -58,6 +56,7 @@
include ldap::role::config::labs
$ldapconfig = $ldap::role::config::labs::ldapconfig
+$cron_host = hiera('active_cronrunner')
file { '/usr/local/bin/crontab':
ensure => file,
mode=> '0755',
--
To view, visit https://gerrit.wikimedia.org/r/265192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0699455b2d6da425df8baba681d645cbc40298f7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Use hiera to figure out where cron runner host is - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265192
Change subject: toollabs: Use hiera to figure out where cron runner host is
..
toollabs: Use hiera to figure out where cron runner host is
Bug: T123873
Change-Id: I0699455b2d6da425df8baba681d645cbc40298f7
---
M modules/toollabs/manifests/bastion.pp
1 file changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/92/265192/1
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 15fc282..73e002c 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -10,9 +10,7 @@
#
# Sample Usage:
#
-class toollabs::bastion(
-$cron_host = 'tools-submit',
-) inherits toollabs {
+class toollabs::bastion inherits toollabs {
include gridengine::submit_host,
gridengine::admin_host,
@@ -58,6 +56,7 @@
include ldap::role::config::labs
$ldapconfig = $ldap::role::config::labs::ldapconfig
+$cron_host = hiera('active_cronrunner')
file { '/usr/local/bin/crontab':
ensure => file,
mode=> '0755',
--
To view, visit https://gerrit.wikimedia.org/r/265192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0699455b2d6da425df8baba681d645cbc40298f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Video loader - change (thumbor/video-loader)
jenkins-bot has submitted this change and it was merged.
Change subject: Video loader
..
Video loader
Uses ffmpeg's http capabilities to remotely probe the video
and extract only the frame we need for thumbnailing. This vastly
cuts down bandwidth between thumbor and its source.
A trade-off due to how thumbor is set up is that we can't
cache the "original" anymore, because we would have do so
on a per-frame basis and purging all requested frames at
once wouldn't be possible without some heavy-duty hacking
on the memcached storage class. This should be acceptable
since videos don't need prerendering that badly, and said
prerendering would be subject to race conditions anyway,
causing parallel requests to the same frame regardless.
Bug: T120205
Change-Id: I3f622181ecb9ad7dd57348a23deb6506a5242798
---
A LICENSE
A requirements.txt
A setup.py
A tox.ini
A wikimedia_thumbor_video_loader/__init__.py
5 files changed, 215 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
Filippo Giunchedi: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..04dc90e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Gilles Dubuc, Wikimedia Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000..ef29d7d
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+thumbor
diff --git a/setup.py b/setup.py
new file mode 100644
index 000..1471aa3
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+from setuptools import setup, find_packages
+
+
+setup(
+name='wikimedia_thumbor_video_loader',
+version='0.1.1',
+url='https://github.com/wikimedia/thumbor-video-loader',
+license='MIT',
+author='Gilles Dubuc, Wikimedia Foundation',
+description='Thumbor video loader',
+packages=find_packages(),
+include_package_data=True,
+zip_safe=False,
+platforms='any',
+install_requires=[
+'thumbor',
+],
+extras_require={
+'tests': [
+'pyvows',
+'coverage',
+],
+},
+classifiers=[
+'Development Status :: 4 - Beta',
+'Intended Audience :: Developers',
+'License :: OSI Approved :: MIT License',
+'Operating System :: OS Independent',
+'Programming Language :: Python',
+'Topic :: Software Development :: Libraries :: Python Modules'
+]
+)
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000..9e359d2
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+[tox]
+minversion = 1.6
+skipsdist = True
+envlist = flake8
+
+[testenv]
+setenv = VIRTUAL_ENV={envdir}
+deps = -r{toxinidir}/requirements.txt
+
+[testenv:flake8]
+commands = flake8 {posargs}
+deps = flake8
diff --git a/wikimedia_thumbor_video_loader/__init__.py
b/wikimedia_thumbor_video_loader/__init__.py
new file mode 100644
index 000..408d37c
--- /dev/null
+++ b/wikimedia_thumbor_video_loader/__init__.py
@@ -0,0 +1,146 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# thumbor imaging service
+# https://github.com/thumbor/thumbor/wiki
+
+# Licensed under the MIT license:
+# http://www.opensource.org/licenses/mit-license
+# Copyright (c) 2011 globo.com timeh...@corp.globo.com
+# Copyright (c) 2016 Wikimedia Foundation
+
+# Video loader, only loads the frame needed from a remote video
+# Do not use it as-is with persistent storage of originals,
+# otherwise the first frame requested will be stored as the
+# original for subsequent requests
+
+import re
+import os
+from urllib import unquote
+from functools import partial
+from tempfile import NamedTemporaryFile
+
+from thumbor.loaders import LoaderResult
+from tornado.process import Subprocess
+from thumbor.utils import logger
+from wikimedia_thumbor_base_engine import BaseWikimediaE
[MediaWiki-commits] [Gerrit] Endpoint to handle multiple thumbnail requests at once - change (thumbor/multi-handler)
jenkins-bot has submitted this change and it was merged.
Change subject: Endpoint to handle multiple thumbnail requests at once
..
Endpoint to handle multiple thumbnail requests at once
This will allow us to do pre rendering very efficiently, with
MediaWiki being able to quickly request thumbor to thumbnail
several sizes in one thread, without having to wait for the
work to be done.
Bug: T122570
Change-Id: I27c1efe9c51a4fc6b2b1a08c44cbcbd3c19a2828
---
A LICENSE
A Makefile
A requirements.txt
A setup.py
A tox.ini
A wikimedia_thumbor_multi_handler/__init__.py
A wikimedia_thumbor_multi_handler/handlers/__init__.py
A wikimedia_thumbor_multi_handler/handlers/multi.py
8 files changed, 184 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
Filippo Giunchedi: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..04dc90e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Gilles Dubuc, Wikimedia Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 000..02fd9fe
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+.PHONY: setup_docs build_docs docs
+
+install:
+ pip install .
+
+reinstall:
+ pip uninstall wikimedia_thumbor_multi_handler -y
+ pip install .
+
+setup:
+ @pip install -e .[tests]
+
+setup_docs:
+ pip install -r docs/requirements.txt
+
+build_docs:
+ cd docs && make html
+
+docs: setup_docs build_docs
+ python -mwebbrowser file:///`pwd`/docs/_build/html/index.html
+
+pyvows_run:
+ @pyvows -vvv --profile --cover
--cover-package=wikimedia_thumbor_multi_handler vows/
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000..ce1d4f8
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+tc_core
+thumbor
diff --git a/setup.py b/setup.py
new file mode 100644
index 000..dd049c7
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+from setuptools import setup, find_packages
+
+
+setup(
+name='wikimedia_thumbor_multi_handler',
+version='0.1.1',
+url='https://github.com/wikimedia/thumbor-multi-handler',
+license='MIT',
+author='Gilles Dubuc, Wikimedia Foundation',
+description='Multi request handler',
+packages=find_packages(),
+include_package_data=True,
+zip_safe=False,
+platforms='any',
+install_requires=[
+'thumbor',
+'tc_core',
+],
+extras_require={
+'tests': [
+'pyvows',
+'coverage',
+],
+},
+classifiers=[
+'Development Status :: 4 - Beta',
+'Intended Audience :: Developers',
+'License :: OSI Approved :: MIT License',
+'Operating System :: OS Independent',
+'Programming Language :: Python',
+'Topic :: Software Development :: Libraries :: Python Modules'
+]
+)
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000..157253d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+[tox]
+minversion = 1.6
+skipsdist = True
+envlist = flake8, py27
+
+[testenv]
+setenv = VIRTUAL_ENV={envdir}
+deps = -r{toxinidir}/requirements.txt
+
+[testenv:flake8]
+commands = flake8 {posargs}
+deps = flake8
diff --git a/wikimedia_thumbor_multi_handler/__init__.py
b/wikimedia_thumbor_multi_handler/__init__.py
new file mode 100644
index 000..ef97a05
--- /dev/null
+++ b/wikimedia_thumbor_multi_handler/__init__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2016, thumbor-community, Wikimedia Foundation
+# Use of this source code is governed by the MIT license that can be
+# found in the LICENSE file.
+
+from tc_core import Extension, Extensions
+from wikimedia_thumbor_multi_handler.handlers.multi import MultiHandler
+
+
+extension = Extension('wikimedia_thumbor_multi_handler')
+exten
[MediaWiki-commits] [Gerrit] toollabs: Puppetize jlocal - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Puppetize jlocal
..
toollabs: Puppetize jlocal
Change-Id: If72e0572a93aa9e556372b1ff7129bbddd6b9038
---
A modules/toollabs/files/jlocal
M modules/toollabs/manifests/cronrunner.pp
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/toollabs/files/jlocal b/modules/toollabs/files/jlocal
new file mode 100644
index 000..f56e046
--- /dev/null
+++ b/modules/toollabs/files/jlocal
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# WAY too many things depend on this being run on a exec submit host
+# This is used by tools that want to run a shell script that would
+# launch jobs themselves. Since exec nodes are not submit nodes themselves
+# and a lot of tools use this already, keep this up for now. Hopefully
+# someone someday finds those tools, tells the authors to fix it up and
+# then we can remove this.
+exec $@
diff --git a/modules/toollabs/manifests/cronrunner.pp
b/modules/toollabs/manifests/cronrunner.pp
index 49d6a55..6931aab 100644
--- a/modules/toollabs/manifests/cronrunner.pp
+++ b/modules/toollabs/manifests/cronrunner.pp
@@ -15,4 +15,13 @@
ensure => present,
source =>
"puppet:///modules/toollabs/40-${::labsproject}-submithost-banner",
}
+
+# ;_; :'()
+file { '/usr/local/bin/jlocal':
+ensure => present,
+source => 'puppet:///modules/toollabs/jlocal',
+owner => 'root',
+group => 'root',
+mode => '0555',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/265191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If72e0572a93aa9e556372b1ff7129bbddd6b9038
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Puppetize jlocal - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265191
Change subject: toollabs: Puppetize jlocal
..
toollabs: Puppetize jlocal
Change-Id: If72e0572a93aa9e556372b1ff7129bbddd6b9038
---
M modules/toollabs/manifests/cronrunner.pp
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/265191/1
diff --git a/modules/toollabs/manifests/cronrunner.pp
b/modules/toollabs/manifests/cronrunner.pp
index 49d6a55..6931aab 100644
--- a/modules/toollabs/manifests/cronrunner.pp
+++ b/modules/toollabs/manifests/cronrunner.pp
@@ -15,4 +15,13 @@
ensure => present,
source =>
"puppet:///modules/toollabs/40-${::labsproject}-submithost-banner",
}
+
+# ;_; :'()
+file { '/usr/local/bin/jlocal':
+ensure => present,
+source => 'puppet:///modules/toollabs/jlocal',
+owner => 'root',
+group => 'root',
+mode => '0555',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/265191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If72e0572a93aa9e556372b1ff7129bbddd6b9038
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the update job more effiicient - change (mediawiki...PageAssessments)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the update job more effiicient
..
Make the update job more effiicient
Don't do updates when there are no new changes
Bug: T123645
Change-Id: I8d4aa79beda79a0addd5ae793e09039dcdf2a24c
---
M PageAssessmentsBody.php
1 file changed, 17 insertions(+), 2 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PageAssessmentsBody.php b/PageAssessmentsBody.php
index 0b53332..f25adb2 100644
--- a/PageAssessmentsBody.php
+++ b/PageAssessmentsBody.php
@@ -79,16 +79,31 @@
/**
-* Update record in DB with new values
+* Update record in DB if there are new values
* @param array $values New values to be entered into the DB
* @return bool True/False on query success/fail
*/
public static function updateRecord ( $values ) {
- $dbw = wfGetDB( DB_MASTER );
+ $dbr = wfGetDB( DB_SLAVE );
$conds = array(
'pa_page_name' => $values['pa_page_name'],
'pa_project' => $values['pa_project']
);
+ // Check if there are no updates to be done
+ $record = $dbr->select(
+ 'page_assessments',
+ array( 'pa_class', 'pa_importance', 'pa_project',
'pa_page_name' ),
+ $conds
+ );
+ foreach ( $record as $row ) {
+ if ( $row->pa_importance == $values['pa_importance'] &&
+ $row->pa_class == $values['pa_class'] ) {
+ // Return if no updates
+ return true;
+ }
+ }
+ // Make updates if there are changes
+ $dbw = wfGetDB( DB_MASTER );
$dbw->update( 'page_assessments', $values, $conds, __METHOD__ );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/264712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d4aa79beda79a0addd5ae793e09039dcdf2a24c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Niharika29
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Establish `group2` and `exempt` dblists - change (operations/mediawiki-config)
Dduvall has uploaded a new change for review. https://gerrit.wikimedia.org/r/265189 Change subject: Establish `group2` and `exempt` dblists .. Establish `group2` and `exempt` dblists Having an `exempt.dblist` will accommodate blacklisting for cases where we need to temporarily hold certain wikis back, the immediate use case being for `labswiki` and `labstestwiki`. Using an explicit `group2.dblist` instead of `all.dblist` will allow us to implement this blacklist for the final train deployment. On-wiki documentation for train (and perhaps other) deployment should be updated to reflect this. Change-Id: I9a0f9d86cc006af23540b2ecccfe466c63a91b51 --- A dblists/exempt.dblist M dblists/group1.dblist A dblists/group2.dblist 3 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/89/265189/1 diff --git a/dblists/exempt.dblist b/dblists/exempt.dblist new file mode 100644 index 000..6cc4560 --- /dev/null +++ b/dblists/exempt.dblist @@ -0,0 +1,2 @@ +labswiki +labtestwiki diff --git a/dblists/group1.dblist b/dblists/group1.dblist index f79b86c..840460a 100644 --- a/dblists/group1.dblist +++ b/dblists/group1.dblist @@ -1 +1 @@ -%% all.dblist - group0.dblist - wikipedia.dblist + group1-wikipedia.dblist +%% all.dblist - group0.dblist - wikipedia.dblist + group1-wikipedia.dblist - exempt.dblist diff --git a/dblists/group2.dblist b/dblists/group2.dblist new file mode 100644 index 000..428763a --- /dev/null +++ b/dblists/group2.dblist @@ -0,0 +1 @@ +%% all.dblist - exempt.dblist -- To view, visit https://gerrit.wikimedia.org/r/265189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a0f9d86cc006af23540b2ecccfe466c63a91b51 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dduvall ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Include toollabs init in cronrunner - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Include toollabs init in cronrunner
..
toollabs: Include toollabs init in cronrunner
Rather than inherit! Also needed for setting up the bind mount
for gridengine. Clearly that belings in the 'toollabs' class
and not the 'gridengine' class
Change-Id: I7de4aa9b8c717cd5bc212ba488c0401994e520c8
---
M modules/toollabs/manifests/cronrunner.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/cronrunner.pp
b/modules/toollabs/manifests/cronrunner.pp
index 66a1f6e..49d6a55 100644
--- a/modules/toollabs/manifests/cronrunner.pp
+++ b/modules/toollabs/manifests/cronrunner.pp
@@ -1,6 +1,7 @@
class toollabs::cronrunner {
include gridengine::submit_host,
-toollabs::hba
+toollabs::hba,
+toollabs
file { '/etc/ssh/ssh_config':
ensure => file,
--
To view, visit https://gerrit.wikimedia.org/r/265187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7de4aa9b8c717cd5bc212ba488c0401994e520c8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: coren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove EXIF GPS refs decoding, it's handled by core - change (mediawiki...GeoData)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265188
Change subject: Remove EXIF GPS refs decoding, it's handled by core
..
Remove EXIF GPS refs decoding, it's handled by core
Change-Id: I24ed7e133f148c351bc03d89893a0483f23b95f4
---
M includes/Hooks.php
1 file changed, 0 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData
refs/changes/88/265188/1
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 0ed9872..ff7fbbc 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -156,9 +156,6 @@
if ( isset( $metadata ) && isset( $metadata['GPSLatitude'] ) &&
isset( $metadata['GPSLongitude'] ) ) {
$lat = $metadata['GPSLatitude'];
$lon = $metadata['GPSLongitude'];
- $refs = self::decodeRefs( $metadata );
- $lat *= $refs[0];
- $lon *= $refs[1];
if ( GeoData::validateCoord( $lat, $lon, 'earth' ) ) {
$coord = new Coord( $lat, $lon );
$coord->primary = true;
@@ -166,19 +163,6 @@
}
}
return null;
- }
-
- private static function decodeRefs( $metadata ) {
- global $wgGlobes;
- if ( isset( $metadata['GPSLatitudeRef'] ) && isset(
$metadata['GPSLongitudeRef'] ) ) {
- $coordInfo = GeoData::getCoordInfo();
- $latRef = GeoData::parseSuffix(
$metadata['GPSLatitudeRef'], $coordInfo['lat'] );
- $lonRef = GeoData::parseSuffix(
$metadata['GPSLongitudeRef'], $wgGlobes['earth'] );
- if ( $latRef != 0 && $lonRef != 0 ) {
- return array( $latRef, $lonRef );
- }
- }
- return array( 1, 1 );
}
private static function doLinksUpdate( $coords, $pageId ) {
--
To view, visit https://gerrit.wikimedia.org/r/265188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24ed7e133f148c351bc03d89893a0483f23b95f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move the isElementInViewport function to "mobile.startup/utils" - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Move the isElementInViewport function to "mobile.startup/utils"
..
Move the isElementInViewport function to "mobile.startup/utils"
Make the function sharable so that other modules can use it.
Change-Id: Ice6d797e8e45f89b68bd5a9908a0b8881f5b3625
---
M resources/mobile.startup/util.js
M resources/mobile.toggle/toggle.js
2 files changed, 29 insertions(+), 27 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.startup/util.js b/resources/mobile.startup/util.js
index a77e870..b5137e4 100644
--- a/resources/mobile.startup/util.js
+++ b/resources/mobile.startup/util.js
@@ -1,5 +1,6 @@
-( function ( M ) {
- var util;
+( function ( M, $ ) {
+ var util,
+ $window = $( window );
/**
* Utility library for looking up details on the current user
@@ -36,9 +37,32 @@
}
}
return id;
+ },
+
+ /**
+* Check if at least half of the element's height and half of
its width are in viewport
+*
+* @method
+* @param {jQuery.Object} $el - element that's being tested
+* @return {Boolean}
+*/
+ isElementInViewport: function ( $el ) {
+ var windowHeight = $window.height(),
+ windowWidth = $window.width(),
+ windowScrollLeft = $window.scrollLeft(),
+ windowScrollTop = $window.scrollTop(),
+ elHeight = $el.height(),
+ elWidth = $el.width(),
+ elOffset = $el.offset();
+
+ return (
+ ( windowScrollTop + windowHeight >=
elOffset.top + elHeight / 2 ) &&
+ ( windowScrollLeft + windowWidth >=
elOffset.left + elWidth / 2 ) &&
+ ( windowScrollTop <= elOffset.top + elHeight /
2 )
+ );
}
};
M.define( 'mobile.startup/util', util );
-}( mw.mobileFrontend ) );
+}( mw.mobileFrontend, jQuery ) );
diff --git a/resources/mobile.toggle/toggle.js
b/resources/mobile.toggle/toggle.js
index bbdeb55..7ec2591 100644
--- a/resources/mobile.toggle/toggle.js
+++ b/resources/mobile.toggle/toggle.js
@@ -2,6 +2,7 @@
var context = M.require( 'mobile.context/context' ),
settings = M.require( 'mobile.settings/settings' ),
browser = M.require( 'mobile.browser/browser' ),
+ util = M.require( 'mobile.startup/util' ),
escapeHash = M.require( 'mobile.startup/util' ).escapeHash,
arrowOptions = {
name: 'arrow',
@@ -339,29 +340,6 @@
}
/**
-* Check if at least half of the element's height and half of
its width are in viewport
-*
-* @method
-* @param {jQuery.Object} $el - element that's being tested
-* @return {Boolean}
-*/
- function isElementInViewport( $el ) {
- var windowHeight = $window.height(),
- windowWidth = $window.width(),
- windowScrollLeft = $window.scrollLeft(),
- windowScrollTop = $window.scrollTop(),
- elHeight = $el.height(),
- elWidth = $el.width(),
- elOffset = $el.offset();
-
- return (
- ( windowScrollTop + windowHeight >=
elOffset.top + elHeight / 2 ) &&
- ( windowScrollLeft + windowWidth >=
elOffset.left + elWidth / 2 ) &&
- ( windowScrollTop <= elOffset.top + elHeight /
2 )
- );
- }
-
- /**
* Log when the heading is scrolled into the viewport
*
* @param {jQuery.Object} $heading
@@ -373,7 +351,7 @@
* @ignore
*/
function log() {
- if ( isElementInViewport( $heading ) ) {
+ if ( util.isElementInViewport( $heading ) ) {
$window.off( 'scroll.' + $heading.attr(
'id' ), log );
self.schema.log( {
eventName: 'scrolled-into-view',
--
To view, visit https://gerrit.wikimedia.org/r/265168
To unsubscribe, visit ht
[MediaWiki-commits] [Gerrit] toollabs: Include toollabs init in cronrunner - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265187
Change subject: toollabs: Include toollabs init in cronrunner
..
toollabs: Include toollabs init in cronrunner
Rather than inherit! Also needed for setting up the bind mount
for gridengine. Clearly that belings in the 'toollabs' class
and not the 'gridengine' class
Change-Id: I7de4aa9b8c717cd5bc212ba488c0401994e520c8
---
M modules/toollabs/manifests/cronrunner.pp
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/265187/1
diff --git a/modules/toollabs/manifests/cronrunner.pp
b/modules/toollabs/manifests/cronrunner.pp
index 66a1f6e..49d6a55 100644
--- a/modules/toollabs/manifests/cronrunner.pp
+++ b/modules/toollabs/manifests/cronrunner.pp
@@ -1,6 +1,7 @@
class toollabs::cronrunner {
include gridengine::submit_host,
-toollabs::hba
+toollabs::hba,
+toollabs
file { '/etc/ssh/ssh_config':
ensure => file,
--
To view, visit https://gerrit.wikimedia.org/r/265187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7de4aa9b8c717cd5bc212ba488c0401994e520c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add some tolerance to token issue time - change (mediawiki/oauthclient-php)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265186
Change subject: Add some tolerance to token issue time
..
Add some tolerance to token issue time
Add a few seconds tolerance when checking that the issue time (IAT)
of the JWT token is in the past. This can help with clock drift on
the client (which seems to be fairly typical on vagrant boxes at
least).
Change-Id: I38c4d28b5162b3911921cf5af10412e2610a9b16
---
M src/Client.php
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/oauthclient-php
refs/changes/86/265186/1
diff --git a/src/Client.php b/src/Client.php
index 20f21c7..959dc7d 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -34,6 +34,13 @@
class Client implements LoggerAwareInterface {
/**
+* Number of seconds by which IAT (token issue time) can be larger than
current time, to account
+* for clock drift.
+* @var int
+*/
+ const IAT_TOLERANCE = 2;
+
+ /**
* @var LoggerInterface $logger
*/
protected $logger;
@@ -317,7 +324,7 @@
// Verify we are within the time limits of the token. Issued at
(iat)
// should be in the past, Expiration (exp) should be in the
future.
$now = time();
- if ( $identity->iat > $now || $identity->exp < $now ) {
+ if ( $identity->iat > $now + static::IAT_TOLERANCE ||
$identity->exp < $now ) {
$this->logger->info(
"Invalid times issued='{$identity->iat}', " .
"expires='{$identity->exp}', now='{$now}'"
--
To view, visit https://gerrit.wikimedia.org/r/265186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38c4d28b5162b3911921cf5af10412e2610a9b16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/oauthclient-php
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable active gadget user stats on enwiki since it takes to... - change (operations/mediawiki-config)
Kaldari has uploaded a new change for review. https://gerrit.wikimedia.org/r/265185 Change subject: Disable active gadget user stats on enwiki since it takes too long .. Disable active gadget user stats on enwiki since it takes too long Bug: T121949 Change-Id: I443933f39ad9acacf4a0d77a1ed8a2b51a8824a2 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/85/265185/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3d1ba92..b7c7937 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10867,7 +10867,7 @@ ), 'wmgSpecialGadgetUsageActiveUsers' => array( 'default' => true, - 'testwiki' => false, + 'enwiki' => false, ), # @} end of EXTENSIONS -- To view, visit https://gerrit.wikimedia.org/r/265185 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I443933f39ad9acacf4a0d77a1ed8a2b51a8824a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Kaldari ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Add cronrunner role - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Add cronrunner role
..
toollabs: Add cronrunner role
Splitting up submit_host to clearer sub-roles
Bug: T123873
Change-Id: Ic1e0e1d593974dca1979034acfb84b97e86db94f
---
M manifests/role/labstools.pp
A modules/toollabs/manifests/cronrunner.pp
2 files changed, 25 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index c4098ea..e1d71be 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -51,6 +51,14 @@
}
}
+class cronrunner {
+include ::toollabs::cronrunner
+
+system::role { 'role::labs::tools::cronrunner':
+description => 'Tool Labs cron starter host',
+}
+}
+
class submit {
include ::toollabs::submit
diff --git a/modules/toollabs/manifests/cronrunner.pp
b/modules/toollabs/manifests/cronrunner.pp
new file mode 100644
index 000..66a1f6e
--- /dev/null
+++ b/modules/toollabs/manifests/cronrunner.pp
@@ -0,0 +1,17 @@
+class toollabs::cronrunner {
+include gridengine::submit_host,
+toollabs::hba
+
+file { '/etc/ssh/ssh_config':
+ensure => file,
+mode => '0444',
+owner => 'root',
+group => 'root',
+source => 'puppet:///modules/toollabs/submithost-ssh_config',
+}
+
+motd::script { 'submithost-banner':
+ensure => present,
+source =>
"puppet:///modules/toollabs/40-${::labsproject}-submithost-banner",
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/265183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1e0e1d593974dca1979034acfb84b97e86db94f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: coren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert Scribunto to use new registration - change (mediawiki...Scribunto)
MtDu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265184
Change subject: Convert Scribunto to use new registration
..
Convert Scribunto to use new registration
Bug: T87969
Change-Id: Id00a2a00bddf72f5c8716f21226695456b3a32c6
---
A Scribunto.hooks.php
D Scribunto.i18n.php
M Scribunto.php
A extension.json
4 files changed, 202 insertions(+), 240 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto
refs/changes/84/265184/1
diff --git a/Scribunto.hooks.php b/Scribunto.hooks.php
new file mode 100644
index 000..136e6be
--- /dev/null
+++ b/Scribunto.hooks.php
@@ -0,0 +1,9 @@
+https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimc5d9278c8d74fbc1' ) ) {
- function wfJsonI18nShimc5d9278c8d74fbc1( $cache, $code, &$cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShimc5d9278c8d74fbc1';
-}
diff --git a/Scribunto.php b/Scribunto.php
index 49961cf..07c33cc 100644
--- a/Scribunto.php
+++ b/Scribunto.php
@@ -1,206 +1,15 @@
- * http://www.mediawiki.org/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-if ( !defined( 'MEDIAWIKI' ) )
- die();
-
-$wgExtensionCredits['parserhook']['Scribunto'] = array(
- 'path' => __FILE__,
- 'name' => 'Scribunto',
- 'author' => array( 'Victor Vasiliev', 'Tim Starling', 'Brad
Jorsch' ),
- 'descriptionmsg' => 'scribunto-desc',
- 'url'=>
'https://www.mediawiki.org/wiki/Extension:Scribunto',
-);
-
-define( 'CONTENT_MODEL_SCRIBUNTO', 'Scribunto' );
-
-$dir = __DIR__ . '/';
-$wgMessagesDirs['Scribunto'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Scribunto'] = $dir . 'Scribunto.i18n.php';
-$wgExtensionMessagesFiles['ScribuntoMagic'] = $dir . 'Scribunto.magic.php';
-$wgExtensionMessagesFiles['ScribuntoNamespaces'] = $dir .
'Scribunto.namespaces.php';
-
-$wgAutoloadClasses['ScribuntoEngineBase'] = $dir.'common/Base.php';
-$wgAutoloadClasses['ScribuntoModuleBase'] = $dir.'common/Base.php';
-$wgAutoloadClasses['ScribuntoHooks'] = $dir.'common/Hooks.php';
-$wgAutoloadClasses['ScribuntoException'] = $dir.'common/Common.php';
-$wgAutoloadClasses['Scribunto'] = $dir.'common/Common.php';
-$wgAutoloadClasses['ApiScribuntoConsole'] =
$dir.'common/ApiScribuntoConsole.php';
-$wgAutoloadClasses['ScribuntoContentHandler'] =
$dir.'common/ScribuntoContentHandler.php';
-$wgAutoloadClasses['ScribuntoContent'] = $dir.'common/ScribuntoContent.php';
-$wgAutoloadClasses['Scribunto_LuaError'] =
$dir.'engines/LuaCommon/LuaCommon.php';
-$wgAutoloadClasses['Scribunto_LuaInterpreterNotFoundError'] =
$dir.'engines/LuaCommon/LuaInterpreter.php';
-$wgAutoloadClasses['Scribunto_LuaSandboxInterpreter'] =
$dir.'engi
[MediaWiki-commits] [Gerrit] Configure $wgCdnReboundPurgeDelay - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Configure $wgCdnReboundPurgeDelay .. Configure $wgCdnReboundPurgeDelay Bug: T113192 Change-Id: I3a24fe5f133d412aaf19ed20efcfc67e42e95f85 --- M wmf-config/db-codfw.php M wmf-config/db-eqiad.php M wmf-config/squid.php 3 files changed, 5 insertions(+), 2 deletions(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 78f9cef..b6b9eb6 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -168,7 +168,7 @@ 'password'=> $wgDBpassword, 'type'=> 'mysql', 'flags' => DBO_DEFAULT, - 'max lag' => 10, + 'max lag' => 10, // should be safely less than $wgCdnReboundPurgeDelay 'variables' => array( 'innodb_lock_wait_timeout' => 15 ) diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 91e1a70..52e5a8a 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -162,7 +162,7 @@ 'password'=> $wgDBpassword, 'type'=> 'mysql', 'flags' => DBO_DEFAULT, - 'max lag' => 10, + 'max lag' => 10, // should be safely less than $wgCdnReboundPurgeDelay 'variables' => array( 'innodb_lock_wait_timeout' => 15 ) diff --git a/wmf-config/squid.php b/wmf-config/squid.php index 7f13361..3a3f521 100644 --- a/wmf-config/squid.php +++ b/wmf-config/squid.php @@ -69,3 +69,6 @@ '62.214.230.86', '217.94.171.96', ); + +# Secondary purges to deal with DB replication lag +$wgCdnReboundPurgeDelay = 11; // should be safely more than $wgLBFactoryConf 'max lag' -- To view, visit https://gerrit.wikimedia.org/r/258365 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3a24fe5f133d412aaf19ed20efcfc67e42e95f85 Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aaron Schulz Gerrit-Reviewer: Aaron Schulz Gerrit-Reviewer: Chad Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Add cronrunner role - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265183
Change subject: toollabs: Add cronrunner role
..
toollabs: Add cronrunner role
Splitting up submit_host to clearer sub-roles
Bug: T123873
Change-Id: Ic1e0e1d593974dca1979034acfb84b97e86db94f
---
M manifests/role/labstools.pp
A modules/toollabs/manifests/cronrunner.pp
2 files changed, 25 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/265183/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index c4098ea..e1d71be 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -51,6 +51,14 @@
}
}
+class cronrunner {
+include ::toollabs::cronrunner
+
+system::role { 'role::labs::tools::cronrunner':
+description => 'Tool Labs cron starter host',
+}
+}
+
class submit {
include ::toollabs::submit
diff --git a/modules/toollabs/manifests/cronrunner.pp
b/modules/toollabs/manifests/cronrunner.pp
new file mode 100644
index 000..66a1f6e
--- /dev/null
+++ b/modules/toollabs/manifests/cronrunner.pp
@@ -0,0 +1,17 @@
+class toollabs::cronrunner {
+include gridengine::submit_host,
+toollabs::hba
+
+file { '/etc/ssh/ssh_config':
+ensure => file,
+mode => '0444',
+owner => 'root',
+group => 'root',
+source => 'puppet:///modules/toollabs/submithost-ssh_config',
+}
+
+motd::script { 'submithost-banner':
+ensure => present,
+source =>
"puppet:///modules/toollabs/40-${::labsproject}-submithost-banner",
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/265183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1e0e1d593974dca1979034acfb84b97e86db94f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add snippet to mention notification - change (mediawiki...Echo)
Sbisson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265182
Change subject: Add snippet to mention notification
..
Add snippet to mention notification
Bug: T121817
Change-Id: I9a77d8ecb1b91f6a196f1cfabf97c0b59da7
---
M i18n/en.json
M i18n/qqq.json
M includes/formatters/MentionPresentationModel.php
3 files changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/82/265182/1
diff --git a/i18n/en.json b/i18n/en.json
index e52ef6a..a2fae61 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -79,6 +79,7 @@
"notification-add-talkpage-topic2": "[[User:$1|$1]]
{{GENDER:$1|posted}} a new topic \"$2\" on [[$3]].",
"notification-add-talkpage-topic-yours2": "[[User:$1|$1]]
{{GENDER:$1|sent}} you a message: \"[[$3#$2|$2]]\".",
"notification-add-comment-yours2": "[[User:$1|$1]]
{{GENDER:$1|commented}} on \"[[$3#$2|$2]]\" on your talk page.",
+ "notification-body-mention": "$1",
"notification-mention": "[[User:$1|$1]] {{GENDER:$1|mentioned}}
{{GENDER:$6|you}} on the $5 talk page in \"[[:$3#$2|$4]]\".",
"notification-header-mention": "$1 {{GENDER:$2|mentioned}}
{{GENDER:$5|you}} on the $3 talk page in \"$4\".",
"notification-mention-nosection": "[[User:$1|$1]]
{{GENDER:$1|mentioned}} {{GENDER:$4|you}} on the [[:$3|$2 talk page]].",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 47f1af2..f540d1f 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -100,6 +100,7 @@
"notification-add-talkpage-topic2": "Format for displaying
notifications of a new discussion being added. Parameters:\n* $1 - the username
of the person who edited, plain text. Can be used for GENDER.\n* $2 - the
section title of the discussion\n* $3 - the page on which the discussion was
added, plain text\nSee also:\n* {{msg-mw|Notification-edit-talk-page2}}\n*
{{msg-mw|Notification-edit-talk-page-flyout2}}",
"notification-add-talkpage-topic-yours2": "Parameters:\n* $1 - a
username, plain text. Can be used for GENDER.\n* $2 - a page section\n* $3 - a
page title",
"notification-add-comment-yours2": "Parameters:\n* $1 - a username,
plain text; can be used for GENDER\n* $2 - discussion name\n* $3 - link to user
talk page\nSee also:\n* {{msg-mw|Notification-add-comment2}}",
+ "notification-body-mention": "{{notranslate}}",
"notification-mention": "Format for displaying notifications of a
comment in a specific section including a link to another user's user
page.\n\nParameters:\n* $1 - the username of the person who edited, plain text.
Can be used for GENDER\n* $2 - the section title of the discussion\n* $3 - the
page title of the discussion\n* $4 - the raw section title text\n* $5 - the
title text without namespace (a page title in any namespace)\n* $6 - name of
the user viewing the notification, can be used for GENDER",
"notification-header-mention": "Header text for a notification when you
are mentioned by another user.\n* $1 - user's name (not suitable for
GENDER).\n* $2 - user's name for use in GENDER.\n* $3 - name of the page they
were mentioned in (without namespace).\n* $4 - name of the section they were
mentioned in.\n* $5 - name of the user viewing the notification, can be used
for GENDER",
"notification-mention-nosection": "Format for displaying notifications
of a comment including a link to another user's user page. Parameters:\n* $1 -
the username of the person who edited, plain text. Can be used for GENDER\n* $2
- the title text without namespace (a page title in any namespace)\n* $3 - the
page title of the discussion\n* $4 - name of the user viewing the notification,
can be used for GENDER",
diff --git a/includes/formatters/MentionPresentationModel.php
b/includes/formatters/MentionPresentationModel.php
index aae3e47..f0c8a68 100644
--- a/includes/formatters/MentionPresentationModel.php
+++ b/includes/formatters/MentionPresentationModel.php
@@ -88,6 +88,23 @@
return $title;
}
+ public function getBodyMessage() {
+ $content = $this->event->getExtraParam( 'content' );
+ if ( $content && $this->userCan( Revision::DELETED_TEXT ) ) {
+ $msg = $this->msg( 'notification-body-mention' );
+ $msg->params(
+ EchoDiscussionParser::getTextSnippet(
+ $content,
+ $this->language,
+ 30
+ )
+ );
+ return $msg;
+ } else {
+ return false;
+ }
+ }
+
public function getPrimaryLink() {
return array(
// Need FullURL so the section is included
--
To view
[MediaWiki-commits] [Gerrit] [FIXUP] Fix autolinking - change (mediawiki/core)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265181
Change subject: [FIXUP] Fix autolinking
..
[FIXUP] Fix autolinking
continueRequests needs to be preserved because it will be used
to validate continue submissions.
Kept neededRequests but it seems to be unnecessary now that
getAuthenticationRequests with the continue action always gives
the same result.
Change-Id: Ic0c733d6f29a249ad99fd255ca03c8fd23f0ea1f
---
M includes/auth/AuthManager.php
M includes/auth/AuthenticationRequest.php
M includes/auth/AuthenticationResponse.php
M languages/i18n/en.json
4 files changed, 20 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/81/265181/1
diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php
index a4ccf6e..1e0f488 100644
--- a/includes/auth/AuthManager.php
+++ b/includes/auth/AuthManager.php
@@ -352,7 +352,10 @@
* AuthManager::continueAuthentication() should be called.
* - status RESTART: The user logged in successfully with a third-party
* service, but the third-party credentials aren't attached to any
local
-* account. This could be treated as a UI or a FAIL.
+* account. This could be treated as a UI or a FAIL. In the second
case,
+* if it is followed up by an account creation process, the
$createRequest
+* in the response should be passed to
AuthManager::beginAccountCreation()
+* after adding a local username.
* - status PASS: Authentication was successful.
*
* @param AuthenticationRequest[] $reqs
@@ -511,20 +514,24 @@
$this->logger->info(
"Primary login with
{$provider->getUniqueId()} succeeded, but returned no user"
);
+ $ret = AuthenticationResponse::newRestart(
wfMessage( $msg ) );
+ $restartRequests =
$this->getAuthenticationRequestsInternal( self::ACTION_LOGIN,
+ array(),
$this->getPrimaryAuthenticationProviders() +
+
$this->getSecondaryAuthenticationProviders() );
+ if ( $res->createRequest || $state['maybeLink']
) {
+ $createRequest = new
CreateFromLoginAuthenticationRequest( $res->createRequest,
+ $state['maybeLink'] );
+ $restartRequests[] = $createRequest;
+ $ret->createRequest = $createRequest;
+ }
+ $ret->neededRequests = $restartRequests;
$session->set( 'AuthManager::authnState', array(
'reqs' => array(), // Will be filled in
later
'primary' => null,
'primaryResponse' => null,
'secondary' => array(),
- 'continueRequests' => array(),
+ 'continueRequests' => $restartRequests,
) + $state );
- $ret = AuthenticationResponse::newRestart(
wfMessage( $msg ) );
- $ret->neededRequests =
$this->getAuthenticationRequests( self::ACTION_LOGIN_CONTINUE );
- if ( $res->createRequest || $state['maybeLink']
) {
- $ret->createRequest = new
CreateFromLoginAuthenticationRequest(
- $res->createRequest,
$state['maybeLink']
- );
- }
return $ret;
}
diff --git a/includes/auth/AuthenticationRequest.php
b/includes/auth/AuthenticationRequest.php
index 83d145c..006efae 100644
--- a/includes/auth/AuthenticationRequest.php
+++ b/includes/auth/AuthenticationRequest.php
@@ -159,7 +159,7 @@
* and ACTION_REMOVE and for requests returned in
* AuthenticationResponse::$linkRequest to create useful user
interfaces.
*
-* @return array with the following keys:
+* @return \Message[] with the following keys:
* - provider: A Message identifying the service that provides
*the credentials, e.g. the name of the third party authentication
*service.
diff --git a/includes/auth/AuthenticationResponse.php
b/includes/auth/AuthenticationResponse.php
index b85f378..12287e4 100644
--- a/includes/auth/AuthenticationResponse.php
+++ b/includes/auth/AuthenticationResponse.php
@@ -88
[MediaWiki-commits] [Gerrit] toollabs: Don't setup exec_environ in submit hosts - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Don't setup exec_environ in submit hosts
..
toollabs: Don't setup exec_environ in submit hosts
Not sure why they were needed here, and is causing apt breakage.
Bug: T124014
Change-Id: Ieb5f4ac69150a944ef12cd74a22076500f456768
---
M modules/toollabs/manifests/submit.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/toollabs/manifests/submit.pp
b/modules/toollabs/manifests/submit.pp
index ad36f05..df79f1b 100644
--- a/modules/toollabs/manifests/submit.pp
+++ b/modules/toollabs/manifests/submit.pp
@@ -15,7 +15,6 @@
class toollabs::submit inherits toollabs {
include gridengine::submit_host,
-toollabs::exec_environ,
toollabs::hba
file { '/etc/ssh/ssh_config':
--
To view, visit https://gerrit.wikimedia.org/r/265180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb5f4ac69150a944ef12cd74a22076500f456768
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: coren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Don't setup exec_environ in submit hosts - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265180
Change subject: toollabs: Don't setup exec_environ in submit hosts
..
toollabs: Don't setup exec_environ in submit hosts
Not sure why they were needed here, and is causing apt breakage.
Bug: T124014
Change-Id: Ieb5f4ac69150a944ef12cd74a22076500f456768
---
M modules/toollabs/manifests/submit.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/265180/1
diff --git a/modules/toollabs/manifests/submit.pp
b/modules/toollabs/manifests/submit.pp
index ad36f05..df79f1b 100644
--- a/modules/toollabs/manifests/submit.pp
+++ b/modules/toollabs/manifests/submit.pp
@@ -15,7 +15,6 @@
class toollabs::submit inherits toollabs {
include gridengine::submit_host,
-toollabs::exec_environ,
toollabs::hba
file { '/etc/ssh/ssh_config':
--
To view, visit https://gerrit.wikimedia.org/r/265180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb5f4ac69150a944ef12cd74a22076500f456768
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove dependancy on DataValues as it's been removed from Ge... - change (integration/config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/265179 Change subject: Remove dependancy on DataValues as it's been removed from Gerrit... .. Remove dependancy on DataValues as it's been removed from Gerrit... Change-Id: I54516b3eb091f1bc56d69e53b9f327c0674a0538 --- M jjb/mediawiki-extensions.yaml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/79/265179/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 9118df2..9e86109 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -585,7 +585,6 @@ - UpdateMediaWiki - UserPageViewTracker - Validator: -dependencies: 'DataValues' - VectorBeta: dependencies: 'EventLogging' - VisualChat -- To view, visit https://gerrit.wikimedia.org/r/265179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54516b3eb091f1bc56d69e53b9f327c0674a0538 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Reedy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set $wgCentralAuthUseSlaves for loginwiki, mw.org - change (operations/mediawiki-config)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265178
Change subject: Set $wgCentralAuthUseSlaves for loginwiki, mw.org
..
Set $wgCentralAuthUseSlaves for loginwiki, mw.org
Change-Id: I9e675011f8cc9bdbb1318a4c324808ab38693a60
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/78/265178/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d44f2c9..42b5d88 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1255,7 +1255,7 @@
);
// testing -- aaron 2016-01-12
- if ( in_array( $wgDBname, array( 'testwiki' ) ) ) {
+ if ( in_array( $wgDBname, array( 'testwiki', 'mediawikiwiki',
'loginwiki' ) ) ) {
$wgCentralAuthUseSlaves = true;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/265178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e675011f8cc9bdbb1318a4c324808ab38693a60
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Do not use inheritance for submit role - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Do not use inheritance for submit role
..
toollabs: Do not use inheritance for submit role
Change-Id: I67791519a692e8d78f65e6c2bda461454cb40ff0
---
M manifests/role/labstools.pp
M modules/gridengine/manifests/submit_host.pp
2 files changed, 9 insertions(+), 6 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 3a49b65..c4098ea 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -51,10 +51,12 @@
}
}
-class submit inherits role::labs::tools::common {
-include toollabs::submit
+class submit {
+include ::toollabs::submit
-system::role { 'role::labs::tools::submit': description => 'Tool Labs
job submit (cron) host' }
+system::role { 'role::labs::tools::submit':
+description => 'Tool Labs job submit (cron) host',
+}
}
class proxy {
diff --git a/modules/gridengine/manifests/submit_host.pp
b/modules/gridengine/manifests/submit_host.pp
index 0940161..509208f 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -1,7 +1,9 @@
# gridengine/submit_host.pp
-class gridengine::submit_host
-{
+class gridengine::submit_host {
+
+include ::gridengine
+
package { [ 'jobutils' ]:
ensure => latest,
}
@@ -23,4 +25,3 @@
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/265176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67791519a692e8d78f65e6c2bda461454cb40ff0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [wip] Rephrase mention notifications - change (mediawiki...Echo)
Sbisson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265177
Change subject: [wip] Rephrase mention notifications
..
[wip] Rephrase mention notifications
Split mentions into 4 cases:
- Mentioned on article talk page
- Mentioned on agent's talk page
- Mentioned on another user's talk page
- Mentioned on any other page
Also adjust secondary link icon accordingly.
Bug: T56433
Change-Id: Ibf965dad4f9cc468fdd4321b2450d6eaec0ac1d7
---
M i18n/en.json
M i18n/qqq.json
M includes/formatters/MentionPresentationModel.php
3 files changed, 85 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/77/265177/1
diff --git a/i18n/en.json b/i18n/en.json
index e52ef6a..bc2a47f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -80,9 +80,15 @@
"notification-add-talkpage-topic-yours2": "[[User:$1|$1]]
{{GENDER:$1|sent}} you a message: \"[[$3#$2|$2]]\".",
"notification-add-comment-yours2": "[[User:$1|$1]]
{{GENDER:$1|commented}} on \"[[$3#$2|$2]]\" on your talk page.",
"notification-mention": "[[User:$1|$1]] {{GENDER:$1|mentioned}}
{{GENDER:$6|you}} on the $5 talk page in \"[[:$3#$2|$4]]\".",
- "notification-header-mention": "$1 {{GENDER:$2|mentioned}}
{{GENDER:$5|you}} on the $3 talk page in \"$4\".",
"notification-mention-nosection": "[[User:$1|$1]]
{{GENDER:$1|mentioned}} {{GENDER:$4|you}} on the [[:$3|$2 talk page]].",
- "notification-header-mention-nosection": "$1 {{GENDER:$2|mentioned}}
{{GENDER:$5|you}} on the $3 talk page.",
+ "notification-header-mention-other": "$1 {{GENDER:$2|mentioned}}
{{GENDER:$3|you}} on '''$4''' in \"$5\".",
+ "notification-header-mention-other-nosection": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on '''$4'''.",
+ "notification-header-mention-user-talkpage": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on the user talk page of '''$4''' in
\"$5\".",
+ "notification-header-mention-user-talkpage-nosection": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on the user talk page of '''$4'''.",
+ "notification-header-mention-agent-talkpage": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on {{GENDER:$2|his|her|their}} talk
page in \"$4\".",
+ "notification-header-mention-agent-talkpage-nosection": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on {{GENDER:$2|his|her|their}} talk
page.",
+ "notification-header-mention-article-talkpage": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on the '''$4''' talk page in \"$5\".",
+ "notification-header-mention-article-talkpage-nosection": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on the '''$4''' talk page.",
"notification-user-rights": "Your user rights
[[Special:Log/rights/$1|were {{GENDER:$1|changed}}]] by [[User:$1|$1]]. $2.
[[Special:ListGroupRights|Learn more]]",
"notification-header-user-rights": "Your user rights were
{{GENDER:$2|changed}} by $1. $3.",
"notification-user-rights-add": "You are now a member of
{{PLURAL:$2|this group|these groups}}: $1",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 47f1af2..0d8fd70 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -101,9 +101,15 @@
"notification-add-talkpage-topic-yours2": "Parameters:\n* $1 - a
username, plain text. Can be used for GENDER.\n* $2 - a page section\n* $3 - a
page title",
"notification-add-comment-yours2": "Parameters:\n* $1 - a username,
plain text; can be used for GENDER\n* $2 - discussion name\n* $3 - link to user
talk page\nSee also:\n* {{msg-mw|Notification-add-comment2}}",
"notification-mention": "Format for displaying notifications of a
comment in a specific section including a link to another user's user
page.\n\nParameters:\n* $1 - the username of the person who edited, plain text.
Can be used for GENDER\n* $2 - the section title of the discussion\n* $3 - the
page title of the discussion\n* $4 - the raw section title text\n* $5 - the
title text without namespace (a page title in any namespace)\n* $6 - name of
the user viewing the notification, can be used for GENDER",
- "notification-header-mention": "Header text for a notification when you
are mentioned by another user.\n* $1 - user's name (not suitable for
GENDER).\n* $2 - user's name for use in GENDER.\n* $3 - name of the page they
were mentioned in (without namespace).\n* $4 - name of the section they were
mentioned in.\n* $5 - name of the user viewing the notification, can be used
for GENDER",
"notification-mention-nosection": "Format for displaying notifications
of a comment including a link to another user's user page. Parameters:\n* $1 -
the username of the person who edited, plain text. Can be used for GENDER\n* $2
- the title text without namespace (a page title in any namespace)\n* $3 - the
page title of the discussion\n* $4 - name of the user viewing the notification
[MediaWiki-commits] [Gerrit] toollabs: Do not use inheritance for submit role - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265176
Change subject: toollabs: Do not use inheritance for submit role
..
toollabs: Do not use inheritance for submit role
Change-Id: I67791519a692e8d78f65e6c2bda461454cb40ff0
---
M manifests/role/labstools.pp
M modules/gridengine/manifests/submit_host.pp
2 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/265176/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 3a49b65..c4098ea 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -51,10 +51,12 @@
}
}
-class submit inherits role::labs::tools::common {
-include toollabs::submit
+class submit {
+include ::toollabs::submit
-system::role { 'role::labs::tools::submit': description => 'Tool Labs
job submit (cron) host' }
+system::role { 'role::labs::tools::submit':
+description => 'Tool Labs job submit (cron) host',
+}
}
class proxy {
diff --git a/modules/gridengine/manifests/submit_host.pp
b/modules/gridengine/manifests/submit_host.pp
index 0940161..509208f 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -1,7 +1,9 @@
# gridengine/submit_host.pp
-class gridengine::submit_host
-{
+class gridengine::submit_host {
+
+include ::gridengine
+
package { [ 'jobutils' ]:
ensure => latest,
}
@@ -23,4 +25,3 @@
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/265176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67791519a692e8d78f65e6c2bda461454cb40ff0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Stop specifying $gridmaster in role - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Stop specifying $gridmaster in role
..
toollabs: Stop specifying $gridmaster in role
It was pointing to the wrong host, and hence does not matter
I think. Also I added it in hiera, at
https://wikitech.wikimedia.org/w/index.php?title=Hiera:Tools&diff=262358&oldid=242815
Change-Id: I9a083e3f7c8013dec4b8e1ebce50c13571cec76c
---
M manifests/role/labstools.pp
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 4cb524e..3a49b65 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -2,9 +2,7 @@
class role::labs::tools {
class common {
-$gridmaster = "${::labsproject}-master.${::site}.wmflabs"
-
-class { 'gridengine': gridmaster => $gridmaster }
+include ::gridengine
}
class bastion inherits role::labs::tools::common {
--
To view, visit https://gerrit.wikimedia.org/r/265175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a083e3f7c8013dec4b8e1ebce50c13571cec76c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: coren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apache: Add http to https redirection for simplestatic role - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: apache: Add http to https redirection for simplestatic role
..
apache: Add http to https redirection for simplestatic role
Change-Id: I48077621c4f11e2c00ee7e25a45893af4473e1dc
---
M manifests/role/simplestatic.pp
M templates/apache/sites/simplestatic.erb
2 files changed, 15 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/simplestatic.pp b/manifests/role/simplestatic.pp
index 243d6bb..a09dcff 100644
--- a/manifests/role/simplestatic.pp
+++ b/manifests/role/simplestatic.pp
@@ -10,6 +10,9 @@
# This role is expected to be used only in labs
requires_realm('labs')
+include ::apache::mod::rewrite
+include ::apache::mod::headers
+
apache::site { 'simplestatic':
ensure => present,
content => template('apache/sites/simplestatic.erb'),
diff --git a/templates/apache/sites/simplestatic.erb
b/templates/apache/sites/simplestatic.erb
index 066e8f8..877df4c 100644
--- a/templates/apache/sites/simplestatic.erb
+++ b/templates/apache/sites/simplestatic.erb
@@ -6,6 +6,18 @@
ServerName <%= host_name %>
DocumentRoot <%= base_path %>/<%= host_name %>
+
+# Redirect HTTP to HTTPS
+# Assumes that X-Forwarded-Proto is being set by a layer in front of
apache
+# This is fine in this specific case because we require the labs realm
+RewriteEngine On
+RewriteCond %{HTTP:X-Forwarded-Proto} !https
+RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI}
[R=301,E=ProtoRedirect]
+# Make sure we vary caches by protocol (Probably not useful in the
labs world)
+Header always merge Vary X-Forwarded-Proto
+# Enable HSTS
+Header always set Strict-Transport-Security "max-age=31536000"
+
/<%= host_name %>>
= 2.4>
Require all granted
--
To view, visit https://gerrit.wikimedia.org/r/265162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48077621c4f11e2c00ee7e25a45893af4473e1dc
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy
Gerrit-Reviewer: Madhuvishy
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Stop specifying $gridmaster in role - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265175
Change subject: toollabs: Stop specifying $gridmaster in role
..
toollabs: Stop specifying $gridmaster in role
It was pointing to the wrong host, and hence does not matter
I think. Also I added it in hiera, at
https://wikitech.wikimedia.org/w/index.php?title=Hiera:Tools&diff=262358&oldid=242815
Change-Id: I9a083e3f7c8013dec4b8e1ebce50c13571cec76c
---
M manifests/role/labstools.pp
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/265175/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 4cb524e..3a49b65 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -2,9 +2,7 @@
class role::labs::tools {
class common {
-$gridmaster = "${::labsproject}-master.${::site}.wmflabs"
-
-class { 'gridengine': gridmaster => $gridmaster }
+include ::gridengine
}
class bastion inherits role::labs::tools::common {
--
To view, visit https://gerrit.wikimedia.org/r/265175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a083e3f7c8013dec4b8e1ebce50c13571cec76c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable cross-wiki notifications beta feature on testwiki and... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable cross-wiki notifications beta feature on testwiki and test2wiki .. Enable cross-wiki notifications beta feature on testwiki and test2wiki Change-Id: I1a2b5a6ebe6b972b6cd3090c6badd2209c5b33ee --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8de93c9..3d1ba92 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14938,6 +14938,8 @@ ), 'wmgEchoUseCrossWikiBetaFeature' => array( 'default' => false, + 'testwiki' => true, + 'test2wiki' => true, ), # from and reply to address when Echo sends email notifications 'wmgNotificationSender' => array( -- To view, visit https://gerrit.wikimedia.org/r/264917 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a2b5a6ebe6b972b6cd3090c6badd2209c5b33ee Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Chad Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...MassMessage)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I3a488b6537591ea1d0b92184ff04684a6c7fc52b
---
M includes/SpecialCreateMassMessageList.php
M includes/SpecialEditMassMessageList.php
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SpecialCreateMassMessageList.php
b/includes/SpecialCreateMassMessageList.php
index 520fe2e..eb04e04 100644
--- a/includes/SpecialCreateMassMessageList.php
+++ b/includes/SpecialCreateMassMessageList.php
@@ -6,6 +6,10 @@
parent::__construct( 'CreateMassMessageList' );
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* Add ResourceLoader module and call parent implementation.
* @param string $par
diff --git a/includes/SpecialEditMassMessageList.php
b/includes/SpecialEditMassMessageList.php
index 26507a1..9b1e6b9 100644
--- a/includes/SpecialEditMassMessageList.php
+++ b/includes/SpecialEditMassMessageList.php
@@ -26,6 +26,10 @@
parent::__construct( 'EditMassMessageList' );
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* @param string $par
*/
--
To view, visit https://gerrit.wikimedia.org/r/265173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a488b6537591ea1d0b92184ff04684a6c7fc52b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Wctaiwan
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add license information to extension metadata - change (mediawiki...GlobalUserPage)
Dereckson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265174
Change subject: Add license information to extension metadata
..
Add license information to extension metadata
Change-Id: Ic0caa4eb97b35bd90e9f5b73f281c26888cf8773
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserPage
refs/changes/74/265174/1
diff --git a/extension.json b/extension.json
index 9a10089..976819e 100644
--- a/extension.json
+++ b/extension.json
@@ -7,6 +7,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:GlobalUserPage";,
"descriptionmsg": "globaluserpage-desc",
+ "license-name": "GPL-2.0+",
"type": "other",
"requires": {
"MediaWiki": ">= 1.27.0"
--
To view, visit https://gerrit.wikimedia.org/r/265174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0caa4eb97b35bd90e9f5b73f281c26888cf8773
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUserPage
Gerrit-Branch: master
Gerrit-Owner: Dereckson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...CommunityVoice)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123589
Change-Id: I8938ed2f2e01498743774be4462d2457587cb767
---
M CommunityVoice.page.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CommunityVoice.page.php b/CommunityVoice.page.php
index d59d76e..7ffb655 100644
--- a/CommunityVoice.page.php
+++ b/CommunityVoice.page.php
@@ -18,6 +18,10 @@
parent::__construct( 'CommunityVoice' );
}
+ public function doesWrites() {
+ return true;
+ }
+
public function execute( $sub ) {
global $wgOut, $wgRequest, $wgUser;
--
To view, visit https://gerrit.wikimedia.org/r/264357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8938ed2f2e01498743774be4462d2457587cb767
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CommunityVoice
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...CommunityTwitter)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123589
Change-Id: Ia96b238b692a22114859f8ae98d89db7ed04a633
---
M CommunityTwitter_body.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CommunityTwitter_body.php b/CommunityTwitter_body.php
index dd43a9a..11a9de3 100755
--- a/CommunityTwitter_body.php
+++ b/CommunityTwitter_body.php
@@ -42,6 +42,10 @@
SpecialPage::__construct('CommunityTwitter', 'twitter');
}
+ public function doesWrites() {
+ return true;
+ }
+
function execute($query) {
// Get context variables
$output = $this->getOutput();
--
To view, visit https://gerrit.wikimedia.org/r/264354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia96b238b692a22114859f8ae98d89db7ed04a633
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CommunityTwitter
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...Challenge)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123589
Change-Id: I4dccf015751eec1ff6836b4f974e49933d190bf3
---
M ChallengeUser.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ChallengeUser.php b/ChallengeUser.php
index 9203cd4..46645e7 100644
--- a/ChallengeUser.php
+++ b/ChallengeUser.php
@@ -6,6 +6,10 @@
parent::__construct( 'ChallengeUser' );
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* Under which header this special page is listed in
Special:SpecialPages?
*
--
To view, visit https://gerrit.wikimedia.org/r/264347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4dccf015751eec1ff6836b4f974e49933d190bf3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Challenge
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...Duplicator)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123589
Change-Id: Ic15f970e005a5d5ba33f4108e760880ebe8b11ea
---
M Duplicator.page.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Duplicator.page.php b/Duplicator.page.php
index 3c5d8e3..d41bce0 100644
--- a/Duplicator.page.php
+++ b/Duplicator.page.php
@@ -51,6 +51,10 @@
parent::__construct( 'Duplicator' );
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* Main execution function
*
--
To view, visit https://gerrit.wikimedia.org/r/264370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic15f970e005a5d5ba33f4108e760880ebe8b11ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Duplicator
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...DataTransfer)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123589
Change-Id: If7ed0b91c013042fa4a13c4552653c17662d637b
---
M specials/DT_ImportCSV.php
M specials/DT_ImportXML.php
M specials/DT_ViewXML.php
3 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/DT_ImportCSV.php b/specials/DT_ImportCSV.php
index f6fb34c..9d2f4c0 100644
--- a/specials/DT_ImportCSV.php
+++ b/specials/DT_ImportCSV.php
@@ -14,6 +14,10 @@
parent::__construct( $name );
}
+ public function doesWrites() {
+ return true;
+ }
+
function execute( $query ) {
$this->setHeaders();
diff --git a/specials/DT_ImportXML.php b/specials/DT_ImportXML.php
index 105f94c..20bda5e 100644
--- a/specials/DT_ImportXML.php
+++ b/specials/DT_ImportXML.php
@@ -14,6 +14,10 @@
parent::__construct( $name );
}
+ public function doesWrites() {
+ return true;
+ }
+
function execute( $query ) {
$this->setHeaders();
diff --git a/specials/DT_ViewXML.php b/specials/DT_ViewXML.php
index bd8eb7a..e6beaff 100644
--- a/specials/DT_ViewXML.php
+++ b/specials/DT_ViewXML.php
@@ -14,6 +14,10 @@
parent::__construct( $name );
}
+ public function doesWrites() {
+ return true;
+ }
+
function execute( $query ) {
$this->setHeaders();
self::doSpecialViewXML( $query );
--
To view, visit https://gerrit.wikimedia.org/r/264366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7ed0b91c013042fa4a13c4552653c17662d637b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataTransfer
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add cross-wiki notifications to beta features whitelist - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add cross-wiki notifications to beta features whitelist .. Add cross-wiki notifications to beta features whitelist Bonus: also correct the expiry date for the completion suggester. Change-Id: I57b0f190f042557eff44e637f64d41f6f12c054d --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Alex Monk: Looks good to me, approved Jforrester: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a93c7f9..917b17a 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12166,7 +12166,8 @@ 'beta-feature-flow-user-talk-page', // 2016-03-02 - Flow opt-in 'cx', // 2016-05-08 - ContentTranslation 'read-more',// 2016-06-10 - Read more - 'cirrussearch-completionsuggester', // 2016-12-17 - Completion Suggester / type as you search + 'cirrussearch-completionsuggester', // 2016-06-17 - Completion Suggester / type as you search + 'echo-cross-wiki-notifications',// 2016-07-19 - Enhanced/cross-wiki notifications ), ), -- To view, visit https://gerrit.wikimedia.org/r/264920 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I57b0f190f042557eff44e637f64d41f6f12c054d Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Chad Gerrit-Reviewer: Florianschmidtwelzow 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] Define doesWrites() for SpecialPage classes - change (mediawiki...Maintenance)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: Ie5e7db575080e3665bc6871d0ede2cee8b984308
---
M Maintenance_body.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Maintenance_body.php b/Maintenance_body.php
index 4e3c2b8..230f07e 100644
--- a/Maintenance_body.php
+++ b/Maintenance_body.php
@@ -18,6 +18,10 @@
parent::__construct( 'Maintenance'/*class*/,
'maintenance'/*restriction*/ );
}
+ public function doesWrites() {
+ return true;
+ }
+
public function getType() { return $this->type; }
public function getMetadata() { return $this->metadata; }
--
To view, visit https://gerrit.wikimedia.org/r/265000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5e7db575080e3665bc6871d0ede2cee8b984308
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Maintenance
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...InviteSignup)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123589
Change-Id: I331252f4554c83267bdd7744158577e7380e497d
---
M SpecialInviteSignup.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialInviteSignup.php b/SpecialInviteSignup.php
index 8b576b5..38e7e12 100644
--- a/SpecialInviteSignup.php
+++ b/SpecialInviteSignup.php
@@ -20,6 +20,10 @@
$this->groups = $wgISGroups;
}
+ public function doesWrites() {
+ return true;
+ }
+
public function setStore( InviteStore $store ) {
$this->store = $store;
}
--
To view, visit https://gerrit.wikimedia.org/r/264387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I331252f4554c83267bdd7744158577e7380e497d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InviteSignup
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...RDFIO)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I44eb62f2cee73acebb98b1b0e476fadfd524789b
---
M specials/SpecialARC2Admin_body.php
M specials/SpecialRDFImport_body.php
M specials/SpecialSPARQLEndpoint_body.php
3 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/SpecialARC2Admin_body.php
b/specials/SpecialARC2Admin_body.php
index aa75270..a8bacd6 100644
--- a/specials/SpecialARC2Admin_body.php
+++ b/specials/SpecialARC2Admin_body.php
@@ -21,6 +21,10 @@
parent::__construct( 'SpecialARC2Admin' );
}
+ public function doesWrites() {
+ return true;
+ }
+
function execute( $par ) {
global $wgRequest, $wgOut, $smwgARC2StoreConfig,
$wgServer, $wgScriptPath, $wgUser;
diff --git a/specials/SpecialRDFImport_body.php
b/specials/SpecialRDFImport_body.php
index 6dd23f7..bb5668a 100644
--- a/specials/SpecialRDFImport_body.php
+++ b/specials/SpecialRDFImport_body.php
@@ -5,6 +5,10 @@
parent::__construct( 'RDFImport' );
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* The main code goes here
*/
diff --git a/specials/SpecialSPARQLEndpoint_body.php
b/specials/SpecialSPARQLEndpoint_body.php
index a55d37a..6ff976e 100644
--- a/specials/SpecialSPARQLEndpoint_body.php
+++ b/specials/SpecialSPARQLEndpoint_body.php
@@ -21,6 +21,10 @@
$this->requestdata = null;
}
+public function doesWrites() {
+return true;
+}
+
/**
* The main function
*/
--
To view, visit https://gerrit.wikimedia.org/r/265075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I44eb62f2cee73acebb98b1b0e476fadfd524789b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RDFIO
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...Newsletter)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I5e68e54c76adba26b7b1e3aa25b629936b3e8774
---
M includes/specials/SpecialNewsletter.php
M includes/specials/SpecialNewsletterManage.php
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialNewsletter.php
b/includes/specials/SpecialNewsletter.php
index aff4632..9ab9cdb 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -22,6 +22,10 @@
parent::__construct( 'Newsletter' );
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* @param string|null $par subpage parameter
*/
diff --git a/includes/specials/SpecialNewsletterManage.php
b/includes/specials/SpecialNewsletterManage.php
index ed663bc..13bf8ee 100644
--- a/includes/specials/SpecialNewsletterManage.php
+++ b/includes/specials/SpecialNewsletterManage.php
@@ -13,6 +13,10 @@
parent::__construct( 'NewsletterManage' );
}
+ public function doesWrites() {
+ return true;
+ }
+
public function execute( $par ) {
$this->setHeaders();
$output = $this->getOutput();
--
To view, visit https://gerrit.wikimedia.org/r/265013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e68e54c76adba26b7b1e3aa25b629936b3e8774
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...MassEditRegex)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I9eaf6edee930f10b69705a2ccc18e75c25e67e75
---
M MassEditRegex.special.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MassEditRegex.special.php b/MassEditRegex.special.php
index 432cf25..3519d8f 100644
--- a/MassEditRegex.special.php
+++ b/MassEditRegex.special.php
@@ -39,6 +39,10 @@
parent::__construct( 'MassEditRegex', 'masseditregex' );
}
+ public function doesWrites() {
+ return true;
+ }
+
/// Perform the regex process.
/**
* @param bool $isPreview
--
To view, visit https://gerrit.wikimedia.org/r/265002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9eaf6edee930f10b69705a2ccc18e75c25e67e75
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MassEditRegex
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...SemanticPageMaker)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I72a893f32748d7a13c1c06e6de79ae21e051de50
---
M specials/WikiObjectEditor/SPM_ObjectEditor.php
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/WikiObjectEditor/SPM_ObjectEditor.php
b/specials/WikiObjectEditor/SPM_ObjectEditor.php
index d54dcc0..e3c3ea7 100644
--- a/specials/WikiObjectEditor/SPM_ObjectEditor.php
+++ b/specials/WikiObjectEditor/SPM_ObjectEditor.php
@@ -17,6 +17,11 @@
public function __construct() {
parent::__construct( 'ObjectEditor' );
}
+
+ public function doesWrites() {
+ return true;
+ }
+
/*
* Overloaded function that is responsible for the creation of the
Special Page
*/
--
To view, visit https://gerrit.wikimedia.org/r/265113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72a893f32748d7a13c1c06e6de79ae21e051de50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticPageMaker
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...RevisionCommentSupplement)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I513111708d7e4f5f6c4acfbf0c8f635f5887c688
---
M special/SpecialRevisionCommentSupplement.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/special/SpecialRevisionCommentSupplement.php
b/special/SpecialRevisionCommentSupplement.php
index 30c0040..8cd992e 100644
--- a/special/SpecialRevisionCommentSupplement.php
+++ b/special/SpecialRevisionCommentSupplement.php
@@ -33,6 +33,10 @@
parent::__construct( 'RevisionCommentSupplement',
'supplementcomment', true );
}
+ public function doesWrites() {
+ return true;
+ }
+
# from class SpecialAbuseFilter in SpecialAbuseFilter.php into
extension AbuseFilter
function execute( $subpage ) {
$this->setHeaders();
--
To view, visit https://gerrit.wikimedia.org/r/265096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I513111708d7e4f5f6c4acfbf0c8f635f5887c688
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionCommentSupplement
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...PollNY)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I79b15eb50b153b4bf3c866284e76b92bafa7e8f7
---
M SpecialAdminPoll.php
M SpecialCreatePoll.php
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialAdminPoll.php b/SpecialAdminPoll.php
index 8b44e35..9012512 100644
--- a/SpecialAdminPoll.php
+++ b/SpecialAdminPoll.php
@@ -14,6 +14,10 @@
parent::__construct( 'AdminPoll', 'polladmin' );
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* Show the special page
*
diff --git a/SpecialCreatePoll.php b/SpecialCreatePoll.php
index 06db9fa..c2dc5c0 100644
--- a/SpecialCreatePoll.php
+++ b/SpecialCreatePoll.php
@@ -13,6 +13,10 @@
parent::__construct( 'CreatePoll' );
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* Show the special page
*
--
To view, visit https://gerrit.wikimedia.org/r/265022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79b15eb50b153b4bf3c866284e76b92bafa7e8f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...OpenStackManager)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I0e48f42348bc11056638b9aded2671f2123037d1
---
M special/SpecialNova.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
Objections:
Alex Monk: There's a problem with this change, please improve
diff --git a/special/SpecialNova.php b/special/SpecialNova.php
index 44974f5..ee723c5 100644
--- a/special/SpecialNova.php
+++ b/special/SpecialNova.php
@@ -8,6 +8,10 @@
*/
abstract class SpecialNova extends SpecialPage {
+ public function doesWrites() {
+ return true;
+ }
+
/**
* @return void
*/
--
To view, visit https://gerrit.wikimedia.org/r/265018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e48f42348bc11056638b9aded2671f2123037d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...SocialProfile)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I659b3ead135179f27f62ca4cac280517eadc97bd
---
M SystemGifts/SpecialSystemGiftManager.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SystemGifts/SpecialSystemGiftManager.php
b/SystemGifts/SpecialSystemGiftManager.php
index 0bba14c..0f2d2ff 100644
--- a/SystemGifts/SpecialSystemGiftManager.php
+++ b/SystemGifts/SpecialSystemGiftManager.php
@@ -16,6 +16,10 @@
parent::__construct( 'SystemGiftManager'/*class*/,
'awardsmanage'/*restriction*/ );
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* Show the special page
*
--
To view, visit https://gerrit.wikimedia.org/r/265116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I659b3ead135179f27f62ca4cac280517eadc97bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Lewis Cawte
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...ReplaceText)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I9275317363ca17c8c5d6c0f887212ec66e805142
---
M SpecialReplaceText.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialReplaceText.php b/SpecialReplaceText.php
index b3039a3..6a716fb 100644
--- a/SpecialReplaceText.php
+++ b/SpecialReplaceText.php
@@ -7,6 +7,10 @@
parent::__construct( 'ReplaceText', 'replacetext' );
}
+ public function doesWrites() {
+ return true;
+ }
+
function execute( $query ) {
if ( !$this->getUser()->isAllowed( 'replacetext' ) ) {
throw new PermissionsError( 'replacetext' );
--
To view, visit https://gerrit.wikimedia.org/r/265093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9275317363ca17c8c5d6c0f887212ec66e805142
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReplaceText
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...RefreshSpecial)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I96be872a1903228e4895fc09afa6ca0b25974abf
---
M RefreshSpecial.body.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RefreshSpecial.body.php b/RefreshSpecial.body.php
index bc75b6e..0260e3d 100644
--- a/RefreshSpecial.body.php
+++ b/RefreshSpecial.body.php
@@ -27,6 +27,10 @@
parent::__construct( 'RefreshSpecial'/*class*/,
'refreshspecial'/*restriction*/ );
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* Show the special page
*
--
To view, visit https://gerrit.wikimedia.org/r/265086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96be872a1903228e4895fc09afa6ca0b25974abf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RefreshSpecial
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...SemanticMediaWiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I3df199eefd1d34b97b60ab56b6c262ec3c497072
---
M includes/specials/SMW_SpecialSMWAdmin.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SMW_SpecialSMWAdmin.php
b/includes/specials/SMW_SpecialSMWAdmin.php
index 60744be..af2a00a 100644
--- a/includes/specials/SMW_SpecialSMWAdmin.php
+++ b/includes/specials/SMW_SpecialSMWAdmin.php
@@ -42,6 +42,10 @@
$this->store = StoreFactory::getStore();
}
+ public function doesWrites() {
+ return true;
+ }
+
public function setStore( Store $store ) {
$this->store = $store;
}
--
To view, visit https://gerrit.wikimedia.org/r/265112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3df199eefd1d34b97b60ab56b6c262ec3c497072
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...SmiteSpam)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: Id16e1d994dc29d14ecb512cfb613a89ecc4b1c74
---
M SpecialSmiteSpamTrustedUsers.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialSmiteSpamTrustedUsers.php b/SpecialSmiteSpamTrustedUsers.php
index 208d397..e136cf2 100644
--- a/SpecialSmiteSpamTrustedUsers.php
+++ b/SpecialSmiteSpamTrustedUsers.php
@@ -6,6 +6,10 @@
parent::__construct( 'SmiteSpamTrustedUsers', 'smitespam' );
}
+ public function doesWrites() {
+ return true;
+ }
+
public function execute( $subPage ) {
if ( !$this->userCanExecute( $this->getUser() ) ) {
$this->displayRestrictionError();
--
To view, visit https://gerrit.wikimedia.org/r/265115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id16e1d994dc29d14ecb512cfb613a89ecc4b1c74
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SmiteSpam
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...SiteSettings)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I994d066cbc798ce99b215d494983ca3d53a0d8af
---
M SpecialSiteSettings.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialSiteSettings.php b/SpecialSiteSettings.php
index 583ccf0..bf3241d 100644
--- a/SpecialSiteSettings.php
+++ b/SpecialSiteSettings.php
@@ -15,6 +15,10 @@
parent::__construct( 'SiteSettings' );
}
+ public function doesWrites() {
+ return true;
+ }
+
function execute($query) {
$user = $this->getUser();
$out = $this->getOutput();
--
To view, visit https://gerrit.wikimedia.org/r/265114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I994d066cbc798ce99b215d494983ca3d53a0d8af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SiteSettings
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...Sudo)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I32435d97197377bdcbb7def38feb814e4357b96f
---
M SpecialSudo.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialSudo.php b/SpecialSudo.php
index 2c556e8..04f5dda 100644
--- a/SpecialSudo.php
+++ b/SpecialSudo.php
@@ -36,6 +36,10 @@
parent::__construct( 'Sudo', 'sudo' );
}
+ public function doesWrites() {
+ return true;
+ }
+
/**
* Show the special page
*
--
To view, visit https://gerrit.wikimedia.org/r/265125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I32435d97197377bdcbb7def38feb814e4357b96f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Sudo
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...TwitterLogin)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: Ifa8acaea930964a614b10a82bfed1ecca4c209d7
---
M SpecialTwitterLogin.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialTwitterLogin.php b/SpecialTwitterLogin.php
index 3b171a4..aebfc0c 100644
--- a/SpecialTwitterLogin.php
+++ b/SpecialTwitterLogin.php
@@ -33,6 +33,10 @@
$this->_consumerSecret = $wgConsumerSecret;
}
+ public function doesWrites() {
+ return true;
+ }
+
// default method being called by a specialpage
public function execute( $parameter ){
$this->setHeaders();
--
To view, visit https://gerrit.wikimedia.org/r/265133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa8acaea930964a614b10a82bfed1ecca4c209d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwitterLogin
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...WikiLexicalData)
jenkins-bot has submitted this change and it was merged.
Change subject: Define doesWrites() for SpecialPage classes
..
Define doesWrites() for SpecialPage classes
Bug: T123591
Change-Id: I727b2411bb40d795e22089c35cf155e70547b273
---
M SpecialLanguages.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialLanguages.php b/SpecialLanguages.php
index 07e862a..cb615d1 100644
--- a/SpecialLanguages.php
+++ b/SpecialLanguages.php
@@ -26,6 +26,10 @@
parent::__construct( 'Languages' );
}
+ public function doesWrites() {
+ return true;
+ }
+
function execute( $par ) {
// added $wgDBprefix for wld and mw prefix compatibility
global $wgOut, $wgRequest, $wgUser, $wgDBprefix;
--
To view, visit https://gerrit.wikimedia.org/r/265159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I727b2411bb40d795e22089c35cf155e70547b273
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
