[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...Flow)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214006
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: Ie61097dca1ddcbb1435fcfae5552e2281a30e7c9
(cherry picked from commit 08fc2c940cd5c6b9d0e9d4efae7bf897beda0315)
---
D Flow.i18n.php
M Flow.php
2 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/06/214006/1
diff --git a/Flow.i18n.php b/Flow.i18n.php
deleted file mode 100644
index ad8c853..000
--- a/Flow.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShimb43d2b8567007f2a' ) ) {
- function wfJsonI18nShimb43d2b8567007f2a( $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'][] =
'wfJsonI18nShimb43d2b8567007f2a';
-}
diff --git a/Flow.php b/Flow.php
index e66bd23..48ea2ab 100644
--- a/Flow.php
+++ b/Flow.php
@@ -78,7 +78,6 @@
require $dir . 'Resources.php';
$wgMessagesDirs['Flow'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Flow'] = $dir . 'Flow.i18n.php';
$wgExtensionMessagesFiles['FlowNamespaces'] = $dir . '/Flow.namespaces.php';
// This file is autogenerated by scripts/gen-autoload.php
--
To view, visit https://gerrit.wikimedia.org/r/214006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie61097dca1ddcbb1435fcfae5552e2281a30e7c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Makes unit tests of WikibaseClient pass when BetaFeature is ... - change (mediawiki...Wikibase)
Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214004
Change subject: Makes unit tests of WikibaseClient pass when BetaFeature is
installed
..
Makes unit tests of WikibaseClient pass when BetaFeature is installed
Change-Id: Id01b4be55fc12fc6f1c23218f77b913521c888fc
---
M client/includes/Hooks/SidebarHookHandlers.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/04/214004/1
diff --git a/client/includes/Hooks/SidebarHookHandlers.php
b/client/includes/Hooks/SidebarHookHandlers.php
index 7e82a8d..6faf539 100644
--- a/client/includes/Hooks/SidebarHookHandlers.php
+++ b/client/includes/Hooks/SidebarHookHandlers.php
@@ -230,7 +230,7 @@
$betaFeatureEnabled = class_exists( '\BetaFeatures' )
$this-otherProjectsLinksBeta
- \BetaFeatures::isFeatureEnabled( $skin-getUser(),
'wikibase-otherprojects' );
+ \BetaFeatures::isFeatureEnabled(
$skin-getContext()-getUser(), 'wikibase-otherprojects' );
if ( $this-otherProjectsLinksDefault || $betaFeatureEnabled ) {
$otherProjectsSidebar = $outputPage-getProperty(
'wikibase-otherprojects-sidebar' );
--
To view, visit https://gerrit.wikimedia.org/r/214004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id01b4be55fc12fc6f1c23218f77b913521c888fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make it possible to adapt references manually to an empty pa... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Make it possible to adapt references manually to an empty
paragraph
..
Make it possible to adapt references manually to an empty paragraph
Bug: T99507, T85714
Change-Id: Id3f70219af6a6f5e3641c1df65eb5d292e4e1646
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M modules/tools/ext.cx.tools.reference.js
M modules/tools/styles/ext.cx.tools.reference.less
5 files changed, 66 insertions(+), 4 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 0602e6a..b5c127f 100644
--- a/Resources.php
+++ b/Resources.php
@@ -448,6 +448,7 @@
),
'messages' = array(
'cx-tools-reference-title',
+ 'cx-tools-reference-add',
'cx-tools-reference-remove',
),
'dependencies' = array(
diff --git a/i18n/en.json b/i18n/en.json
index 1146431..d18b29f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -71,6 +71,7 @@
cx-stats-title: Content Translation statistics,
cx-stats-unknown: unknown,
cx-tools-reference-title: Reference,
+ cx-tools-reference-add: Add reference,
cx-tools-reference-remove: Remove reference,
cx-tools-link-instruction-shortcut: Shift + click any link to open,
cx-tools-link-hover-tooltip: Click to open,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index cca01f3..ed9954f 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -79,6 +79,7 @@
cx-stats-title: The title for the Special:ContentTranslationStats
special page.,
cx-stats-unknown: Text when the source or target language is
unknown. An adjective that describes the language.\n{{Identical|Unknown}},
cx-tools-reference-title: Title of Reference (footnote) tool card on
Special:ContentTranslation.\n{{Identical|Reference}},
+ cx-tools-reference-add: Text shown in the reference tool card.
Clicking on it will add the reference in the cursor position.,
cx-tools-reference-remove: Text shown in the reference tool card.
Clicking on it removes the reference in the context.,
cx-tools-link-instruction-shortcut: Text explaining the shortcut for
opening a link. Appears in the link tool card.,
cx-tools-link-hover-tooltip: Tooltip text shown when the mouse is
over the link with shift or control key is pressed.,
diff --git a/modules/tools/ext.cx.tools.reference.js
b/modules/tools/ext.cx.tools.reference.js
index b604753..211cfc4 100644
--- a/modules/tools/ext.cx.tools.reference.js
+++ b/modules/tools/ext.cx.tools.reference.js
@@ -18,6 +18,7 @@
function ReferenceCard() {
this.$card = null;
this.$removeReference = null;
+ this.$addReference = null;
this.$reference = null;
}
@@ -30,6 +31,9 @@
this.$card = $( 'div' )
.addClass( 'card reference' );
+ this.$addReference = $( 'div' )
+ .addClass( 'card__add-reference' )
+ .text( mw.msg( 'cx-tools-reference-add' ) );
this.$removeReference = $( 'div' )
.addClass( 'card__remove-reference' )
.text( mw.msg( 'cx-tools-reference-remove' ) );
@@ -49,7 +53,7 @@
$referenceInfo.append( $( 'div' )
.addClass( 'card__reference-content' ) );
- $referenceInfo.append( this.$removeReference );
+ $referenceInfo.append( this.$addReference,
this.$removeReference );
this.$card.append( $referenceInfo );
this.listen();
return this.$card;
@@ -71,6 +75,32 @@
this.$reference.remove();
this.stop();
}
+ };
+
+ /**
+* Add the reference to the cursor position in translation
+*/
+ ReferenceCard.prototype.addReference = function () {
+ var $reference, referenceId, targetReferenceId;
+
+ mw.cx.selection.restore( 'translation' );
+ $reference = this.$reference.clone();
+ referenceId = $reference.prop( 'id' );
+ targetReferenceId = 'cx' + referenceId;
+ $reference.attr( {
+ 'id': targetReferenceId,
+ 'data-sourceid': referenceId
+ } );
+ mw.cx.selection.pasteHTML( $reference[ 0 ].outerHTML );
+ // Adapt references.
+ this.adaptReference( targetReferenceId );
+ // Click handler for references.
+ $( document.getElementById( targetReferenceId ) )
+ .on( 'click', referenceClickHandler )
+ // Mark it readonly
+ .attr( 'contenteditable', false );
+
+
[MediaWiki-commits] [Gerrit] RTL fixes for the reference card - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214015
Change subject: RTL fixes for the reference card
..
RTL fixes for the reference card
* Apply the source language's lang and dir attributes
to the reference text.
* Fix the positioning of the + icon for the Add reference button.
Change-Id: I101af283891ea7a8cd4502ff6abc37614d1d7d28
---
M modules/tools/ext.cx.tools.reference.js
M modules/tools/styles/ext.cx.tools.reference.less
2 files changed, 6 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/15/214015/1
diff --git a/modules/tools/ext.cx.tools.reference.js
b/modules/tools/ext.cx.tools.reference.js
index 211cfc4..f31b21f 100644
--- a/modules/tools/ext.cx.tools.reference.js
+++ b/modules/tools/ext.cx.tools.reference.js
@@ -51,6 +51,11 @@
$referenceInfo.append( $( 'div' )
.addClass( 'card__reference-number' ) );
$referenceInfo.append( $( 'div' )
+ // By default the reference is in the source language
and direction
+ .prop( {
+ lang: mw.cx.sourceLanguage,
+ dir: $.uls.data.getDir( mw.cx.sourceLanguage )
+ } )
.addClass( 'card__reference-content' ) );
$referenceInfo.append( this.$addReference,
this.$removeReference );
diff --git a/modules/tools/styles/ext.cx.tools.reference.less
b/modules/tools/styles/ext.cx.tools.reference.less
index 99cb761..dc56126 100644
--- a/modules/tools/styles/ext.cx.tools.reference.less
+++ b/modules/tools/styles/ext.cx.tools.reference.less
@@ -20,7 +20,7 @@
color: #565656; // TODO Should come from library?
.background-image-svg('../images/add.svg', '../images/add.png');
background-color: #FFF;
- background-position: 10px center;
+ background-position: left 10px center;
background-repeat: no-repeat;
background-size: 15px;
padding: 5px 10px 5px 32px;
--
To view, visit https://gerrit.wikimedia.org/r/214015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I101af283891ea7a8cd4502ff6abc37614d1d7d28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bump phabricator release tag. - change (operations/puppet)
20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214014
Change subject: bump phabricator release tag.
..
bump phabricator release tag.
Change-Id: Iab7ba9bd9bb2bf47967cdbed53be32169d0ca2ee
---
M manifests/role/phabricator.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/214014/1
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 54e6cfc..54f0130 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -33,7 +33,7 @@
include role::phabricator::config
include phabricator::monitoring
-$current_tag = 'release/2015-05-20/1'
+$current_tag = 'release/2015-05-27/1'
$domain = 'phabricator.wikimedia.org'
$altdom = 'phab.wmfusercontent.org'
$mysql_host = 'm3-master.eqiad.wmnet'
@@ -162,7 +162,7 @@
# pass not sensitive but has to match phab and db
$mysqlpass = 'labspass'
-$current_tag = 'release/2015-05-20/1'
+$current_tag = 'release/2015-05-27/1'
class { '::phabricator':
git_tag = $current_tag,
lock_file = '/var/run/phab_repo_lock',
--
To view, visit https://gerrit.wikimedia.org/r/214014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab7ba9bd9bb2bf47967cdbed53be32169d0ca2ee
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 mmod...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mmv.mixins.less: Remove '-ms-linear-gradient' - change (mediawiki...MultimediaViewer)
Galorefitz has uploaded a new change for review. https://gerrit.wikimedia.org/r/214032 Change subject: mmv.mixins.less: Remove '-ms-linear-gradient' .. mmv.mixins.less: Remove '-ms-linear-gradient' No stable versions of IE have an '-ms-less-gradient'. Any lines using the same have been removed. Bug: T100285 Change-Id: I9fccb3f2208433d2759949a39b86b46d5b71eac1 --- M resources/mmv/mmv.mixins.less 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/32/214032/1 diff --git a/resources/mmv/mmv.mixins.less b/resources/mmv/mmv.mixins.less index fa037a1..5052e79 100644 --- a/resources/mmv/mmv.mixins.less +++ b/resources/mmv/mmv.mixins.less @@ -31,7 +31,6 @@ color-stop(100%, @backgroundColor)); // Chrome,Safari4+ background-image: -webkit-linear-gradient(top, @invisible 0%, @backgroundColor 100%); // Chrome10+,Safari5.1+ background-image: -o-linear-gradient(top, @invisible 0%, @backgroundColor 100%); // Opera 11.10+ - background-image: -ms-linear-gradient(top, @invisible 0%, @backgroundColor 100%); // IE10+ filter: e(%(progid:DXImageTransform.Microsoft.gradient( startColorstr='#%s', endColorstr='#%s',GradientType=0 ), rgbahex(@invisible), rgbahex(@backgroundColor))); // IE6-9 } @@ -43,7 +42,6 @@ color-stop(100%, @backgroundColor)); // Chrome,Safari4+ background-image: -webkit-linear-gradient(left, @invisible 0%, @backgroundColor 100%); // Chrome10+,Safari5.1+ background-image: -o-linear-gradient(left, @invisible 0%, @backgroundColor 100%); // Opera 11.10+ - background-image: -ms-linear-gradient(left, @invisible 0%, @backgroundColor 100%); // IE10+ filter: e(%(progid:DXImageTransform.Microsoft.gradient( startColorstr='#%s', endColorstr='#%s',GradientType=1 ), rgbahex(@invisible), rgbahex(@backgroundColor))); // IE6-9 } -- To view, visit https://gerrit.wikimedia.org/r/214032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9fccb3f2208433d2759949a39b86b46d5b71eac1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Galorefitz smritis.31...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New compiled templates for Lightncandy version 21 - change (mediawiki...Flow)
Sbisson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214001
Change subject: New compiled templates for Lightncandy version 21
..
New compiled templates for Lightncandy version 21
Change-Id: I6f6e21bcae851e5dbc70485f28d1b3418a0a6348
---
M handlebars/compiled/flow_block_board-history.handlebars.php
M handlebars/compiled/flow_block_header.handlebars.php
M handlebars/compiled/flow_block_header_diff_view.handlebars.php
M handlebars/compiled/flow_block_header_edit.handlebars.php
M handlebars/compiled/flow_block_header_single_view.handlebars.php
M handlebars/compiled/flow_block_header_undo_edit.handlebars.php
M handlebars/compiled/flow_block_loop.handlebars.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topic_diff_view.handlebars.php
M handlebars/compiled/flow_block_topic_edit_title.handlebars.php
M handlebars/compiled/flow_block_topic_history.handlebars.php
M handlebars/compiled/flow_block_topic_lock.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_block_topic_single_view.handlebars.php
M handlebars/compiled/flow_block_topic_undo_edit.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
M handlebars/compiled/flow_block_topicsummary_diff_view.handlebars.php
M handlebars/compiled/flow_block_topicsummary_edit.handlebars.php
M handlebars/compiled/flow_block_topicsummary_single_view.handlebars.php
M handlebars/compiled/flow_block_topicsummary_undo_edit.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/compiled/flow_revision_diff_header.handlebars.php
M handlebars/compiled/flow_tooltip.handlebars.php
M handlebars/compiled/timestamp.handlebars.php
26 files changed, 52 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/01/214001/1
diff --git a/handlebars/compiled/flow_block_board-history.handlebars.php
b/handlebars/compiled/flow_block_board-history.handlebars.php
index e88f7b1..eb4703d 100644
--- a/handlebars/compiled/flow_block_board-history.handlebars.php
+++ b/handlebars/compiled/flow_block_board-history.handlebars.php
@@ -7,7 +7,6 @@
'prop' = false,
'method' = false,
'mustlok' = false,
-'mustsec' = false,
'echo' = false,
'debug' = $debugopt,
),
@@ -123,8 +122,9 @@
ul class=flow-history-moderation-menu
'.LCRun3::p($cx, 'flow_moderation_actions_list',
array(array($in),array('moderationType'='history','moderationTarget'='post','moderationTemplate'='post','moderationMwUiClass'='mw-ui-anchor','moderationIcons'=false))).'/ul
';},),
-'scopes' = array($in),
+'scopes' = array(),
'sp_vars' = array('root' = $in),
+'lcrun' = 'LCRun3',
);
diff --git a/handlebars/compiled/flow_block_header.handlebars.php
b/handlebars/compiled/flow_block_header.handlebars.php
index 4281c3e..0b74e21 100644
--- a/handlebars/compiled/flow_block_header.handlebars.php
+++ b/handlebars/compiled/flow_block_header.handlebars.php
@@ -7,7 +7,6 @@
'prop' = false,
'method' = false,
'mustlok' = false,
-'mustsec' = false,
'echo' = false,
'debug' = $debugopt,
),
@@ -53,8 +52,9 @@
title='.LCRun3::ch($cx, 'l10n',
array(array('flow-board-expand-description'),array()), 'encq').'/span
/a
';},),
-'scopes' = array($in),
+'scopes' = array(),
'sp_vars' = array('root' = $in),
+'lcrun' = 'LCRun3',
);
diff --git a/handlebars/compiled/flow_block_header_diff_view.handlebars.php
b/handlebars/compiled/flow_block_header_diff_view.handlebars.php
index 65dcd89..7af2985 100644
--- a/handlebars/compiled/flow_block_header_diff_view.handlebars.php
+++ b/handlebars/compiled/flow_block_header_diff_view.handlebars.php
@@ -7,7 +7,6 @@
'prop' = false,
'method' = false,
'mustlok' = false,
-'mustsec' = false,
'echo' = false,
'debug' = $debugopt,
),
@@ -18,8 +17,9 @@
'blockhelpers' = array(),
'hbhelpers' = array(),
'partials' = array(),
-'scopes' = array($in),
+'scopes' = array(),
'sp_vars' = array('root' = $in),
+'lcrun' = 'LCRun3',
);
diff --git a/handlebars/compiled/flow_block_header_edit.handlebars.php
b/handlebars/compiled/flow_block_header_edit.handlebars.php
index 807172c..fc5c720 100644
--- a/handlebars/compiled/flow_block_header_edit.handlebars.php
+++ b/handlebars/compiled/flow_block_header_edit.handlebars.php
@@ -7,7 +7,6 @@
'prop' = false,
'method' = false,
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...Math)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214002
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I61dc6d4f6a179b4a0252d217bad0d26a3e2f1c25
(cherry picked from commit 452cf371e8b0fd5d2372f12c88e108fdc5b08327)
---
D Math.i18n.php
M Math.php
2 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/02/214002/1
diff --git a/Math.i18n.php b/Math.i18n.php
deleted file mode 100644
index 58feee1..000
--- a/Math.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShim076fa7ce17fc47b9' ) ) {
- function wfJsonI18nShim076fa7ce17fc47b9( $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'][] =
'wfJsonI18nShim076fa7ce17fc47b9';
-}
diff --git a/Math.php b/Math.php
index 85cff5b..ba375b2 100644
--- a/Math.php
+++ b/Math.php
@@ -232,7 +232,6 @@
$wgAutoloadClasses['SpecialMathShowImage'] = $dir . 'SpecialMathShowImage.php';
$wgAutoloadClasses['SpecialMathStatus'] = $dir . 'SpecialMathStatus.php';
$wgMessagesDirs['Math'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Math'] = $dir . 'Math.i18n.php';
$wgExtensionMessagesFiles['MathAlias'] = $dir . 'Math.alias.php';
$wgExtensionMessagesFiles['MathAliasNoTranslate'] = $dir .
'Math.alias.noTranslate.php';
--
To view, visit https://gerrit.wikimedia.org/r/214002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61dc6d4f6a179b4a0252d217bad0d26a3e2f1c25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Maintenance script sends notifications immediately - change (mediawiki...Echo)
Sbisson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214020
Change subject: Maintenance script sends notifications immediately
..
Maintenance script sends notifications immediately
Update the processEchoEmailBatch to allow sending all
notifications immediately even if configured to be
daily or weekly.
Change-Id: I6ebeea86708247700d1950e0f6471c7b3d1fecd2
---
M includes/EmailBatch.php
M maintenance/processEchoEmailBatch.php
2 files changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/20/214020/1
diff --git a/includes/EmailBatch.php b/includes/EmailBatch.php
index 8e84798..f6d3ca1 100644
--- a/includes/EmailBatch.php
+++ b/includes/EmailBatch.php
@@ -37,7 +37,7 @@
* @param $userId int
* @return MWEchoEmailBatch/false
*/
- public static function newFromUserId( $userId ) {
+ public static function newFromUserId( $userId, $enforceFrequency = true
) {
$batchClassName = self::getEmailBatchClass();
$user = User::newFromId( intval( $userId ) );
@@ -71,7 +71,7 @@
if ( $userLastBatch ) {
// use 20 as hours per day to get estimate
$nextBatch = wfTimestamp( TS_UNIX, $userLastBatch ) +
$userEmailSetting * 20 * 60 * 60;
- if ( wfTimestamp( TS_MW, $nextBatch )
wfTimestampNow() ) {
+ if ( $enforceFrequency wfTimestamp( TS_MW,
$nextBatch ) wfTimestampNow() ) {
return false;
}
}
diff --git a/maintenance/processEchoEmailBatch.php
b/maintenance/processEchoEmailBatch.php
index 222af2d..9a628c5 100644
--- a/maintenance/processEchoEmailBatch.php
+++ b/maintenance/processEchoEmailBatch.php
@@ -20,10 +20,17 @@
public function __construct() {
parent::__construct();
$this-mDescription = Process email digest;
+
+ $this-addOption(
+ ignoreConfiguredSchedule,
+ Send all pending notifications immediately even if
configured to be weekly or daily.,
+ false, false, i );
}
public function execute() {
global $wgEchoCluster;
+
+ $ignoreConfiguredSchedule = $this-getOption(
ignoreConfiguredSchedule, 0 );
$this-output( Started processing... \n );
@@ -39,7 +46,7 @@
foreach ( $res as $row ) {
$userId = intval( $row-eeb_user_id );
if ( $userId $userId $startUserId ) {
- $emailBatch =
MWEchoEmailBatch::newFromUserId( $userId );
+ $emailBatch =
MWEchoEmailBatch::newFromUserId( $userId, !$ignoreConfiguredSchedule );
if ( $emailBatch ) {
$this-output( processing
user_Id . $userId . \n );
$emailBatch-process();
--
To view, visit https://gerrit.wikimedia.org/r/214020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ebeea86708247700d1950e0f6471c7b3d1fecd2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Sbisson sbis...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] noc - Raise HSTS max-age to 1 year - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: noc - Raise HSTS max-age to 1 year
..
noc - Raise HSTS max-age to 1 year
If nothing went wrong after Ie3706dd8 was merged, let's
raise the HSTS max-age to 1 year.
Bug: T40516
Change-Id: I4459049b3c7719fddfa144312a9743e8911f8453
---
M modules/noc/templates/noc.wikimedia.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/noc/templates/noc.wikimedia.org.erb
b/modules/noc/templates/noc.wikimedia.org.erb
index 5120070..cb442e1 100644
--- a/modules/noc/templates/noc.wikimedia.org.erb
+++ b/modules/noc/templates/noc.wikimedia.org.erb
@@ -18,7 +18,7 @@
RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI}
[R=301,E=ProtoRedirect]
Header always merge Vary X-Forwarded-Proto env=ProtoRedirect
-Header always set Strict-Transport-Security max-age=604800
+Header always set Strict-Transport-Security max-age=31536000
ErrorLog /var/log/apache2/error.log
--
To view, visit https://gerrit.wikimedia.org/r/213976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4459049b3c7719fddfa144312a9743e8911f8453
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chmarkine chmark...@hotmail.com
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...UploadWizard)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214008
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I79d2099b3502dfaa1786306689fdd79b41cfa47b
(cherry picked from commit ba86edb9fd2e0519ae26eb75c13a7d150ba216ad)
---
D UploadWizard.i18n.php
M UploadWizard.php
2 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/08/214008/1
diff --git a/UploadWizard.i18n.php b/UploadWizard.i18n.php
deleted file mode 100644
index e98a90a..000
--- a/UploadWizard.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShim68b2bbac0fb2582b' ) ) {
- function wfJsonI18nShim68b2bbac0fb2582b( $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'][] =
'wfJsonI18nShim68b2bbac0fb2582b';
-}
diff --git a/UploadWizard.php b/UploadWizard.php
index 8b02a40..47544ee 100644
--- a/UploadWizard.php
+++ b/UploadWizard.php
@@ -44,7 +44,6 @@
);
$wgMessagesDirs['UploadWizard'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['UploadWizard'] = __DIR__ . '/UploadWizard.i18n.php';
$wgExtensionMessagesFiles['UploadWizardAlias'] = __DIR__ .
'/UploadWizard.alias.php';
# Require modules
--
To view, visit https://gerrit.wikimedia.org/r/214008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79d2099b3502dfaa1786306689fdd79b41cfa47b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed test and did few refactorings on special page. - change (mediawiki...WikidataQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214009
Change subject: Fixed test and did few refactorings on special page.
..
Fixed test and did few refactorings on special page.
Fixed CheckResultTestToViolationTranslatorTest. Constraint Violations are now
saved in database (again). Removed unnecessary stuff from special page. Changes
access modifiers for methods of special page.
Change-Id: I5dccc1a283d4ad1e60db6e104aba2e68e391b35e
---
M includes/ConstraintReportFactory.php
M modules/SpecialConstraintReportPage.css
M specials/SpecialConstraintReport.php
M tests/phpunit/DelegatingConstraintCheckerTest.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
M tests/phpunit/Violations/CheckResultToViolationTranslatorTest.php
6 files changed, 166 insertions(+), 169 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/09/214009/1
diff --git a/includes/ConstraintReportFactory.php
b/includes/ConstraintReportFactory.php
index 93dc0a2..5e19dd0 100755
--- a/includes/ConstraintReportFactory.php
+++ b/includes/ConstraintReportFactory.php
@@ -2,6 +2,7 @@
namespace WikibaseQuality\ConstraintReport;
+use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Lib\Store\EntityLookup;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\DelegatingConstraintChecker;
@@ -27,12 +28,23 @@
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConnectionCheckerHelper;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\RangeCheckerHelper;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\TypeCheckerHelper;
+use
WikibaseQuality\ConstraintReport\Violations\CheckResultToViolationTranslator;
use WikibaseQuality\ConstraintReport\Violations\ConstraintViolationContext;
class ConstraintReportFactory {
- /**
+/**
+ * @var EntityLookup
+ */
+private $entityLookup;
+
+/**
+ * @var EntityRevisionLookup
+ */
+private $entityRevisionLookup;
+
+/**
* @var constraintRepository
*/
private $constraintRepository;
@@ -48,14 +60,14 @@
private $delegatingConstraintChecker;
/**
-* @var EntityLookup
-*/
- private $lookup;
-
- /**
* @var array
*/
private $constraintParameterMap;
+
+/**
+ * @var CheckResultToViolationTranslator
+ */
+private $checkResultToViolationTranslator;
/**
* Returns the default instance.
@@ -67,17 +79,22 @@
static $instance = null;
if ( $instance === null ) {
- $instance = new self(
WikibaseRepo::getDefaultInstance()-getEntityLookup() );
+ $instance = new self(
+WikibaseRepo::getDefaultInstance()-getEntityLookup(),
+WikibaseRepo::getDefaultInstance()-getEntityRevisionLookup()
+);
}
return $instance;
}
- /**
-* @param EntityLookup $lookup
-*/
- public function __construct( EntityLookup $lookup ) {
- $this-lookup = $lookup;
+/**
+ * @param EntityLookup $entityLookup
+ * @param EntityRevisionLookup $entityRevisionLookup
+ */
+ public function __construct( EntityLookup $entityLookup,
EntityRevisionLookup $entityRevisionLookup ) {
+ $this-entityLookup = $entityLookup;
+$this-entityRevisionLookup = $entityRevisionLookup;
}
/**
@@ -85,7 +102,7 @@
*/
public function getConstraintChecker() {
if ( $this-delegatingConstraintChecker === null ) {
- $this-delegatingConstraintChecker = new
DelegatingConstraintChecker( $this-lookup, $this-getConstraintCheckerMap(
$this-lookup ) );
+ $this-delegatingConstraintChecker = new
DelegatingConstraintChecker( $this-entityLookup,
$this-getConstraintCheckerMap( $this-entityLookup ) );
}
return $this-delegatingConstraintChecker;
@@ -99,21 +116,21 @@
$constraintReportHelper = new ConstraintReportHelper();
$connectionCheckerHelper = new
ConnectionCheckerHelper();
$rangeCheckerHelper = new RangeCheckerHelper();
- $typeCheckerHelper = new TypeCheckerHelper(
$this-lookup );
+ $typeCheckerHelper = new TypeCheckerHelper(
$this-entityLookup );
$this-constraintCheckerMap = array(
- 'Conflicts with' = new ConflictsWithChecker(
$this-lookup, $constraintReportHelper, $connectionCheckerHelper ),
- 'Item' = new ItemChecker( $this-lookup,
$constraintReportHelper, $connectionCheckerHelper ),
-
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...Gitweb)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214010
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: Iaebd1754ea20f6e2e8f34bc544e2acc3226f4ef4
(cherry picked from commit f0e935cb4e6139b873f77c11eef966468cd68f7b)
---
D Gitweb.i18n.php
M Gitweb.php
2 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gitweb
refs/changes/10/214010/1
diff --git a/Gitweb.i18n.php b/Gitweb.i18n.php
deleted file mode 100644
index a1d661b..000
--- a/Gitweb.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShimbbb8a95aad58f5a8' ) ) {
- function wfJsonI18nShimbbb8a95aad58f5a8( $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'][] =
'wfJsonI18nShimbbb8a95aad58f5a8';
-}
diff --git a/Gitweb.php b/Gitweb.php
index a965709..0b8bc04 100644
--- a/Gitweb.php
+++ b/Gitweb.php
@@ -40,7 +40,6 @@
);
$wgMessagesDirs['Gitweb'] = __DIR__ . '/i18n';
- $wgExtensionMessagesFiles['Gitweb'] = __DIR__ . '/Gitweb.i18n.php';
$wgExtensionMessagesFiles['GitwebMagic'] = __DIR__ .
'/Gitweb.i18n.magic.php';
}
--
To view, visit https://gerrit.wikimedia.org/r/214010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaebd1754ea20f6e2e8f34bc544e2acc3226f4ef4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gitweb
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...GlobalUsage)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214011
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I21e673f9b7b62f42eec3869ff74580a58d33d954
(cherry picked from commit d3327353eab6200e4463326dd1fbee01131f5a8c)
---
D GlobalUsage.i18n.php
M GlobalUsage.php
2 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUsage
refs/changes/11/214011/1
diff --git a/GlobalUsage.i18n.php b/GlobalUsage.i18n.php
deleted file mode 100644
index 807e0af..000
--- a/GlobalUsage.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShim816ee38078637ed2' ) ) {
- function wfJsonI18nShim816ee38078637ed2( $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'][] =
'wfJsonI18nShim816ee38078637ed2';
-}
diff --git a/GlobalUsage.php b/GlobalUsage.php
index 979ec9b..13a7afc 100644
--- a/GlobalUsage.php
+++ b/GlobalUsage.php
@@ -47,7 +47,6 @@
// Internationlization files
$wgMessagesDirs['GlobalUsage'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['GlobalUsage'] = $dir . 'GlobalUsage.i18n.php';
$wgExtensionMessagesFiles['GlobalUsageAliases'] = $dir .
'GlobalUsage.alias.php';
$wgAutoloadClasses['GlobalUsage'] = $dir . 'GlobalUsage_body.php';
--
To view, visit https://gerrit.wikimedia.org/r/214011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21e673f9b7b62f42eec3869ff74580a58d33d954
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUsage
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...ConfirmAccount)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214007
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I526aecf59044e754d61105f5bef9fb9eda9cf670
(cherry picked from commit 0dac57dd5454603b72d1406b7d1d60bb302880b1)
---
M ConfirmAccount.setup.php
D frontend/language/ConfirmAccount.i18n.php
D frontend/language/ConfirmAccountPage.i18n.php
D frontend/language/RequestAccountPage.i18n.php
D frontend/language/UserCredentialsPage.i18n.php
5 files changed, 0 insertions(+), 144 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmAccount
refs/changes/07/214007/1
diff --git a/ConfirmAccount.setup.php b/ConfirmAccount.setup.php
index 78f7bc7..7558efe 100644
--- a/ConfirmAccount.setup.php
+++ b/ConfirmAccount.setup.php
@@ -24,7 +24,6 @@
# Main i18n file and special page alias file
$wgMessagesDirs['ConfirmAccount'] = __DIR__ . '/i18n/core';
- $messagesFiles['ConfirmAccount'] =
$langDir/ConfirmAccount.i18n.php;
$messagesFiles['ConfirmAccountAliases'] =
$langDir/ConfirmAccount.alias.php;
# UI setup class
@@ -35,16 +34,13 @@
# UI to request an account
$classes['RequestAccountPage'] =
$spActionDir/RequestAccount_body.php;
$wgMessagesDirs['RequestAccountPage'] = __DIR__ .
'/i18n/requestaccount';
- $messagesFiles['RequestAccountPage'] =
$langDir/RequestAccountPage.i18n.php;
# UI to confirm accounts
$classes['ConfirmAccountsPage'] =
$spActionDir/ConfirmAccount_body.php;
$classes['ConfirmAccountsPager'] =
$spActionDir/ConfirmAccount_body.php;
$wgMessagesDirs['ConfirmAccountPage'] = __DIR__ .
'/i18n/confirmaccount';
- $messagesFiles['ConfirmAccountPage'] =
$langDir/ConfirmAccountPage.i18n.php;
# UI to see account credentials
$classes['UserCredentialsPage'] =
$spActionDir/UserCredentials_body.php;
$wgMessagesDirs['UserCredentialsPage'] = __DIR__ .
'/i18n/usercredentials';
- $messagesFiles['UserCredentialsPage'] =
$langDir/UserCredentialsPage.i18n.php;
# Utility functions
$classes['ConfirmAccount'] =
$backendDir/ConfirmAccount.class.php;
diff --git a/frontend/language/ConfirmAccount.i18n.php
b/frontend/language/ConfirmAccount.i18n.php
deleted file mode 100644
index d41f7f9..000
--- a/frontend/language/ConfirmAccount.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShim0e360ea79fe74b10' ) ) {
- function wfJsonI18nShim0e360ea79fe74b10( $cache, $code, $cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) .
/../../i18n/core/$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'][] =
'wfJsonI18nShim0e360ea79fe74b10';
-}
diff --git a/frontend/language/ConfirmAccountPage.i18n.php
b/frontend/language/ConfirmAccountPage.i18n.php
deleted file mode 100644
index e7e7592..000
--- a/frontend/language/ConfirmAccountPage.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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
[MediaWiki-commits] [Gerrit] Ignore *.*~ files - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Ignore *.*~ files .. Ignore *.*~ files Added to ignore *.rst~ files, but many other file extensions are editable and will create *~ files. Change-Id: I72b50c5eba29f635dea0128b477fdb65ad9819f3 --- M .gitignore 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 38c2560..46c028d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ *.bak *.pyc *.pyo -*.py~ +*.*~ /.tox /*.egg /data* -- To view, visit https://gerrit.wikimedia.org/r/214016 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72b50c5eba29f635dea0128b477fdb65ad9819f3 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add system = true to mysql_wmf::mysqluser - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214027
Change subject: Add system = true to mysql_wmf::mysqluser
..
Add system = true to mysql_wmf::mysqluser
The only mysql user invocation across the puppet tree that isn't a
system user. The class seems to only be referenced by pc100x boxes.
Change-Id: Iacd89800d72512511dcef20f235adab806fbf4a4
---
M modules/mysql_wmf/manifests/mysqluser.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/214027/1
diff --git a/modules/mysql_wmf/manifests/mysqluser.pp
b/modules/mysql_wmf/manifests/mysqluser.pp
index ced7f92..79633f7 100644
--- a/modules/mysql_wmf/manifests/mysqluser.pp
+++ b/modules/mysql_wmf/manifests/mysqluser.pp
@@ -1,6 +1,7 @@
class mysql_wmf::mysqluser {
user { 'mysql':
ensure = present,
+system = true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacd89800d72512511dcef20f235adab806fbf4a4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make skin sort of responsive, other random stuff - change (mediawiki...GreyStuff)
Isarra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214026
Change subject: Make skin sort of responsive, other random stuff
..
Make skin sort of responsive, other random stuff
Split out less into main and three sizes: large, small, mobile
Small design is basically as was. Mobile will extend upon that. Large
currently has a sidebar actually on the side, but it looks stupid as
arse.
Other random things were also done, largely out of frustration and
needing a break from the css stuff.
Change-Id: I33567f3230ee660e1dc30ca4d3fbb88984820281
---
M GreyStuff.skin.php
M i18n/en.json
M i18n/qqq.json
M resources/main.less
A resources/screen-large.less
A resources/screen-mobile.less
A resources/screen-small.less
A resources/variables.less
M skin.json
9 files changed, 320 insertions(+), 123 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/GreyStuff
refs/changes/26/214026/1
diff --git a/GreyStuff.skin.php b/GreyStuff.skin.php
index bff1ca9..36a9282 100755
--- a/GreyStuff.skin.php
+++ b/GreyStuff.skin.php
@@ -64,7 +64,7 @@
div id=header-top-container
div id=header-top
?php
- $this-outputPersonalMenu();
+ $this-outputPersonalNavigation();
$this-outputSearch();
?
div class=mw-portlet id=p-header
@@ -79,24 +79,14 @@
/div
/div
/div
- div id=header-navigation-container
- div id=header-navigation
- div id=header-tools
- ?php
- $this-outputPortlet( array(
- 'id' = 'p-variants',
- 'headerMessage' =
'variants',
- 'content' =
$this-data['content_navigation']['variants'],
- ) );
- $this-outputToolbox();
- ?
- /div
- div id=navigation
- ?php
- $this-outputSidebar();
- ?
- /div
- /div
+ /div
+ div id=train-wreck
+ div id=plane-wreck
+ div id=header-navigation-container
+ div id=header-navigation
+ ?php
+ $this-outputMainNavigation();
+ ?
/div
/div
div id=content-container
@@ -153,15 +143,25 @@
?
/div
div id =page-tools
+
?php
- $ptools = array_merge(
-
$this-data['content_navigation']['views'],
-
$this-data['content_navigation']['actions']
- );
+ if ( isset(
$this-data['content_navigation']['actions']['watch'] ) ) {
+
$this-data['content_navigation']['views']['watch'] =
$this-data['content_navigation']['actions']['watch'];
+ unset(
$this-data['content_navigation']['actions']['watch'] );
+ }
+ if ( isset(
$this-data['content_navigation']['actions']['unwatch'] ) ) {
+
$this-data['content_navigation']['views']['unwatch'] =
$this-data['content_navigation']['actions']['unwatch'];
+ unset(
$this-data['content_navigation']['actions']['unwatch'] );
+ }
$this-outputPortlet( array(
'id' = 'p-views',
'headerMessage' =
'views',
- 'content' = $ptools
+
[MediaWiki-commits] [Gerrit] admin: use $LAST_SYSTEM_UID in enforce-users-groups - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214030
Change subject: admin: use $LAST_SYSTEM_UID in enforce-users-groups
..
admin: use $LAST_SYSTEM_UID in enforce-users-groups
Change-Id: Iaf19e7dc22dda91e132040b3cafc35d6504e57d2
---
M modules/admin/files/enforce-users-groups.sh
1 file changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/214030/1
diff --git a/modules/admin/files/enforce-users-groups.sh
b/modules/admin/files/enforce-users-groups.sh
index 914d2d3..8d2406a 100755
--- a/modules/admin/files/enforce-users-groups.sh
+++ b/modules/admin/files/enforce-users-groups.sh
@@ -1,16 +1,18 @@
#!/bin/bash
-# This is a user garbage collection script that removes
-# users who do not have a supplementary group that also have
-# a UID above the ID_BOUNDARY. Removals are logged to syslog.
-# with 'dryrun' as first arg exits 1 if cleanup is needed
+set -e
-# /etc/adduser.conf
-ID_BOUNDRY='999'
+# This is a user garbage collection script that removes users who do not have a
+# supplementary group that also have a UID above the LAST_SYSTEM_UID. Removals
+# are logged to syslog. With 'dryrun' as the first argument, it exits 1 if
+# cleanup is needed.
+
+# for $LAST_SYSTEM_UID
+. /etc/adduser.conf
+
ARCHIVE_DIR='/var/userarchive'
EXCLUDE=(nobody \
l10nupdate \
- gmetric \# nescio.wikimedia.org
mwdeploy \ # eventlog*
gerrit2 \# ytterbium.wikimedia.org
spamd \ # sodium.wikimedia.org:
@@ -36,9 +38,7 @@
return 1
}
-# This is an intentional hard stop
-# as before T84032 this could do some
-# serious damage to a labstore host.
+# FIXME: this is an intentional hard stop as before T84032
if [[ `hostname -s` =~ ^labstore100 ]]; then
exit 1
fi
@@ -60,7 +60,7 @@
continue
fi
-if [[ $uid -gt $ID_BOUNDRY ]]; then
+if [[ $uid -gt $LAST_SYSTEM_UID ]]; then
if [[ `/usr/bin/id $username` != *,* ]]; then
if [ ${1} == dryrun ]
then
--
To view, visit https://gerrit.wikimedia.org/r/214030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf19e7dc22dda91e132040b3cafc35d6504e57d2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ve: switch jsbench/chromium user/groups to system - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214029
Change subject: ve: switch jsbench/chromium user/groups to system
..
ve: switch jsbench/chromium user/groups to system
The jsbench user was created and destroyed by enforce-users-groups on
every puppet run for months -- this switches it to a system user to
fix this.
The chromium user was not, but this is because enforce-users-groups had
this whitelisted as one out of a very few exceptions. Remove that
exception as well.
Change-Id: I4177b0866b2c5f64ec69dd092ff813d9574cdf0c
---
M manifests/role/jsbench.pp
M modules/admin/files/enforce-users-groups.sh
M modules/chromium/manifests/init.pp
3 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/214029/1
diff --git a/manifests/role/jsbench.pp b/manifests/role/jsbench.pp
index 06697d2..d71df39 100644
--- a/manifests/role/jsbench.pp
+++ b/manifests/role/jsbench.pp
@@ -25,6 +25,7 @@
ensure = present,
comment= 'Chromium service user for jsbench',
home = '/srv/profile/jsbench',
+system = true,
managehome = true,
require= File['/srv/profile'],
}
diff --git a/modules/admin/files/enforce-users-groups.sh
b/modules/admin/files/enforce-users-groups.sh
index 9dd79a5..914d2d3 100755
--- a/modules/admin/files/enforce-users-groups.sh
+++ b/modules/admin/files/enforce-users-groups.sh
@@ -18,8 +18,6 @@
reprepro \ # caesium.eqiad.wmnet
mysql \ # pc1001.eqiad.wmnet
dbmon \ # db1044.eqiad.wmnet
- txstatsd \ # osmium.eqiad.wmnet
- chromium \ # osmium.eqiad.wmnet
parsoid-rt); # ruthenium.eqiad.wmnet T90966
log() {
diff --git a/modules/chromium/manifests/init.pp
b/modules/chromium/manifests/init.pp
index 31a8c79..d83f6d6 100644
--- a/modules/chromium/manifests/init.pp
+++ b/modules/chromium/manifests/init.pp
@@ -41,6 +41,7 @@
group { 'chromium':
ensure = $ensure,
+system = true,
}
user { 'chromium':
@@ -48,6 +49,7 @@
gid= 'chromium',
shell = '/bin/false',
home = '/var/lib/chromium',
+system = true,
managehome = true,
}
--
To view, visit https://gerrit.wikimedia.org/r/214029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4177b0866b2c5f64ec69dd092ff813d9574cdf0c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove txstatsd module and role class - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/214028 Change subject: Remove txstatsd module and role class .. Remove txstatsd module and role class Only the txstatsd::decommission class was referenced and this can safely go now too. Change-Id: I513abe352a4e3daff039c8da313b7e1dd6351198 --- D files/txstatsd/backends/8126.cfg D files/txstatsd/backends/8127.cfg D files/txstatsd/backends/8128.cfg D files/txstatsd/backends/8129.cfg D files/txstatsd/backends/8130.cfg D files/txstatsd/backends/8131.cfg D files/txstatsd/backends/8132.cfg D files/txstatsd/backends/8133.cfg D files/txstatsd/backends/8134.cfg D files/txstatsd/backends/8135.cfg D files/txstatsd/backends/8136.cfg D files/txstatsd/backends/8137.cfg D files/txstatsd/backends/8138.cfg D files/txstatsd/backends/8139.cfg D files/txstatsd/init/init.conf D files/txstatsd/init/instance.conf D files/txstatsd/txstatsdctl M manifests/role/labmon.pp M manifests/role/statsdlb.pp M manifests/role/swift.pp D manifests/role/txstatsd.pp D modules/txstatsd/files/txstatsd.conf D modules/txstatsd/files/txstatsd.service D modules/txstatsd/manifests/decommission.pp D modules/txstatsd/manifests/init.pp D modules/txstatsd/templates/txstatsd.cfg.erb 26 files changed, 0 insertions(+), 428 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/28/214028/1 diff --git a/files/txstatsd/backends/8126.cfg b/files/txstatsd/backends/8126.cfg deleted file mode 100644 index a7497ff..000 --- a/files/txstatsd/backends/8126.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8126 -listen-port = 8126 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8127.cfg b/files/txstatsd/backends/8127.cfg deleted file mode 100644 index a74726d..000 --- a/files/txstatsd/backends/8127.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8127 -listen-port = 8127 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8128.cfg b/files/txstatsd/backends/8128.cfg deleted file mode 100644 index 83c263f..000 --- a/files/txstatsd/backends/8128.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8128 -listen-port = 8128 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8129.cfg b/files/txstatsd/backends/8129.cfg deleted file mode 100644 index a32fd99..000 --- a/files/txstatsd/backends/8129.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8129 -listen-port = 8129 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8130.cfg b/files/txstatsd/backends/8130.cfg deleted file mode 100644 index da136f6..000 --- a/files/txstatsd/backends/8130.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8130 -listen-port = 8130 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8131.cfg b/files/txstatsd/backends/8131.cfg deleted file mode 100644 index 663a60a..000 --- a/files/txstatsd/backends/8131.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8131 -listen-port = 8131 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8132.cfg b/files/txstatsd/backends/8132.cfg deleted file mode 100644 index b201ef4..000 --- a/files/txstatsd/backends/8132.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8132 -listen-port = 8132 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8133.cfg b/files/txstatsd/backends/8133.cfg deleted file mode 100644 index af6cf74..000 --- a/files/txstatsd/backends/8133.cfg +++ /dev/null
[MediaWiki-commits] [Gerrit] Fixed test and did few refactorings on special page. - change (mediawiki...WikidataQualityConstraints)
Jonaskeutel has submitted this change and it was merged.
Change subject: Fixed test and did few refactorings on special page.
..
Fixed test and did few refactorings on special page.
Fixed CheckResultTestToViolationTranslatorTest. Constraint Violations are now
saved in database (again). Removed unnecessary stuff from special page. Changes
access modifiers for methods of special page.
Change-Id: I5dccc1a283d4ad1e60db6e104aba2e68e391b35e
---
M includes/ConstraintReportFactory.php
M modules/SpecialConstraintReportPage.css
M specials/SpecialConstraintReport.php
M tests/phpunit/DelegatingConstraintCheckerTest.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
M tests/phpunit/Violations/CheckResultToViolationTranslatorTest.php
6 files changed, 166 insertions(+), 169 deletions(-)
Approvals:
Jonaskeutel: Verified; Looks good to me, approved
diff --git a/includes/ConstraintReportFactory.php
b/includes/ConstraintReportFactory.php
index 93dc0a2..5e19dd0 100755
--- a/includes/ConstraintReportFactory.php
+++ b/includes/ConstraintReportFactory.php
@@ -2,6 +2,7 @@
namespace WikibaseQuality\ConstraintReport;
+use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Lib\Store\EntityLookup;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\DelegatingConstraintChecker;
@@ -27,12 +28,23 @@
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConnectionCheckerHelper;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\RangeCheckerHelper;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\TypeCheckerHelper;
+use
WikibaseQuality\ConstraintReport\Violations\CheckResultToViolationTranslator;
use WikibaseQuality\ConstraintReport\Violations\ConstraintViolationContext;
class ConstraintReportFactory {
- /**
+/**
+ * @var EntityLookup
+ */
+private $entityLookup;
+
+/**
+ * @var EntityRevisionLookup
+ */
+private $entityRevisionLookup;
+
+/**
* @var constraintRepository
*/
private $constraintRepository;
@@ -48,14 +60,14 @@
private $delegatingConstraintChecker;
/**
-* @var EntityLookup
-*/
- private $lookup;
-
- /**
* @var array
*/
private $constraintParameterMap;
+
+/**
+ * @var CheckResultToViolationTranslator
+ */
+private $checkResultToViolationTranslator;
/**
* Returns the default instance.
@@ -67,17 +79,22 @@
static $instance = null;
if ( $instance === null ) {
- $instance = new self(
WikibaseRepo::getDefaultInstance()-getEntityLookup() );
+ $instance = new self(
+WikibaseRepo::getDefaultInstance()-getEntityLookup(),
+WikibaseRepo::getDefaultInstance()-getEntityRevisionLookup()
+);
}
return $instance;
}
- /**
-* @param EntityLookup $lookup
-*/
- public function __construct( EntityLookup $lookup ) {
- $this-lookup = $lookup;
+/**
+ * @param EntityLookup $entityLookup
+ * @param EntityRevisionLookup $entityRevisionLookup
+ */
+ public function __construct( EntityLookup $entityLookup,
EntityRevisionLookup $entityRevisionLookup ) {
+ $this-entityLookup = $entityLookup;
+$this-entityRevisionLookup = $entityRevisionLookup;
}
/**
@@ -85,7 +102,7 @@
*/
public function getConstraintChecker() {
if ( $this-delegatingConstraintChecker === null ) {
- $this-delegatingConstraintChecker = new
DelegatingConstraintChecker( $this-lookup, $this-getConstraintCheckerMap(
$this-lookup ) );
+ $this-delegatingConstraintChecker = new
DelegatingConstraintChecker( $this-entityLookup,
$this-getConstraintCheckerMap( $this-entityLookup ) );
}
return $this-delegatingConstraintChecker;
@@ -99,21 +116,21 @@
$constraintReportHelper = new ConstraintReportHelper();
$connectionCheckerHelper = new
ConnectionCheckerHelper();
$rangeCheckerHelper = new RangeCheckerHelper();
- $typeCheckerHelper = new TypeCheckerHelper(
$this-lookup );
+ $typeCheckerHelper = new TypeCheckerHelper(
$this-entityLookup );
$this-constraintCheckerMap = array(
- 'Conflicts with' = new ConflictsWithChecker(
$this-lookup, $constraintReportHelper, $connectionCheckerHelper ),
- 'Item' = new ItemChecker( $this-lookup,
$constraintReportHelper, $connectionCheckerHelper ),
- 'Target required claim' = new
TargetRequiredClaimChecker( $this-lookup,
[MediaWiki-commits] [Gerrit] Ignore .rst~ files - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/214016 Change subject: Ignore .rst~ files .. Ignore .rst~ files Change-Id: I72b50c5eba29f635dea0128b477fdb65ad9819f3 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/16/214016/1 diff --git a/.gitignore b/.gitignore index 38c2560..9d98912 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.pyc *.pyo *.py~ +*.rst~ /.tox /*.egg /data* -- To view, visit https://gerrit.wikimedia.org/r/214016 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72b50c5eba29f635dea0128b477fdb65ad9819f3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove FIXME from APISite.loadflowinfo - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/214024 Change subject: Remove FIXME from APISite.loadflowinfo .. Remove FIXME from APISite.loadflowinfo As APISite.loadflowinfo is deprecated, and this FIXME would require changing the exception raised from APIError to UnknownException, it is better to leave it and document the existing behaviour. Change-Id: I3df9f67edc252069192efcdfda0a12262189ef0c --- M pywikibot/site.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/24/214024/1 diff --git a/pywikibot/site.py b/pywikibot/site.py index eae3500..deabf6a 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2494,7 +2494,9 @@ Load Flow-related information about a given page. -FIXME: Assumes that the Flow extension is installed. +Assumes that the Flow extension is installed. + +@raises APIError: Flow extension is not installed title = page.title(withSection=False) query = self._generator(api.PropertyGenerator, -- To view, visit https://gerrit.wikimedia.org/r/214024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3df9f67edc252069192efcdfda0a12262189ef0c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...HSTS)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214012
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I0c08c4978ed5e72d249efbc560e03164dbf21b17
---
D HSTS.i18n.php
M HSTS.php
2 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HSTS
refs/changes/12/214012/1
diff --git a/HSTS.i18n.php b/HSTS.i18n.php
deleted file mode 100644
index 7b1e7c5..000
--- a/HSTS.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShim1db2528a4e0f7eac' ) ) {
- function wfJsonI18nShim1db2528a4e0f7eac( $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'][] =
'wfJsonI18nShim1db2528a4e0f7eac';
-}
diff --git a/HSTS.php b/HSTS.php
index 80eba15..f3a84ae 100644
--- a/HSTS.php
+++ b/HSTS.php
@@ -86,7 +86,6 @@
$wgAutoloadClasses['HSTSExtension'] = __DIR__ . '/HSTS.php';
$wgMessagesDirs['HSTS'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['HSTS'] = __DIR__ . '/HSTS.i18n.php';
$wgHooks['GetPreferences'][] = 'HSTSExtension::getPreferences';
$wgHooks['GetBetaFeaturePreferences'][] =
'HSTSExtension::getBetaFeaturePreferences';
--
To view, visit https://gerrit.wikimedia.org/r/214012
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c08c4978ed5e72d249efbc560e03164dbf21b17
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HSTS
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mirrors: update ftpsync version - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: mirrors: update ftpsync version
..
mirrors: update ftpsync version
Update to 20150425 from 20140805. This is effectively just a VERSION tag
change (which is used to track mirror versions, so important enough), as
we were previously running the same code but checked out from git.
Change-Id: Iff4945876dbaa38ff1893bb60f4b9bf3a80fb0c9
---
M modules/mirrors/files/archvsync/bin/ftpsync
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mirrors/files/archvsync/bin/ftpsync
b/modules/mirrors/files/archvsync/bin/ftpsync
index c0a44c6..a67d20b 100755
--- a/modules/mirrors/files/archvsync/bin/ftpsync
+++ b/modules/mirrors/files/archvsync/bin/ftpsync
@@ -36,7 +36,7 @@
# Script version. DO NOT CHANGE, *unless* you change the master copy maintained
# by Joerg Jaspert and the Debian mirroradm group.
# This is used to track which mirror is using which script version.
-VERSION=20140805
+VERSION=20150425
# Source our common functions
. ${BASEDIR}/etc/common
--
To view, visit https://gerrit.wikimedia.org/r/214018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff4945876dbaa38ff1893bb60f4b9bf3a80fb0c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow botirc package to load without irc dep - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/214017 Change subject: Allow botirc package to load without irc dep .. Allow botirc package to load without irc dep This allows sphinx to load the module without installing pre-req package 'irc'. Change-Id: I8235ca9008da07daeb65e1dae7424c2a8068a21e --- M pywikibot/botirc.py 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/17/214017/1 diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py index c63f4d0..2464d8a 100644 --- a/pywikibot/botirc.py +++ b/pywikibot/botirc.py @@ -7,7 +7,7 @@ # # (C) Balasyum, 2008 -# (C) Pywikibot team, 2008-2014 +# (C) Pywikibot team, 2008-2015 # # Distributed under the terms of the MIT license. # @@ -22,7 +22,17 @@ import re -from ircbot import SingleServerIRCBot +try: +from ircbot import SingleServerIRCBot +except ImportError as e: +class SingleServerIRCBot(object): + +Fake SingleServerIRCBot. + +def __init__(*args, **kwargs): +Report import exception. +raise e + _logger = botirc -- To view, visit https://gerrit.wikimedia.org/r/214017 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8235ca9008da07daeb65e1dae7424c2a8068a21e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jquery.ui.button.css: Remove '-ms-linear-gradient' - change (mediawiki...Vector)
Galorefitz has uploaded a new change for review. https://gerrit.wikimedia.org/r/214033 Change subject: jquery.ui.button.css: Remove '-ms-linear-gradient' .. jquery.ui.button.css: Remove '-ms-linear-gradient' No stable versions of IE have an '-ms-linear-gradient'. Any lines using the same have been removed. Bug: T100285 Change-Id: Idb835809e297513c46cab26ee4f1caa5f9fa6a60 --- M skinStyles/jquery.ui/jquery.ui.button.css 1 file changed, 0 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector refs/changes/33/214033/1 diff --git a/skinStyles/jquery.ui/jquery.ui.button.css b/skinStyles/jquery.ui/jquery.ui.button.css index d3bb727..bd3bdb3 100644 --- a/skinStyles/jquery.ui/jquery.ui.button.css +++ b/skinStyles/jquery.ui/jquery.ui.button.css @@ -167,7 +167,6 @@ background: -moz-linear-gradient(top, #fff 0%, #ddd 90%) !important; /* FF3.6+ */ background: -webkit-linear-gradient(top, #fff 0%, #ddd 90%) !important; /* Chrome10+, Safari5.1+ */ background: -o-linear-gradient(top, #fff 0%, #ddd 90%) !important; /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #fff 0%, #ddd 90%) !important; /* IE10+ */ background: linear-gradient(to bottom, #fff 0%, #ddd 90%) !important; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff', endColorstr='#dd', GradientType=0); /* IE6-8 */ cursor: pointer; @@ -193,7 +192,6 @@ background: -moz-linear-gradient(top, #fff 0%, #eee 90%) !important; /* FF3.6+ */ background: -webkit-linear-gradient(top, #fff 0%, #eee 90%) !important; /* Chrome10+, Safari5.1+ */ background: -o-linear-gradient(top, #fff 0%, #eee 90%) !important; /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #fff 0%, #eee 90%) !important; /* IE10+ */ background: linear-gradient(to bottom, #fff 0%, #eee 90%) !important; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff', endColorstr='#ee', GradientType=0); /* IE6-8 */ box-shadow: 0 1px 3px rgba(0,0,0,.1); @@ -208,7 +206,6 @@ background: -moz-linear-gradient(top, #f0f0f0 0%, #d0d0d0 90%) !important; /* FF3.6+ */ background: -webkit-linear-gradient(top, #f0f0f0 0%, #d0d0d0 90%) !important; /* Chrome10+, Safari5.1+ */ background: -o-linear-gradient(top, #f0f0f0 0%, #d0d0d0 90%) !important; /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #f0f0f0 0%, #d0d0d0 90%) !important; /* IE10+ */ background: linear-gradient(to bottom, #f0f0f0 0%, #d0d0d0 90%) !important; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0f0f0', endColorstr='#d0d0d0', GradientType=0); /* IE6-8 */ } @@ -227,7 +224,6 @@ background: -moz-linear-gradient(top, #3c8 0%, #295 90%) !important; /* FF3.6+ */ background: -webkit-linear-gradient(top, #3c8 0%, #295 90%) !important; /* Chrome10+, Safari5.1+ */ background: -o-linear-gradient(top, #3c8 0%, #295 90%) !important; /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #3c8 0%, #295 90%) !important; /* IE10+ */ background: linear-gradient(to bottom, #3c8 0%, #295 90%) !important; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#33cc88', endColorstr='#229955', GradientType=0); /* IE6-8 */ box-shadow: 0 1px 3px rgba(0,0,0,.3); @@ -237,7 +233,6 @@ background: -moz-linear-gradient(top, #44d388 0%, #33a055 90%) !important; /* FF3.6+ */ background: -webkit-linear-gradient(top, #44d388 0%, #33a055 90%) !important; /* Chrome10+, Safari5.1+ */ background: -o-linear-gradient(top, #44d388 0%, #33a055 90%) !important; /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #44d388 0%, #33a055 90%) !important; /* IE10+ */ background: linear-gradient(to bottom, #44d388 0%, #33a055 90%) !important; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#44d388', endColorstr='#33a055', GradientType=0); /* IE6-8 */ box-shadow: 0 1px 3px rgba(0,0,0,.25); @@ -252,7 +247,6 @@ background: -moz-linear-gradient(top, #30c080 0%, #338855 90%) !important; /* FF3.6+ */ background: -webkit-linear-gradient(top, #30c080 0%, #338855 90%) !important; /* Chrome10+, Safari5.1+ */ background: -o-linear-gradient(top, #30c080 0%, #338855 90%) !important; /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #30c080 0%, #338855 90%) !important; /* IE10+ */ background: linear-gradient(to bottom, #30c080 0%, #338855 90%) !important; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#30c080', endColorstr='#338855', GradientType=0); /* IE6-8 */ } @@ -269,7 +263,6 @@ background: -moz-linear-gradient(top, #48e 0%, #36b 90%) !important; /* FF3.6+ */ background:
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...MathSearch)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214013
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I47708fc669e7caa394703bfd74d3e0618c78d84a
---
D MathSearch.i18n.php
M MathSearch.php
2 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch
refs/changes/13/214013/1
diff --git a/MathSearch.i18n.php b/MathSearch.i18n.php
deleted file mode 100644
index 06f594a..000
--- a/MathSearch.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShimfca91e45c7bdf174' ) ) {
- function wfJsonI18nShimfca91e45c7bdf174( $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'][] =
'wfJsonI18nShimfca91e45c7bdf174';
-}
diff --git a/MathSearch.php b/MathSearch.php
index 5fbbafc..763dc20 100644
--- a/MathSearch.php
+++ b/MathSearch.php
@@ -51,7 +51,6 @@
$wgAutoloadClasses['MwsDumpWriter'] = __DIR__ . '/includes/MwsDumpWriter.php';
$wgMessagesDirs['MathSeach'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['MathSearch'] = __DIR__ . '/MathSearch.i18n.php';
$wgExtensionMessagesFiles['MathSearchAlias'] = __DIR__ .
'/MathSearch.alias.php';
$wgSpecialPageGroups['MathSearch'] = 'mathsearch';
--
To view, visit https://gerrit.wikimedia.org/r/214013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47708fc669e7caa394703bfd74d3e0618c78d84a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] RTL fixes for the reference card - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: RTL fixes for the reference card
..
RTL fixes for the reference card
* Apply the source language's lang and dir attributes
to the reference text.
* Fix the positioning of the + icon for the Add reference button.
Change-Id: I101af283891ea7a8cd4502ff6abc37614d1d7d28
---
M modules/tools/ext.cx.tools.reference.js
M modules/tools/styles/ext.cx.tools.reference.less
2 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.reference.js
b/modules/tools/ext.cx.tools.reference.js
index 211cfc4..f31b21f 100644
--- a/modules/tools/ext.cx.tools.reference.js
+++ b/modules/tools/ext.cx.tools.reference.js
@@ -51,6 +51,11 @@
$referenceInfo.append( $( 'div' )
.addClass( 'card__reference-number' ) );
$referenceInfo.append( $( 'div' )
+ // By default the reference is in the source language
and direction
+ .prop( {
+ lang: mw.cx.sourceLanguage,
+ dir: $.uls.data.getDir( mw.cx.sourceLanguage )
+ } )
.addClass( 'card__reference-content' ) );
$referenceInfo.append( this.$addReference,
this.$removeReference );
diff --git a/modules/tools/styles/ext.cx.tools.reference.less
b/modules/tools/styles/ext.cx.tools.reference.less
index 99cb761..dc56126 100644
--- a/modules/tools/styles/ext.cx.tools.reference.less
+++ b/modules/tools/styles/ext.cx.tools.reference.less
@@ -20,7 +20,7 @@
color: #565656; // TODO Should come from library?
.background-image-svg('../images/add.svg', '../images/add.png');
background-color: #FFF;
- background-position: 10px center;
+ background-position: left 10px center;
background-repeat: no-repeat;
background-size: 15px;
padding: 5px 10px 5px 32px;
--
To view, visit https://gerrit.wikimedia.org/r/214015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I101af283891ea7a8cd4502ff6abc37614d1d7d28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mirrors: update ftpsync version - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214018
Change subject: mirrors: update ftpsync version
..
mirrors: update ftpsync version
Update to 20150425 from 20140805. This is effectively just a VERSION tag
change (which is used to track mirror versions, so important enough), as
we were previously running the same code but checked out from git.
Change-Id: Iff4945876dbaa38ff1893bb60f4b9bf3a80fb0c9
---
M modules/mirrors/files/archvsync/bin/ftpsync
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/214018/1
diff --git a/modules/mirrors/files/archvsync/bin/ftpsync
b/modules/mirrors/files/archvsync/bin/ftpsync
index c0a44c6..a67d20b 100755
--- a/modules/mirrors/files/archvsync/bin/ftpsync
+++ b/modules/mirrors/files/archvsync/bin/ftpsync
@@ -36,7 +36,7 @@
# Script version. DO NOT CHANGE, *unless* you change the master copy maintained
# by Joerg Jaspert and the Debian mirroradm group.
# This is used to track which mirror is using which script version.
-VERSION=20140805
+VERSION=20150425
# Source our common functions
. ${BASEDIR}/etc/common
--
To view, visit https://gerrit.wikimedia.org/r/214018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff4945876dbaa38ff1893bb60f4b9bf3a80fb0c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-05-27T10:00:01+0000 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214022
Change subject: New Wikidata Build - 2015-05-27T10:00:01+
..
New Wikidata Build - 2015-05-27T10:00:01+
Change-Id: I3da23b291a15716ee03182da2dc80a69a1a0a3c6
---
M composer.lock
M extensions/Wikibase/client/i18n/eo.json
M extensions/Wikibase/client/i18n/uk.json
M extensions/Wikibase/lib/i18n/eo.json
M extensions/Wikibase/lib/i18n/kk-cyrl.json
M extensions/Wikibase/lib/i18n/ms.json
M extensions/Wikibase/lib/i18n/ne.json
M extensions/Wikibase/lib/i18n/tr.json
M extensions/Wikibase/lib/i18n/uk.json
M extensions/Wikibase/repo/i18n/ar.json
M extensions/Wikibase/repo/i18n/bcl.json
M extensions/Wikibase/repo/i18n/gl.json
M extensions/Wikibase/repo/i18n/hu.json
M extensions/Wikibase/repo/i18n/kk-cyrl.json
M extensions/Wikibase/repo/i18n/ksh.json
M extensions/Wikibase/repo/i18n/ne.json
M extensions/Wikibase/repo/i18n/sa.json
M extensions/Wikibase/repo/i18n/tr.json
M extensions/Wikibase/repo/i18n/uk.json
M vendor/composer/installed.json
20 files changed, 583 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/22/214022/1
diff --git a/composer.lock b/composer.lock
index 1d6bbf8..f91264e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1213,12 +1213,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: a0cafee1a1907b1548d66ef8d4940357f1f75a60
+reference: 62ced0cde0394aaa52960ca70a20f8fe615d0f75
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/a0cafee1a1907b1548d66ef8d4940357f1f75a60;,
-reference: a0cafee1a1907b1548d66ef8d4940357f1f75a60,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/62ced0cde0394aaa52960ca70a20f8fe615d0f75;,
+reference: 62ced0cde0394aaa52960ca70a20f8fe615d0f75,
shasum:
},
require: {
@@ -1286,7 +1286,7 @@
wikibaserepo,
wikidata
],
-time: 2015-05-24 21:10:42
+time: 2015-05-26 20:29:26
},
{
name: wikibase/wikimedia-badges,
diff --git a/extensions/Wikibase/client/i18n/eo.json
b/extensions/Wikibase/client/i18n/eo.json
index 4345927..67bbab0 100644
--- a/extensions/Wikibase/client/i18n/eo.json
+++ b/extensions/Wikibase/client/i18n/eo.json
@@ -8,21 +8,22 @@
},
wikibase-client-desc: Kliento por la Vikidatuma etendaĵo,
tooltip-t-wikibase: Ligilo al konektita datuma ero,
- wikibase-after-page-move: Vi povas [$1 ĝisdatigi] la ligitan
Vikidatuman eron por pluteni la lingvan ligilon al la la movita paĝo.,
- wikibase-after-page-move-queued: La [$1 Vikidatuma ero] asociigita
kun tiu ĉi paĝo estos baldaŭ aŭtomate ĝisdatigita.,
- wikibase-comment-add: Vikidatuma ero estis kreita.,
- wikibase-comment-remove: Ligita Vikidatuma ero etis forigita. La
lingvaj ligiloj estas forviŝitaj.,
- wikibase-comment-linked: Vikidatuma ero estis ligita al ĉi tiu
paĝo.,
- wikibase-comment-unlink: Ĉi tiu paĝo estis malligita de la
Vikidatuma ero. La lingvaj ligiloj estas forigitaj.,
- wikibase-comment-restore: Ligita vikidatuma ero estis restarigita.
La lingvaj ligiloj ankaŭ estis restarigitaj.,
+ wikibase-after-page-move: Vi povas [$1 ĝisdatigi] la ligitan eron en
{{WBREPONAME}} por pluteni la lingvan ligilon al la la movita paĝo.,
+ wikibase-after-page-move-queued: La [$1 ero en {{WBREPONAME}}]
asociigita kun tiu ĉi paĝo estos baldaŭ aŭtomate ĝisdatigita.,
+ wikibase-comment-add: Ero en {{WBREPONAME}} estis kreita.,
+ wikibase-comment-remove: Ligita ero en {{WBREPONAME}} estis
forigita. La lingvaj ligiloj estas forviŝitaj.,
+ wikibase-comment-linked: Ero en {{WBREPONAME}} estis ligita al ĉi
tiu paĝo.,
+ wikibase-comment-unlink: Ĉi tiu paĝo estis malligita de la ero en
{{WBREPONAME}}. La lingvaj ligiloj estas forigitaj.,
+ wikibase-comment-restore: Ligita ero en {{WBREPONAME}} estis
restarigita. La lingvaj ligiloj ankaŭ estis restarigitaj.,
wikibase-comment-update: Ero en {{WBREPONAME}} ĝisdatigita.,
wikibase-comment-sitelink-add: Lingva ligilo aldonita: $1,
wikibase-comment-sitelink-change: Lingva ligilo ŝanĝita de $1 al $2,
wikibase-comment-sitelink-remove: Lingva ligilo forigita: $1,
wikibase-comment-multi: $1 {{PLURAL:$1|ŝanĝo|ŝanĝoj}},
wikibase-dataitem: Ero en {{WBREPONAME}},
- wikibase-editlinks: Redaktu ligilojn,
- wikibase-editlinkstitle: Redaktu interlingvajn ligilojn,
+ wikibase-editlinks: Redakti ligilojn,
+
[MediaWiki-commits] [Gerrit] ButtonWidget: Fix not having tabindex updated when enabled/d... - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: ButtonWidget: Fix not having tabindex updated when
enabled/disabled
..
ButtonWidget: Fix not having tabindex updated when enabled/disabled
The onDisable method provided by ButtonWidget was overriding the one
provided by TabIndexedElement. Rename the latter.
Bug: T100480
Change-Id: I0644419b43cb082866579427ed929bc646967afb
---
M src/elements/TabIndexedElement.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/src/elements/TabIndexedElement.js
b/src/elements/TabIndexedElement.js
index 5c2151a..d87a9f6 100644
--- a/src/elements/TabIndexedElement.js
+++ b/src/elements/TabIndexedElement.js
@@ -45,7 +45,7 @@
this.tabIndex = null;
// Events
- this.connect( this, { disable: 'onDisable' } );
+ this.connect( this, { disable: 'onTabIndexedElementDisable' } );
// Initialization
this.setTabIndex( config.tabIndex );
@@ -124,7 +124,7 @@
* @private
* @param {boolean} disabled Element is disabled
*/
-OO.ui.TabIndexedElement.prototype.onDisable = function () {
+OO.ui.TabIndexedElement.prototype.onTabIndexedElementDisable = function () {
this.updateTabIndex();
};
--
To view, visit https://gerrit.wikimedia.org/r/213962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0644419b43cb082866579427ed929bc646967afb
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...TemplateSandbox)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214003
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I9aceef32012ce918c0d9b11b19a4b1be0744cd44
(cherry picked from commit a034c486af698822f94791aa7dbf3949563d54de)
---
D TemplateSandbox.i18n.php
M extension.json
2 files changed, 0 insertions(+), 36 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateSandbox
refs/changes/03/214003/1
diff --git a/TemplateSandbox.i18n.php b/TemplateSandbox.i18n.php
deleted file mode 100644
index cf000f8..000
--- a/TemplateSandbox.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShim21ca22783d54cf63' ) ) {
- function wfJsonI18nShim21ca22783d54cf63( $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'][] =
'wfJsonI18nShim21ca22783d54cf63';
-}
diff --git a/extension.json b/extension.json
index 23eea0f..4925ece 100644
--- a/extension.json
+++ b/extension.json
@@ -18,7 +18,6 @@
]
},
ExtensionMessagesFiles: {
- TemplateSandbox: TemplateSandbox.i18n.php,
TemplateSandboxAlias: TemplateSandbox.alias.php
},
AutoloadClasses: {
--
To view, visit https://gerrit.wikimedia.org/r/214003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9aceef32012ce918c0d9b11b19a4b1be0744cd44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateSandbox
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...SiteMatrix)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214005
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I7ea8eefec447a7a4830a12eda61958cbb49dc1ce
(cherry picked from commit d4388665a000468276d1a9c9ce93f3cbf14f57d0)
---
D SiteMatrix.i18n.php
M SiteMatrix.php
2 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SiteMatrix
refs/changes/05/214005/1
diff --git a/SiteMatrix.i18n.php b/SiteMatrix.i18n.php
deleted file mode 100644
index 745b29d..000
--- a/SiteMatrix.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShimd8ef58095e4ec576' ) ) {
- function wfJsonI18nShimd8ef58095e4ec576( $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'][] =
'wfJsonI18nShimd8ef58095e4ec576';
-}
diff --git a/SiteMatrix.php b/SiteMatrix.php
index dac1355..3a8db96 100644
--- a/SiteMatrix.php
+++ b/SiteMatrix.php
@@ -69,7 +69,6 @@
$dir = __DIR__ . '/';
$wgMessagesDirs['SiteMatrix'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['SiteMatrix'] = $dir . 'SiteMatrix.i18n.php';
$wgExtensionMessagesFiles['SiteMatrixAlias'] = $dir . 'SiteMatrix.alias.php';
$wgAutoloadClasses['SiteMatrix'] = $dir . 'SiteMatrix_body.php';
--
To view, visit https://gerrit.wikimedia.org/r/214005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ea8eefec447a7a4830a12eda61958cbb49dc1ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SiteMatrix
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent swapping to an invalid target language - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214019
Change subject: Prevent swapping to an invalid target language
..
Prevent swapping to an invalid target language
Pick a language from ULS common languages instead of swapping
when the target language is invalid.
This addresses the following comment:
https://phabricator.wikimedia.org/T96573#1296025
Bug: T96573
Change-Id: I1f3f9fd3637cd6ab198984a743a28a1cc412c61a
---
M modules/source/ext.cx.source.selector.js
1 file changed, 13 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/19/214019/1
diff --git a/modules/source/ext.cx.source.selector.js
b/modules/source/ext.cx.source.selector.js
index ff01210..2e9f566 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -169,12 +169,22 @@
* @param {string} language A language code
*/
CXSourceSelector.prototype.setSourceLanguage = function ( language ) {
- var langProps;
+ var langProps, currentSource, newTarget;
// Don't let the same languages be selected as source and
target.
- // Instead, do what the user probably means and swap them.
+ // Instead, do what the user probably means: either swap them if
+ // it's valid, or pick the first of the common languages in ULS.
if ( language === this.getTargetLanguage() ) {
- this.setTargetLanguage( this.getSourceLanguage() );
+ currentSource = this.getSourceLanguage();
+
+ if ( CXSourceSelector.prototype.isValidTarget(
currentSource ) ) {
+ this.setTargetLanguage( currentSource );
+ } else {
+ this.setTargetLanguage(
+ this.$targetLanguage.data( 'uls'
).options.quickList()[ 0 ]
+ );
+ }
+
}
langProps = {
--
To view, visit https://gerrit.wikimedia.org/r/214019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f3f9fd3637cd6ab198984a743a28a1cc412c61a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not load mw-ui-icon-ok in icons pack - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Do not load mw-ui-icon-ok in icons pack
..
Do not load mw-ui-icon-ok in icons pack
The library should not provide any icons. This is an unused css rule
that is being shipped to all our users.
Change-Id: I6f237ffc1ed7dccbab68666d5c219f05178a1e1b
---
M resources/src/mediawiki.ui/components/icons.less
D resources/src/mediawiki.ui/components/images/ok.png
D resources/src/mediawiki.ui/components/images/ok.svg
3 files changed, 0 insertions(+), 6 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.ui/components/icons.less
b/resources/src/mediawiki.ui/components/icons.less
index 5107f8e..a6e6490 100644
--- a/resources/src/mediawiki.ui/components/icons.less
+++ b/resources/src/mediawiki.ui/components/icons.less
@@ -97,8 +97,3 @@
}
}
}
-
-// Icons
-.mw-ui-icon-ok {
- .mixin-mw-ui-icon-bgimage('images/ok.svg', 'images/ok.png');
-}
diff --git a/resources/src/mediawiki.ui/components/images/ok.png
b/resources/src/mediawiki.ui/components/images/ok.png
deleted file mode 100644
index 1ea6aa2..000
--- a/resources/src/mediawiki.ui/components/images/ok.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.ui/components/images/ok.svg
b/resources/src/mediawiki.ui/components/images/ok.svg
deleted file mode 100644
index a3d3058..000
--- a/resources/src/mediawiki.ui/components/images/ok.svg
+++ /dev/null
@@ -1 +0,0 @@
-?xml version=1.0 encoding=UTF-8?svg xmlns=http://www.w3.org/2000/svg;
width=22 height=22path d=M18.125 1.813l-10.5 10.75-3.844-3.75L0
12.719l7.72 7.452L22 5.625z fill=#f0f0f0//svg
--
To view, visit https://gerrit.wikimedia.org/r/213982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f237ffc1ed7dccbab68666d5c219f05178a1e1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Edokter er...@darcoury.nl
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Repool pc1001 after maintenance - change (operations/mediawiki-config)
Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/214025 Change subject: Repool pc1001 after maintenance .. Repool pc1001 after maintenance Buffer pool has been warmed, but I expect a high number of cache misses Not depooling pc1002 on the same commit to avoid too much impact on query latency. Change-Id: Ib3bdab0fde9d42d26b55b157fe75936d40138410 References: T100301 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/25/214025/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 856e525..8efcddc 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -8,7 +8,7 @@ #$wgReadOnly = Wikimedia Sites are currently read-only during maintenance, please try again soon.; $wmgParserCacheDBs = array( -# '10.64.16.156', # pc1001 (down for maintenance) + '10.64.16.156', # pc1001 '10.64.16.157', # pc1002 '10.64.16.158', # pc1003 ); -- To view, visit https://gerrit.wikimedia.org/r/214025 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3bdab0fde9d42d26b55b157fe75936d40138410 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...Echo)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214031
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I180cbbced3a9bab95baa37a7a6fc25870e8a6bbf
---
D Echo.i18n.php
M Echo.php
2 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/31/214031/1
diff --git a/Echo.i18n.php b/Echo.i18n.php
deleted file mode 100644
index c805ec6..000
--- a/Echo.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShimf2b01d837887d3da' ) ) {
- function wfJsonI18nShimf2b01d837887d3da( $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'][] =
'wfJsonI18nShimf2b01d837887d3da';
-}
diff --git a/Echo.php b/Echo.php
index a5f2d59..083ad35 100644
--- a/Echo.php
+++ b/Echo.php
@@ -45,7 +45,6 @@
$dir = dirname( __FILE__ ) . '/';
$wgMessagesDirs['Echo'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Echo'] = $dir . 'Echo.i18n.php';
$wgExtensionMessagesFiles['EchoAliases'] = $dir . 'Echo.alias.php';
// This file is autogenerated by scripts/gen-autoload.php
--
To view, visit https://gerrit.wikimedia.org/r/214031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I180cbbced3a9bab95baa37a7a6fc25870e8a6bbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] udp2log: add conntrack exception firewall rule - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: udp2log: add conntrack exception firewall rule
..
udp2log: add conntrack exception firewall rule
root@fluorine:~# zgrep -c 'nf_conntrack: table full, dropping packet'
/var/log/kern.log*
/var/log/kern.log:4824
/var/log/kern.log.1:10485
/var/log/kern.log.2.gz:10035
/var/log/kern.log.3.gz:8149
/var/log/kern.log.4.gz:2370
Change-Id: I9e11921a612e01788fb36b7ae602e60a53a6983f
---
M manifests/misc/udp2log.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index 5d5c8c0..c6de225 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -406,6 +406,12 @@
rule = 'saddr ($ALL_NETWORKS) proto udp ACCEPT;',
}
+ferm::rule { 'udp2log_notrack':
+table = 'raw',
+chain = 'PREROUTING',
+rule = 'saddr ($ALL_NETWORKS) proto udp NOTRACK;',
+}
+
# let monitoring host connect via NRPE
ferm::rule { 'udp2log_accept_icinga_nrpe':
rule = 'proto tcp dport 5666 { saddr $INTERNAL ACCEPT; }',
--
To view, visit https://gerrit.wikimedia.org/r/214034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9e11921a612e01788fb36b7ae602e60a53a6983f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Separate module definition for addModuleStyles - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Separate module definition for addModuleStyles .. Separate module definition for addModuleStyles Follow-up to I7d9e793b4b36a9ca3f5da75480ad89cddf7d5bf8 Fixing the issue of modules that contain both JS and CSS and how they interact with addModuleStyles. Since we don't want the position definition to affect modules when they are added normally (without addModuleStyles), we have to separate them when they have a dual purpose. Depends on Ie4287e17d6f298cc63f42f257b1f67ee36961b77 Bug: T97410 Change-Id: Ibf22aa509d205b4c632d186c8da56a87c5d16099 --- M repo/includes/EntityParserOutputGenerator.php M view/resources/jquery/wikibase/resources.php M view/resources/jquery/wikibase/toolbar/resources.php 3 files changed, 19 insertions(+), 11 deletions(-) Approvals: JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/EntityParserOutputGenerator.php b/repo/includes/EntityParserOutputGenerator.php index 84efaa8..5b5c378 100644 --- a/repo/includes/EntityParserOutputGenerator.php +++ b/repo/includes/EntityParserOutputGenerator.php @@ -383,9 +383,9 @@ // make css available for JavaScript-less browsers $parserOutput-addModuleStyles( array( 'wikibase.common', - 'jquery.ui.core', - 'jquery.wikibase.statementview', - 'jquery.wikibase.toolbar', + 'jquery.ui.core.styles', + 'jquery.wikibase.statementview.RankSelector.styles', + 'jquery.wikibase.toolbar.styles', ) ); // make sure required client-side resources will be loaded diff --git a/view/resources/jquery/wikibase/resources.php b/view/resources/jquery/wikibase/resources.php index 4b39988..d49bb6e 100644 --- a/view/resources/jquery/wikibase/resources.php +++ b/view/resources/jquery/wikibase/resources.php @@ -431,13 +431,9 @@ ), 'jquery.wikibase.statementview' = $moduleTemplate + array( - 'position' = 'top', 'scripts' = array( 'jquery.wikibase.statementview.js', 'jquery.wikibase.statementview.RankSelector.js', - ), - 'styles' = array( - 'themes/default/jquery.wikibase.statementview.RankSelector.css', ), 'dependencies' = array( 'jquery.ui.EditableTemplatedWidget', @@ -449,6 +445,7 @@ 'jquery.wikibase.referenceview', 'jquery.wikibase.snakview', 'jquery.wikibase.snaklistview', + 'jquery.wikibase.statementview.RankSelector.styles', 'wikibase.datamodel.Claim', 'wikibase.datamodel.ReferenceList', 'wikibase.datamodel.SnakList', @@ -466,6 +463,13 @@ ), ), + 'jquery.wikibase.statementview.RankSelector.styles' = $moduleTemplate + array( + 'position' = 'top', + 'styles' = array( + 'themes/default/jquery.wikibase.statementview.RankSelector.css', + ), + ), + ); return array_merge( diff --git a/view/resources/jquery/wikibase/toolbar/resources.php b/view/resources/jquery/wikibase/toolbar/resources.php index 2dce035..53f415c 100644 --- a/view/resources/jquery/wikibase/toolbar/resources.php +++ b/view/resources/jquery/wikibase/toolbar/resources.php @@ -91,15 +91,19 @@ ), 'jquery.wikibase.toolbar' = $moduleTemplate + array( - 'position' = 'top', 'scripts' = array( 'jquery.wikibase.toolbar.js', ), - 'styles' = array( - 'themes/default/jquery.wikibase.toolbar.css', - ), 'dependencies' = array( 'jquery.wikibase.toolbaritem', + 'jquery.wikibase.toolbar.styles', + ), + ), + + 'jquery.wikibase.toolbar.styles' = $moduleTemplate + array( + 'position' = 'top', + 'styles' = array( + 'themes/default/jquery.wikibase.toolbar.css', ), ), -- To view, visit https://gerrit.wikimedia.org/r/209773 To unsubscribe, visit
[MediaWiki-commits] [Gerrit] Assign Hostname/IPs to the etcd cluster @ eqiad - change (operations/dns)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214035
Change subject: Assign Hostname/IPs to the etcd cluster @ eqiad
..
Assign Hostname/IPs to the etcd cluster @ eqiad
Just a starting point, will also need SRV records
Change-Id: I28b6830e6351b1a44b2fd16c317624504d93dd87
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/35/214035/1
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index aa0b0f5..1c530b6 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -816,6 +816,9 @@
171 1H IN PTR ganeti1003.eqiad.wmnet.
172 1H IN PTR ganeti1004.eqiad.wmnet.
173 1H IN PTR ganeti01.svc.eqiad.wmnet.
+174 1H IN PTR etcd1001.eqiad.wmnet.
+175 1H IN PTR etcd1002.eqiad.wmnet.
+176 1H IN PTR etcd1003.eqiad.wmnet.
$ORIGIN 33.64.{{ zonename }}.
1 1H IN PTR vl1019-eth2.lvs1001.wikimedia.org.
diff --git a/templates/wmnet b/templates/wmnet
index e05c463..3ef126f 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -325,6 +325,9 @@
es1008 1H IN A10.64.32.18
es1009 1H IN A10.64.32.19
es1010 1H IN A10.64.32.20
+etcd10011H IN A10.64.32.174
+etcd10021H IN A10.64.32.175
+etcd10031H IN A10.64.32.176
eventlog10011H IN A10.64.32.167
fluorine1H IN A10.64.0.21
francium1H IN A10.64.32.168
--
To view, visit https://gerrit.wikimedia.org/r/214035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28b6830e6351b1a44b2fd16c317624504d93dd87
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I180cbbced3a9bab95baa37a7a6fc25870e8a6bbf
---
D Echo.i18n.php
M Echo.php
2 files changed, 0 insertions(+), 36 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Echo.i18n.php b/Echo.i18n.php
deleted file mode 100644
index c805ec6..000
--- a/Echo.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShimf2b01d837887d3da' ) ) {
- function wfJsonI18nShimf2b01d837887d3da( $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'][] =
'wfJsonI18nShimf2b01d837887d3da';
-}
diff --git a/Echo.php b/Echo.php
index 276e090..fab82e6 100644
--- a/Echo.php
+++ b/Echo.php
@@ -45,7 +45,6 @@
$dir = dirname( __FILE__ ) . '/';
$wgMessagesDirs['Echo'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Echo'] = $dir . 'Echo.i18n.php';
$wgExtensionMessagesFiles['EchoAliases'] = $dir . 'Echo.alias.php';
// This file is autogenerated by scripts/gen-autoload.php
--
To view, visit https://gerrit.wikimedia.org/r/214021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I180cbbced3a9bab95baa37a7a6fc25870e8a6bbf
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] make-wmf-branch should check that it's running the latest or... - change (mediawiki...release)
jenkins-bot has submitted this change and it was merged.
Change subject: make-wmf-branch should check that it's running the latest
origin/master
..
make-wmf-branch should check that it's running the latest origin/master
Bug: T8
Change-Id: I9de9a935ce5f449708e5463de90f2993446379b5
---
M make-wmf-branch/make-wmf-branch
1 file changed, 26 insertions(+), 0 deletions(-)
Approvals:
20after4: Looks good to me, approved
JanZerebecki: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/make-wmf-branch/make-wmf-branch b/make-wmf-branch/make-wmf-branch
index e8f07a9..53136d4 100755
--- a/make-wmf-branch/make-wmf-branch
+++ b/make-wmf-branch/make-wmf-branch
@@ -9,6 +9,32 @@
exit( 1 );
}
+$current_branch = trim(`git symbolic-ref --short HEAD`);
+$abort = false;
+if ($current_branch == 'master') {
+echo Verifying that make-wmf-branch is up to date with origin/master...;
+shell_exec('git fetch');
+$log = `git log HEAD..origin/master --pretty=oneline`;
+$logsize = strlen($log);
+if ($logsize 0) {
+$abort=true;
+$reason = Out of date, you need to integrate these commits from
origin/master:\n;
+$reason .= $log;
+echo \n;
+} else {
+echo ok\n;
+}
+} else {
+$abort=true;
+$reason = Wrong branch: $current_branch. Please run make-wmf-branch from
the latest origin/master revision.;
+}
+
+if ($abort) {
+echo Aborting make-wmf-branch:\n;
+echo Reason: $reason\n;
+exit(1);
+}
+
$newVersion = $argv[1];
$oldVersion = $argv[2];
$clonePath = isset( $argv[3] ) ? $argv[3] : null;
--
To view, visit https://gerrit.wikimedia.org/r/212757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9de9a935ce5f449708e5463de90f2993446379b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...Echo)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214021
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I180cbbced3a9bab95baa37a7a6fc25870e8a6bbf
---
D Echo.i18n.php
M i18n/tr.json
M i18n/uk.json
3 files changed, 34 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/21/214021/1
diff --git a/Echo.i18n.php b/Echo.i18n.php
deleted file mode 100644
index c805ec6..000
--- a/Echo.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShimf2b01d837887d3da' ) ) {
- function wfJsonI18nShimf2b01d837887d3da( $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'][] =
'wfJsonI18nShimf2b01d837887d3da';
-}
diff --git a/i18n/tr.json b/i18n/tr.json
index d8e25c0..dbd4719 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -7,7 +7,8 @@
Meelo,
Rapsar,
Sayginer,
- Violetanka
+ Violetanka,
+ Arystanbek
]
},
echo-desc: Bildirim sistemi,
@@ -67,11 +68,12 @@
notification-page-linked: [[:$2]] sayfasına [[:$3]] sayfasından
{{GENDER:$1|bağlantı verildi}}. [[Special:WhatLinksHere/$2|Bu sayfaya bağlantı
veren tüm sayfaları görüntüleyin]].,
notification-page-linked-flyout: [[:$2]] sayfasına [[:$3]]
sayfasından {{GENDER:$1|bağlantı verildi}}.,
notification-add-comment2: [[User:$1|$1]], \$4\ mesaj sayfasındaki
\[[$3|$2]]\ bölümüne {{GENDER:$1|yorum yaptı}}.,
+ notification-add-talkpage-topic2: [[User:$1|$1]]
{{CİNSİYET:$1|yayınlanan}} yeni bir konu,\$2\ [[$3]].,
notification-add-talkpage-topic-yours2: [[User:$1|$1]] size bir
mesaj {{GENDER:$1|gönderdi}}: \[[$3#$2|$2]]\.,
notification-add-comment-yours2: [[User:$1|$1]], mesaj sayfanızdaki
\[[$3#$2|$2]]\ konusuna {{GENDER:$1|yorum yaptı}}.,
notification-mention: [[User:$1|$1]], $5 sayfasının tartışma
sayfasının \[[:$3#$2|$4]]\ başlığında sizden {{GENDER:$1|bahsetti}}.,
notification-mention-flyout: $1, $5 sayfasının tartışma sayfasının
\[[:$3#$2|$4]]\ başlığında sizden {{GENDER:$1|bahsetti}}.,
- notification-mention-nosection: [[Kullanıcı:$1|$1]], [[:$3|$2
başlıklı tartışma sayfasında]] sizden {{GENDER:$1|bahsetti}}.,
+ notification-mention-nosection: [[User:$1|$1]] {{CİNSİYET:$1|söz}}
[[:$3|$2 tartışma sayfası]].,
notification-mention-nosection-flyout: $1, [[:$3|$2 başlıklı
tartışma sayfasında]] sizden {{GENDER:$1|bahsetti}}.,
notification-user-rights: Kullanıcı haklarınız [[User:$1|$1]]
tarafından [[Special:Log/rights/$1|{{GENDER:$1|değiştirildi}}]]. $2.
[[Special:ListGroupRights|Daha fazla bilgi]],
notification-user-rights-flyout: Kullanıcı haklarınız $1 tarafından
{{GENDER:$1|değiştirildi}}. $2. [[Special:ListGroupRights|Daha fazla bilgi
alın]],
@@ -85,8 +87,11 @@
notification-edit-talk-page-email-batch-body-with-section: $1, mesaj
sayfanızın \$2\ başlığında bir mesaj {{GENDER:$1|bıraktı}}.,
notification-page-linked-email-subject: Sayfanıza {{SITENAME}}
sitesinde bağlantı verildi,
notification-page-linked-email-batch-body: $2 sayfasına $3
sayfasından {{GENDER:$1|bağlantı verildi}}.,
+ notification-reverted-email-subject2:
[MediaWiki-commits] [Gerrit] remove show block log for user button - change (mediawiki...Renameuser)
Microchip08 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214023
Change subject: remove show block log for user button
..
remove show block log for user button
The Show block log for user button was created in response to bug 9315
(which is now T11315). The bug was created by an English Wikipedia
bureaucrat who wanted MediaWiki to alert if the user to be renamed was
currently blocked. This was implemented instead by showing a fragment of
the user's block log if a second submit button was clicked, which is
overengineered for the use case in question.
This commit removes the second button, which was probably rarely used,
and should probably have been a hyperlink. It replaces the functionality
with a warning: if someone attempts to rename a currently blocked user,
MediaWiki will now require a confirmation checkbox to be ticked, and to
submit the form a second time. This preserves the original intent of the
bug, whilst removing a rather suspect UI element.
Change-Id: I49f27ee7ff57b343fea82c4a93f75a22c1843f21
---
M i18n/en.json
M i18n/qqq.json
M specials/SpecialRenameuser.php
3 files changed, 6 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Renameuser
refs/changes/23/214023/1
diff --git a/i18n/en.json b/i18n/en.json
index 40c7a11..97bce5d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -16,7 +16,6 @@
renameuserwarnings: Warnings:,
renameuserconfirm: Yes, rename the user,
renameusersubmit: Submit,
-renameuser-submit-blocklog: Show block log for user,
renameusererrordoesnotexist: The user \nowiki$1/nowiki\ does not
exist.,
renameusererrorexists: The user \nowiki$1/nowiki\ already
exists.,
renameusererrorinvalid: The username \nowiki$1/nowiki\ is
invalid.,
@@ -26,6 +25,7 @@
renameuser-page-exists: The page $1 already exists and cannot be
automatically overwritten.,
renameuser-page-moved: The page $1 has been moved to $2.,
renameuser-page-unmoved: The page $1 could not be moved to $2.,
+ renameuser-warning-currentblock: User is currently blocked,
log-name-renameuser: User rename log,
log-description-renameuser: This is a log of changes to user names.,
logentry-renameuser-renameuser: $1 {{GENDER:$2|renamed}} user $4
({{PLURAL:$6|$6 edit|$6 edits}}) to $5,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2ceff6e..38c242c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -32,6 +32,7 @@
renameusererrorexists: Used as error message. Parameters:\n* $1 -
username\nSee also:\n* {{msg-mw|Renameusererrordoesnotexist}},
renameusererrorinvalid: Used as error message when renaming user in
[[Special:Renameuser]]. Parameters:\n* $1 - old username, or new username,
renameuser-error-request: Used as error message when renaming user
in [[Special:Renameuser]].,
+ renameuser-warning-currentblock: Displayed as a warning in
[[Special:RenameUser]] before renaming a user that is currently blocked.,
renameuser-error-same-user: Used as error message when renaming user
in [[Special:Renameuser]].,
renameusersuccess: Used as success message when renaming user in
[[Special:Renameuser]]. Parameters:\n* $1 - old username\n* $2 - new username,
renameuser-page-exists: Used when renaming user in
[[Special:Renameuser]]. Parameters:\n* $1 - new page title (with link),
diff --git a/specials/SpecialRenameuser.php b/specials/SpecialRenameuser.php
index c8b2a53..ad343c4 100644
--- a/specials/SpecialRenameuser.php
+++ b/specials/SpecialRenameuser.php
@@ -39,7 +39,6 @@
}
$request = $this-getRequest();
- $showBlockLog = $request-getBool( 'submit-showBlockLog' );
$oldnamePar = trim( str_replace( '_', ' ', $request-getText(
'oldusername', $par ) ) );
$oldusername = Title::makeTitle( NS_USER, $oldnamePar );
// Force uppercase of newusername, otherwise wikis with
wgCapitalLinks=false can create lc usernames
@@ -54,6 +53,10 @@
$warnings = array();
if ( $oun $nun !$request-getCheck( 'confirmaction' ) ) {
+ $oldU = User::newFromName( $oun );
+ if ( $oldU-isBlocked() ) {
+ $warnings[] = 'renameuser-warning-currentblock';
+ }
Hooks::run( 'RenameUserWarning', array( $oun, $nun,
$warnings ) );
}
@@ -165,14 +168,6 @@
)
) .
' ' .
- Xml::submitButton(
- $this-msg(
'renameuser-submit-blocklog' )-text(),
- array (
-
[MediaWiki-commits] [Gerrit] udp2log: add conntrack exception firewall rule - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214034
Change subject: udp2log: add conntrack exception firewall rule
..
udp2log: add conntrack exception firewall rule
root@fluorine:~# zgrep -c 'nf_conntrack: table full, dropping packet'
/var/log/kern.log*
/var/log/kern.log:4824
/var/log/kern.log.1:10485
/var/log/kern.log.2.gz:10035
/var/log/kern.log.3.gz:8149
/var/log/kern.log.4.gz:2370
Change-Id: I9e11921a612e01788fb36b7ae602e60a53a6983f
---
M manifests/misc/udp2log.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/214034/1
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index 5d5c8c0..c6de225 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -406,6 +406,12 @@
rule = 'saddr ($ALL_NETWORKS) proto udp ACCEPT;',
}
+ferm::rule { 'udp2log_notrack':
+table = 'raw',
+chain = 'PREROUTING',
+rule = 'saddr ($ALL_NETWORKS) proto udp NOTRACK;',
+}
+
# let monitoring host connect via NRPE
ferm::rule { 'udp2log_accept_icinga_nrpe':
rule = 'proto tcp dport 5666 { saddr $INTERNAL ACCEPT; }',
--
To view, visit https://gerrit.wikimedia.org/r/214034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e11921a612e01788fb36b7ae602e60a53a6983f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add stacked bars component to compare layout - change (analytics/dashiki)
Mforns has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214036
Change subject: Add stacked bars component to compare layout
..
Add stacked bars component to compare layout
* Add visualizer that draws a stacked bar chart
* Add component that compares two stacked bar charts
* Add data converter that takes data for the bar chart
Bug: T91123
Change-Id: Iba4cc5c4145e1dfa1d7d5d47c09bc4247c7a383b
---
A src/app/data-converters/matrix-data.js
M src/app/data-converters/timeseries-data.js
M src/app/require.config.js
M src/app/startup.js
A src/components/a-b-compare/compare-stacked-bars.html
A src/components/a-b-compare/compare-stacked-bars.js
M src/components/compare-layout/compare-layout.js
A src/components/visualizers/stacked-bars/bindings.js
A src/components/visualizers/stacked-bars/stacked-bars.html
A src/components/visualizers/stacked-bars/stacked-bars.js
A src/css/070_stacked_bars.css
M src/layouts/compare/index.js
M src/lib/utils.js
13 files changed, 498 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/36/214036/1
diff --git a/src/app/data-converters/matrix-data.js
b/src/app/data-converters/matrix-data.js
new file mode 100644
index 000..6999823
--- /dev/null
+++ b/src/app/data-converters/matrix-data.js
@@ -0,0 +1,64 @@
+/**
+ * This module returns a method that knows how to parse data of the form:
+ * datetype col1 col2 col3
+ * 2015-01-01 row1 123
+ * 2015-01-01 row2 456
+ * 2015-01-02 row1 789
+ * And aggregate it by date, returning a TimeseriesData object
+ * with the following data format:
+ * daterow1@col1 row1@col2 row1@col3 row2@col1 row2@col2 row2@col3
+ * 2015-01-01 1 2 3 4 5 6
+ * 2015-01-02 7 8 9 0 0 0
+ */
+define(function (require) {
+
+var TimeseriesData = require('converters.timeseries-data'),
+utils = require('utils'),
+_ = require('lodash');
+
+return function (data) {
+var colNames = data.header.slice(2, data.header.length),
+headerMap = {},
+rowsByDate = {};
+
+// First pass: aggregate by date and get all crossNames
+data.rows.forEach(function (row) {
+var dateStr = utils.formatDate(row[0]),
+rowName = row[1],
+values = row.slice(2, row.length).map(function (value) {
+return +value || 0;
+});
+
+if (!_.has(rowsByDate, dateStr)) {
+rowsByDate[dateStr] = {};
+}
+var rowByDate = rowsByDate[dateStr];
+
+for (var i = 0; i values.length; i++) {
+var colName = colNames[i],
+value = values[i],
+crossName = rowName + '@' + colName;
+
+headerMap[crossName] = true;
+rowByDate[crossName] = value;
+}
+});
+
+// Get header sorted alphabetically
+var header = _.chain(headerMap).keys().sort().value();
+
+// Second pass: sort values and fill undefineds
+_.keys(rowsByDate).forEach(function (dateStr) {
+var row = [];
+
+header.forEach(function (crossName) {
+var value = _.get(rowsByDate[dateStr], crossName, 0);
+row.push(value);
+});
+
+rowsByDate[dateStr] = row;
+});
+
+return new TimeseriesData(header, rowsByDate);
+};
+});
diff --git a/src/app/data-converters/timeseries-data.js
b/src/app/data-converters/timeseries-data.js
index 65f6aa8..d6039d4 100644
--- a/src/app/data-converters/timeseries-data.js
+++ b/src/app/data-converters/timeseries-data.js
@@ -76,13 +76,11 @@
};
_.reduce(from, function (dest, src) {
-console.log('processing: ', src);
_.map(src.rowsByDate, function (value, key) {
if (!_.has(dest.rowsByDate, key)) {
// fill arrays that are nonexistent up to this point
dest.rowsByDate[key] = _.fill(Array(dest.header.length),
null);
}
-console.log(dest.rowsByDate);
dest.rowsByDate[key] = dest.rowsByDate[key].concat(value);
});
diff --git a/src/app/require.config.js b/src/app/require.config.js
index 36d6a0e..53359c8 100644
--- a/src/app/require.config.js
+++ b/src/app/require.config.js
@@ -58,6 +58,8 @@
'converters.wikimetrics-timeseries' :
'app/data-converters/wikimetrics-timeseries',
'converters.funnel-data':
'app/data-converters/funnel-data',
'converters.timeseries' :
'app/data-converters/timeseries-data',
+'converters.matrix-data':
'app/data-converters/matrix-data',
+
[MediaWiki-commits] [Gerrit] [WIP] Promisify - change (mediawiki...citoid)
Mvolz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214038
Change subject: [WIP] Promisify
..
[WIP] Promisify
Uses promisifymerged branch of html-metadata
until changes are merged into master there.
Create CitoidRequest.js
CitoidService.prototype.distinguish -- .addResponseFunction
Scraper.js fully promisified.
Super wip at this point.
Bug: T75993
Change-Id: I3ff26f22809ccb18113642107828dc4334844f8b
---
A lib/CitoidRequest.js
A lib/CitoidResponse.js
M lib/CitoidService.js
M lib/Scraper.js
M package.json
M routes/root.js
M test/features/scraping/export.js
M test/features/scraping/index.js
M test/utils/assert.js
9 files changed, 453 insertions(+), 289 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/38/214038/1
diff --git a/lib/CitoidRequest.js b/lib/CitoidRequest.js
new file mode 100644
index 000..9e21f8a
--- /dev/null
+++ b/lib/CitoidRequest.js
@@ -0,0 +1,31 @@
+'use strict';
+
+/**
+ * An object corresponding to each request to the citoid service
+ */
+
+var CitoidResponse = require('./CitoidResponse.js');
+
+/**
+ * Constructor for CitoidRequest object
+ * @param {Object} req raw request object from express
+ * @param {Object} opts cleaned request parameters
+ * @param {Object} logger logger object, must have a log() method
+ * @param {Object} statsd metrics object
+ */
+function CitoidRequest(req, logger, statsd) {
+
+ this.request = req;
+ this.logger = logger;
+ this.stats = statsd;
+
+ this.acceptLanguage = this.request.headers['accept-language'];
+ this.format = encodeURIComponent(this.request.query.format);
+ this.encodedSearch = encodeURIComponent(this.request.query.search); //
Should already be encoded, but reencode in case
+ this.search = decodeURIComponent(this.encodedSearch);
+
+ this.response = new CitoidResponse(this.format, logger, statsd); //
Prepare a response
+
+}
+
+module.exports = CitoidRequest;
diff --git a/lib/CitoidResponse.js b/lib/CitoidResponse.js
new file mode 100644
index 000..ef0bba6
--- /dev/null
+++ b/lib/CitoidResponse.js
@@ -0,0 +1,23 @@
+'use strict';
+
+/**
+ * An object corresponding to each request to the citoid service
+ */
+
+/**
+ * Constructor for CitoidRequest object
+ * @param {Object} cr CitoidRequest option
+ * @param {Object} logger logger object, must have a log() method
+ * @param {Object} statsd metrics object
+ */
+function CitoidResponse(format, logger, stats) {
+
+ this.logger = logger;
+ this.status = stats;
+
+ this.citation = []; // Initialise empty native citation list
+ this.responseCode = 500; // Default internal server error
+ this.format = format;
+}
+
+module.exports = CitoidResponse;
diff --git a/lib/CitoidService.js b/lib/CitoidService.js
index d0dc979..a32b5b5 100644
--- a/lib/CitoidService.js
+++ b/lib/CitoidService.js
@@ -5,14 +5,16 @@
*/
/* Import Modules */
+var BBPromise = require('bluebird');
var request = require('request');
var urlParse = require('url');
/* Import Local Modules */
-var unshorten = require('./unshorten.js');
-var Scraper = require('./Scraper.js');
-var ZoteroService = require('./ZoteroService.js');
+var CitoidRequest = require('./CitoidRequest.js');
var pubMedRequest = require('./pubMedRequest.js');
+var Scraper = require('./Scraper.js');
+var unshorten = require('./unshorten.js');
+var ZoteroService = require('./ZoteroService.js');
/**
* Constructor for CitoidService object
@@ -30,30 +32,106 @@
/**
* Requests to the citoid service
- * @param {Object} opts options object containing request information
- * @param {Function} callback callback (error, statusCode, body)
+ * @param {Object} opts request parameters
+ * @param {Object} reqfull Request object
+ * @param {Function} callback callback (error, statusCode, body)
*/
-CitoidService.prototype.request = function(opts, callback){
+CitoidService.prototype.request = function(cr, callback){
var runnerOpts;
- var citoidService = this;
- citoidService.distinguish(opts.search, function(extractedID,
runnerFunction){
+ this.addResponseFunction(cr).then(function(cr){
runnerOpts = {
- format : opts.format,
- search : extractedID,
- acceptLanguage : opts.acceptLanguage
+ format : cr.format,
+ search : cr.idValue,
+ acceptLanguage : cr.acceptLanguage
};
- runnerFunction(runnerOpts, callback);
+ cr.getResponse(cr, runnerOpts, callback);
});
+
};
+
+/**
+ * Promise for adding correct response function given input type
+ * @param {String} rawSearchInputwhat the end user searched for
+ * @param {Function} callback
[MediaWiki-commits] [Gerrit] Enable CirrusSearch-PerUser pool counter in fully featured c... - change (mediawiki...CirrusSearch)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/214040 Change subject: Enable CirrusSearch-PerUser pool counter in fully featured config .. Enable CirrusSearch-PerUser pool counter in fully featured config Long standing todo, the required patch has been merged some time ago. The only question is if 1 is really the right limit here, for jenkins it probably was but for a fully featured wiki configuration probably not. As such it has been updated to a limit of 5. Change-Id: I4ecf748e1ab28b78bd409aecb32bee81cd1b4047 --- M tests/jenkins/FullyFeaturedConfig.php 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/40/214040/1 diff --git a/tests/jenkins/FullyFeaturedConfig.php b/tests/jenkins/FullyFeaturedConfig.php index 4be1c1d..cb67fc0 100644 --- a/tests/jenkins/FullyFeaturedConfig.php +++ b/tests/jenkins/FullyFeaturedConfig.php @@ -64,12 +64,12 @@ 'workers' = 50, 'maxqueue' = 200, ); - // Can't be enabled until poolcounter gets Ie282b8486c7bad451fbc5fb9a8274c6e01a728a7. - // TODO enable this. - // $wgPoolCounterConf[ 'CirrusSearch-PerUser' ] = array( - // 'class' = 'PoolCounter_Client', - // 'timeout' = 0, - // 'workers' = 1, - // 'maxqueue' = 1, - // ); + // Limit users to a single concurent search. Note that this also effects + // ip address, so shared ip addresses will run into issues. + $wgPoolCounterConf[ 'CirrusSearch-PerUser' ] = array( + 'class' = 'PoolCounter_Client', + 'timeout' = 0, + 'workers' = 5, + 'maxqueue' = 5, + ); } -- To view, visit https://gerrit.wikimedia.org/r/214040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ecf748e1ab28b78bd409aecb32bee81cd1b4047 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...CodeEditor)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214041
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: Ie9b6c2fce685e103ac90084eb793c341d79ee5eb
---
D CodeEditor.i18n.php
M CodeEditor.php
M i18n/de.json
M i18n/ksh.json
M i18n/mk.json
M i18n/pl.json
M i18n/qqq.json
M i18n/tr.json
M i18n/uk.json
M i18n/zh-hans.json
10 files changed, 49 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/41/214041/1
diff --git a/CodeEditor.i18n.php b/CodeEditor.i18n.php
deleted file mode 100644
index 952d35f..000
--- a/CodeEditor.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShim4b027795d81f161f' ) ) {
- function wfJsonI18nShim4b027795d81f161f( $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'][] =
'wfJsonI18nShim4b027795d81f161f';
-}
diff --git a/CodeEditor.php b/CodeEditor.php
index d52cfb4..fab879c 100644
--- a/CodeEditor.php
+++ b/CodeEditor.php
@@ -25,7 +25,6 @@
$wgAutoloadClasses['CodeEditorHooks'] = __DIR__ . '/CodeEditor.hooks.php';
$wgMessagesDirs['CodeEditor'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['CodeEditor'] = __DIR__ . '/CodeEditor.i18n.php';
$wgHooks['EditPage::showEditForm:initial'][] =
'CodeEditorHooks::editPageShowEditFormInitial';
$wgHooks['EditPage::showReadOnlyForm:initial'][] =
'CodeEditorHooks::editPageShowEditFormInitial';
diff --git a/i18n/de.json b/i18n/de.json
index d80e4e9..ddc909a 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -8,5 +8,11 @@
codeeditor-desc: Ermöglicht das Bearbeiten von JavaScript und CSS
mit Syntaxhervorhebung mithilfe des [http://ace.ajax.org/ Ace-Editors],
codeeditor-next-annotation: Zur nächsten Anmerkung gehen,
codeeditor-toolbar-toggle: Codeeditor ein- und ausschalten,
- codeeditor-save-with-errors: Das Dokument enthält Fehler. Möchtest
du wirklich speichern?
+ codeeditor-save-with-errors: Das Dokument enthält Fehler. Möchtest
du wirklich speichern?,
+ codeeditor-invisibleChars-toggle: Unsichtbare Zeichen umschalten,
+ codeeditor-lineWrapping-toggle: Zeilenumbruch umschalten,
+ codeeditor-searchReplace-toggle: Suchen-und-Ersetzen-Dialog
umschalten,
+ codeeditor-gotoline: Gehe zu Zeilennummer …,
+ codeeditor-indent: Einrücken,
+ codeeditor-outdent: Ausrücken
}
diff --git a/i18n/ksh.json b/i18n/ksh.json
index d7ccdf7..80c380c 100644
--- a/i18n/ksh.json
+++ b/i18n/ksh.json
@@ -6,5 +6,11 @@
},
codeeditor-desc: JavaSkrep- un i lang=\en\CSS/i-Sigge mem i
lang=\en\[http://ace.ajax.org/ Ace Editor]/i beärbeide, woh de Syntax
bunnt aanjemohld es.,
codeeditor-toolbar-toggle: Et Kood-Beärbeide ömschallde,
- codeeditor-save-with-errors: Heh sen Fähler dren. Wells De dat
trozdämm faßjehallde han?
+ codeeditor-save-with-errors: Heh sen Fähler dren. Wells De dat
trozdämm faßjehallde han?,
+ codeeditor-invisibleChars-toggle: donn de jewöhnlesch onseeschbaa
Zeijsche ömschallde zwesche seeschbaa jemaad un onseeschbaa,
+ codeeditor-lineWrapping-toggle: Der Ömbruch noh Reihje ömmschallde
!--
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Codeeditor-lineWrapping-toggle/ksh
--,
+ codeeditor-searchReplace-toggle: Ömschallde zwesche „Ennföhje“ un
[MediaWiki-commits] [Gerrit] [FIX] chars test: Apply differences in 2.6/3.3 - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] chars test: Apply differences in 2.6/3.3
..
[FIX] chars test: Apply differences in 2.6/3.3
The test in 7a98d58f was applying the status of the Unicode standard used in
Python 2.7 and 3.4 but Python 3.3 and 2.6 were using revisions of the standards
where additional codepoints weren't defined yet. The test now acknowledges Cn
as a valid category too.
Change-Id: Ia920f892c44a2f35f564a1e371f036ad1984c5ca
---
M tests/tools_chars_tests.py
1 file changed, 2 insertions(+), 8 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/tools_chars_tests.py b/tests/tools_chars_tests.py
index e7c45d1..4c44b55 100644
--- a/tests/tools_chars_tests.py
+++ b/tests/tools_chars_tests.py
@@ -36,18 +36,12 @@
def test_category_cf(self):
Test that all characters in _category_cf are actually in Cf.
invalid = {}
+# Cn are undefined characters (and were defined later in Unicode)
for char in chars._category_cf:
cat = unicodedata.category(char)
-if cat != 'Cf':
+if cat not in ('Cf', 'Cn'):
invalid[char] = cat
if sys.version_info[0] == 2:
-# These weren't defined in Unicode 5.2 (which is what Py2 is using)
-self.assertEqual(invalid.pop('\u0604'), 'Cn')
-self.assertEqual(invalid.pop('\u061c'), 'Cn')
-self.assertEqual(invalid.pop('\u2066'), 'Cn')
-self.assertEqual(invalid.pop('\u2067'), 'Cn')
-self.assertEqual(invalid.pop('\u2068'), 'Cn')
-self.assertEqual(invalid.pop('\u2069'), 'Cn')
# This category has changed between Unicode 6 and 7 to Cf
self.assertEqual(invalid.pop('\u180e'), 'Zs')
self.assertCountEqual(invalid.items(), [])
--
To view, visit https://gerrit.wikimedia.org/r/214044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia920f892c44a2f35f564a1e371f036ad1984c5ca
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix timestamp of notifications generated by lqt-import - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214050
Change subject: Fix timestamp of notifications generated by lqt-import
..
Fix timestamp of notifications generated by lqt-import
Requires Ib9596cc058871a6b27cca7a809efc6b1ca75dfb0
Change-Id: Iabdfc9c52a30717aaa8197b514d55ae758af5f64
---
M includes/Import/Postprocessor/LqtNotifications.php
M includes/Notifications/Controller.php
2 files changed, 13 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/50/214050/1
diff --git a/includes/Import/Postprocessor/LqtNotifications.php
b/includes/Import/Postprocessor/LqtNotifications.php
index a04fa25..00e9aa2 100644
--- a/includes/Import/Postprocessor/LqtNotifications.php
+++ b/includes/Import/Postprocessor/LqtNotifications.php
@@ -131,6 +131,7 @@
'lqtThreadId' = $topic-getLqtThreadId(),
'notifyAgent' = true,
),
+ 'timestamp' = $topic-getTimestamp(),
) );
}
diff --git a/includes/Notifications/Controller.php
b/includes/Notifications/Controller.php
index eb7815b..60a4db5 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -142,15 +142,20 @@
break;
}
- $events = array(
- EchoEvent::create( array(
- 'type' = $eventName,
- 'agent' = $user,
- 'title' = $title,
- 'extra' = $extraData,
- ) ),
+ $info = array(
+ 'type' = $eventName,
+ 'agent' = $user,
+ 'title' = $title,
+ 'extra' = $extraData,
);
+ // Allow a specific timestamp to be set - useful when importing
existing data
+ if ( isset( $data['timestamp'] ) ){
+ $info['timestamp'] = $data['timestamp'];
+ }
+
+ $events = array( EchoEvent::create( $info ) );
+
if ( $newPost ) {
$events = array_merge( $events, $this-notifyNewPost(
$newPost ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/214050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabdfc9c52a30717aaa8197b514d55ae758af5f64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] empty php entry point - change (mediawiki...CodeEditor)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214052
Change subject: empty php entry point
..
empty php entry point
Change-Id: Ia4b86b7d99f23f93e1faa3eec9a61970b3fef475
---
M CodeEditor.php
1 file changed, 12 insertions(+), 103 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/52/214052/1
diff --git a/CodeEditor.php b/CodeEditor.php
index 74cea86..ea9a1f9 100644
--- a/CodeEditor.php
+++ b/CodeEditor.php
@@ -15,106 +15,15 @@
* See https://www.mediawiki.org/wiki/Manual:Extension_registration for more
details.
*/
-$wgExtensionCredits['other'][] = array(
- 'path' = __FILE__,
- 'name' = 'CodeEditor',
- 'url' = 'https://www.mediawiki.org/wiki/Extension:CodeEditor',
- 'author' = array( 'Brion Vibber', 'Derk-Jan Hartman', 'authors of Ace
(ajax.org)' ),
- 'descriptionmsg' = 'codeeditor-desc',
-);
-
-$wgAutoloadClasses['CodeEditorHooks'] = __DIR__ . '/CodeEditor.hooks.php';
-$wgMessagesDirs['CodeEditor'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['CodeEditor'] = __DIR__ . '/CodeEditor.i18n.php';
-
-$wgHooks['EditPage::showEditForm:initial'][] =
'CodeEditorHooks::editPageShowEditFormInitial';
-$wgHooks['EditPage::showReadOnlyForm:initial'][] =
'CodeEditorHooks::editPageShowEditFormInitial';
-$wgHooks['BeforePageDisplay'][] = 'CodeEditorHooks::onBeforePageDisplay';
-$wgHooks['MakeGlobalVariablesScript'][] =
'CodeEditorHooks::onMakeGlobalVariablesScript';
-$wgHooks['GetPreferences'][] = 'CodeEditorHooks::getPreferences';
-
-$tpl = array(
- 'localBasePath' = __DIR__ . '/modules',
- 'remoteExtPath' = 'CodeEditor/modules',
- 'group' = 'ext.wikiEditor',
-);
-
-$wgResourceModules['ext.codeEditor'] = array(
- 'scripts' = 'ext.codeEditor.js',
- 'dependencies' = array(
- 'ext.wikiEditor.toolbar',
- 'jquery.codeEditor'
- ),
-) + $tpl;
-
-$wgResourceModules['jquery.codeEditor'] = array(
- 'scripts' = 'jquery.codeEditor.js',
- 'styles' = 'jquery.codeEditor.css',
- 'dependencies' = array(
- 'jquery.wikiEditor',
- 'ext.codeEditor.ace',
- 'jquery.ui.resizable',
- 'mediawiki.api',
- 'user.options',
- ),
- 'messages' = array(
- 'codeeditor-toolbar-toggle',
- 'codeeditor-save-with-errors'
- )
-) + $tpl;
-
-// Minimal bundling of a couple bits of Ace
-$wgResourceModules['ext.codeEditor.ace'] = array(
- 'group' = 'ext.codeEditor.ace',
- 'scripts' = array(
- 'ace/ace.js',
- 'ace/mode-javascript.js',
- 'ace/mode-json.js',
- 'ace/mode-css.js',
- 'ace/mode-lua.js',
- 'ace/ext-language_tools.js',
- ),
-) + $tpl;
-
-// Extra highlighting modes to match some available GeSHi highlighting
languages
-$wgResourceModules['ext.codeEditor.ace.modes'] = array(
- 'group' = 'ext.codeEditor.ace',
- 'scripts' = array(
- 'ace/mode-c_cpp.js',
- 'ace/mode-clojure.js',
- 'ace/mode-csharp.js',
- 'ace/mode-coffee.js',
- 'ace/mode-groovy.js',
- 'ace/mode-html.js',
- 'ace/mode-java.js',
- 'ace/mode-ocaml.js',
- 'ace/mode-perl.js',
- 'ace/mode-php.js',
- 'ace/mode-python.js',
- 'ace/mode-ruby.js',
- 'ace/mode-scala.js',
- ),
- 'dependencies' = 'ext.codeEditor.ace',
-) + $tpl;
-
-// Helper to add inline [edit] links to source sections
-$wgResourceModules['ext.codeEditor.geshi'] = array(
- 'scripts' = array(
- 'ext.codeEditor.geshi.js'
- ),
- 'styles' = array(
- 'ext.codeEditor.geshi.css'
- ),
- 'messages' = array(
- 'editsection',
- 'savearticle'
- ),
- 'dependencies' = 'mediawiki.api.parse',
-) + $tpl;
-
-// Experimental feature; not ready yet.
-$wgCodeEditorGeshiIntegration = false;
-
-// If this is disabled, CodeEditor will only be available for client-side code
-// and extensions, it won't be enabled for standard CSS and JS pages.
-$wgCodeEditorEnableCore = true;
+if ( function_exists( 'wfLoadExtension' ) ) {
+ wfLoadExtension( 'CodeEditor' );
+ // Keep i18n globals so mergeMessageFileList.php doesn't break
+ $wgMessagesDirs['CodeEditor'] = __DIR__ . '/i18n';
+ /* wfWarn(
+ 'Deprecated PHP entry point used for CodeEditor extension.
Please use wfLoadExtension instead, ' .
+ 'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
+ ); */
+ return;
+} else {
+ die( 'This version of the CodeEditor extension requires MediaWiki
1.25+' );
+}
--
To view, visit
[MediaWiki-commits] [Gerrit] New option to log but not fail per-user pool counter failures - change (mediawiki...CirrusSearch)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214039
Change subject: New option to log but not fail per-user pool counter failures
..
New option to log but not fail per-user pool counter failures
When turning on the per-user pool counter in production we had a significant
number of hits almost immediately. Patch adds a new feature flag that will
log but not fail the queries when they hit. This should help us to tune the
settings and figure out the right values before we start blocking queries.
Bug: T76497
Change-Id: I7e1b8c3411cbbcc9d39b6e9031db9c8975e26779
---
M CirrusSearch.php
M includes/Util.php
2 files changed, 27 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/39/214039/1
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 3f9a99b..f2b414c 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -503,6 +503,14 @@
// just leave this as it is.
$wgCirrusSearchPoolCounterKey = '_elasticsearch';
+/**
+ * Allow failures of the per-user Pool Counter to continue through. This
+ * still runs the error callbacks to trigger logging of failures, but does
+ * not prevent the search from running. Used to tune the per-user pool counter
+ * settings before enabling it fully and blocking queries.
+ */
+$wgCirrusSearchBypassPerUserFailure = false;
+
// Merge configuration for the indices. See
//
http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/index-modules-merge.html
// for the meanings.
@@ -528,7 +536,6 @@
* Whether search events should be logged in the client side.
*/
$wgCirrusSearchEnableSearchLogging = false;
-
$includes = __DIR__ . /includes/;
$apiDir = $includes . 'Api/';
diff --git a/includes/Util.php b/includes/Util.php
index 22771aa..209430f 100644
--- a/includes/Util.php
+++ b/includes/Util.php
@@ -123,17 +123,27 @@
return $errorCallback( $status[ 0 ][ 0 ], $key
);
};
};
+ $doPerUserWork = function() use ( $type, $globalKey,
$workCallback, $errorHandler ) {
+ // Now that we have the per user lock lets get the
operation lock.
+ // Note that this could block, causing the user to wait
in line with their lock held.
+ $work = new PoolCounterWorkViaCallback( $type,
$globalKey, array(
+ 'doWork' = $workCallback,
+ 'error' = $errorHandler( $globalKey ),
+ ) );
+ return $work-execute();
+ };
$work = new PoolCounterWorkViaCallback( 'CirrusSearch-PerUser',
$perUserKey, array(
- 'doWork' = function() use ( $type, $globalKey,
$workCallback, $errorHandler ) {
- // Now that we have the per user lock lets get
the operation lock.
- // Note that this could block, causing the user
to wait in line with their lock held.
- $work = new PoolCounterWorkViaCallback( $type,
$globalKey, array(
- 'doWork' = $workCallback,
- 'error' = $errorHandler( $globalKey ),
- ) );
- return $work-execute();
+ 'doWork' = $doPerUserWork,
+ 'error' = function( $status ) use( $errorHandler,
$perUserKey, $doPerUserWork ) {
+global $wgCirrusSearchBypassPerUserFailure;
+ $errorCallback = $errorHandler( $perUserKey );
+ $errorResult = $errorCallback( $status );
+ if ( $wgCirrusSearchBypassPerUserFailure ) {
+ return $doPerUserWork();
+ } else {
+ return $errorResult;
+ }
},
- 'error' = $errorHandler( $perUserKey ),
) );
return $work-execute();
}
--
To view, visit https://gerrit.wikimedia.org/r/214039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e1b8c3411cbbcc9d39b6e9031db9c8975e26779
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove noncallable ReCaptcha extension fucntion - change (mediawiki...ConfirmEdit)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214045
Change subject: Remove noncallable ReCaptcha extension fucntion
..
Remove noncallable ReCaptcha extension fucntion
Bug: T100504
Change-Id: I258cd2317385f378643c24e7aaefe00d18fda2e4
---
M ReCaptcha/extension.json
1 file changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit
refs/changes/45/214045/1
diff --git a/ReCaptcha/extension.json b/ReCaptcha/extension.json
index 5f97810..97cafb3 100644
--- a/ReCaptcha/extension.json
+++ b/ReCaptcha/extension.json
@@ -1,10 +1,7 @@
{
name: ReCaptcha,
- ExtensionFunctions: [
- efReCaptcha
- ],
MessagesDirs: {
- ReCaptcha: [
+ ReCaptcha: [
i18n
]
},
--
To view, visit https://gerrit.wikimedia.org/r/214045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I258cd2317385f378643c24e7aaefe00d18fda2e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix path to recaptchalib - change (mediawiki...ConfirmEdit)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214046
Change subject: Fix path to recaptchalib
..
Fix path to recaptchalib
Bug: T100505
Change-Id: I09a43d426e8398c3a6db1aec15f8519a624aa9eb
---
M includes/ConfirmEditHooks.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit
refs/changes/46/214046/1
diff --git a/includes/ConfirmEditHooks.php b/includes/ConfirmEditHooks.php
index 5f9c338..16dfa11 100644
--- a/includes/ConfirmEditHooks.php
+++ b/includes/ConfirmEditHooks.php
@@ -144,6 +144,8 @@
* FIXME: This should be done in a better way, e.g. only load the
libraray, if really needed.
*/
public static function onReCaptchaSetup() {
- require_once( ReCaptcha/recaptchalib.php );
+ global $IP;
+
+ require_once(
$IP/extensions/ConfirmEdit/ReCaptcha/recaptchalib.php );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09a43d426e8398c3a6db1aec15f8519a624aa9eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pre-cache title information about search resultset - change (mediawiki...CirrusSearch)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214054
Change subject: Pre-cache title information about search resultset
..
Pre-cache title information about search resultset
For each and every search result mediawiki is going out and making a
database query to collect information about these objects. Instead
build up a LinkBatch when constructing the ResultSet to batch together
into a single query.
Change-Id: Ic0cb78c7fc6dab46fce99d51e42f59dac3438c02
---
M includes/Search/ResultSet.php
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/54/214054/1
diff --git a/includes/Search/ResultSet.php b/includes/Search/ResultSet.php
index a1839fc..3f498f6 100644
--- a/includes/Search/ResultSet.php
+++ b/includes/Search/ResultSet.php
@@ -2,6 +2,7 @@
namespace CirrusSearch\Search;
use \CirrusSearch\Searcher;
+use \LinkBatch;
use \SearchResultSet;
/**
@@ -33,6 +34,7 @@
$this-hits = $res-count();
$this-totalHits = $res-getTotalHits();
$this-interwikiPrefix = $interwiki;
+ $this-preCacheContainedTitles();
$suggestion = $this-findSuggestion();
if ( $suggestion !
$this-resultContainsFullyHighlightedMatch() ) {
$this-suggestionQuery = $suggestion[ 'text' ];
@@ -101,6 +103,20 @@
return false;
}
+ private function preCacheContainedTitles() {
+ $lb = new LinkBatch;
+ foreach ( $this-result-getResults() as $result ) {
+ $title = Title::makeTitle( $result-namespace,
$result-title, '', $this-interwikiPrefix );
+ if ( $title ) {
+ $lb-addObj( $title );
+ }
+ }
+ if ( !$lb-isEmpty() ) {
+ $lb-setCaller( __METHOD__ );
+ $lb-execute();
+ }
+ }
+
public function getTotalHits() {
return $this-totalHits;
}
--
To view, visit https://gerrit.wikimedia.org/r/214054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0cb78c7fc6dab46fce99d51e42f59dac3438c02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add option to mwgrep to hide private wiki results - change (operations/puppet)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214037
Change subject: Add option to mwgrep to hide private wiki results
..
Add option to mwgrep to hide private wiki results
Sometimes we want to pastebin these results so people without NDAs etc. can
deal with them, and private wikis probably shouldn't be included.
Change-Id: I25f177c4077823ebf44527345eca61782efe8c4a
---
M modules/scap/files/mwgrep
1 file changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/214037/1
diff --git a/modules/scap/files/mwgrep b/modules/scap/files/mwgrep
index d3fca74..d784f2f 100755
--- a/modules/scap/files/mwgrep
+++ b/modules/scap/files/mwgrep
@@ -14,6 +14,7 @@
--timeout N abort search after this many seconds (default: 30)
--user search NS_USER rather than NS_MEDIAWIKI
--module search NS_MODULE rather than NS_MEDIAWIKI
+--no-private exclude private wikis from results
mwgrep will grep the MediaWiki namespace across Wikimedia wikis. specify
--user to search the user namespace instead.
@@ -84,6 +85,13 @@
help='search NS_MODULE rather than NS_MEDIAWIKI'
)
+ns_group.add_argument(
+'--no-private',
+action='store_true',
+dest='noprivate',
+help='exclude private wikis from results'
+)
+
args = ap.parse_args()
filters = [
@@ -110,8 +118,15 @@
req = urllib2.urlopen(uri, json.dumps(search))
result = json.load(req)['hits']
+private_wikis = open('/srv/mediawiki/private.dblist').read().splitlines()
+hidden = 0
+
for hit in result['hits']:
db_name = hit['_index'].rsplit('_', 2)[0]
+if db_name in private_wikis and args.noprivate:
+hidden += 1
+continue
+
title = hit['_source']['title']
page_name = '%s%s' % (PREFIX_NS[args.ns], title)
bisect.insort(matches, (db_name, page_name))
@@ -119,4 +134,7 @@
for db_name, page_name in matches:
print('{:20}{}'.format(db_name, page_name))
-print('(total: %s, shown: %s)' % (result['total'], len(result['hits'])))
+if args.noprivate:
+print('(total: %s, shown: %s, private not shown: %s)' % (result['total'],
len(result['hits']), hidden))
+else:
+print('(total: %s, shown: %s)' % (result['total'], len(result['hits'])))
--
To view, visit https://gerrit.wikimedia.org/r/214037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25f177c4077823ebf44527345eca61782efe8c4a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wdq: Improve errors in getDataFromHost - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214051
Change subject: wdq: Improve errors in getDataFromHost
..
wdq: Improve errors in getDataFromHost
Bug: T93305
Change-Id: If11b5e5c4dffa4fbe78ff8e0066f7ec7fe6e99d0
---
M pywikibot/data/wikidataquery.py
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/51/214051/1
diff --git a/pywikibot/data/wikidataquery.py b/pywikibot/data/wikidataquery.py
index 80d2616..2d7ee3a 100644
--- a/pywikibot/data/wikidataquery.py
+++ b/pywikibot/data/wikidataquery.py
@@ -565,11 +565,20 @@
pywikibot.warning(uFailed to retrieve %s % url)
raise
+data = resp.content
+if not data:
+pywikibot.warning('No data received for %s' % url)
+raise pywikibot.ServerError('No data received for %s' % url)
+
try:
-data = json.loads(resp.content)
+data = json.loads(data)
except ValueError:
-pywikibot.warning(uData received from host but no JSON could be
decoded)
-raise pywikibot.ServerError(Data received from host but no JSON
could be decoded)
+pywikibot.warning(
+'Data received for %s but no JSON could be decoded: %r'
+% (url, data))
+raise pywikibot.ServerError(
+'Data received for %s but no JSON could be decoded: %r'
+% (url, data))
return data
--
To view, visit https://gerrit.wikimedia.org/r/214051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If11b5e5c4dffa4fbe78ff8e0066f7ec7fe6e99d0
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...CodeEditor)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214042
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: Ie9b6c2fce685e103ac90084eb793c341d79ee5eb
---
D CodeEditor.i18n.php
M CodeEditor.php
2 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/42/214042/1
diff --git a/CodeEditor.i18n.php b/CodeEditor.i18n.php
deleted file mode 100644
index 952d35f..000
--- a/CodeEditor.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShim4b027795d81f161f' ) ) {
- function wfJsonI18nShim4b027795d81f161f( $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'][] =
'wfJsonI18nShim4b027795d81f161f';
-}
diff --git a/CodeEditor.php b/CodeEditor.php
index 74cea86..6c2ddb4 100644
--- a/CodeEditor.php
+++ b/CodeEditor.php
@@ -25,7 +25,6 @@
$wgAutoloadClasses['CodeEditorHooks'] = __DIR__ . '/CodeEditor.hooks.php';
$wgMessagesDirs['CodeEditor'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['CodeEditor'] = __DIR__ . '/CodeEditor.i18n.php';
$wgHooks['EditPage::showEditForm:initial'][] =
'CodeEditorHooks::editPageShowEditFormInitial';
$wgHooks['EditPage::showReadOnlyForm:initial'][] =
'CodeEditorHooks::editPageShowEditFormInitial';
--
To view, visit https://gerrit.wikimedia.org/r/214042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9b6c2fce685e103ac90084eb793c341d79ee5eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bump phabricator release tag. - change (operations/puppet)
Rush has submitted this change and it was merged.
Change subject: bump phabricator release tag.
..
bump phabricator release tag.
Change-Id: Iab7ba9bd9bb2bf47967cdbed53be32169d0ca2ee
---
M manifests/role/phabricator.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 54e6cfc..54f0130 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -33,7 +33,7 @@
include role::phabricator::config
include phabricator::monitoring
-$current_tag = 'release/2015-05-20/1'
+$current_tag = 'release/2015-05-27/1'
$domain = 'phabricator.wikimedia.org'
$altdom = 'phab.wmfusercontent.org'
$mysql_host = 'm3-master.eqiad.wmnet'
@@ -162,7 +162,7 @@
# pass not sensitive but has to match phab and db
$mysqlpass = 'labspass'
-$current_tag = 'release/2015-05-20/1'
+$current_tag = 'release/2015-05-27/1'
class { '::phabricator':
git_tag = $current_tag,
lock_file = '/var/run/phab_repo_lock',
--
To view, visit https://gerrit.wikimedia.org/r/214014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab7ba9bd9bb2bf47967cdbed53be32169d0ca2ee
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Assign Hostname/IPs to the etcd cluster @ eqiad - change (operations/dns)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Assign Hostname/IPs to the etcd cluster @ eqiad
..
Assign Hostname/IPs to the etcd cluster @ eqiad
Change-Id: I28b6830e6351b1a44b2fd16c317624504d93dd87
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Alexandros Kosiaris: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index aa0b0f5..1c530b6 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -816,6 +816,9 @@
171 1H IN PTR ganeti1003.eqiad.wmnet.
172 1H IN PTR ganeti1004.eqiad.wmnet.
173 1H IN PTR ganeti01.svc.eqiad.wmnet.
+174 1H IN PTR etcd1001.eqiad.wmnet.
+175 1H IN PTR etcd1002.eqiad.wmnet.
+176 1H IN PTR etcd1003.eqiad.wmnet.
$ORIGIN 33.64.{{ zonename }}.
1 1H IN PTR vl1019-eth2.lvs1001.wikimedia.org.
diff --git a/templates/wmnet b/templates/wmnet
index e05c463..3ef126f 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -325,6 +325,9 @@
es1008 1H IN A10.64.32.18
es1009 1H IN A10.64.32.19
es1010 1H IN A10.64.32.20
+etcd10011H IN A10.64.32.174
+etcd10021H IN A10.64.32.175
+etcd10031H IN A10.64.32.176
eventlog10011H IN A10.64.32.167
fluorine1H IN A10.64.0.21
francium1H IN A10.64.32.168
--
To view, visit https://gerrit.wikimedia.org/r/214035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28b6830e6351b1a44b2fd16c317624504d93dd87
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bd808: Add second ssh public key for personal laptop - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: bd808: Add second ssh public key for personal laptop .. bd808: Add second ssh public key for personal laptop See officewiki [0] for additional verification. [0]: https://office.wikimedia.org/w/index.php?title=User:BDavis_%28WMF%29oldid=145113 Change-Id: Ic38775155562bb41e18e699cd72ed011f7589722 --- M modules/admin/data/data.yaml 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index a291425..8227741 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -520,8 +520,9 @@ gid: 500 name: bd808 realname: Bryan Davis -ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQCdtHX29Vcd5n950X3H11kAbQdmKTCJvOOclRKkaXGofp6UuCzgbbdK4Lfvz3cZ2dH9Kvv6M+Yf2uzh6XN470XxXIP91IzA7lVcaMV0sjOuhZKSvqe0NlA4kN/uytHGcfmBxlYAM+b1RxtveXTle3vVWefo1SkQ4fHteA8U/WWXhQ11HnCGd/ZAuiPTf4Fyfe5HFY6y4ECj7zTBEX6I6m2vDyJB7vsthfsmjWbll5Nr+wpcEp2ILVYdp+N+BUhHLkH4C6pivdxpAZQMSpACPPI7Bs+2Fmr08aVnaYKSFC6eZAFogf2lQ3l1oUVBhJRO4OX++E3TNEHNmJ6FeHD4acFv -bd808+cluster8@wmf-bd808-mbp01.local] +ssh_keys: + - ssh-rsa B3NzaC1yc2EDAQABAAABAQCdtHX29Vcd5n950X3H11kAbQdmKTCJvOOclRKkaXGofp6UuCzgbbdK4Lfvz3cZ2dH9Kvv6M+Yf2uzh6XN470XxXIP91IzA7lVcaMV0sjOuhZKSvqe0NlA4kN/uytHGcfmBxlYAM+b1RxtveXTle3vVWefo1SkQ4fHteA8U/WWXhQ11HnCGd/ZAuiPTf4Fyfe5HFY6y4ECj7zTBEX6I6m2vDyJB7vsthfsmjWbll5Nr+wpcEp2ILVYdp+N+BUhHLkH4C6pivdxpAZQMSpACPPI7Bs+2Fmr08aVnaYKSFC6eZAFogf2lQ3l1oUVBhJRO4OX++E3TNEHNmJ6FeHD4acFv bd808+cluster8@wmf-bd808-mbp01.local + - ssh-rsa B3NzaC1yc2EDAQABAAACAQDLPSfU/UrxB4Se7Hi0xjTOMMj2DDaUFcxf8y0wk4nNODo/iFuU57ccgmAXJO5uy3x0Hzk20lr1HsoawaPjUw1oR0yUrUn2LvIBRZ0htI/WsIcUoqOJIWp23jqAmJy2whbW8JgaJlojXD9d5T5KgqtcIFFcoWAOXcJrjzCHmVv1GurooiUmimby0EQHylzv2EV+fT2cZz4Umz+iPCOrLS+ArT04LdzvEFZWaiiCFlnoiYQnnOMuuFup+fcp4A5Ex5x16FzBYNWWjrmzKJRGImGXtNMchRfRklB4bGTcy1u1XvB8OL0r3KwUmxP/jZE8VX3B3FQ4eCJimNmYWgABuYmQDVHILdb3NYeWwkJhzwDTllZQ5Ayou4GOT+jz7ebINCyDiV+xq14yptjt9HgPSpeHvQeBQ+PagAz852Sgh/ZchAJkl/x0lFHqJ2QAIXZWuPG35nx+KxvIzhQa9Qd5vEgBSItoyZqwEW9KcFTPFP+PuVMMyN8Wnopy/HaecVGlkg71MXUQ2y6wna9DEQX6ic5Khb/WsM5yxHlH/dwZa7Tc9dJhI+/OyXG80Ts0PWsKWnk2BuUJp4GkRJk1EZkWv9C8aJ6hlNv0USoTxE89bjC+mGvwFfpnQtgkJupWB57TWn3VClYwMhG98yd0DskZBXP01bf5b4rn4+ehDdRbwN/dNw== bd808+cluster@freeside uid: 3518 brion: ensure: present -- To view, visit https://gerrit.wikimedia.org/r/207369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic38775155562bb41e18e699cd72ed011f7589722 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync extension.json with CodeEditor.php and empty php entry ... - change (mediawiki...CodeEditor)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/214043 Change subject: Sync extension.json with CodeEditor.php and empty php entry point .. Sync extension.json with CodeEditor.php and empty php entry point Change-Id: I4e27986911bc73a1247f9e3f0127797fc560df1c --- M CodeEditor.php M extension.json M i18n/de.json M i18n/ksh.json M i18n/mk.json M i18n/pl.json M i18n/qqq.json M i18n/tr.json M i18n/uk.json M i18n/zh-hans.json 10 files changed, 71 insertions(+), 124 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor refs/changes/43/214043/1 diff --git a/CodeEditor.php b/CodeEditor.php index d52cfb4..ea9a1f9 100644 --- a/CodeEditor.php +++ b/CodeEditor.php @@ -15,114 +15,15 @@ * See https://www.mediawiki.org/wiki/Manual:Extension_registration for more details. */ -$wgExtensionCredits['other'][] = array( - 'path' = __FILE__, - 'name' = 'CodeEditor', - 'url' = 'https://www.mediawiki.org/wiki/Extension:CodeEditor', - 'author' = array( 'Brion Vibber', 'Derk-Jan Hartman', 'authors of Ace (ajax.org)' ), - 'descriptionmsg' = 'codeeditor-desc', -); - -$wgAutoloadClasses['CodeEditorHooks'] = __DIR__ . '/CodeEditor.hooks.php'; -$wgMessagesDirs['CodeEditor'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['CodeEditor'] = __DIR__ . '/CodeEditor.i18n.php'; - -$wgHooks['EditPage::showEditForm:initial'][] = 'CodeEditorHooks::editPageShowEditFormInitial'; -$wgHooks['EditPage::showReadOnlyForm:initial'][] = 'CodeEditorHooks::editPageShowEditFormInitial'; -$wgHooks['BeforePageDisplay'][] = 'CodeEditorHooks::onBeforePageDisplay'; -$wgHooks['MakeGlobalVariablesScript'][] = 'CodeEditorHooks::onMakeGlobalVariablesScript'; -$wgHooks['GetPreferences'][] = 'CodeEditorHooks::getPreferences'; - -$tpl = array( - 'localBasePath' = __DIR__ . '/modules', - 'remoteExtPath' = 'CodeEditor/modules', - 'group' = 'ext.wikiEditor', -); - -$wgResourceModules['ext.codeEditor'] = array( - 'scripts' = 'ext.codeEditor.js', - 'dependencies' = array( - 'ext.wikiEditor.toolbar', - 'jquery.codeEditor' - ), -) + $tpl; - -$wgResourceModules['jquery.codeEditor'] = array( - 'scripts' = 'jquery.codeEditor.js', - 'styles' = 'jquery.codeEditor.css', - 'dependencies' = array( - 'jquery.wikiEditor', - 'ext.codeEditor.ace', - 'jquery.ui.resizable', - 'mediawiki.api', - 'user.options', - 'mediawiki.cookie', - ), - 'messages' = array( - 'codeeditor-next-annotation', - 'codeeditor-toolbar-toggle', - 'codeeditor-save-with-errors', - 'codeeditor-invisibleChars-toggle', - 'codeeditor-lineWrapping-toggle', - 'codeeditor-searchReplace-toggle', - 'codeeditor-gotoline', - 'codeeditor-indent', - 'codeeditor-outdent', - ) -) + $tpl; - -// Minimal bundling of a couple bits of Ace -$wgResourceModules['ext.codeEditor.ace'] = array( - 'group' = 'ext.codeEditor.ace', - 'scripts' = array( - 'ace/ace.js', - 'ace/mode-javascript.js', - 'ace/mode-json.js', - 'ace/mode-css.js', - 'ace/mode-lua.js', - 'ace/ext-language_tools.js', - ), -) + $tpl; - -// Extra highlighting modes to match some available GeSHi highlighting languages -$wgResourceModules['ext.codeEditor.ace.modes'] = array( - 'group' = 'ext.codeEditor.ace', - 'scripts' = array( - 'ace/mode-c_cpp.js', - 'ace/mode-clojure.js', - 'ace/mode-csharp.js', - 'ace/mode-coffee.js', - 'ace/mode-groovy.js', - 'ace/mode-html.js', - 'ace/mode-java.js', - 'ace/mode-ocaml.js', - 'ace/mode-perl.js', - 'ace/mode-php.js', - 'ace/mode-python.js', - 'ace/mode-ruby.js', - 'ace/mode-scala.js', - ), - 'dependencies' = 'ext.codeEditor.ace', -) + $tpl; - -// Helper to add inline [edit] links to source sections -$wgResourceModules['ext.codeEditor.geshi'] = array( - 'scripts' = array( - 'ext.codeEditor.geshi.js' - ), - 'styles' = array( - 'ext.codeEditor.geshi.css' - ), - 'messages' = array( - 'editsection', - 'savearticle' - ), - 'dependencies' = 'mediawiki.api.parse', -) + $tpl; - -// Experimental feature; not ready yet. -$wgCodeEditorGeshiIntegration = false; - -// If this is disabled, CodeEditor will only be available for client-side code -// and extensions, it won't be enabled for standard CSS and JS pages. -$wgCodeEditorEnableCore = true; +if ( function_exists(
[MediaWiki-commits] [Gerrit] Turn off sshd MAC and KEX hardening for Jenkins slaves - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/214055 Change subject: Turn off sshd MAC and KEX hardening for Jenkins slaves .. Turn off sshd MAC and KEX hardening for Jenkins slaves When restarting the Jenkins master, the labs slaves were no more reacheable over ssh. That is due to the hardened sshd MAC and KEX setup not being supported by Jenkins/Java7/Precise on gallium. Just like for Gerrit (c34bc58ee), disable KEX/MAC on the integration labs project. Tested via Hiera:integration on wikitech. Bug: T100509 Change-Id: I55cbea6beea325dda6e9d0e2cb7f3152a914e40f --- A hieradata/labs/integration/common.yaml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/214055/1 diff --git a/hieradata/labs/integration/common.yaml b/hieradata/labs/integration/common.yaml new file mode 100644 index 000..87af200 --- /dev/null +++ b/hieradata/labs/integration/common.yaml @@ -0,0 +1,5 @@ +--- +# T100509 Java7 on gallium does not support the hardned sshd MAC and KEX setup +# causing slaves to be unreacheable. +ssh::server::disable_nist_kex: false +ssh::server::explicit_macs: false -- To view, visit https://gerrit.wikimedia.org/r/214055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55cbea6beea325dda6e9d0e2cb7f3152a914e40f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] chars test: Apply differences in 2.6/3.3 - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214044
Change subject: [FIX] chars test: Apply differences in 2.6/3.3
..
[FIX] chars test: Apply differences in 2.6/3.3
The test in 7a98d58f was applying the status of the Unicode standard used in
Python 2.7 and 3.4 but Python 3.3 and 2.6 were using revisions of the standards
where additional codepoints weren't defined yet. The test now acknowledges Cn
as a valid category too.
Change-Id: Ia920f892c44a2f35f564a1e371f036ad1984c5ca
---
M tests/tools_chars_tests.py
1 file changed, 2 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/44/214044/1
diff --git a/tests/tools_chars_tests.py b/tests/tools_chars_tests.py
index e7c45d1..4c44b55 100644
--- a/tests/tools_chars_tests.py
+++ b/tests/tools_chars_tests.py
@@ -36,18 +36,12 @@
def test_category_cf(self):
Test that all characters in _category_cf are actually in Cf.
invalid = {}
+# Cn are undefined characters (and were defined later in Unicode)
for char in chars._category_cf:
cat = unicodedata.category(char)
-if cat != 'Cf':
+if cat not in ('Cf', 'Cn'):
invalid[char] = cat
if sys.version_info[0] == 2:
-# These weren't defined in Unicode 5.2 (which is what Py2 is using)
-self.assertEqual(invalid.pop('\u0604'), 'Cn')
-self.assertEqual(invalid.pop('\u061c'), 'Cn')
-self.assertEqual(invalid.pop('\u2066'), 'Cn')
-self.assertEqual(invalid.pop('\u2067'), 'Cn')
-self.assertEqual(invalid.pop('\u2068'), 'Cn')
-self.assertEqual(invalid.pop('\u2069'), 'Cn')
# This category has changed between Unicode 6 and 7 to Cf
self.assertEqual(invalid.pop('\u180e'), 'Zs')
self.assertCountEqual(invalid.items(), [])
--
To view, visit https://gerrit.wikimedia.org/r/214044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia920f892c44a2f35f564a1e371f036ad1984c5ca
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IMPROV] chars tests: Check Unicode version - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214047
Change subject: [IMPROV] chars tests: Check Unicode version
..
[IMPROV] chars tests: Check Unicode version
Instead of just checking if Python 2 or Python 3 it's checking if the Unicode
version is below 6.3 when U+180e was in the category Zs.
Change-Id: I74b65977f2774b17c7d78d5ae8a27bed6bbf8684
---
M tests/tools_chars_tests.py
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/47/214047/1
diff --git a/tests/tools_chars_tests.py b/tests/tools_chars_tests.py
index 4c44b55..5e2006b 100644
--- a/tests/tools_chars_tests.py
+++ b/tests/tools_chars_tests.py
@@ -9,8 +9,9 @@
__version__ = '$Id$'
-import sys
import unicodedata
+
+from distutils.version import StrictVersion
from pywikibot.tools import chars
@@ -41,8 +42,8 @@
cat = unicodedata.category(char)
if cat not in ('Cf', 'Cn'):
invalid[char] = cat
-if sys.version_info[0] == 2:
-# This category has changed between Unicode 6 and 7 to Cf
+if StrictVersion(unicodedata.unidata_version) StrictVersion('6.3'):
+# This category has changed with Unicode 6.3 to Cf
self.assertEqual(invalid.pop('\u180e'), 'Zs')
self.assertCountEqual(invalid.items(), [])
--
To view, visit https://gerrit.wikimedia.org/r/214047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74b65977f2774b17c7d78d5ae8a27bed6bbf8684
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove double line break from the end of a line - change (mediawiki...WikimediaMessages)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214048
Change subject: Remove double line break from the end of a line
..
Remove double line break from the end of a line
It seems unnecessary and it's untranslatable.
Change-Id: I10397538adc3cc6e4a3859ce9e91c233b4d27320
---
M i18n/wikimedia/en.json
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages
refs/changes/48/214048/1
diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index c4f9782..e1b830f 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -1,4 +1,4 @@
-{
+/{
@metadata: {
authors: []
},
@@ -239,7 +239,7 @@
protect-level-editeditorprotected: Allow only editors,
restriction-level-editeditorprotected: editor protected,
wikimedia-feedback-termsofuse: I agree to provide feedback in
accordance with the a
href=\https://wikimediafoundation.org/wiki/Terms_of_Use\;
target=\_blank\Terms of Use/a.,
- wikimedia-globalrenamequeue-email-body-approved: The request to
rename \{{GENDER:$1|$1}}\ to \{{GENDER:$1|$2}}\ has been approved. Once
completed, you will be able to log in using your new username with your old
password. Thank you for participating on Wikimedia projects.\n\n,
+ wikimedia-globalrenamequeue-email-body-approved: The request to
rename \{{GENDER:$1|$1}}\ to \{{GENDER:$1|$2}}\ has been approved. Once
completed, you will be able to log in using your new username with your old
password. Thank you for participating on Wikimedia projects.,
wikimedia-globalrenamequeue-email-body-rejected: The request to
rename \{{GENDER:$1|$1}}\ to \{{GENDER:$1|$2}}\ could not be
completed.\n\nNote: $3\n\nFor more information, please visit this help page:
https://meta.wikimedia.org/wiki/Help:Unified_login#Frequently_asked_questions.
To discuss your rename request, you can post on this page:
https://meta.wikimedia.org/wiki/Talk:Steward_requests/Username_changes. You
must still log in to your current account name first.,
wikimedia-sulrenamewarning-usenew: From now on you need to log in
using your new username strong$1/strong. Your new username is unique to you
across every Wikimedia project, and if you are logged in to one project and
visit another, your account will carry over with you. The
[[:m:Special:MyLanguage/Help:Unified_login|Unified login help page]] has more
information about single-user login, as well as a list of frequently asked
questions. If you need to update your email address or to change your password
in your [[Special:Preferences|preferences]], now might be a good time to do
so.\n\nTo request a different account name, visit
[[Special:GlobalRenameRequest]]. Thank you for participating on Wikimedia
projects.,
wikimedia-centralauth-contribs-locked: This account is globally
locked.\nSee [[m:Special:CentralAuth/$1|global account details]] for more
information.,
--
To view, visit https://gerrit.wikimedia.org/r/214048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10397538adc3cc6e4a3859ce9e91c233b4d27320
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add diamond collector_module class - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214053
Change subject: Add diamond collector_module class
..
Add diamond collector_module class
This decouples the installation of custom collectors from their
usage via the diamond::collector class.
Change-Id: I7b64baa7659f0bbe97309fbf461eded40a6e63df
---
M modules/diamond/manifests/collector.pp
A modules/diamond/manifests/collector_module.pp
2 files changed, 44 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/214053/1
diff --git a/modules/diamond/manifests/collector.pp
b/modules/diamond/manifests/collector.pp
index 9ec19df..8e8d317 100644
--- a/modules/diamond/manifests/collector.pp
+++ b/modules/diamond/manifests/collector.pp
@@ -65,21 +65,13 @@
notify = Service['diamond'],
}
+# If this is a custom collector, use the collector_module class
+# to install the custom python collector.
if $source {
-file { /usr/share/diamond/collectors/${name}:
-ensure = ensure_directory($ensure),
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-
-file { /usr/share/diamond/collectors/${name}/${name}.py:
+class { '::diamond::collector_module':
ensure = $ensure,
-before = File[/etc/diamond/collectors/${collector}.conf],
+name = $name,
source = $source,
-owner = 'root',
-group = 'root',
-mode = '0644',
}
}
}
diff --git a/modules/diamond/manifests/collector_module.pp
b/modules/diamond/manifests/collector_module.pp
new file mode 100644
index 000..ef8cdd6
--- /dev/null
+++ b/modules/diamond/manifests/collector_module.pp
@@ -0,0 +1,40 @@
+# == Class diamond::collector_module
+# Installs a python diamond collector module.
+#
+# === Parameters
+# [*ensure*]
+# Specifies whether or not this Diamond python module should exist.
+# The default is 'present'.
+#
+# [*name*]
+# The name of the collector class. The 'Collector' suffix may be
+# omitted from the name.
+#
+# [*source*]
+# A Puppet file reference to the Python collector source file.
+#
+class diamond::collector_module(
+$ensure = 'present',
+$name,
+$source,
+) {
+include ::diamond
+
+validate_ensure($ensure)
+
+file { /usr/share/diamond/collectors/${name}:
+ensure = ensure_directory($ensure),
+owner = 'root',
+group = 'root',
+mode = '0755',
+}
+
+file { /usr/share/diamond/collectors/${name}/${name}.py:
+ensure = $ensure,
+before = File[/etc/diamond/collectors/${collector}.conf],
+source = $source,
+owner = 'root',
+group = 'root',
+mode = '0644',
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/214053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b64baa7659f0bbe97309fbf461eded40a6e63df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Repool pc1001 after maintenance - change (operations/mediawiki-config)
Jcrespo has submitted this change and it was merged. Change subject: Repool pc1001 after maintenance .. Repool pc1001 after maintenance Buffer pool has been warmed, but I expect a high number of cache misses Not depooling pc1002 on the same commit to avoid too much impact on query latency. Change-Id: Ib3bdab0fde9d42d26b55b157fe75936d40138410 References: T100301 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jcrespo: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 856e525..8efcddc 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -8,7 +8,7 @@ #$wgReadOnly = Wikimedia Sites are currently read-only during maintenance, please try again soon.; $wmgParserCacheDBs = array( -# '10.64.16.156', # pc1001 (down for maintenance) + '10.64.16.156', # pc1001 '10.64.16.157', # pc1002 '10.64.16.158', # pc1003 ); -- To view, visit https://gerrit.wikimedia.org/r/214025 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib3bdab0fde9d42d26b55b157fe75936d40138410 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only import unread LQT notifications - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/214049 Change subject: Only import unread LQT notifications .. Only import unread LQT notifications Bug: T98996 Change-Id: I3920c8dfb5e4d5a7f2d74799daca26d202552e4c --- M includes/Import/Postprocessor/LqtNotifications.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/49/214049/1 diff --git a/includes/Import/Postprocessor/LqtNotifications.php b/includes/Import/Postprocessor/LqtNotifications.php index 148644e..a04fa25 100644 --- a/includes/Import/Postprocessor/LqtNotifications.php +++ b/includes/Import/Postprocessor/LqtNotifications.php @@ -97,6 +97,7 @@ ); $it-addConditions( array( 'ums_conversation' = $activeThreadId, + 'ums_read_timestamp' = null, ) ); // flatten result into a stream of rows -- To view, visit https://gerrit.wikimedia.org/r/214049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3920c8dfb5e4d5a7f2d74799daca26d202552e4c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Repool pc1002 after maintenance - change (operations/mediawiki-config)
Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/214093 Change subject: Repool pc1002 after maintenance .. Repool pc1002 after maintenance Buffer pool has been warmed Change-Id: If20df29086444feb68711f6fde543a0972fdd446 References: T100301 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/93/214093/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 1ec8f00..8efcddc 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -9,7 +9,7 @@ $wmgParserCacheDBs = array( '10.64.16.156', # pc1001 -# '10.64.16.157', # pc1002 (down for maintenance) + '10.64.16.157', # pc1002 '10.64.16.158', # pc1003 ); -- To view, visit https://gerrit.wikimedia.org/r/214093 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If20df29086444feb68711f6fde543a0972fdd446 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Repool pc1002 after maintenance - change (operations/mediawiki-config)
Jcrespo has submitted this change and it was merged. Change subject: Repool pc1002 after maintenance .. Repool pc1002 after maintenance Buffer pool has been warmed Change-Id: If20df29086444feb68711f6fde543a0972fdd446 References: T100301 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jcrespo: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 1ec8f00..8efcddc 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -9,7 +9,7 @@ $wmgParserCacheDBs = array( '10.64.16.156', # pc1001 -# '10.64.16.157', # pc1002 (down for maintenance) + '10.64.16.157', # pc1002 '10.64.16.158', # pc1003 ); -- To view, visit https://gerrit.wikimedia.org/r/214093 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If20df29086444feb68711f6fde543a0972fdd446 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use namespaced \MediaWiki\Logger\LoggerFactory - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Use namespaced \MediaWiki\Logger\LoggerFactory
..
Use namespaced \MediaWiki\Logger\LoggerFactory
Bug: T100520
Change-Id: I58f62fb8a98212e48fc117df4e712f9180892676
(cherry picked from commit b11263c17413dc8d2091ce51ff0de298c7326ae4)
---
M includes/BuildDocument/RedirectsAndIncomingLinks.php
M includes/ElasticsearchIntermediary.php
M includes/NearMatchPicker.php
M includes/OtherIndexes.php
M includes/Search/ResultsType.php
M includes/Updater.php
6 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/BuildDocument/RedirectsAndIncomingLinks.php
b/includes/BuildDocument/RedirectsAndIncomingLinks.php
index a2b6568..52f4712 100644
--- a/includes/BuildDocument/RedirectsAndIncomingLinks.php
+++ b/includes/BuildDocument/RedirectsAndIncomingLinks.php
@@ -7,7 +7,7 @@
use Elastica\Search;
use Elastica\Query\Filtered;
use Elastica\Query\MatchAll;
-use \MWLoggerFactory;
+use MediaWiki\Logger\LoggerFactory;
/**
* Adds redirects and incoming links to the documents. These are done together
@@ -116,7 +116,7 @@
$pageIds = array_map( function( $page ) {
return $page-getId();
}, $pages );
- MWLoggerFactory::getInstance(
'CirrusSearchChangeFailed' )-info(
+ LoggerFactory::getInstance(
'CirrusSearchChangeFailed' )-info(
'Links for page ids: ' . implode( ',',
$pageIds ) );
}
}
diff --git a/includes/ElasticsearchIntermediary.php
b/includes/ElasticsearchIntermediary.php
index d828e93..91c452a 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -3,7 +3,7 @@
namespace CirrusSearch;
use Elastica\Exception\PartialShardFailureException;
use Elastica\Exception\ResponseException;
-use \MWLoggerFactory;
+use MediaWiki\Logger\LoggerFactory;
use \Status;
/**
@@ -172,10 +172,10 @@
}
// Now log and clear our state.
- MWLoggerFactory::getInstance( 'CirrusSearchRequests' )-debug(
$logMessage );
+ LoggerFactory::getInstance( 'CirrusSearchRequests' )-debug(
$logMessage );
if ( $this-slowMillis $took = $this-slowMillis ) {
$logMessage .= $this-user ? ' for ' .
$this-user-getName() : '';
- MWLoggerFactory::getInstance(
'CirrusSearchSlowRequests' )-info( $logMessage );
+ LoggerFactory::getInstance( 'CirrusSearchSlowRequests'
)-info( $logMessage );
}
$this-requestStart = null;
return $took;
diff --git a/includes/NearMatchPicker.php b/includes/NearMatchPicker.php
index d0472bb..556ced8 100644
--- a/includes/NearMatchPicker.php
+++ b/includes/NearMatchPicker.php
@@ -1,7 +1,7 @@
?php
namespace CirrusSearch;
-use \MWLoggerFactory;
+use MediaWiki\Logger\LoggerFactory;
/**
* Picks the best near match title.
@@ -69,7 +69,7 @@
if ( isset( $this-titles[ 0 ][ 'redirectMatches' ][ 0
] ) ) {
return $this-titles[ 0 ][ 'redirectMatches' ][
0 ];
}
- MWLoggerFactory::getInstance( 'CirrusSearch' )-info(
+ LoggerFactory::getInstance( 'CirrusSearch' )-info(
'NearMatchPicker built with busted matches.
Assuming no near match' );
return null;
}
@@ -129,4 +129,4 @@
$transformedTitle = call_user_func( $transformer,
$matchedTitle-getText() );
return $transformedTerm === $transformedTitle;
}
-}
\ No newline at end of file
+}
diff --git a/includes/OtherIndexes.php b/includes/OtherIndexes.php
index 11f973a..dd6881c 100644
--- a/includes/OtherIndexes.php
+++ b/includes/OtherIndexes.php
@@ -1,7 +1,7 @@
?php
namespace CirrusSearch;
-use \MWLoggerFactory;
+use MediaWiki\Logger\LoggerFactory;
use \Title;
/**
@@ -189,7 +189,7 @@
$articleIDs = array_map( function( $title ) {
return $title-getArticleID();
}, $titles );
- MWLoggerFactory::getInstance(
'CirrusSearchChangeFailed' )-info(
+ LoggerFactory::getInstance( 'CirrusSearchChangeFailed'
)-info(
Other Index $actionName for article ids: .
implode( ',', $articleIDs ) );
return false;
}
diff --git a/includes/Search/ResultsType.php b/includes/Search/ResultsType.php
index ffa2cbb..f17b0f1 100644
--- a/includes/Search/ResultsType.php
+++
[MediaWiki-commits] [Gerrit] Add system = true to mysql_wmf::mysqluser - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Add system = true to mysql_wmf::mysqluser
..
Add system = true to mysql_wmf::mysqluser
The only mysql user invocation across the puppet tree that isn't a
system user. The class seems to only be referenced by pc100x boxes.
Change-Id: Iacd89800d72512511dcef20f235adab806fbf4a4
---
M modules/mysql_wmf/manifests/mysqluser.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Jcrespo: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mysql_wmf/manifests/mysqluser.pp
b/modules/mysql_wmf/manifests/mysqluser.pp
index ced7f92..79633f7 100644
--- a/modules/mysql_wmf/manifests/mysqluser.pp
+++ b/modules/mysql_wmf/manifests/mysqluser.pp
@@ -1,6 +1,7 @@
class mysql_wmf::mysqluser {
user { 'mysql':
ensure = present,
+system = true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacd89800d72512511dcef20f235adab806fbf4a4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove txstatsd module and role class - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Remove txstatsd module and role class .. Remove txstatsd module and role class Only the txstatsd::decommission class was referenced and this can safely go now too. Change-Id: I513abe352a4e3daff039c8da313b7e1dd6351198 --- D files/txstatsd/backends/8126.cfg D files/txstatsd/backends/8127.cfg D files/txstatsd/backends/8128.cfg D files/txstatsd/backends/8129.cfg D files/txstatsd/backends/8130.cfg D files/txstatsd/backends/8131.cfg D files/txstatsd/backends/8132.cfg D files/txstatsd/backends/8133.cfg D files/txstatsd/backends/8134.cfg D files/txstatsd/backends/8135.cfg D files/txstatsd/backends/8136.cfg D files/txstatsd/backends/8137.cfg D files/txstatsd/backends/8138.cfg D files/txstatsd/backends/8139.cfg D files/txstatsd/init/init.conf D files/txstatsd/init/instance.conf D files/txstatsd/txstatsdctl M manifests/role/labmon.pp M manifests/role/statsdlb.pp M manifests/role/swift.pp D manifests/role/txstatsd.pp D modules/txstatsd/files/txstatsd.conf D modules/txstatsd/files/txstatsd.service D modules/txstatsd/manifests/decommission.pp D modules/txstatsd/manifests/init.pp D modules/txstatsd/templates/txstatsd.cfg.erb 26 files changed, 0 insertions(+), 428 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/files/txstatsd/backends/8126.cfg b/files/txstatsd/backends/8126.cfg deleted file mode 100644 index a7497ff..000 --- a/files/txstatsd/backends/8126.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8126 -listen-port = 8126 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8127.cfg b/files/txstatsd/backends/8127.cfg deleted file mode 100644 index a74726d..000 --- a/files/txstatsd/backends/8127.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8127 -listen-port = 8127 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8128.cfg b/files/txstatsd/backends/8128.cfg deleted file mode 100644 index 83c263f..000 --- a/files/txstatsd/backends/8128.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8128 -listen-port = 8128 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8129.cfg b/files/txstatsd/backends/8129.cfg deleted file mode 100644 index a32fd99..000 --- a/files/txstatsd/backends/8129.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8129 -listen-port = 8129 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8130.cfg b/files/txstatsd/backends/8130.cfg deleted file mode 100644 index da136f6..000 --- a/files/txstatsd/backends/8130.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8130 -listen-port = 8130 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8131.cfg b/files/txstatsd/backends/8131.cfg deleted file mode 100644 index 663a60a..000 --- a/files/txstatsd/backends/8131.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8131 -listen-port = 8131 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8132.cfg b/files/txstatsd/backends/8132.cfg deleted file mode 100644 index b201ef4..000 --- a/files/txstatsd/backends/8132.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file for txStatsD -# This file is managed by Puppet -[statsd] -carbon-cache-host = localhost -carbon-cache-port = 2004 -instance-name = statsd.8132 -listen-port = 8132 -max-datapoints-per-message = 1 -max-queue-size = 100 -prefix = -statsd-compliance = 0 - diff --git a/files/txstatsd/backends/8133.cfg b/files/txstatsd/backends/8133.cfg deleted file mode 100644 index af6cf74..000 --- a/files/txstatsd/backends/8133.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Configuraton file
[MediaWiki-commits] [Gerrit] ve: switch jsbench/chromium user/groups to system - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: ve: switch jsbench/chromium user/groups to system
..
ve: switch jsbench/chromium user/groups to system
The jsbench user was created and destroyed by enforce-users-groups on
every puppet run for months -- this switches it to a system user to
fix this.
The chromium user was not, but this is because enforce-users-groups had
this whitelisted as one out of a very few exceptions. Remove that
exception as well.
Change-Id: I4177b0866b2c5f64ec69dd092ff813d9574cdf0c
---
M manifests/role/jsbench.pp
M modules/admin/files/enforce-users-groups.sh
M modules/chromium/manifests/init.pp
3 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/jsbench.pp b/manifests/role/jsbench.pp
index 06697d2..d71df39 100644
--- a/manifests/role/jsbench.pp
+++ b/manifests/role/jsbench.pp
@@ -25,6 +25,7 @@
ensure = present,
comment= 'Chromium service user for jsbench',
home = '/srv/profile/jsbench',
+system = true,
managehome = true,
require= File['/srv/profile'],
}
diff --git a/modules/admin/files/enforce-users-groups.sh
b/modules/admin/files/enforce-users-groups.sh
index 9dd79a5..914d2d3 100755
--- a/modules/admin/files/enforce-users-groups.sh
+++ b/modules/admin/files/enforce-users-groups.sh
@@ -18,8 +18,6 @@
reprepro \ # caesium.eqiad.wmnet
mysql \ # pc1001.eqiad.wmnet
dbmon \ # db1044.eqiad.wmnet
- txstatsd \ # osmium.eqiad.wmnet
- chromium \ # osmium.eqiad.wmnet
parsoid-rt); # ruthenium.eqiad.wmnet T90966
log() {
diff --git a/modules/chromium/manifests/init.pp
b/modules/chromium/manifests/init.pp
index 31a8c79..d83f6d6 100644
--- a/modules/chromium/manifests/init.pp
+++ b/modules/chromium/manifests/init.pp
@@ -41,6 +41,7 @@
group { 'chromium':
ensure = $ensure,
+system = true,
}
user { 'chromium':
@@ -48,6 +49,7 @@
gid= 'chromium',
shell = '/bin/false',
home = '/var/lib/chromium',
+system = true,
managehome = true,
}
--
To view, visit https://gerrit.wikimedia.org/r/214029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4177b0866b2c5f64ec69dd092ff813d9574cdf0c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Move searchForm into includes folder - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214095
Change subject: Hygiene: Move searchForm into includes folder
..
Hygiene: Move searchForm into includes folder
It's not shipped with module so don't give people impression that it
is.
Change-Id: I0ed51888044fd1ec2ebb782cd0698efd4d24526c
---
M includes/skins/MinervaTemplateAlpha.php
R includes/skins/searchForm.mustache
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/95/214095/1
diff --git a/includes/skins/MinervaTemplateAlpha.php
b/includes/skins/MinervaTemplateAlpha.php
index c8d4483..1daf6d6 100644
--- a/includes/skins/MinervaTemplateAlpha.php
+++ b/includes/skins/MinervaTemplateAlpha.php
@@ -137,11 +137,11 @@
* @inheritdoc
*/
protected function renderMainMenu( $data ) {
- $templateParser = new TemplateParser( __DIR__
.'/../../resources' );
+ $templateParser = new TemplateParser( __DIR__ );
$args = array(
'searchForm' = $this-makeSearchForm( $data )
);
- echo $templateParser-processTemplate(
'mobile.mainMenu/searchForm', $args );
+ echo $templateParser-processTemplate( 'searchForm', $args );
parent::renderMainMenu( $data );
}
diff --git a/resources/mobile.mainMenu/searchForm.mustache
b/includes/skins/searchForm.mustache
similarity index 100%
rename from resources/mobile.mainMenu/searchForm.mustache
rename to includes/skins/searchForm.mustache
--
To view, visit https://gerrit.wikimedia.org/r/214095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ed51888044fd1ec2ebb782cd0698efd4d24526c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] admin: use $LAST_SYSTEM_UID in enforce-users-groups - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: admin: use $LAST_SYSTEM_UID in enforce-users-groups
..
admin: use $LAST_SYSTEM_UID in enforce-users-groups
Change-Id: Iaf19e7dc22dda91e132040b3cafc35d6504e57d2
---
M modules/admin/files/enforce-users-groups.sh
1 file changed, 11 insertions(+), 11 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/admin/files/enforce-users-groups.sh
b/modules/admin/files/enforce-users-groups.sh
index 914d2d3..8d2406a 100755
--- a/modules/admin/files/enforce-users-groups.sh
+++ b/modules/admin/files/enforce-users-groups.sh
@@ -1,16 +1,18 @@
#!/bin/bash
-# This is a user garbage collection script that removes
-# users who do not have a supplementary group that also have
-# a UID above the ID_BOUNDARY. Removals are logged to syslog.
-# with 'dryrun' as first arg exits 1 if cleanup is needed
+set -e
-# /etc/adduser.conf
-ID_BOUNDRY='999'
+# This is a user garbage collection script that removes users who do not have a
+# supplementary group that also have a UID above the LAST_SYSTEM_UID. Removals
+# are logged to syslog. With 'dryrun' as the first argument, it exits 1 if
+# cleanup is needed.
+
+# for $LAST_SYSTEM_UID
+. /etc/adduser.conf
+
ARCHIVE_DIR='/var/userarchive'
EXCLUDE=(nobody \
l10nupdate \
- gmetric \# nescio.wikimedia.org
mwdeploy \ # eventlog*
gerrit2 \# ytterbium.wikimedia.org
spamd \ # sodium.wikimedia.org:
@@ -36,9 +38,7 @@
return 1
}
-# This is an intentional hard stop
-# as before T84032 this could do some
-# serious damage to a labstore host.
+# FIXME: this is an intentional hard stop as before T84032
if [[ `hostname -s` =~ ^labstore100 ]]; then
exit 1
fi
@@ -60,7 +60,7 @@
continue
fi
-if [[ $uid -gt $ID_BOUNDRY ]]; then
+if [[ $uid -gt $LAST_SYSTEM_UID ]]; then
if [[ `/usr/bin/id $username` != *,* ]]; then
if [ ${1} == dryrun ]
then
--
To view, visit https://gerrit.wikimedia.org/r/214030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf19e7dc22dda91e132040b3cafc35d6504e57d2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Chasemp chas...@gmail.com
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...UserMerge)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214096
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: Ia4eff75f7181db55a10a9ebf3e12e6a3ce8b3d62
---
D UserMerge.i18n.php
M UserMerge.php
M i18n/ksh.json
3 files changed, 2 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge
refs/changes/96/214096/1
diff --git a/UserMerge.i18n.php b/UserMerge.i18n.php
deleted file mode 100644
index 841f856..000
--- a/UserMerge.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShim12288ddd27589de3' ) ) {
- function wfJsonI18nShim12288ddd27589de3( $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'][] =
'wfJsonI18nShim12288ddd27589de3';
-}
diff --git a/UserMerge.php b/UserMerge.php
index cdf9282..4fee3e3 100644
--- a/UserMerge.php
+++ b/UserMerge.php
@@ -67,7 +67,6 @@
$wgHooks['UnitTestsList'][] = 'UserMergeHooks::onUnitTestsList';
$wgMessagesDirs['UserMerge'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['UserMerge'] = $dir . 'UserMerge.i18n.php';
$wgExtensionMessagesFiles['UserMergeAlias'] = $dir . 'UserMerge.alias.php';
$wgSpecialPages['UserMerge'] = 'UserMerge';
diff --git a/i18n/ksh.json b/i18n/ksh.json
index 7015849..9683125 100644
--- a/i18n/ksh.json
+++ b/i18n/ksh.json
@@ -21,8 +21,8 @@
usermerge-userdeleted-log: Fott jeschmeße Metmaacherame: „$2“ ($3),
usermerge-success: Et Zosammelääje {{GENDER:$1|vum|vum|vumm
Metmaacher|vun dä|vum}} „$1“ ($2) {{GENDER:$3|mem|mem|med dämm Metmaacher|met
dä|mem}} „$3“ {{GENDER:$3|nohm|nohm|nohm|noh dä|nohm}} „$3“ ($4) es komplätt.,
usermerge-success-log: {{GENDER:$2|Dä Metmaacher|De Metmaacherėn|Dä
Metmaacher|De Metmaacherėn|Dä Metmaacher}} mem Nahme „$2“ ($3) es zosammejelaat
met {{GENDER:$4|däm Metmaacher|dä Metmaacherėn|däm Metmaacher|dä
Metmaacherėn|däm Metmaacher}} mem Name „$4“ ($5),
- usermerge-logpage: Logboch övver et Metmaacher-Zosammelääje,
- usermerge-logpagetext: Dat hee es et Logboch övver de zosammejelaate
Metmaachere.,
+ usermerge-logpage: Logbohch övver et Metmaacher_Zosammelähje,
+ usermerge-logpagetext: Dat heh es et Logbohch övver de
zosammejelaate Metmaachere.,
usermerge-noselfdelete: Ene Metmaacher met sesch sellver zosamme ze
lääje, wat ene Quatsch! Dat jeiht nit.{{GENDER:$1|}},
usermerge-protectedgroup: Schadt. Di esu zosamme ze lähje es nit
müjjelesch. {{GENDER:$1|Dä Metmaacher|De Metmaacherėn|Dä Metmaacher|De
Metmaacherėn|Dä Metmaacher}} „$1“ es en en Jropp, die et Zosammelähje
verbehdt.,
right-usermerge: Metmaacher zosammelääje,
--
To view, visit https://gerrit.wikimedia.org/r/214096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4eff75f7181db55a10a9ebf3e12e6a3ce8b3d62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...UserMerge)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214097
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: Ia4eff75f7181db55a10a9ebf3e12e6a3ce8b3d62
---
D UserMerge.i18n.php
M UserMerge.php
2 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge
refs/changes/97/214097/1
diff --git a/UserMerge.i18n.php b/UserMerge.i18n.php
deleted file mode 100644
index 841f856..000
--- a/UserMerge.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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( 'wfJsonI18nShim12288ddd27589de3' ) ) {
- function wfJsonI18nShim12288ddd27589de3( $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'][] =
'wfJsonI18nShim12288ddd27589de3';
-}
diff --git a/UserMerge.php b/UserMerge.php
index 1da477b..f84edca 100644
--- a/UserMerge.php
+++ b/UserMerge.php
@@ -67,7 +67,6 @@
$wgHooks['UnitTestsList'][] = 'UserMergeHooks::onUnitTestsList';
$wgMessagesDirs['UserMerge'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['UserMerge'] = $dir . 'UserMerge.i18n.php';
$wgExtensionMessagesFiles['UserMergeAlias'] = $dir . 'UserMerge.alias.php';
$wgSpecialPages['UserMerge'] = 'UserMerge';
$wgSpecialPageGroups['UserMerge'] = 'users';
--
To view, visit https://gerrit.wikimedia.org/r/214097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4eff75f7181db55a10a9ebf3e12e6a3ce8b3d62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix pagination on moderation view - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214098
Change subject: Fix pagination on moderation view
..
Fix pagination on moderation view
Bug: T100148
Change-Id: I41a93496b7a3af9ad5aeeea273d4c415713327ed
---
M includes/models/CollectionsList.php
M includes/specials/SpecialGather.php
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/98/214098/1
diff --git a/includes/models/CollectionsList.php
b/includes/models/CollectionsList.php
index 6f9044f..5a6b372 100644
--- a/includes/models/CollectionsList.php
+++ b/includes/models/CollectionsList.php
@@ -115,7 +115,8 @@
-getSubpage( $this-getOwner() )
-getLocalURL( $query );
} else {
- return SpecialPage::getTitleFor( 'GatherLists' )
+ return SpecialPage::getTitleFor( 'Gather' )
+ -getSubpage( 'all' )
-getSubpage( $this-listMode )
-getLocalURL( $query );
}
@@ -164,7 +165,7 @@
$query['lstowner'] = $user-getName();
}
if ( $mode ) {
- $query['lstmode'] = $mode;
+ $query['lstmode'] = all$mode;
} else {
$mode = '';
}
diff --git a/includes/specials/SpecialGather.php
b/includes/specials/SpecialGather.php
index e2400f4..17b9c37 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -106,7 +106,7 @@
$req = $this-getRequest();
$continue = $req-getValues();
$cList = models\CollectionsList::newFromApi( null,
$mode === 'hidden',
- false, $continue, $mode === 'hidden' ?
'allhidden' : 'allpublic', 100 );
+ false, $continue, $mode === 'hidden' ? 'hidden'
: 'public', 100 );
$this-renderRows( $cList, $mode === 'hidden' ? 'show'
: 'hide' );
} else {
@@ -123,7 +123,7 @@
*/
public function getSubTitle( $hidden = false ) {
return Linker::link(
- SpecialPage::getTitleFor( 'GatherLists', ( $hidden ?
'hidden' : false ) ),
+ SpecialPage::getTitleFor( 'Gather', ( $hidden ?
'hidden' : false ) ),
( $hidden ? $this-msg( 'gather-lists-showhidden' ) :
$this-msg( 'gather-lists-showvisible' ) )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/214098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I41a93496b7a3af9ad5aeeea273d4c415713327ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make error titles easier to translate - change (mediawiki...WikiGrok)
jenkins-bot has submitted this change and it was merged. Change subject: Make error titles easier to translate .. Make error titles easier to translate Reported by Purodha at https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Wikigrok-dialog-error-message-heading/en and https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Wikigrok-roulette-error-message-heading/ksh Change-Id: Ie833bd9910696d3236ab69a831be9a0f8943dc74 --- M i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 5bcb6b9..d09287c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -23,7 +23,7 @@ wikigrok-roulette-info-overlay-title: Contribute, wikigrok-roulette-info-overlay-content: Wikipedia is experimenting with new ways for people to contribute. By collecting responses from you and other readers, we can improve search on Wikipedia., wikigrok-roulette-info-overlay-start-button-label: Let's go!, - wikigrok-roulette-error-message-heading: Uh oh!, + wikigrok-roulette-error-message-heading: Oops!, wikigrok-roulette-error-message-body: There was a problem., wikigrok-roulette-error-ok-button-label: Okay, wikigrok-dialog-instruction: Improve Wikipedia by tagging information on this page, @@ -33,7 +33,7 @@ wikigrok-dialog-license-info: Submissions are a href=\$1\released freely/a., wikigrok-dialog-none-button-label: None of these, wikigrok-dialog-next-button-label: Next, - wikigrok-dialog-error-message-heading: Uh oh!, + wikigrok-dialog-error-message-heading: Oops!, wikigrok-dialog-error-message-body: There was a problem., wikigrok-dialog-error-ok-button-label: Okay, wikigrok-dialog-more-info-heading: strongAbout/strong, -- To view, visit https://gerrit.wikimedia.org/r/212884 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie833bd9910696d3236ab69a831be9a0f8943dc74 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikiGrok Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Log what job types were never inserted - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Log what job types were never inserted
..
Log what job types were never inserted
I am seeing a constant stream of
Notice: JobQueueGroup::__destruct: 1 buffered job(s) never inserted. in
/srv/mediawiki/php-1.26wmf6/includes/jobqueue/JobQueueGroup.php on line
419
In the production logfiles. Log what type of jobs these are so we can figure
out
how to fix them.
Change-Id: I7beca910d8c4b20aa20bdec4883e399fd94fbcfd
---
M includes/jobqueue/JobQueueGroup.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/jobqueue/JobQueueGroup.php
b/includes/jobqueue/JobQueueGroup.php
index 3d2393e..5bd1cc9 100644
--- a/includes/jobqueue/JobQueueGroup.php
+++ b/includes/jobqueue/JobQueueGroup.php
@@ -416,7 +416,8 @@
function __destruct() {
$n = count( $this-bufferedJobs );
if ( $n 0 ) {
- trigger_error( __METHOD__ . : $n buffered job(s) never
inserted. );
+ $type = implode( ', ', array_unique( array_map(
'get_class', $this-bufferedJobs ) ) );
+ trigger_error( __METHOD__ . : $n buffered job(s) of
type(s) $type never inserted. );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7beca910d8c4b20aa20bdec4883e399fd94fbcfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add my new key now that I'm back in office - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: Add my new key now that I'm back in office .. Add my new key now that I'm back in office Change-Id: I534ab94f936f78a60d8caf9caa95421e88c7ad96 --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 8227741..da27854 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -666,7 +666,8 @@ gid: 500 name: maxsem realname: Max Semenik -ssh_keys: [] +ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDIjvXP86ZFowYPJln3ildiEvMJODV0t+x9baITmIMMgpJ17qLY4UWUJtuw7WPFCge7Tr0E1yzU4tYTvRbQecl9O8GUoJxX4JcDMAz2K7Bm3Bqdqu1DOEho1e8uyedp70b+wXLp3c/OvGvAtw/892NjPfrSZpgnHKw3/qgWNMJ0cK1xJUOMZXn5yh5j+4xadiXWxNJIy5jAzGVf/7/xGkGp1Vhuz68fi0KOfVgsqsdStj6JiG7nf62pQk6KnBXexlhrOE9uuaCtS34RuexGpFsjgKUE/+CWvb2KJsmTbIbVECABBVB/F4ltbQujQaRlwag8Wt6DINGp8CEYLZ+bl//F +mseme...@maxsem.corp.wikimedia.org] uid: 1220 mattflaschen: ensure: present -- To view, visit https://gerrit.wikimedia.org/r/210716 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I534ab94f936f78a60d8caf9caa95421e88c7ad96 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ores: Initial module, with web class / role - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: ores: Initial module, with web class / role
..
ores: Initial module, with web class / role
Change-Id: Ibbe120ee57cd036ac371556ed60311da5f2f7156
---
A manifests/role/labsores.pp
A modules/ores/manifests/web.pp
2 files changed, 80 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
new file mode 100644
index 000..414de11
--- /dev/null
+++ b/manifests/role/labsores.pp
@@ -0,0 +1,3 @@
+class role::labs::ores::web {
+include ::ores::web
+}
diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
new file mode 100644
index 000..0e1d54f
--- /dev/null
+++ b/modules/ores/manifests/web.pp
@@ -0,0 +1,77 @@
+# = Class: ores::web
+# Sets up a uwsgi based web server for ORES running python3
+class ores::web {
+# Let's use a virtualenv for maximum flexibility - we can convert
+# this to deb packages in the future if needed. We also install build tools
+# because they are needed by pip to install numpy, scipy and scilearn.
+# FIXME: Use debian packages for all the packages needing compilation
+require_package('python-virtualenv', 'python3-dev', 'build-essential',
+'gfortran', 'libopenblas-dev', 'liblapack-dev')
+
+# ORES is a python3 application \o/
+require_package('uwsgi-plugin-python3')
+
+# It requires the enchant debian package
+require_package('enchant')
+
+# Spellcheck packages for supported languages
+require_package('myspell-pt', 'myspell-fa', 'myspell-en-au',
+'myspell-en-gb', 'myspell-en-us',
+'myspell-en-za', 'myspell-fr')
+
+$src_path = '/srv/ores/src'
+$venv_path = '/srv/ores/venv'
+$data_path = '/srv/ores/data'
+
+file { '/srv':
+ensure = directory,
+owner = 'root',
+group = 'root',
+mode = '0775',
+}
+
+file { [
+'/srv/ores',
+$data_path,
+${data_path}/nltk,
+]:
+ensure = directory,
+owner = 'www-data',
+group = 'www-data',
+mode= '0775',
+require = File['/srv'],
+}
+
+git::clone { 'ores-src':
+origin=
'https://github.com/halfak/Objective-Revision-Evaluation-Service.git',
+directory = $src_path,
+branch= 'deploy',
+ensure= 'latest',
+owner = 'www-data',
+group = 'www-data',
+require = File['/srv/ores'],
+}
+
+exec { 'initial-setup-virtualenv':
+command = /bin/mkdir -p ${venv_path} /usr/bin/virtualenv --python
python3 ${venv_path},
+user= 'www-data',
+group = 'www-data',
+creates = $venv_path,
+require = File['/srv/ores'],
+}
+
+uwsgi::app { 'ores-web':
+settings = {
+uwsgi = {
+plugins = 'python3',
+protocol= 'uwsgi',
+'wsgi-file' = ${src_path}/ores.wsgi,
+master = true,
+chdir = $src_path,
+socket = '0.0.0.0:8080',
+venv= '/srv/ores/venv',
+processes = inline_template('%= @processorcount.to_i * 2
%'),
+}
+}
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/213354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbe120ee57cd036ac371556ed60311da5f2f7156
Gerrit-PatchSet: 16
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ores: Add simple nginx load balancer - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: ores: Add simple nginx load balancer
..
ores: Add simple nginx load balancer
Change-Id: Iaf033a6de308e88ccadf9a4e131ae232926a571f
---
M manifests/role/labsores.pp
A modules/ores/manifests/lb.pp
A modules/ores/templates/lb.nginx.erb
3 files changed, 32 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index 414de11..31115bc 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -1,3 +1,11 @@
class role::labs::ores::web {
include ::ores::web
}
+
+class role::labs::ores::lb(
+$realservers,
+) {
+class { '::ores::lb':
+realservers = $realservers,
+}
+}
diff --git a/modules/ores/manifests/lb.pp b/modules/ores/manifests/lb.pp
new file mode 100644
index 000..63a644a
--- /dev/null
+++ b/modules/ores/manifests/lb.pp
@@ -0,0 +1,8 @@
+# Simple nginx HTTP load balancer for ores
+class ores::lb(
+$realservers,
+) {
+nginx::site { 'ores-lb':
+content = template('ores/lb.nginx.erb'),
+}
+}
diff --git a/modules/ores/templates/lb.nginx.erb
b/modules/ores/templates/lb.nginx.erb
new file mode 100644
index 000..f9f33af
--- /dev/null
+++ b/modules/ores/templates/lb.nginx.erb
@@ -0,0 +1,16 @@
+# THIS FILE IS MANAGED BY PUPPET
+upstream oresweb {
+% @realservers.each do |realserver| %
+server %= realserver %;
+% end %
+}
+
+server {
+listen 80;
+
+location / {
+include uwsgi_params;
+
+uwsgi_pass oresweb;
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/214060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf033a6de308e88ccadf9a4e131ae232926a571f
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Give the same error for a blank ref tag and a self-closing one - change (mediawiki...Cite)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214099
Change subject: Give the same error for a blank ref tag and a self-closing one
..
Give the same error for a blank ref tag and a self-closing one
Currently, inside references, a ref tag containing an empty string does
produce an error, while a self-closing ref tag doesn't. This change
causes the latter to produce an error as well.
Change-Id: Ic74b4538bae8250334a52a37fe4b4ad1295079ab
---
M Cite_body.php
M citeParserTests.txt
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite
refs/changes/99/214099/1
diff --git a/Cite_body.php b/Cite_body.php
index e5f0a5a..1423824 100644
--- a/Cite_body.php
+++ b/Cite_body.php
@@ -226,7 +226,7 @@
# ref and references have conflicting group
attributes.
$this-mReferencesErrors[] =
$this-error(
'cite_error_references_group_mismatch', htmlspecialchars( $group ) );
- } elseif ( $str !== '' ) {
+ } elseif ( $str !== '' $str !== null ) {
if ( !isset( $this-mRefs[$group] ) ) {
# Called with group attribute not
defined in text.
$this-mReferencesErrors[] =
diff --git a/citeParserTests.txt b/citeParserTests.txt
index 2477f2d..a6228c1 100644
--- a/citeParserTests.txt
+++ b/citeParserTests.txt
@@ -384,7 +384,8 @@
li id=cite_note-foospan class=mw-cite-backlinka
href=#cite_ref-foo_0↑/a/span strong class=error
mw-ext-cite-errorCite error: Invalid codelt;refgt;/code tag;
no text was provided for refs named codefoo/code/strong/li
/ol
-pstrong class=error mw-ext-cite-errorCite error:
codelt;refgt;/code tag with name unused defined in
codelt;referencesgt;/code is not used in prior text./strongbr /
+pstrong class=error mw-ext-cite-errorCite error:
codelt;refgt;/code tag defined in codelt;referencesgt;/code with
name foo has no content./strongbr /
+strong class=error mw-ext-cite-errorCite error: codelt;refgt;/code
tag with name unused defined in codelt;referencesgt;/code is not used
in prior text./strongbr /
strong class=error mw-ext-cite-errorCite error: codelt;refgt;/code
tag in codelt;referencesgt;/code has conflicting group attribute
1./strongbr /
strong class=error mw-ext-cite-errorCite error: codelt;refgt;/code
tag defined in codelt;referencesgt;/code has no name attribute./strong
/p
--
To view, visit https://gerrit.wikimedia.org/r/214099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic74b4538bae8250334a52a37fe4b4ad1295079ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove v6 token puppetization from cp1008 for testing - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214100
Change subject: remove v6 token puppetization from cp1008 for testing
..
remove v6 token puppetization from cp1008 for testing
Change-Id: I71afd6710464a54aa2b177e5da2e600d9b2e92e8
---
M modules/interface/manifests/add_ip6_mapped.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/214100/1
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index b4b8c79..194c181 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -29,7 +29,7 @@
}
# XXX Temporary: testing on cp1008 first in a couple of different
scenarios...
-if $::hostname == 'cp1008' {
+if $::hostname == 'cp' {
# The above sets up an up command to add the fixed IPv6 mapping of
the v4
# address statically, and also executes the command to add the address
--
To view, visit https://gerrit.wikimedia.org/r/214100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71afd6710464a54aa2b177e5da2e600d9b2e92e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove v6 token puppetization from cp1008 for testing - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: remove v6 token puppetization from cp1008 for testing
..
remove v6 token puppetization from cp1008 for testing
Change-Id: I71afd6710464a54aa2b177e5da2e600d9b2e92e8
---
M modules/interface/manifests/add_ip6_mapped.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index b4b8c79..194c181 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -29,7 +29,7 @@
}
# XXX Temporary: testing on cp1008 first in a couple of different
scenarios...
-if $::hostname == 'cp1008' {
+if $::hostname == 'cp' {
# The above sets up an up command to add the fixed IPv6 mapping of
the v4
# address statically, and also executes the command to add the address
--
To view, visit https://gerrit.wikimedia.org/r/214100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71afd6710464a54aa2b177e5da2e600d9b2e92e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use more appropriate RecentChange_save hook for tagging - change (mediawiki...VisualEditor)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214101
Change subject: Use more appropriate RecentChange_save hook for tagging
..
Use more appropriate RecentChange_save hook for tagging
* At this point the IDs are all known so there is no need
to re-query what was written in the transaction
* This works when recent change insertion is deferred
* Also deferred tagging in ApiVisualEditorEdit to after
the RC row is saved
Bug: T100439
Change-Id: Ic4c7d8d89b8cfeee57eda867c0ff74fa9682ffc8
---
M ApiVisualEditorEdit.php
M VisualEditor.hooks.php
M VisualEditor.php
3 files changed, 11 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/01/214101/1
diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php
old mode 100644
new mode 100755
index 5e1385f..2be476a
--- a/ApiVisualEditorEdit.php
+++ b/ApiVisualEditorEdit.php
@@ -163,7 +163,11 @@
if ( isset( $saveresult['edit']['newrevid'] ) ) {
$newRevId = intval(
$saveresult['edit']['newrevid'] );
if ( $this-veConfig-get(
'VisualEditorUseChangeTagging' ) ) {
- ChangeTags::addTags( 'visualeditor',
null, $newRevId, null );
+ // Defer till after the RC row is
inserted
+ // @TODO: doEditContent should let
callers specify desired tags
+ DeferredUpdates::addCallableUpdate(
function() use ( $newRevId ) {
+ ChangeTags::addTags(
'visualeditor', null, $newRevId, null );
+ } );
}
} else {
$newRevId = $page-getLatestRevId();
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
old mode 100644
new mode 100755
index 7a4b43d..954e02d
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -185,26 +185,14 @@
* Called when an edit is saved
* Adds 'visualeditor-switched' tag to the edit if requested
*
-* @param $article WikiPage
-* @param $user User
-* @param $content Content
-* @param $summary string
-* @param $isMinor boolean
-* @param $isWatch boolean
-* @param $section int
-* @param $flags int
-* @param $revision Revision|null
-* @param $status Status
-* @param $baseRevId int|boolean
+* @param RecentChange $rc
* @return boolean true
*/
- public static function onPageContentSaveComplete(
- $article, $user, $content, $summary, $isMinor, $isWatch,
- $section, $flags, $revision, $status, $baseRevId
- ) {
+ public static function onRecentChange_save( RecentChange $rc ) {
$request = RequestContext::getMain()-getRequest();
- if ( $request-getBool( 'veswitched' ) $revision ) {
- ChangeTags::addTags( 'visualeditor-switched', null,
$revision-getId() );
+ if ( $request-getBool( 'veswitched' )
$rc-mAttribs['rc_this_oldid'] ) {
+ ChangeTags::addTags( 'visualeditor-switched',
+ $rc-mAttribs['rc_id'],
$rc-mAttribs['rc_this_oldid'] );
}
return true;
}
diff --git a/VisualEditor.php b/VisualEditor.php
old mode 100644
new mode 100755
index d333676..ba06924
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -84,7 +84,7 @@
$wgHooks['SkinTemplateNavigation'][] =
'VisualEditorHooks::onSkinTemplateNavigation';
$wgHooks['ParserTestGlobals'][] = 'VisualEditorHooks::onParserTestGlobals';
$wgHooks['EditPage::showEditForm:fields'][] =
'VisualEditorHooks::onEditPageShowEditFormFields';
-$wgHooks['PageContentSaveComplete'][] =
'VisualEditorHooks::onPageContentSaveComplete';
+$wgHooks['RecentChange_save'][] = 'VisualEditorHooks::onRecentChange_save';
$wgHooks['BeforeInitialize'][] = 'VisualEditorHooks::onBeforeInitialize';
$wgExtensionFunctions[] = 'VisualEditorHooks::onSetup';
--
To view, visit https://gerrit.wikimedia.org/r/214101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4c7d8d89b8cfeee57eda867c0ff74fa9682ffc8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Labcontrol1001 will be the new virt1000 - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214102
Change subject: Labcontrol1001 will be the new virt1000
..
Labcontrol1001 will be the new virt1000
Change-Id: I5b4e262e0f34a5307cb2b0a2bec90fe7da466034
---
M manifests/site.pp
1 file changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/214102/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 5c39c9b..c5df739 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1198,10 +1198,22 @@
}
node 'labcontrol1001.wikimedia.org' {
-$cluster = 'virt'
+$cluster = 'virt'
+$ganglia_aggregator= true
+$is_puppet_master = true
+$is_labs_puppet_master = true
+$use_neutron = false
include standard
-include base::firewall
+include role::dns::ldap
+include ldap::role::client::labs
+include role::nova::controller
+include role::salt::masters::labs
+include role::deployment::salt_masters
+if $use_neutron == true {
+include role::neutron::controller
+
+}
}
node 'labcontrol2001.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/214102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b4e262e0f34a5307cb2b0a2bec90fe7da466034
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a comment in a test - change (mediawiki...codesniffer)
Polybuildr has uploaded a new change for review. https://gerrit.wikimedia.org/r/214103 Change subject: Add a comment in a test .. Add a comment in a test This is actually a test to see if the HHVM test fails for master. Change-Id: I0ccf4c5c1bbcc2c1c3e90a265dc442ae57088f3b --- M MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax_fail.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer refs/changes/03/214103/1 diff --git a/MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax_fail.php b/MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax_fail.php index 8ed884b..9069a23 100644 --- a/MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax_fail.php +++ b/MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax_fail.php @@ -1,5 +1,5 @@ ?php - +//who uses ticks? declare ( ticks = 1 ): echo foo; enddeclare; -- To view, visit https://gerrit.wikimedia.org/r/214103 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ccf4c5c1bbcc2c1c3e90a265dc442ae57088f3b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: Polybuildr v.a.ghai...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganeti: ferm::service for DRBD ports - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214104
Change subject: ganeti: ferm::service for DRBD ports
..
ganeti: ferm::service for DRBD ports
Port range is derived from http://docs.ganeti.org/ganeti/2.12/api/py/
FIRST_DRBD_PORT and LAST_DRBD_PORT
Change-Id: I2e24b8720e297fe8eff20da1b0da3accbf4ade32
---
M manifests/role/ganeti.pp
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/214104/1
diff --git a/manifests/role/ganeti.pp b/manifests/role/ganeti.pp
index d80870c..05bb1c0 100644
--- a/manifests/role/ganeti.pp
+++ b/manifests/role/ganeti.pp
@@ -81,5 +81,13 @@
description = 'ganeti-mond running',
nrpe_command = '/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1
-u root -C ganeti-mond'
}
+
+# DRBD is used for HA of disk images. Port range for ganeti is
+# 11000-14999
+ferm::service { 'ganeti_drbd':
+proto = 'tcp',
+port = '11000:14999',
+srange = @resolve(($ganeti_ferm_nodes)),
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e24b8720e297fe8eff20da1b0da3accbf4ade32
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use the new service names for labs puppetmasters. - change (operations/puppet)
Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/214105 Change subject: Use the new service names for labs puppetmasters. .. Use the new service names for labs puppetmasters. Change-Id: I85359c01c30b4dcedea58dc6865c057df9c2b322 --- M hieradata/eqiad.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/05/214105/1 diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml index 336aedc..21e2340 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -21,8 +21,8 @@ labs_nova_controller: virt1000.wikimedia.org labs_glance_controller: virt1000.wikimedia.org -labs_puppet_master: virt1000.wikimedia.org -labs_puppet_master_secondary: labcontrol2001.wikimedia.org +labs_puppet_master: labs-puppetmaster-eqiad.wikimedia.org +labs_puppet_master_secondary: labs-puppetmaster-codfw.wikimedia.org labs_keystone_host: virt1000.wikimedia.org labs_ldap_dns_host: virt1000.wikimedia.org labs_ldap_dns_host_secondary: labcontrol2001.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/214105 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85359c01c30b4dcedea58dc6865c057df9c2b322 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott abog...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganeti: ferm::service for DRBD ports - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: ganeti: ferm::service for DRBD ports
..
ganeti: ferm::service for DRBD ports
Port range is derived from http://docs.ganeti.org/ganeti/2.12/api/py/
FIRST_DRBD_PORT and LAST_DRBD_PORT
Change-Id: I2e24b8720e297fe8eff20da1b0da3accbf4ade32
---
M manifests/role/ganeti.pp
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ganeti.pp b/manifests/role/ganeti.pp
index d80870c..05bb1c0 100644
--- a/manifests/role/ganeti.pp
+++ b/manifests/role/ganeti.pp
@@ -81,5 +81,13 @@
description = 'ganeti-mond running',
nrpe_command = '/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1
-u root -C ganeti-mond'
}
+
+# DRBD is used for HA of disk images. Port range for ganeti is
+# 11000-14999
+ferm::service { 'ganeti_drbd':
+proto = 'tcp',
+port = '11000:14999',
+srange = @resolve(($ganeti_ferm_nodes)),
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e24b8720e297fe8eff20da1b0da3accbf4ade32
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove redundant or defunct ldap servers from the ldap list. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Remove redundant or defunct ldap servers from the ldap list. .. Remove redundant or defunct ldap servers from the ldap list. Neptunium is the same as ldap-eqiad. virt1000 and labcontrol2001 are no longer ldap servers. Change-Id: I6978981bcdf98e3a4e600397932a6b6f1cf77d46 --- M modules/ldap/manifests/role/server.pp 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ldap/manifests/role/server.pp b/modules/ldap/manifests/role/server.pp index d3fbd0f..4bce7f5 100644 --- a/modules/ldap/manifests/role/server.pp +++ b/modules/ldap/manifests/role/server.pp @@ -94,9 +94,6 @@ # playing a shell game with the service domains, best to have # everything listed here. server_list = ['ldap-eqiad.wikimedia.org', -'ldap-codfw.wikimedia.org', -'virt1000.wikimedia.org', -'labcontrol2001.wikimedia.org', -'neptunium.wikimedia.org'] +'ldap-codfw.wikimedia.org'] } } -- To view, visit https://gerrit.wikimedia.org/r/213542 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6978981bcdf98e3a4e600397932a6b6f1cf77d46 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes for ori's dotfiles - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214106
Change subject: Fixes for ori's dotfiles
..
Fixes for ori's dotfiles
* sys.setdefaultencoding() is not present in Python 3, so if calling that
raises an attribute error, ignore it.
* Misc. fixups for bash scripts.
Change-Id: I52826f452a5f59c903a5329c76a489baa9e8b8af
---
M modules/admin/files/home/ori/.bash_profile
M modules/admin/files/home/ori/.pythonrc
2 files changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/214106/1
diff --git a/modules/admin/files/home/ori/.bash_profile
b/modules/admin/files/home/ori/.bash_profile
index d7caed2..896f4cb 100644
--- a/modules/admin/files/home/ori/.bash_profile
+++ b/modules/admin/files/home/ori/.bash_profile
@@ -65,9 +65,9 @@
perf() { sudo perf $@; }
gdbh() { sudo gdb -p $(pidof -s hhvm); }
redis-cli() { command redis-cli -a $(grep -Po '(?=masterauth )\S+'
/etc/redis/redis.conf) $@; }
-fields() { awk 'END { for (i = 1; i = NF; i++) printf(%s : %s\n, i, $i)
}' $@; }
+fields() { tail -1 ${@:---} | awk 'END { for (i = 1; i = NF; i++)
printf(%s : %s\n, i, $i) }' ; }
field() { awk -v field=$1 '{print $(field)}'; }
-lat(){ ls -lat $@ | head; }
+lat(){ ls -lat *${@:+.}${@} | head; }
sudo() { command sudo -E $@; }
ptop() {
diff --git a/modules/admin/files/home/ori/.pythonrc
b/modules/admin/files/home/ori/.pythonrc
index 1a19c6e..203a834 100644
--- a/modules/admin/files/home/ori/.pythonrc
+++ b/modules/admin/files/home/ori/.pythonrc
@@ -1,7 +1,10 @@
# -*- coding: utf-8 -*-
-import sys
-reload(sys)
-sys.setdefaultencoding('utf-8')
+try:
+import sys
+reload(sys)
+sys.setdefaultencoding('utf-8')
+except:
+pass
import datetime
import json
--
To view, visit https://gerrit.wikimedia.org/r/214106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52826f452a5f59c903a5329c76a489baa9e8b8af
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added BagOStuff READ_LATEST flag for replicated stores - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214107
Change subject: Added BagOStuff READ_LATEST flag for replicated stores
..
Added BagOStuff READ_LATEST flag for replicated stores
Bug: T88493
Change-Id: I7ea050a2eabba635f2aadb4e33b6f8fbfb1b01a8
---
M includes/libs/objectcache/BagOStuff.php
M includes/libs/objectcache/ReplicatedBagOStuff.php
M includes/objectcache/ObjectCache.php
3 files changed, 22 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/214107/1
diff --git a/includes/libs/objectcache/BagOStuff.php
b/includes/libs/objectcache/BagOStuff.php
index 65ff0ee..726c789 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -59,6 +59,9 @@
const ERR_UNREACHABLE = 2; // can't connect
const ERR_UNEXPECTED = 3; // response gave some error
+ /** Bitfield constants for get()/getMulti() */
+ const READ_LATEST = 1; // use latest data for replicated stores
+
public function __construct( array $params = array() ) {
if ( isset( $params['logger'] ) ) {
$this-setLogger( $params['logger'] );
@@ -86,9 +89,10 @@
* Get an item with the given key. Returns false if it does not exist.
* @param string $key
* @param mixed $casToken [optional]
+* @param integer $flags Bitfield; supports READ_LATEST [optional]
* @return mixed Returns false on failure
*/
- abstract public function get( $key, $casToken = null );
+ abstract public function get( $key, $casToken = null, $flags = 0 );
/**
* Set an item.
@@ -262,14 +266,13 @@
return false;
}
- /* *** Emulated functions *** */
-
/**
* Get an associative array containing the item for each of the keys
that have items.
* @param array $keys List of strings
+* @param integer $flags Bitfield; supports READ_LATEST [optional]
* @return array
*/
- public function getMulti( array $keys ) {
+ public function getMulti( array $keys, $flags = 0 ) {
$res = array();
foreach ( $keys as $key ) {
$val = $this-get( $key );
diff --git a/includes/libs/objectcache/ReplicatedBagOStuff.php
b/includes/libs/objectcache/ReplicatedBagOStuff.php
index a263a3d..d0e1f84 100644
--- a/includes/libs/objectcache/ReplicatedBagOStuff.php
+++ b/includes/libs/objectcache/ReplicatedBagOStuff.php
@@ -71,12 +71,16 @@
$this-readStore-setDebug( $debug );
}
- public function get( $key, $casToken = null ) {
- return $this-readStore-get( $key, $casToken );
+ public function get( $key, $casToken = null, $flags = 0 ) {
+ return ( $flags self::READ_LATEST )
+ ? $this-writeStore-get( $key, $casToken, $flags )
+ : $this-readStore-get( $key, $casToken, $flags );
}
- public function getMulti( $keys ) {
- return $this-readStore-getMulti( $keys );
+ public function getMulti( $keys, $flags = 0 ) {
+ return ( $flags self::READ_LATEST )
+ ? $this-writeStore-getMulti( $keys, $flags )
+ : $this-readStore-getMulti( $keys, $flags );
}
public function set( $key, $value, $exptime = 0 ) {
diff --git a/includes/objectcache/ObjectCache.php
b/includes/objectcache/ObjectCache.php
index 7faf4bb..56d061c 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -29,9 +29,13 @@
* The word cache has two main dictionary meanings, and both
* are used in this factory class. They are:
* - a) A place to store copies or computations on existing data
- * for higher access speeds (the computer science definition)
+ *for higher access speeds (the computer science definition)
* - b) A place to store lightweight data that is not canonically
- * stored anywhere else (e.g. a hoard of objects)
+ *stored anywhere else (e.g. a hoard of objects)
+ *
+ * The former should always use strongly consistent stores, so callers don't
+ * have to deal with stale reads. The later may be eventually consistent, but
+ * callers can use BagOStuff:READ_LATEST to see the latest available data.
*
* @ingroup Cache
*/
@@ -246,7 +250,7 @@
* In general, this means avoiding updates on idempotent HTTP requests
and
* avoiding an assumption of perfect serializability (or accepting
anomalies).
* Reads may be eventually consistent or data might rollback as nodes
flap.
-*
+* Callers can use BagOStuff:READ_LATEST to see the latest available
data.
*
* @return BagOStuff
* @since 1.26
--
To view, visit
