[MediaWiki-commits] [Gerrit] Code improvements - change (mediawiki...BlueSpiceSkin)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202685
Change subject: Code improvements
..
Code improvements
Now using parametized mixins instead of global scope variables
Change-Id: Ida4ebb57dab0fd8e40fd34f9193ade74196799b3
---
M resources/components/skin.icons.less
1 file changed, 9 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/85/202685/1
diff --git a/resources/components/skin.icons.less
b/resources/components/skin.icons.less
index b9c4fa0..01784b7 100644
--- a/resources/components/skin.icons.less
+++ b/resources/components/skin.icons.less
@@ -25,7 +25,7 @@
margin-right: 4px;
}
-.icon-mixin() {
+.icon-mixin( @bg-pos-top ) {
> a .icon24 {
background-position: 0 @bg-pos-top;
}
@@ -47,9 +47,8 @@
min-height: 24px;
}
- @bg-pos-top: -192px;
li {
- .icon-mixin();
+ .icon-mixin( -192px );
}
.bs-nav-item-text {
@@ -59,40 +58,33 @@
li#n-mainpage,
li#n-mainpage-description {
- @bg-pos-top: -120px;
- .icon-mixin();
+ .icon-mixin( -120px );
}
li#n-special-allpages{
- @bg-pos-top: -72px;
- .icon-mixin();
+ .icon-mixin( -72px );
}
li#n-special-categories {
- @bg-pos-top: -48px;
- .icon-mixin();
+ .icon-mixin( -48px );
}
li#n-special-recentchanges,
li#n-recentchanges {
- @bg-pos-top: -168px;
- .icon-mixin();
+ .icon-mixin( -168px );
}
li#n-external-manuals,
li#n-help{
- @bg-pos-top: -96px;
- .icon-mixin();
+ .icon-mixin( -96px );
}
li#n-external-support {
- @bg-pos-top: -216px;
- .icon-mixin();
+ .icon-mixin( -216px );
}
li#n-external-contact {
- @bg-pos-top: -144px;
- .icon-mixin();
+ .icon-mixin( -144px );
}
#bs-nav-tabs a{
font-size: 210%;
--
To view, visit https://gerrit.wikimedia.org/r/202685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida4ebb57dab0fd8e40fd34f9193ade74196799b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] assign db2041 to s2 - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202686
Change subject: assign db2041 to s2
..
assign db2041 to s2
Change-Id: I4640c7bca758b7ed6baea7b2c212846c4b8cc69e
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/202686/1
diff --git a/manifests/site.pp b/manifests/site.pp
index e5ab96f..33977a6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -620,7 +620,7 @@
}
}
-node /^db20(17|35)\.codfw\.wmnet/ {
+node /^db20(17|35|41)\.codfw\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/202686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4640c7bca758b7ed6baea7b2c212846c4b8cc69e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] assign db2041 to s2 - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: assign db2041 to s2
..
assign db2041 to s2
Change-Id: I4640c7bca758b7ed6baea7b2c212846c4b8cc69e
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index e5ab96f..33977a6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -620,7 +620,7 @@
}
}
-node /^db20(17|35)\.codfw\.wmnet/ {
+node /^db20(17|35|41)\.codfw\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/202686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4640c7bca758b7ed6baea7b2c212846c4b8cc69e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] small change for hook result - change (mediawiki...BlueSpiceExtensions)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202687
Change subject: small change for hook result
..
small change for hook result
* needs cherry pick to REL1_23
Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
---
M TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/87/202687/1
diff --git a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
index 2c20300..63c5d32 100644
--- a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
+++ b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
@@ -194,7 +194,10 @@
return true;
}
- wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites',
array( &$aNavigationSites ));
+ $bResult =
wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites', array(
&$aNavigationSites ));
+ if ($bResult === false){
+ return true;
+ }
$aOut= array();
$aOut[] = HTML::openElement( 'ul' );
--
To view, visit https://gerrit.wikimedia.org/r/202687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use curl_setopt_array instead of a loop - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: Use curl_setopt_array instead of a loop
..
Use curl_setopt_array instead of a loop
'Cos shorter.
Change-Id: If37edcc3388bec942de99e5eb2e176aa7bc03320
---
M gateway_common/gateway.adapter.php
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/gateway_common/gateway.adapter.php
b/gateway_common/gateway.adapter.php
index b2b6947..946b981 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -1423,9 +1423,7 @@
$curl_opts[CURLOPT_HTTPHEADER] = $headers;
$curl_opts[CURLOPT_POSTFIELDS] = $data;
- foreach ( $curl_opts as $option => $value ) {
- curl_setopt( $ch, $option, $value );
- }
+ curl_setopt_array( $ch, $curl_opts );
// As suggested in the PayPal developer forum sample code, try
more than once to get a
// response in case there is a general network issue
--
To view, visit https://gerrit.wikimedia.org/r/202675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If37edcc3388bec942de99e5eb2e176aa7bc03320
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [jscs] Enforce requireSpaceAfterBinaryOperators - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: [jscs] Enforce requireSpaceAfterBinaryOperators
..
[jscs] Enforce requireSpaceAfterBinaryOperators
* This was auto-corrected with jscs -x .
Change-Id: Idee8a562ae2c29cc5c661532b016220be3c107aa
---
M .jscsrc
M api/routes.js
M api/server.js
M api/utils.js
M lib/LogData.js
M lib/XMLSerializer.js
M lib/dom.computeDSR.js
M lib/dom.handlePres.js
M lib/dom.linter.js
M lib/dom.t.TableFixups.js
M lib/dom.wrapTemplates.js
M lib/ext.Cite.js
M lib/ext.core.AttributeExpander.js
M lib/ext.core.LinkHandler.js
M lib/ext.core.ListHandler.js
M lib/ext.core.NoIncludeOnly.js
M lib/ext.core.ParagraphWrapper.js
M lib/ext.core.ParserFunctions.js
M lib/ext.core.PreHandler.js
M lib/ext.core.QuoteTransformer.js
M lib/ext.core.Sanitizer.js
M lib/ext.core.TokenStreamPatcher.js
M lib/ext.util.TokenCollector.js
M lib/jsutils.js
M lib/mediawiki.ApiRequest.js
M lib/mediawiki.DOMPostProcessor.js
M lib/mediawiki.DOMUtils.js
M lib/mediawiki.TokenTransformManager.js
M lib/mediawiki.Util.js
M lib/mediawiki.WikiConfig.js
M lib/mediawiki.WikitextSerializer.js
M lib/mediawiki.parser.defines.js
M lib/mediawiki.parser.environment.js
M lib/mediawiki.parser.js
M lib/mediawiki.tokenizer.utils.js
M lib/mediawiki.wikitext.constants.js
M lib/pegTokenizer.pegjs.txt
M lib/wts.ConstrainedText.js
M lib/wts.LinkHandler.js
M lib/wts.SerializerState.js
M lib/wts.TagHandlers.js
M lib/wts.escapeWikitext.js
M lib/wts.separators.js
M tests/client/client.js
M tests/fetch-parserTests.txt.js
M tests/mocha/api.js
M tests/mocha/parse.js
M tests/parserTests.js
M tests/server/diff.js
M tests/server/render.helpers.js
M tests/server/server.js
M tests/server/static/js/commitList.js
M tests/sync-parserTests.js
53 files changed, 246 insertions(+), 247 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jscsrc b/.jscsrc
index e5d6527..fb5c536 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -20,7 +20,6 @@
"catch"
],
"requireSpaceAfterLineComment": null,
- "requireSpaceAfterBinaryOperators": null,
"requireTrailingComma": null,
"validateIndentation": null,
"validateQuoteMarks": null,
diff --git a/api/routes.js b/api/routes.js
index 31856a8..1016c36 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -598,7 +598,7 @@
}).then(function( v ) {
return Promise.promisify(
child_process.execFile, ['stdout', 'stderr'],
child_process
- )( 'git', ['rev-parse','HEAD'], {
+ )( 'git', ['rev-parse', 'HEAD'], {
cwd: path.join(__dirname, '..')
}).then(function( out ) {
v.sha = out.stdout.slice(0, -1);
diff --git a/api/server.js b/api/server.js
index e91ae6c..75dc6d7 100755
--- a/api/server.js
+++ b/api/server.js
@@ -187,9 +187,9 @@
setInterval(function() {
var heapUsage = process.memoryUsage();
parsoidConfig.performanceTimer.timing('heap.rss', '',
heapUsage.rss);
- parsoidConfig.performanceTimer.timing('heap.total','',
heapUsage.heapTotal);
+ parsoidConfig.performanceTimer.timing('heap.total', '',
heapUsage.heapTotal);
parsoidConfig.performanceTimer.timing('heap.used', '',
heapUsage.heapUsed);
- }, 1000 *60 * 5);
+ }, 1000 * 60 * 5);
}
var app = new ParsoidService( parsoidConfig, logger );
diff --git a/api/utils.js b/api/utils.js
index d46a737..d3254d5 100644
--- a/api/utils.js
+++ b/api/utils.js
@@ -98,8 +98,8 @@
};
apiUtils.htmlSpecialChars = function( s ) {
- return s.replace(/&/g,'&')
- .replace(/= 0; i--) {
+ for (var i = numChildren - 1; i >= 0; i--) {
var isMarkerTag = false,
origCE = ce,
child = children[i],
@@ -464,7 +464,7 @@
}
env.log("trace/dsr", function() {
var str = " UPDATING " +
child.nodeName +
- " with [" + cs + "," + ce + "];
typeof: " +cTypeOf;
+ " with [" + cs + "," + ce + "];
typeof: " + cTypeOf;
// Set up 'dbsrc' so we can debug this
dp.dbsrc = env.page.src.substring(cs,
ce);
return str;
@@ -560,7 +560,7 @@
// Detect errors
if (s !== null && s !== undefined && cs !== s &&
!acceptableInconsistency(opts, node, cs, s)) {
env.log("warning/dsr/inconsistent", "DSR inconsistency: cs/s
mismatch for node:",
-
[MediaWiki-commits] [Gerrit] small change for hook result - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged.
Change subject: small change for hook result
..
small change for hook result
* needs cherry pick to REL1_23
Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
---
M TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Tweichart: Looks good to me, approved
Pwirth: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
index 2c20300..63c5d32 100644
--- a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
+++ b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
@@ -194,7 +194,10 @@
return true;
}
- wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites',
array( &$aNavigationSites ));
+ $bResult =
wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites', array(
&$aNavigationSites ));
+ if ($bResult === false){
+ return true;
+ }
$aOut= array();
$aOut[] = HTML::openElement( 'ul' );
--
To view, visit https://gerrit.wikimedia.org/r/202687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pigpen
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: Tweichart
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] small change for hook result - change (mediawiki...BlueSpiceExtensions)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202688
Change subject: small change for hook result
..
small change for hook result
* needs cherry pick to REL1_23
Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
---
M TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/88/202688/1
diff --git a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
index 2c20300..63c5d32 100644
--- a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
+++ b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
@@ -194,7 +194,10 @@
return true;
}
- wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites',
array( &$aNavigationSites ));
+ $bResult =
wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites', array(
&$aNavigationSites ));
+ if ($bResult === false){
+ return true;
+ }
$aOut= array();
$aOut[] = HTML::openElement( 'ul' );
--
To view, visit https://gerrit.wikimedia.org/r/202688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta: Add wikis for ContentTranslation - change (operations/mediawiki-config)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/202689 Change subject: Beta: Add wikis for ContentTranslation .. Beta: Add wikis for ContentTranslation Bug: T90683 Change-Id: I469460fc977ad0bae7ac8436f6a8503e728214f4 --- M all-labs.dblist M wikiversions-labs.json 2 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/89/202689/1 diff --git a/all-labs.dblist b/all-labs.dblist index a9aae24..d4fd7ae 100644 --- a/all-labs.dblist +++ b/all-labs.dblist @@ -2,6 +2,7 @@ arwiki cawiki commonswiki +dawiki deploymentwiki dewiki ee_prototypewiki @@ -18,15 +19,22 @@ fawiki hewiki hiwiki +idwiki jawiki kowiki loginwiki metawiki +minwiki +mswiki +nnwiki +nowiki ruwiki simplewiki sqwiki +svwiki testwiki ukwiki +uzwiki wikidatawiki zerowiki zhwiki diff --git a/wikiversions-labs.json b/wikiversions-labs.json index 4845292..0e7cfc6 100644 --- a/wikiversions-labs.json +++ b/wikiversions-labs.json @@ -29,6 +29,14 @@ "testwiki": "php-master", "ukwiki": "php-master", "wikidatawiki": "php-master", + "dawiki": "php-master", + "idwiki": "php-master", + "minwiki": "php-master", + "mswiki": "php-master", + "nnwiki": "php-master", + "nowiki": "php-master", + "svwiki": "php-master", + "uzwiki": "php-master", "zerowiki": "php-master", "zhwiki": "php-master" } -- To view, visit https://gerrit.wikimedia.org/r/202689 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I469460fc977ad0bae7ac8436f6a8503e728214f4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: KartikMistry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] small change for hook result - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged.
Change subject: small change for hook result
..
small change for hook result
* needs cherry pick to REL1_23
Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
---
M TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Tweichart: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
index 2c20300..63c5d32 100644
--- a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
+++ b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
@@ -194,7 +194,10 @@
return true;
}
- wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites',
array( &$aNavigationSites ));
+ $bResult =
wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites', array(
&$aNavigationSites ));
+ if ($bResult === false){
+ return true;
+ }
$aOut= array();
$aOut[] = HTML::openElement( 'ul' );
--
To view, visit https://gerrit.wikimedia.org/r/202688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart
Gerrit-Reviewer: Tweichart
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 Sandbox Link to Extensions used by Wikimedia - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Add Sandbox Link to Extensions used by Wikimedia .. Add Sandbox Link to Extensions used by Wikimedia This extension is going to be deployed to a lot of projects soon, and it should be translated. Bug: T72499 Change-Id: I1e2ae21afa21aa548574530a9322ff109efcf887 --- M groups/MediaWiki/WikimediaAgg.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index c53dfc3..a4c216f 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -86,6 +86,7 @@ - ext-relatedsites # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for Wikivoyage - ext-restbaseupdatejobs # 2015-03-09 - ext-rss # 2010-11-25: Wikimediafoundation.org + - ext-sandboxlink - ext-score - ext-scribunto - ext-searchextrans # Change-ID: f8cd2d6eb9c20db92e39b038cc8476f311daeda5, Commonswiki -- To view, visit https://gerrit.wikimedia.org/r/202449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e2ae21afa21aa548574530a9322ff109efcf887 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [jscs] Enforce requireSpaceAfterLineComment - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: [jscs] Enforce requireSpaceAfterLineComment
..
[jscs] Enforce requireSpaceAfterLineComment
* Some of these changes may be controversial in that others may feel
polluting the codebase with commented out console statements eases
debuggability. My take is that they're distasteful and should be
converted to proper log statements where they're actually seeing use.
To support the case that these are rotting, for the most part, in the
tokenizer they often invoke a `pp` which hasn't been defined for quite
some time.
Change-Id: I88f268d76cc4d3f866d0a473c8eed5156f40e662
---
M .jscsrc
M lib/dom.markTreeBuilderFixups.js
M lib/dom.wrapTemplates.js
M lib/ext.core.ExtensionHandler.js
M lib/ext.core.LinkHandler.js
M lib/ext.core.NoIncludeOnly.js
M lib/ext.core.ParagraphWrapper.js
M lib/ext.core.ParserFunctions.js
M lib/ext.core.QuoteTransformer.js
M lib/ext.core.Sanitizer.js
M lib/ext.core.TemplateHandler.js
M lib/ext.util.TokenCollector.js
M lib/jsutils.js
M lib/mediawiki.ApiRequest.js
M lib/mediawiki.DOMDiff.js
M lib/mediawiki.DOMPostProcessor.js
M lib/mediawiki.DOMUtils.js
M lib/mediawiki.Diff.js
M lib/mediawiki.HTML5TreeBuilder.node.js
M lib/mediawiki.Title.js
M lib/mediawiki.TokenTransformManager.js
M lib/mediawiki.Util.js
M lib/mediawiki.WikiConfig.js
M lib/mediawiki.WikitextSerializer.js
M lib/mediawiki.parser.defines.js
M lib/mediawiki.parser.environment.js
M lib/mediawiki.parser.js
M lib/mediawiki.tokenizer.peg.js
M lib/mediawiki.tokenizer.utils.js
M lib/pegTokenizer.pegjs.txt
M lib/wts.LinkHandler.js
M lib/wts.SerializerState.js
M lib/wts.TagHandlers.js
M lib/wts.separators.js
M tests/bugSplit.js
M tests/client/client.js
M tests/mocha/apitest.localsettings.js
M tests/mockAPI.js
M tests/parserTests-whitelist.js
M tests/parserTests.js
M tests/roundtrip-test.js
M tests/rttest.localsettings.js
M tests/server/server.js
M tests/sync-parserTests.js
44 files changed, 158 insertions(+), 299 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jscsrc b/.jscsrc
index fb5c536..88653e6 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -19,7 +19,6 @@
"try",
"catch"
],
- "requireSpaceAfterLineComment": null,
"requireTrailingComma": null,
"validateIndentation": null,
"validateQuoteMarks": null,
diff --git a/lib/dom.markTreeBuilderFixups.js b/lib/dom.markTreeBuilderFixups.js
index 996203d..94f0fd1 100644
--- a/lib/dom.markTreeBuilderFixups.js
+++ b/lib/dom.markTreeBuilderFixups.js
@@ -106,7 +106,6 @@
var prevSibling = c.previousSibling;
if (( prevSibling &&
prevSibling.nodeName.toLowerCase() !== expectedName ) ||
(!prevSibling &&
c.parentNode.nodeName.toLowerCase() !== expectedName)) {
- //console.log( 'start stripped!
', expectedName, c.parentNode.innerHTML );
if (c && cdp.stx !== 'html'
&& (
expectedName === 'td'
||
expectedName === 'tr'
@@ -201,7 +200,6 @@
// Detect auto-inserted end-tags
var metaNode = findMetaShadowNode(c,
'mw:EndTag', cNodeName);
if (!metaNode) {
- //console.log( c.nodeName,
c.parentNode.outerHTML );
// 'c' is a html node that has tsr, but
no end-tag marker tag
// => its closing tag was
auto-generated by treebuilder.
dp.autoInsertedEnd = true;
@@ -232,7 +230,6 @@
// Strip start-tag marker metas
that has its matching node
deleteShadowMeta(fc);
} else {
-
//console.log('autoInsertedStart:', c.outerHTML);
dp.autoInsertedStart = true;
}
} else {
@@ -250,8 +247,6 @@
if (!sibling ||
sibling.nodeName.toLowerCase() !== expectedName) {
// Not found, the tag was
stripped. Insert an
// mw:Placeholder for
round-tripping
-
//console.log('autoinsertedEnd', c.innerHTML, c.parentNode.innerHTML);
- //
console.warn("exp
[MediaWiki-commits] [Gerrit] [English Planet] Add Timo Tijhof (second blog) - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: [English Planet] Add Timo Tijhof (second blog) .. [English Planet] Add Timo Tijhof (second blog) Change-Id: I8ffcf6a569dd47c8c2bfa9f15fdf37a8f88e53c2 --- M modules/planet/templates/feeds/en_config.erb 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved John F. Lewis: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/planet/templates/feeds/en_config.erb b/modules/planet/templates/feeds/en_config.erb index c21c138..2f892bd 100644 --- a/modules/planet/templates/feeds/en_config.erb +++ b/modules/planet/templates/feeds/en_config.erb @@ -484,3 +484,6 @@ [http://my.rsc.org/index.php?page_id=1007&module_name=sblog_info&sblog_id=490] name=Royal Society of Chemistry - Wikimedian in Residence (User:Pigsonthewing) + +[http://codepen.io/Krinkle/blog/feed] +name=Timo Tijhof \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/202471 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ffcf6a569dd47c8c2bfa9f15fdf37a8f88e53c2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Nemo bis Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Dzahn Gerrit-Reviewer: John F. Lewis Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update required version of Monolog to 1.12.0 - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: Update required version of Monolog to 1.12.0
..
Update required version of Monolog to 1.12.0
To stay in sync with version in core/vendor.
Corresponding change in DonationInterface/vendor is Ibe85af85460cc85
That and the follow-on change to clean up unlintable files should
be merged and the submodule updated in the deployment branch during
the next DI deploy.
Change-Id: I5a5f9e916a381e65f251c503433cd04d413ac9eb
---
M composer.json
M composer.lock
2 files changed, 26 insertions(+), 20 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index fe5c8c4..b67d86c 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,6 @@
},
"require": {
"psr/log": "1.0.0",
- "monolog/monolog": "1.7.0"
+ "monolog/monolog": "1.12.0"
}
}
diff --git a/composer.lock b/composer.lock
index 5346e48..a9fac59 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,52 +4,58 @@
"Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-"hash": "f66f26ac4c1ee0614474a94ce1de827c",
+"hash": "ee21c14716f26b1f74a27244319420c9",
"packages": [
{
"name": "monolog/monolog",
-"version": "1.7.0",
+"version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git";,
-"reference": "6225b22de9dcf36546be3a0b2fa8e3d986153f57"
+"reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/Seldaek/monolog/zipball/6225b22de9dcf36546be3a0b2fa8e3d986153f57";,
-"reference": "6225b22de9dcf36546be3a0b2fa8e3d986153f57",
+"url":
"https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f";,
+"reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"psr/log": "~1.0"
},
+"provide": {
+"psr/log-implementation": "1.0.0"
+},
"require-dev": {
-"aws/aws-sdk-php": "~2.4.8",
-"doctrine/couchdb": "dev-master",
-"mlehner/gelf-php": "1.0.*",
-"phpunit/phpunit": "~3.7.0",
-"raven/raven": "0.5.*",
-"ruflin/elastica": "0.90.*"
+"aws/aws-sdk-php": "~2.4, >2.4.8",
+"doctrine/couchdb": "~1.0@dev",
+"graylog2/gelf-php": "~1.0",
+"phpunit/phpunit": "~4.0",
+"raven/raven": "~0.5",
+"ruflin/elastica": "0.90.*",
+"videlalvaro/php-amqplib": "~2.4"
},
"suggest": {
"aws/aws-sdk-php": "Allow sending log messages to AWS services
like DynamoDB",
"doctrine/couchdb": "Allow sending log messages to a CouchDB
server",
"ext-amqp": "Allow sending log messages to an AMQP server
(1.0+ required)",
"ext-mongo": "Allow sending log messages to a MongoDB server",
-"mlehner/gelf-php": "Allow sending log messages to a GrayLog2
server",
+"graylog2/gelf-php": "Allow sending log messages to a GrayLog2
server",
"raven/raven": "Allow sending log messages to a Sentry server",
-"ruflin/elastica": "Allow sending log messages to an Elastic
Search server"
+"rollbar/rollbar": "Allow sending log messages to Rollbar",
+"ruflin/elastica": "Allow sending log messages to an Elastic
Search server",
+"videlalvaro/php-amqplib": "Allow sending log messages to an
AMQP server using php-amqplib"
},
"type": "library",
"extra": {
"branch-alias": {
-"dev-master": "1.7.x-dev"
+"dev-master": "1.12.x-dev"
}
},
"autoload": {
-"psr-0": {
-"Monolog": "src/"
+"psr-4": {
+"Monolog\\": "src/Monolog"
}
},
"notification-url": "https://packagist.org/downloads/";,
@@ -60,8 +66,7 @@
{
"name": "Jordi Boggiano",
"email": "j.boggi...@seld.be",
-"homepage": "http://seld.be";,
-"role": "Developer"
+"homepage": "http://seld.be
[MediaWiki-commits] [Gerrit] Also check wbIsEditView before enabling editing js - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202692
Change subject: Also check wbIsEditView before enabling editing js
..
Also check wbIsEditView before enabling editing js
this is added in ViewEntityAction and checks if
the page is a diff or not current.
Change-Id: I9713fb75408dc0c8d2ff31ec9de42bbb4dcf9a0b
---
M repo/resources/wikibase.ui.entityViewInit.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/92/202692/1
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 9d5d7d8..475617c 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -16,7 +16,8 @@
var $entityview = $( '.wikibase-entityview' );
var entityInitializer = new wb.EntityInitializer( 'wbEntity' );
- var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' );
+ var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' )
+ && mw.config.get( 'wbIsEditView' );
if( canEdit ) {
initToolbarController( $entityview );
--
To view, visit https://gerrit.wikimedia.org/r/202692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9713fb75408dc0c8d2ff31ec9de42bbb4dcf9a0b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Also check wbIsEditView before enabling editing js - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202691
Change subject: Also check wbIsEditView before enabling editing js
..
Also check wbIsEditView before enabling editing js
this is added in ViewEntityAction and checks if
the page is a diff or not current.
Change-Id: I9713fb75408dc0c8d2ff31ec9de42bbb4dcf9a0b
---
M repo/resources/wikibase.ui.entityViewInit.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/91/202691/1
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 9d5d7d8..475617c 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -16,7 +16,8 @@
var $entityview = $( '.wikibase-entityview' );
var entityInitializer = new wb.EntityInitializer( 'wbEntity' );
- var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' );
+ var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' )
+ && mw.config.get( 'wbIsEditView' );
if( canEdit ) {
initToolbarController( $entityview );
--
To view, visit https://gerrit.wikimedia.org/r/202691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9713fb75408dc0c8d2ff31ec9de42bbb4dcf9a0b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf24
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta: Enable sv-da MT in Apertium - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Beta: Enable sv-da MT in Apertium .. Beta: Enable sv-da MT in Apertium Change-Id: I1a5016361a00ac5e883a9c3d1c978598c4954de9 --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index eeed438..106f2ec 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -144,6 +144,8 @@ - 'sl' 'sl': - 'sh' + 'sv': +- 'da' Yandex: 'en': - 'de' -- To view, visit https://gerrit.wikimedia.org/r/202340 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a5016361a00ac5e883a9c3d1c978598c4954de9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Filippo Giunchedi 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] BasePage: Raise exception on redirect - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] BasePage: Raise exception on redirect
..
[FIX] BasePage: Raise exception on redirect
The pageAPInfo method in compat does raises a NoPage and IsRedirectPage
when that applies to the page. The port in 7362b605 does raise NoPage
indirectly (as already exising methods handle that) but doesn't raise
IsRedirectPage (because a redirect page can have a latest revision).
Change-Id: Ifdd8f4bf1d0a635a998375119715cab6ffc1f8e1
---
M pywikibot/page.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 6ff6d3a..357ec3f 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -430,6 +430,8 @@
@deprecated('latest_revision_id')
def pageAPInfo(self):
"""Return the current revision id for this page."""
+if self.isRedirectPage():
+raise pywikibot.IsRedirectPage(self)
return self.latest_revision_id
@property
--
To view, visit https://gerrit.wikimedia.org/r/202439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdd8f4bf1d0a635a998375119715cab6ffc1f8e1
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppet: selector outside a resource - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: puppet: selector outside a resource
..
puppet: selector outside a resource
Change-Id: I3d1ad95a4f2d4fda974c17adc1b38594806d002d
---
M modules/puppet/manifests/self/master.pp
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppet/manifests/self/master.pp
b/modules/puppet/manifests/self/master.pp
index 9dcec7e..bda5818 100644
--- a/modules/puppet/manifests/self/master.pp
+++ b/modules/puppet/manifests/self/master.pp
@@ -16,11 +16,14 @@
$server,
$enc_script_path = undef,
) {
+
+$server_desc = $server ? {
+'localhost' => 'Puppetmaster for itself',
+default => 'Puppetmaster for project labs instances',
+}
+
system::role { 'puppetmaster':
-description => $server ? {
-'localhost' => 'Puppetmaster for itself',
-default => 'Puppetmaster for project labs instances',
-}
+description => $server_desc,
}
include puppet::self::geoip
--
To view, visit https://gerrit.wikimedia.org/r/195533
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d1ad95a4f2d4fda974c17adc1b38594806d002d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trim() the thread title - change (mediawiki...WikiForum)
UltrasonicNXT has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202693
Change subject: trim() the thread title
..
trim() the thread title
Needed as per https://github.com/Brickimedia/brickimedia/issues/363
Change-Id: I4aee57e8ec86914c6e390a54f95e88094d7155c9
---
M Thread.php
M WikiForum.php
2 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiForum
refs/changes/93/202693/1
diff --git a/Thread.php b/Thread.php
index a50f2b2..cc60619 100644
--- a/Thread.php
+++ b/Thread.php
@@ -790,6 +790,8 @@
return WikiForumClass::showErrorMessage(
'wikiforum-error-add', 'wikiforum-error-title-already-exists' );
}
+$title = trim( $title );
+
if ( preg_replace( '/[' . Title::legalChars() . ']/', '',
$title ) ) { // removes all legal chars, then sees if string has length
return WikiForumClass::showErrorMessage(
'wikiforum-error-add', 'wikiforum-error-bad-title' );
}
diff --git a/WikiForum.php b/WikiForum.php
index e656bc8..ae15b44 100644
--- a/WikiForum.php
+++ b/WikiForum.php
@@ -35,7 +35,7 @@
'path' => __FILE__,
'name' => 'WikiForum',
'author' => array( 'Michael Chlebek', 'Jack Phoenix', 'Adam Carter
(UltrasonicNXT)' ),
- 'version' => '2.1.1',
+ 'version' => '2.1.2',
'url' => 'https://www.mediawiki.org/wiki/Extension:WikiForum',
'descriptionmsg' => 'wikiforum-desc'
);
--
To view, visit https://gerrit.wikimedia.org/r/202693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4aee57e8ec86914c6e390a54f95e88094d7155c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiForum
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trim() the thread title - change (mediawiki...WikiForum)
UltrasonicNXT has submitted this change and it was merged.
Change subject: trim() the thread title
..
trim() the thread title
Needed as per https://github.com/Brickimedia/brickimedia/issues/363
Change-Id: I4aee57e8ec86914c6e390a54f95e88094d7155c9
---
M Thread.php
M WikiForum.php
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/Thread.php b/Thread.php
index a50f2b2..c12ca16 100644
--- a/Thread.php
+++ b/Thread.php
@@ -790,6 +790,8 @@
return WikiForumClass::showErrorMessage(
'wikiforum-error-add', 'wikiforum-error-title-already-exists' );
}
+ $title = trim( $title );
+
if ( preg_replace( '/[' . Title::legalChars() . ']/', '',
$title ) ) { // removes all legal chars, then sees if string has length
return WikiForumClass::showErrorMessage(
'wikiforum-error-add', 'wikiforum-error-bad-title' );
}
diff --git a/WikiForum.php b/WikiForum.php
index e656bc8..ae15b44 100644
--- a/WikiForum.php
+++ b/WikiForum.php
@@ -35,7 +35,7 @@
'path' => __FILE__,
'name' => 'WikiForum',
'author' => array( 'Michael Chlebek', 'Jack Phoenix', 'Adam Carter
(UltrasonicNXT)' ),
- 'version' => '2.1.1',
+ 'version' => '2.1.2',
'url' => 'https://www.mediawiki.org/wiki/Extension:WikiForum',
'descriptionmsg' => 'wikiforum-desc'
);
--
To view, visit https://gerrit.wikimedia.org/r/202693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4aee57e8ec86914c6e390a54f95e88094d7155c9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiForum
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT
Gerrit-Reviewer: UltrasonicNXT
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tungsten: deprovision roles - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: tungsten: deprovision roles
..
tungsten: deprovision roles
Bug: T90591
Change-Id: I1f8d91b9675809e605986126b49b565174c10173
---
M manifests/site.pp
1 file changed, 1 insertion(+), 5 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 33977a6..c372d50 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2486,14 +2486,10 @@
role mediawiki::videoscaler
}
-# Primary Graphite, StatsD, and profiling data aggregation host.
+# old graphite host, waiting data backfill T90591
node 'tungsten.eqiad.wmnet' {
include admin
include standard
-include role::graphite::production
-include role::txstatsd
-include role::gdash
-include role::mwprof
}
node 'uranium.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/202376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f8d91b9675809e605986126b49b565174c10173
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed unused wrapMetrics() debug func - change (mediawiki...graphoid)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202694
Change subject: Removed unused wrapMetrics() debug func
..
Removed unused wrapMetrics() debug func
Change-Id: Ic7462f30aab4f21a5144dd138d68a326e7238ef3
---
M routes/v1.js
1 file changed, 0 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/graphoid
refs/changes/94/202694/1
diff --git a/routes/v1.js b/routes/v1.js
index 25f924a..92d54ad 100644
--- a/routes/v1.js
+++ b/routes/v1.js
@@ -83,30 +83,6 @@
}
/**
- * When enabled, logs metrics functions calls
- * @param obj
- * @returns {{increment: *, endTiming: *}}
- */
-function wrapMetrics(obj) {
-function logWrap(name){
-return function(){
-console.log(name + JSON.stringify([].slice.call(arguments)));
-return obj[name].apply(obj, arguments);
-};
-}
-var result = {};
-for (var id in obj) {
-try {
-if (typeof(obj[id]) === "function") {
-result[id] = logWrap(id);
-}
-} catch (err) {}
-}
-return result;
-}
-
-
-/**
* Init vega rendering
* @param domains array of strings - which domains are valid
*/
@@ -403,10 +379,6 @@
// The very first operation should set up our logger
log = app.logger.log.bind(app.logger);
metrics = app.metrics;
-
-// Uncomment to console.log metrics calls
-//metrics = wrapMetrics(app.metrics);
-
log('info/init', 'starting v1' );
metrics.increment('v1.init');
--
To view, visit https://gerrit.wikimedia.org/r/202694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7462f30aab4f21a5144dd138d68a326e7238ef3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/graphoid
Gerrit-Branch: master
Gerrit-Owner: Yurik
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the location of sitematrix.json configurable - change (mediawiki...parsoid)
Werdna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202695
Change subject: Make the location of sitematrix.json configurable
..
Make the location of sitematrix.json configurable
Change-Id: I02b0c56fff8dbd396fa515b8b6711f61ec944c3f
---
M api/localsettings.js.example
M lib/mediawiki.ParsoidConfig.js
2 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/95/202695/1
diff --git a/api/localsettings.js.example b/api/localsettings.js.example
index 99e3a54..a6679f0 100644
--- a/api/localsettings.js.example
+++ b/api/localsettings.js.example
@@ -18,6 +18,10 @@
// 'enwikivoyage' etc. (default true)
//parsoidConfig.loadWMF = false;
+ // If you are using the above setting, you can also specify the path
+ // of the sitematrix.json file to load wikis from.
+ //parsoidConfig.wmfConfigPath = './sitematrix.json';
+
// A default proxy to connect to the API endpoints. Default: undefined
// (no proxying). Overridden by per-wiki proxy config in setInterwiki.
//parsoidConfig.defaultAPIProxyURI = 'http://proxy.example.org:8080';
diff --git a/lib/mediawiki.ParsoidConfig.js b/lib/mediawiki.ParsoidConfig.js
index 561db50..006fd4f 100644
--- a/lib/mediawiki.ParsoidConfig.js
+++ b/lib/mediawiki.ParsoidConfig.js
@@ -7,8 +7,7 @@
require('./core-upgrade.js');
var url = require('url'),
Cite = require('./ext.Cite.js').Cite,
- Util = require('./mediawiki.Util.js').Util,
- sitematrix = require('./sitematrix.json').sitematrix;
+ Util = require('./mediawiki.Util.js').Util;
/**
@@ -28,10 +27,13 @@
this.reverseIWMap = new Map();
this.apiProxies = new Map();
this.interwikiRegexp = "";
+ this.wmfConfigPath = './sitematrix.json';
if ( localSettings && localSettings.setup ) {
localSettings.setup( this );
}
+
+ this.sitematrix = require(this.wmfConfigPath);
// Don't freak out!
// This happily overwrites inherited properties.
@@ -274,8 +276,8 @@
// of null / undefined in setInterwiki.
var self = this;
- Object.keys( sitematrix ).forEach(function( key ) {
- var val = sitematrix[key];
+ Object.keys( this.sitematrix ).forEach(function( key ) {
+ var val = this.sitematrix[key];
if ( !Number.isNaN( Number(key) ) ) {
val.site.forEach(insertInMaps.bind(self, undefined));
} else if ( key === "specials" ) {
--
To view, visit https://gerrit.wikimedia.org/r/202695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02b0c56fff8dbd396fa515b8b6711f61ec944c3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Werdna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] site tests: Correct debug output - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202696
Change subject: [FIX] site tests: Correct debug output
..
[FIX] site tests: Correct debug output
The patch 3fd46e9a assumed that the links were actual Link instances but
are actually Page instances so the correct methods need to be used.
Change-Id: I7617e643d568973b76322fd3cfe97d0e930c25f3
---
M tests/site_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/96/202696/1
diff --git a/tests/site_tests.py b/tests/site_tests.py
index b58bbd5..50ec5d5 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -374,7 +374,7 @@
print('FAILURE wrt T92856:')
print(u'Sym. difference: "{0}"'.format(
u'", "'.join(
- u'{0}@{1}'.format(link.namespace, link.title)
+ u'{0}@{1}'.format(link.namespace(),
link.title(withNamespace=False))
for link in namespace_links ^ links)))
self.assertCountEqual(
set(mysite.pagelinks(mainpage, namespaces=[0, 1])) - links, [])
--
To view, visit https://gerrit.wikimedia.org/r/202696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7617e643d568973b76322fd3cfe97d0e930c25f3
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-04-08T10:00:01+0000 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/202697 Change subject: New Wikidata Build - 2015-04-08T10:00:01+ .. New Wikidata Build - 2015-04-08T10:00:01+ Change-Id: Ia4ec1ce3f17d5ec03a0c895cf0469fe322ddc82f --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.lock M extensions/Wikibase/client/WikibaseClient.i18n.magic.php M extensions/Wikibase/client/i18n/en.json M extensions/Wikibase/client/includes/api/PageTerms.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php M extensions/Wikibase/lib/includes/LanguageFallbackChain.php M extensions/Wikibase/lib/includes/serializers/DescriptionSerializer.php M extensions/Wikibase/lib/includes/serializers/MultilingualSerializer.php M extensions/Wikibase/lib/includes/serializers/SerializationOptions.php M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php M extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainTest.php M extensions/Wikibase/lib/tests/phpunit/changes/EntityChangeFactoryTest.php M extensions/Wikibase/repo/Wikibase.hooks.php M extensions/Wikibase/repo/i18n/ar.json M extensions/Wikibase/repo/i18n/de.json M extensions/Wikibase/repo/i18n/en.json M extensions/Wikibase/repo/i18n/pt.json D extensions/Wikibase/repo/includes/EntitySearchTextGenerator.php A extensions/Wikibase/repo/includes/FingerprintSearchTextGenerator.php M extensions/Wikibase/repo/includes/ItemSearchTextGenerator.php M extensions/Wikibase/repo/includes/LabelDescriptionDuplicateDetector.php M extensions/Wikibase/repo/includes/WikibaseRepo.php M extensions/Wikibase/repo/includes/api/MergeItems.php M extensions/Wikibase/repo/includes/content/EntityContent.php M extensions/Wikibase/repo/includes/content/ItemContent.php M extensions/Wikibase/repo/includes/store/sql/SqlIdGenerator.php M extensions/Wikibase/repo/includes/store/sql/SqlStore.php M extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php M extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php M extensions/Wikibase/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php D extensions/Wikibase/repo/tests/phpunit/includes/EntitySearchTextGeneratorTest.php A extensions/Wikibase/repo/tests/phpunit/includes/FingerprintSearchTextGeneratorTest.php M extensions/Wikibase/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php M extensions/Wikibase/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/GetClaimsTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/RemoveClaimsTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/RemoveQualifiersTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/RemoveReferencesTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/SetClaimTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/SetClaimValueTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/SetQualifierTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/SetReferenceTest.php M extensions/Wikibase/repo/tests/phpunit/includes/content/ItemContentTest.php M extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlIdGeneratorTest.php M extensions/Wikibase/repo/tests/phpunit/includes/store/sql/TermSearchKeyBuilderTest.php M extensions/Wikibase/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php M extensions/Wikibase/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php M extensions/Wikibase/view/src/Module/TemplateModule.php M extensions/Wikibase/view/src/Template/TemplateFactory.php M extensions/Wikibase/view/src/Template/TemplateRegistry.php M extensions/Wikibase/view/tests/phpunit/ClaimHtmlGeneratorTest.php M extensions/Wikibase/view/tests/phpunit/ClaimsViewTest.php M extensions/Wikibase/view/tests/phpunit/EntityTermsViewTest.php M extensions/Wikibase/view/tests/phpunit/EntityViewFactoryTest.php M extensions/Wikibase/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php M extensions/Wikibase/view/tests/phpunit/ItemViewTest.php M extensions/Wikibase/view/tests/phpunit/PropertyViewTest.php M extensions/Wikibase/view/tests/phpunit/SiteLinksViewTest.php M extensions/Wikibase/view/tests/phpunit/SnakHtmlGeneratorTest.php M extensions/Wikibase/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php M vendor/autoload.php M vendor/composer/autoload_classmap.php M vendor/composer/autoload_real.php M vendor/composer/installed.json 68 files changed, 380 insertions(+), 439 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/97/202697/1 diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php index 46989f8..11dc45b
[MediaWiki-commits] [Gerrit] add bootstrap - change (mediawiki...Blueprint)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202698
Change subject: add bootstrap
..
add bootstrap
Change-Id: Ibc4e531d83c86d20ebc223f101ccfcd8b78815e5
---
M Blueprint.php
A lib/bootstrap/bootstrap.min.css
A lib/bootstrap/bootstrap.min.js
3 files changed, 29 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint
refs/changes/98/202698/1
diff --git a/Blueprint.php b/Blueprint.php
index cc17dac..e466ea9 100644
--- a/Blueprint.php
+++ b/Blueprint.php
@@ -49,12 +49,20 @@
);
$wgResourceModules += array(
+ 'ext.bootstrap' => array(
+ 'localBasePath' => __DIR__ . "/lib/bootstrap",
+ 'removeSkinPatch' => 'Blueprint/lib/bootstrap',
+ 'group' => 'skin.blueprint',
+ 'scripts' => 'bootstrap.min.js',
+ 'styles' => 'bootstrap.min.css',
+ ),
'skin.blueprint.styles' => array(
'styles' => 'master.less',
'position' => 'top',
) + $styleguideSkinResourceTemplate,
'skin.blueprint' => array(
'scripts' => 'menu.js',
+ 'dependencies' => 'ext.bootstrap',
) + $styleguideSkinResourceTemplate,
);
diff --git a/lib/bootstrap/bootstrap.min.css b/lib/bootstrap/bootstrap.min.css
new file mode 100755
index 000..c607108
--- /dev/null
+++ b/lib/bootstrap/bootstrap.min.css
@@ -0,0 +1,10 @@
+/*!
+ * Bootstrap v3.3.4 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
+/*!
+ * Generated using the Bootstrap Customizer
(http://getbootstrap.com/customize/?id=c5361ade6c44d7b0e78f)
+ * Config saved to config.json and https://gist.github.com/c5361ade6c44d7b0e78f
+ *//*! normalize.css v3.0.2 | MIT License | git.io/normalize
*/html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px
dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em
0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em
40px}hr{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,
monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html
input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html
input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px
solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em
0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica
Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:hover,a:focus{color:#23527c;text-decoration:underline}a:focus{outline:thin
dotted;outline:5px auto
-webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px
solid #ddd;border-radius:4px;-webkit-transition:all .2s
ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s
ease-in-out;dis
[MediaWiki-commits] [Gerrit] Add test for IRC line for type protect/move_prot - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/202699 Change subject: Add test for IRC line for type protect/move_prot .. Add test for IRC line for type protect/move_prot All other log types already have a test, just move_prot is missing. Change-Id: I97fdb21d3cb58847a883917b06294bc92dac9410 --- M tests/phpunit/includes/changes/RecentChangeTest.php 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/99/202699/1 diff --git a/tests/phpunit/includes/changes/RecentChangeTest.php b/tests/phpunit/includes/changes/RecentChangeTest.php index b3cb7b5..0dba183 100644 --- a/tests/phpunit/includes/changes/RecentChangeTest.php +++ b/tests/phpunit/includes/changes/RecentChangeTest.php @@ -46,6 +46,7 @@ * - protect/protect * - protect/modifyprotect * - protect/unprotect +* - protect/move_prot * - upload/upload * - merge/merge * - import/upload @@ -223,6 +224,15 @@ $protectParams, $this->user_comment ); + + # protect/move_prot + $this->assertIRCComment( + $this->context->msg( 'movedarticleprotection', 'SomeTitle', 'OldTitle' ) + ->plain() . $sep . $this->user_comment, + 'protect', 'move_prot', + array( 'OldTitle' ), + $this->user_comment + ); } /** -- To view, visit https://gerrit.wikimedia.org/r/202699 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97fdb21d3cb58847a883917b06294bc92dac9410 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed unused wrapMetrics() debug func - change (mediawiki...graphoid)
Mobrovac has submitted this change and it was merged.
Change subject: Removed unused wrapMetrics() debug func
..
Removed unused wrapMetrics() debug func
Change-Id: Ic7462f30aab4f21a5144dd138d68a326e7238ef3
---
M routes/v1.js
1 file changed, 0 insertions(+), 28 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/routes/v1.js b/routes/v1.js
index 25f924a..92d54ad 100644
--- a/routes/v1.js
+++ b/routes/v1.js
@@ -83,30 +83,6 @@
}
/**
- * When enabled, logs metrics functions calls
- * @param obj
- * @returns {{increment: *, endTiming: *}}
- */
-function wrapMetrics(obj) {
-function logWrap(name){
-return function(){
-console.log(name + JSON.stringify([].slice.call(arguments)));
-return obj[name].apply(obj, arguments);
-};
-}
-var result = {};
-for (var id in obj) {
-try {
-if (typeof(obj[id]) === "function") {
-result[id] = logWrap(id);
-}
-} catch (err) {}
-}
-return result;
-}
-
-
-/**
* Init vega rendering
* @param domains array of strings - which domains are valid
*/
@@ -403,10 +379,6 @@
// The very first operation should set up our logger
log = app.logger.log.bind(app.logger);
metrics = app.metrics;
-
-// Uncomment to console.log metrics calls
-//metrics = wrapMetrics(app.metrics);
-
log('info/init', 'starting v1' );
metrics.increment('v1.init');
--
To view, visit https://gerrit.wikimedia.org/r/202694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7462f30aab4f21a5144dd138d68a326e7238ef3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/graphoid
Gerrit-Branch: master
Gerrit-Owner: Yurik
Gerrit-Reviewer: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-04-08T10:00:01+0000 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged. Change subject: New Wikidata Build - 2015-04-08T10:00:01+ .. New Wikidata Build - 2015-04-08T10:00:01+ Change-Id: Ia4ec1ce3f17d5ec03a0c895cf0469fe322ddc82f --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.lock M extensions/Wikibase/client/WikibaseClient.i18n.magic.php M extensions/Wikibase/client/i18n/en.json M extensions/Wikibase/client/includes/api/PageTerms.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php M extensions/Wikibase/lib/includes/LanguageFallbackChain.php M extensions/Wikibase/lib/includes/serializers/DescriptionSerializer.php M extensions/Wikibase/lib/includes/serializers/MultilingualSerializer.php M extensions/Wikibase/lib/includes/serializers/SerializationOptions.php M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php M extensions/Wikibase/lib/tests/phpunit/LanguageFallbackChainTest.php M extensions/Wikibase/lib/tests/phpunit/changes/EntityChangeFactoryTest.php M extensions/Wikibase/repo/Wikibase.hooks.php M extensions/Wikibase/repo/i18n/ar.json M extensions/Wikibase/repo/i18n/de.json M extensions/Wikibase/repo/i18n/en.json M extensions/Wikibase/repo/i18n/pt.json D extensions/Wikibase/repo/includes/EntitySearchTextGenerator.php A extensions/Wikibase/repo/includes/FingerprintSearchTextGenerator.php M extensions/Wikibase/repo/includes/ItemSearchTextGenerator.php M extensions/Wikibase/repo/includes/LabelDescriptionDuplicateDetector.php M extensions/Wikibase/repo/includes/WikibaseRepo.php M extensions/Wikibase/repo/includes/api/MergeItems.php M extensions/Wikibase/repo/includes/content/EntityContent.php M extensions/Wikibase/repo/includes/content/ItemContent.php M extensions/Wikibase/repo/includes/store/sql/SqlIdGenerator.php M extensions/Wikibase/repo/includes/store/sql/SqlStore.php M extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php M extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php M extensions/Wikibase/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php D extensions/Wikibase/repo/tests/phpunit/includes/EntitySearchTextGeneratorTest.php A extensions/Wikibase/repo/tests/phpunit/includes/FingerprintSearchTextGeneratorTest.php M extensions/Wikibase/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php M extensions/Wikibase/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/GetClaimsTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/RemoveClaimsTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/RemoveQualifiersTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/RemoveReferencesTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/SetClaimTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/SetClaimValueTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/SetQualifierTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/SetReferenceTest.php M extensions/Wikibase/repo/tests/phpunit/includes/content/ItemContentTest.php M extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlIdGeneratorTest.php M extensions/Wikibase/repo/tests/phpunit/includes/store/sql/TermSearchKeyBuilderTest.php M extensions/Wikibase/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php M extensions/Wikibase/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php M extensions/Wikibase/view/src/Module/TemplateModule.php M extensions/Wikibase/view/src/Template/TemplateFactory.php M extensions/Wikibase/view/src/Template/TemplateRegistry.php M extensions/Wikibase/view/tests/phpunit/ClaimHtmlGeneratorTest.php M extensions/Wikibase/view/tests/phpunit/ClaimsViewTest.php M extensions/Wikibase/view/tests/phpunit/EntityTermsViewTest.php M extensions/Wikibase/view/tests/phpunit/EntityViewFactoryTest.php M extensions/Wikibase/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php M extensions/Wikibase/view/tests/phpunit/ItemViewTest.php M extensions/Wikibase/view/tests/phpunit/PropertyViewTest.php M extensions/Wikibase/view/tests/phpunit/SiteLinksViewTest.php M extensions/Wikibase/view/tests/phpunit/SnakHtmlGeneratorTest.php M extensions/Wikibase/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php M vendor/autoload.php M vendor/composer/autoload_classmap.php M vendor/composer/autoload_real.php M vendor/composer/installed.json 68 files changed, 380 insertions(+), 439 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php index 46989f8..11dc45b 100644 --- a/WikibaseClient.settings.php +++ b/WikibaseClient.sett
[MediaWiki-commits] [Gerrit] Also check wbIsEditView before enabling editing js - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Also check wbIsEditView before enabling editing js
..
Also check wbIsEditView before enabling editing js
this is added in ViewEntityAction and checks if
the page is a diff or not current.
Bug: T95405
Change-Id: I9713fb75408dc0c8d2ff31ec9de42bbb4dcf9a0b
---
M repo/resources/wikibase.ui.entityViewInit.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 9d5d7d8..475617c 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -16,7 +16,8 @@
var $entityview = $( '.wikibase-entityview' );
var entityInitializer = new wb.EntityInitializer( 'wbEntity' );
- var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' );
+ var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' )
+ && mw.config.get( 'wbIsEditView' );
if( canEdit ) {
initToolbarController( $entityview );
--
To view, visit https://gerrit.wikimedia.org/r/202692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9713fb75408dc0c8d2ff31ec9de42bbb4dcf9a0b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Daniel Kinzler
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Also check wbIsEditView before enabling editing js - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Also check wbIsEditView before enabling editing js
..
Also check wbIsEditView before enabling editing js
this is added in ViewEntityAction and checks if
the page is a diff or not current.
Change-Id: I9713fb75408dc0c8d2ff31ec9de42bbb4dcf9a0b
---
M repo/resources/wikibase.ui.entityViewInit.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 9d5d7d8..475617c 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -16,7 +16,8 @@
var $entityview = $( '.wikibase-entityview' );
var entityInitializer = new wb.EntityInitializer( 'wbEntity' );
- var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' );
+ var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' )
+ && mw.config.get( 'wbIsEditView' );
if( canEdit ) {
initToolbarController( $entityview );
--
To view, visit https://gerrit.wikimedia.org/r/202691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9713fb75408dc0c8d2ff31ec9de42bbb4dcf9a0b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf24
Gerrit-Owner: Aude
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata - fix problem with edit links on diff view, ... - change (mediawiki...Wikidata)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202700
Change subject: Update Wikidata - fix problem with edit links on diff view, etc.
..
Update Wikidata - fix problem with edit links on diff view, etc.
Change-Id: Ic9bff2d3c5564e16c8b5a19de96e824c112872c5
---
M composer.lock
M extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
M vendor/composer/installed.json
3 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/00/202700/1
diff --git a/composer.lock b/composer.lock
index a2cdbf8..5c007e4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1208,12 +1208,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "8f5482a72728b91793d32d534c120719f71727ca"
+"reference": "af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8f5482a72728b91793d32d534c120719f71727ca";,
-"reference": "8f5482a72728b91793d32d534c120719f71727ca",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c";,
+"reference": "af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c",
"shasum": ""
},
"require": {
@@ -1281,7 +1281,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2015-04-06 20:29:05"
+"time": "2015-04-08 08:09:44"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
index 9d5d7d8..475617c 100644
--- a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
+++ b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
@@ -16,7 +16,8 @@
var $entityview = $( '.wikibase-entityview' );
var entityInitializer = new wb.EntityInitializer( 'wbEntity' );
- var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' );
+ var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' )
+ && mw.config.get( 'wbIsEditView' );
if( canEdit ) {
initToolbarController( $entityview );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ffd5b86..9fd6a93 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1296,12 +1296,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "8f5482a72728b91793d32d534c120719f71727ca"
+"reference": "af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8f5482a72728b91793d32d534c120719f71727ca";,
-"reference": "8f5482a72728b91793d32d534c120719f71727ca",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c";,
+"reference": "af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c",
"shasum": ""
},
"require": {
@@ -1328,7 +1328,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
-"time": "2015-04-06 20:29:05",
+"time": "2015-04-08 08:09:44",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/202700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9bff2d3c5564e16c8b5a19de96e824c112872c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf24
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] statsite: replace ::txstatsd class and role calls - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202701
Change subject: statsite: replace ::txstatsd class and role calls
..
statsite: replace ::txstatsd class and role calls
Bug: T90111
Change-Id: Ifd79edad4bb0a56517dcd5458b6675ecbb03547a
---
M manifests/role/cache.pp
M manifests/role/labmon.pp
A manifests/role/statsite.pp
M manifests/role/swift.pp
M manifests/role/txstatsd.pp
5 files changed, 24 insertions(+), 101 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/202701/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index d520b43..26ded99 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -411,20 +411,7 @@
# Installs a local statsd instance for aggregating and serializing
# stats before sending them off to a remote statsd instance.
class varnish::statsd {
-class { '::txstatsd':
-settings => {
-statsd => {
-'carbon-cache-host' => "graphite-in.eqiad.wmnet",
-'carbon-cache-port' => 2004,
-'listen-port'=> 8125,
-'statsd-compliance' => 0,
-'prefix' => '',
-'max-queue-size' => 1000 * 1000,
-'max-datapoints-per-message' => 10 * 1000,
-'instance-name' => "statsd.${::hostname}",
-},
-},
-}
+include role::statsite
}
# == Class varnish::kafka
diff --git a/manifests/role/labmon.pp b/manifests/role/labmon.pp
index a7cb46c..1b38836 100644
--- a/manifests/role/labmon.pp
+++ b/manifests/role/labmon.pp
@@ -13,5 +13,5 @@
require => Class['role::graphite::labmon']
}
-include role::txstatsd
+include role::statsite
}
diff --git a/manifests/role/statsite.pp b/manifests/role/statsite.pp
new file mode 100644
index 000..749d71a
--- /dev/null
+++ b/manifests/role/statsite.pp
@@ -0,0 +1,16 @@
+# == Class: role::statsite
+#
+# statsite is a network daemon that listens on a socket for metric data (like
+# timers and counters) and writes aggregates to a metric storage backend like
+# Graphite or Ganglia. See .
+#
+class role::statsite {
+system::role { "role::statsite":
+description => "statsite server"
+}
+
+class { '::statsite': }
+statsite::instance { '8125': }
+
+diamond::collector { 'UDPCollector': }
+}
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index b0716c0..7890cd0 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -115,20 +115,7 @@
include ::swift_new::params
include ::swift_new::container_sync
-class { '::txstatsd':
-settings => {
-statsd => {
-'carbon-cache-host' =>
'graphite-in.eqiad.wmnet',
-'carbon-cache-port' => 2004,
-'listen-port'=> 8125,
-'statsd-compliance' => 0,
-'prefix' => '',
-'max-queue-size' => 1000 * 1000,
-'max-datapoints-per-message' => 10 * 1000,
-'instance-name' => "statsd.${::hostname}",
-},
-},
-}
+include role::statsite
}
class storage inherits role::swift::eqiad_prod {
include ::swift::storage
@@ -137,20 +124,7 @@
include ::swift_new::params
include ::swift_new::container_sync
-class { '::txstatsd':
-settings => {
-statsd => {
-'carbon-cache-host' =>
'graphite-in.eqiad.wmnet',
-'carbon-cache-port' => 2004,
-'listen-port'=> 8125,
-'statsd-compliance' => 0,
-'prefix' => '',
-'max-queue-size' => 1000 * 1000,
-'max-datapoints-per-message' => 10 * 1000,
-'instance-name' => "statsd.${::hostname}",
-},
-},
-}
+include role::statsite
}
}
class esams_prod inherits role::swift::base {
@@ -253,40 +227,14 @@
}
include role::swift::icehouse
-class { '::txstatsd':
-settings => {
-statsd => {
-'carbon-cache-host' =>
'graphite-in.eqiad.wmnet',
-'carbo
[MediaWiki-commits] [Gerrit] Parsoid: Fetch the body HTML instead of full document - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: Parsoid: Fetch the body HTML instead of full document
..
Parsoid: Fetch the body HTML instead of full document
Uses body api argument.
Also fixes bug T94667
Bug: T94667
Change-Id: I1d5c1e0764f67215802430f2fcd76c5790e4
---
M pageloader/PageLoader.js
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
Objections:
Nikerabbit: There's a problem with this change, please improve
diff --git a/pageloader/PageLoader.js b/pageloader/PageLoader.js
index 76171de..49a9ac2 100644
--- a/pageloader/PageLoader.js
+++ b/pageloader/PageLoader.js
@@ -25,10 +25,13 @@
}
PageLoader.prototype.load = function () {
- var deferred = Q.defer();
+ var url,
+ deferred = Q.defer();
- request(
- conf( 'parsoid.api' ) + '/' + this.sourceLanguage + 'wiki/' +
this.page,
+ url = conf( 'parsoid.api' ) + '/' + this.sourceLanguage + 'wiki/' +
+ encodeURIComponent( this.page ) + '?body=1';
+
+ request( url,
function ( error, response, body ) {
if ( error ) {
deferred.reject( new Error( error ) );
--
To view, visit https://gerrit.wikimedia.org/r/201095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d5c1e0764f67215802430f2fcd76c5790e4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: Subramanya Sastry
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] site tests: Correct debug output - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] site tests: Correct debug output
..
[FIX] site tests: Correct debug output
The patch 3fd46e9a assumed that the links were actual Link instances but
are actually Page instances so the correct methods need to be used.
Change-Id: I7617e643d568973b76322fd3cfe97d0e930c25f3
---
M tests/site_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/site_tests.py b/tests/site_tests.py
index b58bbd5..50ec5d5 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -374,7 +374,7 @@
print('FAILURE wrt T92856:')
print(u'Sym. difference: "{0}"'.format(
u'", "'.join(
- u'{0}@{1}'.format(link.namespace, link.title)
+ u'{0}@{1}'.format(link.namespace(),
link.title(withNamespace=False))
for link in namespace_links ^ links)))
self.assertCountEqual(
set(mysite.pagelinks(mainpage, namespaces=[0, 1])) - links, [])
--
To view, visit https://gerrit.wikimedia.org/r/202696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7617e643d568973b76322fd3cfe97d0e930c25f3
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata - fix problem with edit links on diff view, ... - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikidata - fix problem with edit links on diff view, etc.
..
Update Wikidata - fix problem with edit links on diff view, etc.
Change-Id: Ic9bff2d3c5564e16c8b5a19de96e824c112872c5
---
M composer.lock
M extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
M vendor/composer/installed.json
3 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index a2cdbf8..5c007e4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1208,12 +1208,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "8f5482a72728b91793d32d534c120719f71727ca"
+"reference": "af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8f5482a72728b91793d32d534c120719f71727ca";,
-"reference": "8f5482a72728b91793d32d534c120719f71727ca",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c";,
+"reference": "af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c",
"shasum": ""
},
"require": {
@@ -1281,7 +1281,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2015-04-06 20:29:05"
+"time": "2015-04-08 08:09:44"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
index 9d5d7d8..475617c 100644
--- a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
+++ b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
@@ -16,7 +16,8 @@
var $entityview = $( '.wikibase-entityview' );
var entityInitializer = new wb.EntityInitializer( 'wbEntity' );
- var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' );
+ var canEdit = !mw.config.get( 'wbUserIsBlocked' ) &&
mw.config.get( 'wbUserCanEdit' )
+ && mw.config.get( 'wbIsEditView' );
if( canEdit ) {
initToolbarController( $entityview );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ffd5b86..9fd6a93 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1296,12 +1296,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "8f5482a72728b91793d32d534c120719f71727ca"
+"reference": "af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8f5482a72728b91793d32d534c120719f71727ca";,
-"reference": "8f5482a72728b91793d32d534c120719f71727ca",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c";,
+"reference": "af0ad51dc4a30498e1fb3b7eb14ba47006b4b63c",
"shasum": ""
},
"require": {
@@ -1328,7 +1328,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
-"time": "2015-04-06 20:29:05",
+"time": "2015-04-08 08:09:44",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/202700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9bff2d3c5564e16c8b5a19de96e824c112872c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf24
Gerrit-Owner: Aude
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata - fix issue with diff view - change (mediawiki/core)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/202702 Change subject: Update Wikidata - fix issue with diff view .. Update Wikidata - fix issue with diff view Change-Id: I4712392f37ffb03b7662fa2bb0835855d4d910d8 --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/02/202702/1 diff --git a/extensions/Wikidata b/extensions/Wikidata index cb6ad4c..03627a2 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit cb6ad4ccb462b9edfdc7279d0e905fce38fa59dd +Subproject commit 03627a2b72db6da8040a317796247524cbf98242 -- To view, visit https://gerrit.wikimedia.org/r/202702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4712392f37ffb03b7662fa2bb0835855d4d910d8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf24 Gerrit-Owner: Aude ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update cxserver to 95a18ed - change (mediawiki...deploy)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/202703 Change subject: Update cxserver to 95a18ed .. Update cxserver to 95a18ed Changes: * 95a18ed Merge "Parsoid: Fetch the body HTML instead of full document" |\ | * 275e3cb Parsoid: Fetch the body HTML instead of full document * | 7518aa4 config: Add en->sh and mk->sh Apertium MT pairs |/ * a538272 config: Add Gujarati (gu) in source and target * 8831f27 config: Add languages and MT support * b48b291 config: Add Xhosa (xh) in list of languages Change-Id: I0675191c9535ff7e2f7844f06c16d533f1e0710e --- M src 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy refs/changes/03/202703/1 diff --git a/src b/src index 2695a31..95a18ed 16 --- a/src +++ b/src -Subproject commit 2695a311e152ff0d65480927a88178acd878 +Subproject commit 95a18edfd04ef65ba95b5e2f91e3c876ac0e56f0 -- To view, visit https://gerrit.wikimedia.org/r/202703 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0675191c9535ff7e2f7844f06c16d533f1e0710e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver/deploy Gerrit-Branch: master Gerrit-Owner: KartikMistry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop dead code and narrow interfaces in WikibaseApiTestCase - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202704
Change subject: Drop dead code and narrow interfaces in WikibaseApiTestCase
..
Drop dead code and narrow interfaces in WikibaseApiTestCase
* Drop unused static class variables.
* Drop login() method, it became redundant after removing the variable.
* Drop unused assert method.
* Remove not needed static keyword from method.
* Make all methods protected, they are not meant to be used public.
* Add array type hints.
* Add and fix doc tags.
Change-Id: Ia20b4bd9c5a1049f00e8f7f424616d274703789a
---
M repo/tests/phpunit/includes/api/ApiModuleTestHelper.php
M repo/tests/phpunit/includes/api/BotEditTest.php
M repo/tests/phpunit/includes/api/EditEntityTest.php
M repo/tests/phpunit/includes/api/LinkTitlesTest.php
M repo/tests/phpunit/includes/api/ModifyTermTestCase.php
M repo/tests/phpunit/includes/api/SetAliasesTest.php
M repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
7 files changed, 62 insertions(+), 77 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/04/202704/1
diff --git a/repo/tests/phpunit/includes/api/ApiModuleTestHelper.php
b/repo/tests/phpunit/includes/api/ApiModuleTestHelper.php
index e81881b..5a53fc1 100644
--- a/repo/tests/phpunit/includes/api/ApiModuleTestHelper.php
+++ b/repo/tests/phpunit/includes/api/ApiModuleTestHelper.php
@@ -27,7 +27,7 @@
*
* @return ApiBase
*/
- public function newApiModule( $instantiator, $name, $params, User $user
= null ) {
+ public function newApiModule( $instantiator, $name, array $params, User
$user = null ) {
if ( !$user ) {
$user = $GLOBALS['wgUser'];
}
@@ -54,7 +54,7 @@
*
* @param array $response
*/
- public function assertResultSuccess( $response ) {
+ public function assertResultSuccess( array $response ) {
Assert::assertArrayHasKey( 'success', $response, "Missing
'success' marker in response." );
}
@@ -85,7 +85,7 @@
* @param string[] $path
* @param array $response
*/
- public function assertResultHasKeyInPath( $path, $response ) {
+ public function assertResultHasKeyInPath( array $path, array $response
) {
$obj = $response;
$p = '/';
diff --git a/repo/tests/phpunit/includes/api/BotEditTest.php
b/repo/tests/phpunit/includes/api/BotEditTest.php
index 7ad0607..a8f97ac 100644
--- a/repo/tests/phpunit/includes/api/BotEditTest.php
+++ b/repo/tests/phpunit/includes/api/BotEditTest.php
@@ -96,7 +96,7 @@
* @dataProvider provideData
*/
public function testBotEdits( $params, $expected ) {
- $this->login( 'wbbot' );
+ $this->doLogin( 'wbbot' );
// -- do the request
--
if( array_key_exists( 'handle', $params ) ){
diff --git a/repo/tests/phpunit/includes/api/EditEntityTest.php
b/repo/tests/phpunit/includes/api/EditEntityTest.php
index 6ac55d0..0306bbf 100644
--- a/repo/tests/phpunit/includes/api/EditEntityTest.php
+++ b/repo/tests/phpunit/includes/api/EditEntityTest.php
@@ -24,7 +24,14 @@
*/
class EditEntityTest extends WikibaseApiTestCase {
+ /**
+* @var string[]
+*/
private static $idMap;
+
+ /**
+* @var bool
+*/
private static $hasSetup;
public function setup() {
diff --git a/repo/tests/phpunit/includes/api/LinkTitlesTest.php
b/repo/tests/phpunit/includes/api/LinkTitlesTest.php
index a85f46c..8bb6962 100644
--- a/repo/tests/phpunit/includes/api/LinkTitlesTest.php
+++ b/repo/tests/phpunit/includes/api/LinkTitlesTest.php
@@ -74,7 +74,7 @@
// check the item in the database
---
if ( array_key_exists( 'id', $result['entity'] ) ) {
$item = $this->loadEntity( $result['entity']['id'] );
- $links = self::flattenArray( $item['sitelinks'],
'site', 'title' );
+ $links = $this->flattenArray( $item['sitelinks'],
'site', 'title' );
$this->assertEquals( $params['fromtitle'], $links[
$params['fromsite'] ], 'wrong link target' );
$this->assertEquals( $params['totitle'], $links[
$params['tosite'] ], 'wrong link target' );
}
diff --git a/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
b/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
index 79d748d..23260f2 100644
--- a/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
+++ b/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
@@ -105,7 +105,7 @@
$dbEntity = $this->loadEntity( EntityTestHelper::getId( 'Empty'
) );
if( count
[MediaWiki-commits] [Gerrit] Test untested branch nodes - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202705
Change subject: Test untested branch nodes
..
Test untested branch nodes
Change-Id: I581f9f5906b1450e4f8518532cbe92edb78f0486
---
M tests/dm/ve.dm.example.js
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/05/202705/1
diff --git a/tests/dm/ve.dm.example.js b/tests/dm/ve.dm.example.js
index 05f5f28..4e8e9b4 100644
--- a/tests/dm/ve.dm.example.js
+++ b/tests/dm/ve.dm.example.js
@@ -3021,6 +3021,21 @@
],
normalizedBody: '',
clipboardBody: ''
+ },
+ 'other branch nodes': {
+ body: 'FooBar',
+ data: [
+ { type: 'center' },
+ { type: 'paragraph', internal: { generated: 'wrapper' }
},
+ 'F', 'o', 'o',
+ { type: '/paragraph' },
+ { type: '/center' },
+ { type: 'blockquote' },
+ 'B', 'a', 'r',
+ { type: '/blockquote' },
+ { type: 'internalList' },
+ { type: '/internalList' }
+ ]
}
};
--
To view, visit https://gerrit.wikimedia.org/r/202705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I581f9f5906b1450e4f8518532cbe92edb78f0486
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactor switchEditor - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202706
Change subject: Refactor switchEditor
..
Refactor switchEditor
Change-Id: I3fae37b0319f6e85894fbd3cb47469982b5dc6b3
---
M modules/editor/ext.flow.editor.js
M modules/editor/ext.flow.parsoid.js
2 files changed, 67 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/06/202706/1
diff --git a/modules/editor/ext.flow.editor.js
b/modules/editor/ext.flow.editor.js
index 59b7731..6071c5c 100644
--- a/modules/editor/ext.flow.editor.js
+++ b/modules/editor/ext.flow.editor.js
@@ -183,32 +183,75 @@
* @return {jQuery.Promise} Will resolve once editor instance
is loaded
*/
switchEditor: function ( $node, desiredEditor ) {
- var content, oldFormat, newFormat,
- editorList = mw.config.get( 'wgFlowEditorList'
),
+ var editorList = mw.config.get( 'wgFlowEditorList' ),
editor = mw.flow.editor.getEditor( $node ),
- deferred = $.Deferred(),
- performSwitch = function () {
- if (
mw.flow.editors[desiredEditor].static.isSupported() ) {
- content =
editor.getRawContent();
+ deferred = $.Deferred();
- oldFormat =
editor.constructor.static.format;
- mw.flow.editor.editor =
mw.flow.editors[desiredEditor];
- newFormat =
mw.flow.editor.editor.static.format;
+ /*
+* A lot of these steps are async & they'll be chained
together.
+* .then() takes callback functions (for done & fail,
but only using
+* done callbacks here). The difference when compared
to .done is
+* that it can return something that will then be fed
to the next
+* callback, so 1 callback can use the result of the
previous.
+* Instead of a value, a callback can also return a
promise, in
+* which case the next callback will only be called
once that promise
+* is resolved, receiving the value the promise was
resolved with.
+* If any callback fails (returns a deferred.reject()),
it'll be
+* "caught" by the .fail() callback at the end.
+*/
+ deferred
+ // load requested editor
+ .then( function ( desiredEditor ) {
+ return mw.loader.using(
'ext.flow.editors.' + desiredEditor );
+ } )
- mw.flow.editor.destroy( $node );
-
- // convert content from current
editor's format to the
- // one we're switching to, then
fire up that editor
- mw.flow.parsoid.convert(
oldFormat, newFormat, content )
- .done( function(
content ) {
-
mw.flow.editor.load( $node, content );
- });
-
- deferred.resolve();
- } else {
- deferred.reject(
'editor-not-supported' );
+ // kill existing editor
+ .then( function () {
+ if (
!mw.flow.editors[desiredEditor].static.isSupported() ) {
+ return $.Deferred().reject(
'editor-not-supported' );
}
- };
+
+ var content = editor.getRawContent(),
+ oldFormat =
editor.constructor.static.format,
+ newFormat;
+
+ mw.flow.editor.editor =
mw.flow.editors[desiredEditor];
+ newFormat =
mw.flow.editor.editor.static.format;
+
+ mw.flow.editor.destroy( $node );
+
+ // prepare data to feed into conversion
+ return {
+
[MediaWiki-commits] [Gerrit] Remove ext.flow.parsoid.js - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202707
Change subject: Remove ext.flow.parsoid.js
..
Remove ext.flow.parsoid.js
switchEditor was the only caller...
Change-Id: Iacca8d64236160ed202412ca6f5e7e22fd3f7db2
---
M Resources.php
M modules/editor/ext.flow.editor.js
D modules/editor/ext.flow.parsoid.js
3 files changed, 9 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/07/202707/1
diff --git a/Resources.php b/Resources.php
index 9511d0a..3aa7477 100644
--- a/Resources.php
+++ b/Resources.php
@@ -432,7 +432,6 @@
'dependencies' => array(
'oojs',
'mediawiki.user',
- 'ext.flow.parsoid',
// specific editor (ext.flow.editors.*) dependencies
(if any) will be loaded via JS
),
) + $mobile,
@@ -499,11 +498,6 @@
),
),
- 'ext.flow.parsoid' => $flowResourceTemplate + array(
- 'scripts' => array(
- 'editor/ext.flow.parsoid.js',
- ),
- ) + $mobile,
'ext.flow.jquery.conditionalScroll' => $flowResourceTemplate + array(
'scripts' => array(
'engine/misc/jquery.conditionalScroll.js',
diff --git a/modules/editor/ext.flow.editor.js
b/modules/editor/ext.flow.editor.js
index 6071c5c..117e18b 100644
--- a/modules/editor/ext.flow.editor.js
+++ b/modules/editor/ext.flow.editor.js
@@ -230,11 +230,18 @@
// convert content to new editor format
.then( function ( data ) {
- return mw.flow.parsoid.convert(
data.from, data.to, data.content );
+ return new mw.Api().post( {
+ action: 'flow-parsoid-utils',
+ from: data.from,
+ to: data.to,
+ content: data.content,
+ title: mw.config.get(
'wgPageName' )
+ } );
} )
// load new editor with converted data
- .then( function ( content ) {
+ .then( function ( data ) {
+ var content =
data['flow-parsoid-utils'].content;
return mw.flow.editor.load( $node,
content );
} )
diff --git a/modules/editor/ext.flow.parsoid.js
b/modules/editor/ext.flow.parsoid.js
deleted file mode 100644
index c0a..000
--- a/modules/editor/ext.flow.parsoid.js
+++ /dev/null
@@ -1,46 +0,0 @@
-( function ( $, mw ) {
- 'use strict';
-
- mw.flow = mw.flow || {}; // create mw.flow globally
- mw.flow.parsoid = {
- /**
-* @param {string} from Input format: html|wikitext
-* @param {string} to Desired output format: html|wikitext
-* @param {string} content Content to convert
-* @param {string} [title] Page title
-* @return {jQuery.Promise} Will resolve with converted content
as data
-*/
- convert: function ( from, to, content, title ) {
- var deferred = $.Deferred(),
- api = new mw.Api();
-
- if ( content === '' ) {
- return deferred.resolve( content );
- }
-
- if ( from === to ) {
- return deferred.resolve( content );
- }
-
- if ( !title ) {
- title = mw.config.get( 'wgPageName' );
- }
-
- api.post( {
- action: 'flow-parsoid-utils',
- from: from,
- to: to,
- content: content,
- title: title
- } )
- .done( function ( data ) {
- deferred.resolve(
data['flow-parsoid-utils'].content );
- } )
- .fail( function () {
- deferred.reject( 'failed-parsoid-convert' );
- } );
-
- return deferred.promise();
- }
- };
-} ( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/202707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Ger
[MediaWiki-commits] [Gerrit] Update Wikidata - fix issue with diff view - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Wikidata - fix issue with diff view .. Update Wikidata - fix issue with diff view Change-Id: I4712392f37ffb03b7662fa2bb0835855d4d910d8 --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Wikidata b/extensions/Wikidata index cb6ad4c..03627a2 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit cb6ad4ccb462b9edfdc7279d0e905fce38fa59dd +Subproject commit 03627a2b72db6da8040a317796247524cbf98242 -- To view, visit https://gerrit.wikimedia.org/r/202702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4712392f37ffb03b7662fa2bb0835855d4d910d8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf24 Gerrit-Owner: Aude Gerrit-Reviewer: Aude Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Provide URLs for licenses mentioned in Phabricator footer - change (operations/puppet)
Aklapper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202708
Change subject: Provide URLs for licenses mentioned in Phabricator footer
..
Provide URLs for licenses mentioned in Phabricator footer
Bug: T94946
Change-Id: Ib8d6c30f0098a8b04c4c123e98225b0a04a532ff
---
M modules/phabricator/data/fixed_settings.yaml
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/202708/1
diff --git a/modules/phabricator/data/fixed_settings.yaml
b/modules/phabricator/data/fixed_settings.yaml
index f74c090..79ebde7 100644
--- a/modules/phabricator/data/fixed_settings.yaml
+++ b/modules/phabricator/data/fixed_settings.yaml
@@ -6,11 +6,13 @@
# associated daemons do not merge changes to this file.
ui.footer-items:
- - {name: 'Text is available under the Creative Commons
Attribution-ShareAlike 3.0 License; code is available under the GNU General
Public License or other appropriate open source licenses. By using this site,
you agree to the Terms of Use and Privacy Policy.'}
+ - {name: 'Text is available under the Creative Commons
Attribution-ShareAlike 3.0 License (CC-BY-SA); code is available under the GNU
General Public License (GPL) or other appropriate open source licenses. By
using this site, you agree to the Terms of Use and Privacy Policy.'}
- {href: 'https://www.wikimediafoundation.org/', name: Wikimedia Foundation}
- {href: 'https://wikimediafoundation.org/wiki/Privacy_policy', name:
Privacy Policy}
- {href: 'https://wikimediafoundation.org/wiki/Terms_of_Use/Phabricator',
name: Terms of Use}
- {href:
'https://wikimediafoundation.org/wiki/Wikimedia:General_disclaimer', name:
Disclaimer}
+ - {href: 'https://creativecommons.org/licenses/by-sa/3.0/', name: CC-BY-SA}
+ - {href: 'https://www.gnu.org/licenses/', name: GPL}
# Due to issues with 'gd' rending thumbnails for
# Mimetype image/x-icon and image/icon
--
To view, visit https://gerrit.wikimedia.org/r/202708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8d6c30f0098a8b04c4c123e98225b0a04a532ff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aklapper
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove the unused SiteLinkLookup::countLinks - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202709
Change subject: Remove the unused SiteLinkLookup::countLinks
..
Remove the unused SiteLinkLookup::countLinks
And the implementations.
Change-Id: I69bb5da3f3cf31a0b5c645ec41c004597fff7c0a
---
M lib/includes/store/SiteLinkLookup.php
M lib/includes/store/sql/SiteLinkTable.php
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
5 files changed, 0 insertions(+), 90 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/09/202709/1
diff --git a/lib/includes/store/SiteLinkLookup.php
b/lib/includes/store/SiteLinkLookup.php
index 1e4a42b..74b025c 100644
--- a/lib/includes/store/SiteLinkLookup.php
+++ b/lib/includes/store/SiteLinkLookup.php
@@ -53,22 +53,6 @@
public function getItemIdForLink( $globalSiteId, $pageTitle );
/**
-* Returns how many links match the provided conditions.
-*
-* Note: this is an exact count which is expensive if the result set is
big.
-* This means you probably do not want to call this method without any
conditions.
-*
-* @since 0.3
-*
-* @param int[] $numericIds Numeric (unprefixed) item ids
-* @param string[] $siteIds
-* @param string[] $pageNames
-*
-* @return int
-*/
- public function countLinks( array $numericIds = array(), array $siteIds
= array(), array $pageNames = array() );
-
- /**
* Returns the links that match the provided conditions.
* The links are returned as arrays with the following elements in
specified order:
* - string siteId
diff --git a/lib/includes/store/sql/SiteLinkTable.php
b/lib/includes/store/sql/SiteLinkTable.php
index 9a9248b..a3cb1d0 100644
--- a/lib/includes/store/sql/SiteLinkTable.php
+++ b/lib/includes/store/sql/SiteLinkTable.php
@@ -361,43 +361,6 @@
}
/**
-* @see SiteLinkLookup::countLinks
-*
-* @param int[] $numericIds Numeric (unprefixed) item ids
-* @param string[] $siteIds
-* @param string[] $pageNames
-*
-* @return int
-*/
- public function countLinks( array $numericIds = array(), array $siteIds
= array(), array $pageNames = array() ) {
- $dbr = $this->getConnection( DB_SLAVE );
-
- $conditions = array();
-
- if ( $numericIds !== array() ) {
- $conditions['ips_item_id'] = $numericIds;
- }
-
- if ( $siteIds !== array() ) {
- $conditions['ips_site_id'] = $siteIds;
- }
-
- if ( $pageNames !== array() ) {
- $conditions['ips_site_page'] = $pageNames;
- }
-
- $res = $dbr->selectRow(
- $this->table,
- array( 'COUNT(*) AS rowcount' ),
- $conditions,
- __METHOD__
- )->rowcount;
-
- $this->releaseConnection( $dbr );
- return $res;
- }
-
- /**
* @see SiteLinkLookup::getLinks
*
* @param int[] $numericIds Numeric (unprefixed) item ids
diff --git a/lib/tests/phpunit/MockRepository.php
b/lib/tests/phpunit/MockRepository.php
index d2c5af4..5b7197c 100644
--- a/lib/tests/phpunit/MockRepository.php
+++ b/lib/tests/phpunit/MockRepository.php
@@ -391,19 +391,6 @@
}
/**
-* @see SiteLinkLookup::countLinks
-*
-* @param int[] $numericIds Numeric (unprefixed) item ids
-* @param string[] $siteIds
-* @param string[] $pageNames
-*
-* @return int
-*/
- public function countLinks( array $numericIds = array(), array $siteIds
= array(), array $pageNames = array() ) {
- return count( $this->getLinks( $numericIds, $siteIds,
$pageNames ) );
- }
-
- /**
* @see SiteLinkLookup::getLinks
*
* @param int[] $numericIds Numeric (unprefixed) item ids
diff --git a/lib/tests/phpunit/MockRepositoryTest.php
b/lib/tests/phpunit/MockRepositoryTest.php
index 703d1cc..5a92014 100644
--- a/lib/tests/phpunit/MockRepositoryTest.php
+++ b/lib/tests/phpunit/MockRepositoryTest.php
@@ -304,19 +304,6 @@
$this->assertArrayEquals( $expectedLinks, $links );
}
- /**
-* @dataProvider provideGetLinks
-*/
- public function testCountLinks( array $items, array $itemIds, array
$sites, array $pages, array $expectedLinks ) {
- foreach ( $items as $item ) {
- $this->repo->putEntity( $item );
- }
-
- $n = $this->repo->countLinks( $itemIds, $sites, $pages );
-
- $t
[MediaWiki-commits] [Gerrit] Test untested branch nodes - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Test untested branch nodes
..
Test untested branch nodes
Change-Id: I581f9f5906b1450e4f8518532cbe92edb78f0486
---
M tests/dm/ve.dm.example.js
1 file changed, 15 insertions(+), 0 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/dm/ve.dm.example.js b/tests/dm/ve.dm.example.js
index 05f5f28..4e8e9b4 100644
--- a/tests/dm/ve.dm.example.js
+++ b/tests/dm/ve.dm.example.js
@@ -3021,6 +3021,21 @@
],
normalizedBody: '',
clipboardBody: ''
+ },
+ 'other branch nodes': {
+ body: 'FooBar',
+ data: [
+ { type: 'center' },
+ { type: 'paragraph', internal: { generated: 'wrapper' }
},
+ 'F', 'o', 'o',
+ { type: '/paragraph' },
+ { type: '/center' },
+ { type: 'blockquote' },
+ 'B', 'a', 'r',
+ { type: '/blockquote' },
+ { type: 'internalList' },
+ { type: '/internalList' }
+ ]
}
};
--
To view, visit https://gerrit.wikimedia.org/r/202705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I581f9f5906b1450e4f8518532cbe92edb78f0486
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove the unused SiteLinkLookup::countLinks - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove the unused SiteLinkLookup::countLinks
..
Remove the unused SiteLinkLookup::countLinks
And the implementations.
Change-Id: I69bb5da3f3cf31a0b5c645ec41c004597fff7c0a
---
M lib/includes/store/SiteLinkLookup.php
M lib/includes/store/sql/SiteLinkTable.php
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
5 files changed, 0 insertions(+), 90 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/store/SiteLinkLookup.php
b/lib/includes/store/SiteLinkLookup.php
index 1e4a42b..74b025c 100644
--- a/lib/includes/store/SiteLinkLookup.php
+++ b/lib/includes/store/SiteLinkLookup.php
@@ -53,22 +53,6 @@
public function getItemIdForLink( $globalSiteId, $pageTitle );
/**
-* Returns how many links match the provided conditions.
-*
-* Note: this is an exact count which is expensive if the result set is
big.
-* This means you probably do not want to call this method without any
conditions.
-*
-* @since 0.3
-*
-* @param int[] $numericIds Numeric (unprefixed) item ids
-* @param string[] $siteIds
-* @param string[] $pageNames
-*
-* @return int
-*/
- public function countLinks( array $numericIds = array(), array $siteIds
= array(), array $pageNames = array() );
-
- /**
* Returns the links that match the provided conditions.
* The links are returned as arrays with the following elements in
specified order:
* - string siteId
diff --git a/lib/includes/store/sql/SiteLinkTable.php
b/lib/includes/store/sql/SiteLinkTable.php
index 9a9248b..a3cb1d0 100644
--- a/lib/includes/store/sql/SiteLinkTable.php
+++ b/lib/includes/store/sql/SiteLinkTable.php
@@ -361,43 +361,6 @@
}
/**
-* @see SiteLinkLookup::countLinks
-*
-* @param int[] $numericIds Numeric (unprefixed) item ids
-* @param string[] $siteIds
-* @param string[] $pageNames
-*
-* @return int
-*/
- public function countLinks( array $numericIds = array(), array $siteIds
= array(), array $pageNames = array() ) {
- $dbr = $this->getConnection( DB_SLAVE );
-
- $conditions = array();
-
- if ( $numericIds !== array() ) {
- $conditions['ips_item_id'] = $numericIds;
- }
-
- if ( $siteIds !== array() ) {
- $conditions['ips_site_id'] = $siteIds;
- }
-
- if ( $pageNames !== array() ) {
- $conditions['ips_site_page'] = $pageNames;
- }
-
- $res = $dbr->selectRow(
- $this->table,
- array( 'COUNT(*) AS rowcount' ),
- $conditions,
- __METHOD__
- )->rowcount;
-
- $this->releaseConnection( $dbr );
- return $res;
- }
-
- /**
* @see SiteLinkLookup::getLinks
*
* @param int[] $numericIds Numeric (unprefixed) item ids
diff --git a/lib/tests/phpunit/MockRepository.php
b/lib/tests/phpunit/MockRepository.php
index d2c5af4..5b7197c 100644
--- a/lib/tests/phpunit/MockRepository.php
+++ b/lib/tests/phpunit/MockRepository.php
@@ -391,19 +391,6 @@
}
/**
-* @see SiteLinkLookup::countLinks
-*
-* @param int[] $numericIds Numeric (unprefixed) item ids
-* @param string[] $siteIds
-* @param string[] $pageNames
-*
-* @return int
-*/
- public function countLinks( array $numericIds = array(), array $siteIds
= array(), array $pageNames = array() ) {
- return count( $this->getLinks( $numericIds, $siteIds,
$pageNames ) );
- }
-
- /**
* @see SiteLinkLookup::getLinks
*
* @param int[] $numericIds Numeric (unprefixed) item ids
diff --git a/lib/tests/phpunit/MockRepositoryTest.php
b/lib/tests/phpunit/MockRepositoryTest.php
index 703d1cc..5a92014 100644
--- a/lib/tests/phpunit/MockRepositoryTest.php
+++ b/lib/tests/phpunit/MockRepositoryTest.php
@@ -304,19 +304,6 @@
$this->assertArrayEquals( $expectedLinks, $links );
}
- /**
-* @dataProvider provideGetLinks
-*/
- public function testCountLinks( array $items, array $itemIds, array
$sites, array $pages, array $expectedLinks ) {
- foreach ( $items as $item ) {
- $this->repo->putEntity( $item );
- }
-
- $n = $this->repo->countLinks( $itemIds, $sites, $pages );
-
- $this->assertEquals( count( $expectedLinks )
[MediaWiki-commits] [Gerrit] Update from upstream - change (mediawiki...UniversalLanguageSelector)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202710
Change subject: Update from upstream
..
Update from upstream
To github version 345097a8bd.
Show the Common language section only if the list is long enough
Bug: T76196
Change-Id: I6aa0d951657962103c356f6254ab4102e5ee765d
---
M lib/jquery.uls/src/jquery.uls.core.js
1 file changed, 30 insertions(+), 17 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/10/202710/1
diff --git a/lib/jquery.uls/src/jquery.uls.core.js
b/lib/jquery.uls/src/jquery.uls.core.js
index fba4859..201d384 100644
--- a/lib/jquery.uls/src/jquery.uls.core.js
+++ b/lib/jquery.uls/src/jquery.uls.core.js
@@ -54,6 +54,30 @@
/*jshint multistr:false */
/**
+* Count the number of keys in an object.
+* Works in a cross-browser way.
+* @param {Object} The object.
+*/
+ function objectLength ( obj ) {
+ var count, key;
+
+ // Some old browsers don't support Object.keys
+ if ( Object.keys ) {
+ return Object.keys( obj ).length;
+ }
+
+ count = 0;
+
+ for ( key in obj ) {
+ if ( Object.prototype.hasOwnProperty.call( obj, key ) )
{
+ count++;
+ }
+ }
+
+ return count;
+ }
+
+ /**
* ULS Public class definition
*/
ULS = function ( element, options ) {
@@ -208,7 +232,7 @@
* Bind the UI elements with their event listeners
*/
listen: function () {
- var lcd, columnsOptions,
+ var lcd, columnsOptions, languagesCount,
uls = this;
columnsOptions = {
@@ -235,10 +259,12 @@
this.$menu.on( 'keydown', $.proxy(
this.keypress, this ) );
}
+ languagesCount = objectLength( this.options.languages );
lcd = this.$resultsView.lcd( {
languages: this.languages,
columns: columnsOptions[ this.getMenuWidth() ],
- quickList: this.options.quickList,
+
+ quickList: languagesCount > 12 ?
this.options.quickList : false,
clickhandler: $.proxy( this.select, this ),
source: this.$languageFilter,
showRegions: this.options.showRegions,
@@ -354,26 +380,13 @@
* @return string
*/
getMenuWidth: function () {
- var language,
- languagesCount = 0;
+ var languagesCount;
if ( this.options.menuWidth ) {
return this.options.menuWidth;
}
- // IE8 does not support Object.keys
- if ( Object.keys ) {
- languagesCount = Object.keys(
this.options.languages ).length;
- } else {
- for ( language in this.options.languages ) {
- if (
Object.prototype.hasOwnProperty.call(
- this.options.languages,
- language
- ) ) {
- languagesCount++;
- }
- }
- }
+ languagesCount = objectLength( this.options.languages );
if ( languagesCount < 12 ) {
return 'narrow';
--
To view, visit https://gerrit.wikimedia.org/r/202710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6aa0d951657962103c356f6254ab4102e5ee765d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't encoding single hyphens in comments, just doubles - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202711
Change subject: Don't encoding single hyphens in comments, just doubles
..
Don't encoding single hyphens in comments, just doubles
Single hyphens are common and not invalid XML.
Change-Id: Ib0f726e6388da4c0bba7b8ac0ccfc64bd3eee8ac
---
M src/dm/nodes/ve.dm.CommentNode.js
M tests/dm/ve.dm.example.js
2 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/11/202711/1
diff --git a/src/dm/nodes/ve.dm.CommentNode.js
b/src/dm/nodes/ve.dm.CommentNode.js
index 054dc34..5f460cf 100644
--- a/src/dm/nodes/ve.dm.CommentNode.js
+++ b/src/dm/nodes/ve.dm.CommentNode.js
@@ -60,9 +60,11 @@
return [ span ];
} else {
// Real comment node
- // Encode & - > (see T95040)
- data = dataElement.attributes.text.replace( /[-&>]/g, function
( c ) {
- return '&#' + c.charCodeAt(0) + ';';
+ // Encode '&', '--' and '>' (see T95040)
+ data = dataElement.attributes.text.replace( /(--|&|>)/g,
function ( match ) {
+ return match.split( '' ).map( function ( c ) {
+ return '&#' + c.charCodeAt( 0 ) + ';';
+ } ).join( '' );
} );
return [ doc.createComment( data ) ];
}
diff --git a/tests/dm/ve.dm.example.js b/tests/dm/ve.dm.example.js
index 05f5f28..351c0eb 100644
--- a/tests/dm/ve.dm.example.js
+++ b/tests/dm/ve.dm.example.js
@@ -2998,16 +2998,16 @@
fromDataBody: 'abcde'
},
'comment escaping': {
- body: '',
+ body: '',
data: [
{ type: 'paragraph' },
- { type: 'comment', attributes: { text: 'Foo-->b&r' } },
+ { type: 'comment', attributes: { text: 'Foo-bar-->b&z'
} },
{ type: '/comment' },
{ type: '/paragraph' },
{ type: 'internalList' },
{ type: '/internalList' }
],
- clipboardBody: ''
+ clipboardBody: ''
},
'comment escaping is normalized': {
body: '',
--
To view, visit https://gerrit.wikimedia.org/r/202711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0f726e6388da4c0bba7b8ac0ccfc64bd3eee8ac
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix rename of test-coverage to coverage in clean - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202712
Change subject: Fix rename of test-coverage to coverage in clean
..
Fix rename of test-coverage to coverage in clean
Change-Id: I336935f95186efce4282ada0f59996bd1de83ede
---
M Gruntfile.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/12/202712/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 84012f9..2632a99 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -43,7 +43,7 @@
grunt.initConfig( {
pkg: grunt.file.readJSON( 'package.json' ),
clean: {
- dist: [ 'dist/*', 'test-coverage/*' ]
+ dist: [ 'dist/*', 'coverage/*' ]
},
concat: {
options: {
--
To view, visit https://gerrit.wikimedia.org/r/202712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I336935f95186efce4282ada0f59996bd1de83ede
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Get rid of timeouts in ve init - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202713
Change subject: Get rid of timeouts in ve init
..
Get rid of timeouts in ve init
Based on VisualEditor/lib/ve/demos/ve/demo.js, those timeouts don't seem to be
necessary (anymore?)
I've move some other minor things around, but code stayed mostly the same.
Still seems to work, as far as I can tell :p
Change-Id: I4f2107c4eb03fb10218d659deb5831348e7788da
---
M modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js
1 file changed, 32 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/13/202713/1
diff --git
a/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js
b/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js
index 91eb1a1..86dbb90 100644
--- a/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js
+++ b/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js
@@ -34,9 +34,8 @@
* @param {string} [content='']
*/
mw.flow.editors.visualeditor.prototype.init = function ( content ) {
- var $veNode, htmlDoc, dmDoc, target,
- $focusedElement = $( ':focus' ),
- flowEditor = this;
+ var $veNode, surface, $documentNode,
+ $focusedElement = $( ':focus' );
// ve.createDocumentFromHtml documents support for an empty
string
// to create an empty document, but does not mention other
falsy values.
@@ -45,56 +44,49 @@
// add i18n messages to VE
ve.init.platform.addMessages( mw.messages.values );
- $.removeSpinner( 'flow-editor-loading' );
-
- target = this.target = new mw.flow.ve.Target();
-
- htmlDoc = ve.createDocumentFromHtml( content ); // HTMLDocument
+ this.target = new mw.flow.ve.Target();
// Based on ve.init.mw.Target.prototype.setupSurface
- dmDoc = this.dmDoc = ve.dm.converter.getModelFromDom(
- htmlDoc,
+ this.dmDoc = ve.dm.converter.getModelFromDom(
+ ve.createDocumentFromHtml( content ), // HTMLDocument
null,
mw.config.get( 'wgVisualEditor' ).pageLanguageCode,
mw.config.get( 'wgVisualEditor' ).pageLanguageDir
);
- setTimeout( function () {
- var surface = target.addSurface( dmDoc ),
- surfaceView = surface.getView(),
- $documentNode =
surfaceView.getDocument().getDocumentNode().$element;
+ $.removeSpinner( 'flow-editor-loading' );
- $( target.$element ).insertAfter( flowEditor.$node );
+ // attach VE to DOM
+ surface = this.target.addSurface( this.dmDoc );
+ this.target.setSurface( surface );
+ console.log( this.target.$element );
+ this.target.$element.insertAfter( this.$node );
- $documentNode.addClass(
- // Add appropriately mw-content-ltr or mw-content-rtl
class
- 'mw-content-' + mw.config.get( 'wgVisualEditor'
).pageLanguageDir
- );
+ // add appropriately mw-content-ltr or mw-content-rtl class
+ $documentNode =
surface.getView().getDocument().getDocumentNode().$element;
+ $documentNode.addClass(
+ 'mw-content-' + mw.config.get( 'wgVisualEditor'
).pageLanguageDir
+ );
- setTimeout( function () {
- // focus VE instance if textarea had focus
- if ( !$focusedElement.length ||
flowEditor.$node.is( $focusedElement ) ) {
- surface.getView().focus();
- } else {
- $focusedElement.focus();
- }
+ // focus VE instance if textarea had focus
+ if ( !$focusedElement.length || this.$node.is( $focusedElement
) ) {
+ surface.getView().focus();
+ } else {
+ $focusedElement.focus();
+ }
- $veNode = surface.$element.find(
'.ve-ce-documentNode' );
+ $veNode = surface.$element.find( '.ve-ce-documentNode' );
+ $veNode.addClass( 'mw-ui-input' );
- $veNode.addClass( 'mw-ui-input' );
+ // simulate a keyup event on the original node, so the
validation code will
+ // pick up changes in the new node
+
[MediaWiki-commits] [Gerrit] build: Fix rename of test-coverage to coverage in clean task - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Fix rename of test-coverage to coverage in clean task
..
build: Fix rename of test-coverage to coverage in clean task
Change-Id: I336935f95186efce4282ada0f59996bd1de83ede
---
M Gruntfile.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index 84012f9..2632a99 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -43,7 +43,7 @@
grunt.initConfig( {
pkg: grunt.file.readJSON( 'package.json' ),
clean: {
- dist: [ 'dist/*', 'test-coverage/*' ]
+ dist: [ 'dist/*', 'coverage/*' ]
},
concat: {
options: {
--
To view, visit https://gerrit.wikimedia.org/r/202712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I336935f95186efce4282ada0f59996bd1de83ede
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] zuul: switch install to a Debian package - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202714
Change subject: zuul: switch install to a Debian package
..
zuul: switch install to a Debian package
Bug: T48552
Change-Id: I7eb60ed9ffbbb60140e1dcfd516db51732167ed0
---
D modules/zuul/files/zuul-merger.init
D modules/zuul/files/zuul.init
M modules/zuul/manifests/init.pp
M modules/zuul/manifests/merger.pp
M modules/zuul/manifests/server.pp
5 files changed, 13 insertions(+), 432 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/202714/1
diff --git a/modules/zuul/files/zuul-merger.init
b/modules/zuul/files/zuul-merger.init
deleted file mode 100755
index e3bda89..000
--- a/modules/zuul/files/zuul-merger.init
+++ /dev/null
@@ -1,145 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: zuul-merger
-# Required-Start:$remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Zuul Merger
-# Description: Trunk gating system
-### END INIT INFO
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Zuul Merger"
-NAME=zuul-merger
-DAEMON=/usr/local/bin/$NAME
-PIDFILE=/var/run/$NAME/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-USER=zuul
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-START_DAEMON=0
-DAEMON_ARGS=''
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-# Read configuration variable file if it is present
-if [ -r /etc/default/$NAME ] ; then
- . /etc/default/$NAME
-fi
-
-if ! [ "${START_DAEMON}" = "1" ] ; then
- log_daemon_msg "$DESC: /etc/default/$NAME is not set to START_DAEMON=1:
exiting"
- log_end_msg 1
- exit 0
-fi
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
-
- mkdir -p /var/run/$NAME
- chown $USER /var/run/$NAME
- ulimit -n 8192
- start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec
$DAEMON --test > /dev/null \
- || return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec
$DAEMON -- \
- $DAEMON_ARGS \
- || return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon --stop --signal 9 --pidfile $PIDFILE
- RETVAL="$?"
- [ "$RETVAL" = 2 ] && return 2
- rm -f /var/run/$NAME/*
- return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
- #
- # If the daemon can reload its configuration without
- # restarting (for example, when it is sent a SIGHUP),
- # then implement that here.
- #
- start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name
$NAME
- return 0
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- log_daemon_msg "Reloading $DESC" "$NAME"
- do_reload
- log_end_msg $?
- ;;
- restart)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- do_start
- ;;
- *)
- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
diff --git a/modules/zuu
[MediaWiki-commits] [Gerrit] Rename SiteLinkLookup::getEntityIdForSiteLink to getItemIdFo... - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202715
Change subject: Rename SiteLinkLookup::getEntityIdForSiteLink to
getItemIdForSiteLink
..
Rename SiteLinkLookup::getEntityIdForSiteLink to getItemIdForSiteLink
Because that's what it is.
Change-Id: I3356919fcdb9081e29edf43cd2ba0d1d469aa370
---
M client/WikibaseClient.hooks.php
M client/includes/DataAccess/PropertyParserFunction/Runner.php
M client/includes/Hooks/DeletePageNoticeCreator.php
M client/includes/Hooks/InfoActionHookHandler.php
M client/includes/Hooks/MovePageNoticeCreator.php
M client/includes/Hooks/OtherProjectsSidebarGenerator.php
M client/includes/LangLinkHandler.php
M client/includes/UpdateRepo/UpdateRepo.php
M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
M
client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
M client/tests/phpunit/includes/Hooks/DeletePageNoticeCreatorTest.php
M client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
M client/tests/phpunit/includes/Hooks/MovePageNoticeCreatorTest.php
M client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
M client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
M client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveTest.php
M lib/includes/store/CachingSiteLinkLookup.php
M lib/includes/store/SiteLinkLookup.php
M lib/includes/store/sql/SiteLinkTable.php
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/store/CachingSiteLinkLookupTest.php
M lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
22 files changed, 29 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/15/202715/1
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index aec9563..960242e 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -320,7 +320,7 @@
$wikibaseClient = WikibaseClient::getDefaultInstance();
$siteLinkLookup =
$wikibaseClient->getStore()->getSiteLinkLookup();
- return $siteLinkLookup->getEntityIdForSiteLink(
+ return $siteLinkLookup->getItemIdForSiteLink(
new SiteLink(
$wikibaseClient->getSettings()->getSetting(
'siteGlobalID' ),
$title->getFullText()
diff --git a/client/includes/DataAccess/PropertyParserFunction/Runner.php
b/client/includes/DataAccess/PropertyParserFunction/Runner.php
index d025e37..a150a47 100644
--- a/client/includes/DataAccess/PropertyParserFunction/Runner.php
+++ b/client/includes/DataAccess/PropertyParserFunction/Runner.php
@@ -87,7 +87,7 @@
private function getItemIdForConnectedPage( Parser $parser ) {
$title = $parser->getTitle();
$siteLink = new SiteLink( $this->siteId, $title->getFullText()
);
- $itemId = $this->siteLinkLookup->getEntityIdForSiteLink(
$siteLink );
+ $itemId = $this->siteLinkLookup->getItemIdForSiteLink(
$siteLink );
return $itemId;
}
diff --git a/client/includes/Hooks/DeletePageNoticeCreator.php
b/client/includes/Hooks/DeletePageNoticeCreator.php
index 04af59f..9f7452d 100644
--- a/client/includes/Hooks/DeletePageNoticeCreator.php
+++ b/client/includes/Hooks/DeletePageNoticeCreator.php
@@ -54,7 +54,7 @@
* @return string|null
*/
private function getItemUrl( Title $title ) {
- $entityId = $this->siteLinkLookup->getEntityIdForSiteLink(
+ $entityId = $this->siteLinkLookup->getItemIdForSiteLink(
new SiteLink(
$this->siteId,
$title->getFullText()
diff --git a/client/includes/Hooks/InfoActionHookHandler.php
b/client/includes/Hooks/InfoActionHookHandler.php
index 201e76a..74296f8 100644
--- a/client/includes/Hooks/InfoActionHookHandler.php
+++ b/client/includes/Hooks/InfoActionHookHandler.php
@@ -70,7 +70,7 @@
* @return array
*/
private function getPageInfoRow( IContextSource $context, Title $title
) {
- $entityId = $this->siteLinkLookup->getEntityIdForSiteLink(
+ $entityId = $this->siteLinkLookup->getItemIdForSiteLink(
new SiteLink( $this->siteId, $title->getFullText() )
);
diff --git a/client/includes/Hooks/MovePageNoticeCreator.php
b/client/includes/Hooks/MovePageNoticeCreator.php
index 5232150..af02fb3 100644
--- a/client/includes/Hooks/MovePageNoticeCreator.php
+++ b/client/includes/Hooks/MovePageNoticeCreator.php
@@ -54,7 +54,7 @@
* @return string|null
*/
private function getItemUrl( Title $title ) {
- $entityId = $this->siteLinkLookup->getEntityIdForSiteLink(
+ $entityId = $this->siteL
[MediaWiki-commits] [Gerrit] Fix showSelection fixup - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202716
Change subject: Fix showSelection fixup
..
Fix showSelection fixup
Make sure the fixup happens after the model selection has been updated and
protect against unnecessary fixups by checking newBranchNode is not null.
Bug: T95422
Change-Id: Ib8ff1464a073063dec03112304c867af655c0fd9
---
M src/ce/ve.ce.Surface.js
1 file changed, 12 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/16/202716/1
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 6e09fc7..c08c8a0 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -2409,13 +2409,21 @@
* @param {ve.ce.BranchNode} oldBranchNode Node from which the range anchor
has just moved
* @param {ve.ce.BranchNode} newBranchNode Node into which the range anchor
has just moved
*/
-ve.ce.Surface.prototype.onSurfaceObserverBranchNodeChange = function (
oldBranchNode ) {
+ve.ce.Surface.prototype.onSurfaceObserverBranchNodeChange = function (
oldBranchNode, newBranchNode ) {
if ( oldBranchNode instanceof ve.ce.ContentBranchNode ) {
oldBranchNode.renderContents();
}
- // Re-apply selection in case the branch node change left us at an
invalid offset
- // e.g. in the document node.
- this.showSelection( this.getModel().getSelection() );
+ // Optimisation: if newBranchNode is null there will be nothing to fix.
+ if ( newBranchNode ) {
+ var surface = this;
+ // branchNodeChange happens before rangeChange. Deferring makes
sure
+ // we don't apply the wrong selection.
+ setTimeout( function () {
+ // Re-apply selection in case the branch node change
left us at an invalid offset
+ // e.g. in the document node.
+ surface.showSelection(
surface.getModel().getSelection() );
+ } );
+ }
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/202716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8ff1464a073063dec03112304c867af655c0fd9
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up facbde556a: Fix showSelection fixup - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Follow-up facbde556a: Fix showSelection fixup
..
Follow-up facbde556a: Fix showSelection fixup
Make sure the fixup happens after the model selection has been updated
and protect against unnecessary fixups by checking newBranchNode is not
null.
Bug: T95422
Change-Id: Ib8ff1464a073063dec03112304c867af655c0fd9
---
M src/ce/ve.ce.Surface.js
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 6e09fc7..c08c8a0 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -2409,13 +2409,21 @@
* @param {ve.ce.BranchNode} oldBranchNode Node from which the range anchor
has just moved
* @param {ve.ce.BranchNode} newBranchNode Node into which the range anchor
has just moved
*/
-ve.ce.Surface.prototype.onSurfaceObserverBranchNodeChange = function (
oldBranchNode ) {
+ve.ce.Surface.prototype.onSurfaceObserverBranchNodeChange = function (
oldBranchNode, newBranchNode ) {
if ( oldBranchNode instanceof ve.ce.ContentBranchNode ) {
oldBranchNode.renderContents();
}
- // Re-apply selection in case the branch node change left us at an
invalid offset
- // e.g. in the document node.
- this.showSelection( this.getModel().getSelection() );
+ // Optimisation: if newBranchNode is null there will be nothing to fix.
+ if ( newBranchNode ) {
+ var surface = this;
+ // branchNodeChange happens before rangeChange. Deferring makes
sure
+ // we don't apply the wrong selection.
+ setTimeout( function () {
+ // Re-apply selection in case the branch node change
left us at an invalid offset
+ // e.g. in the document node.
+ surface.showSelection(
surface.getModel().getSelection() );
+ } );
+ }
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/202716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8ff1464a073063dec03112304c867af655c0fd9
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] composer update - change (mediawiki...Blueprint)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202717
Change subject: composer update
..
composer update
Change-Id: If482d43fc035cb990b0020b9eebe0f518c26a4e3
---
M composer.lock
1 file changed, 14 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint
refs/changes/17/202717/1
diff --git a/composer.lock b/composer.lock
index 79a0270..99205d2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,7 +1,8 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
-"Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";
+"Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
+"This file is @generated automatically"
],
"hash": "e72751453fd65e861864cc13d8e197db",
"packages": [
@@ -40,16 +41,16 @@
},
{
"name": "werdnum/simple-lightncandy",
-"version": "0.1.x-dev",
+"version": "0.4.0",
"source": {
"type": "git",
"url": "https://github.com/werdnum/simple-lightncandy.git";,
-"reference": "2b9f025bc19dbf88d6ef9cc34ed7ab1c906a6325"
+"reference": "3f9ce07c4ac3e7391b4dabf5bb0a107f361cd626"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/werdnum/simple-lightncandy/zipball/2b9f025bc19dbf88d6ef9cc34ed7ab1c906a6325";,
-"reference": "2b9f025bc19dbf88d6ef9cc34ed7ab1c906a6325",
+"url":
"https://api.github.com/repos/werdnum/simple-lightncandy/zipball/3f9ce07c4ac3e7391b4dabf5bb0a107f361cd626";,
+"reference": "3f9ce07c4ac3e7391b4dabf5bb0a107f361cd626",
"shasum": ""
},
"require": {
@@ -63,20 +64,20 @@
},
"notification-url": "https://packagist.org/downloads/";,
"description": "No-nonsense templating with lightncandy",
-"time": "2015-01-14 11:36:01"
+"time": "2015-04-06 10:24:18"
},
{
"name": "zordius/lightncandy",
-"version": "v0.18",
+"version": "v0.20",
"source": {
"type": "git",
"url": "https://github.com/zordius/lightncandy.git";,
-"reference": "24be6909c37391f4648ce1fdf19036b11bd56d05"
+"reference": "257355494db7edb4738471fa7f2b247a2c4d8719"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/zordius/lightncandy/zipball/24be6909c37391f4648ce1fdf19036b11bd56d05";,
-"reference": "24be6909c37391f4648ce1fdf19036b11bd56d05",
+"url":
"https://api.github.com/repos/zordius/lightncandy/zipball/257355494db7edb4738471fa7f2b247a2c4d8719";,
+"reference": "257355494db7edb4738471fa7f2b247a2c4d8719",
"shasum": ""
},
"require": {
@@ -110,7 +111,7 @@
"php",
"template"
],
-"time": "2015-01-01 04:37:19"
+"time": "2015-03-04 02:07:44"
}
],
"packages-dev": [],
@@ -120,6 +121,8 @@
"werdnum/simple-lightncandy": 20,
"werdnum/mediawiki-lightncandy-skin": 20
},
+"prefer-stable": false,
+"prefer-lowest": false,
"platform": [],
"platform-dev": []
}
--
To view, visit https://gerrit.wikimedia.org/r/202717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If482d43fc035cb990b0020b9eebe0f518c26a4e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Blueprint
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] move toc icon - change (mediawiki...Blueprint)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202721
Change subject: move toc icon
..
move toc icon
Change-Id: I3e18f2e421e381e6da4b62471cbbf5fe19ab76f5
---
M resources/master.less
M templates/Skin.php
M templates/Skin.template
3 files changed, 13 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint
refs/changes/21/202721/1
diff --git a/resources/master.less b/resources/master.less
index 9e23981..ec22606 100644
--- a/resources/master.less
+++ b/resources/master.less
@@ -209,22 +209,12 @@
/* Navbar */
#toc-toggle {
- display: block;
- height: 24px;
- width: 24px;
- background-image: url( 'menu.svg' );
- background-position: center left;
+ background-color: #2B5ECF;
+ background-image: url( 'menu-clicked.svg' );
+ background-position: center center;
background-repeat: no-repeat;
- position: fixed;
- top: 115px;
- left: 110px;
- transition: all 1s ease;
-
- &.clicked {
- background-image: url( 'menu-clicked.svg' );
- top: 57px;
- left: 20px;
- }
+ padding: 25px;
+ border-right: 2px solid #2860B2;
}
diff --git a/templates/Skin.php b/templates/Skin.php
index 5a3fe55..e16e884 100644
--- a/templates/Skin.php
+++ b/templates/Skin.php
@@ -227,7 +227,10 @@
- '.htmlentities((string)$cx['funcs']['v']($cx, $in, array('sitename')),
ENT_QUOTES, 'UTF-8').'
+
+
+ '.htmlentities((string)$cx['funcs']['v']($cx, $in, array('sitename')),
ENT_QUOTES, 'UTF-8').'
+
@@ -256,8 +259,6 @@
-
-
diff --git a/templates/Skin.template b/templates/Skin.template
index 3839f45..50dbd32 100755
--- a/templates/Skin.template
+++ b/templates/Skin.template
@@ -8,7 +8,10 @@
- {{ sitename
}}
+
+
+ {{
sitename }}
+
@@ -45,8 +48,6 @@
-
-
--
To view, visit https://gerrit.wikimedia.org/r/202721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e18f2e421e381e6da4b62471cbbf5fe19ab76f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Blueprint
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove styles that would override bootstrap - change (mediawiki...Blueprint)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202719
Change subject: remove styles that would override bootstrap
..
remove styles that would override bootstrap
Change-Id: I79e2a4623d0149e2a05e3c971bd4de656be897cb
---
M resources/master.less
1 file changed, 0 insertions(+), 128 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint
refs/changes/19/202719/1
diff --git a/resources/master.less b/resources/master.less
index aadce38..b9e96a0 100644
--- a/resources/master.less
+++ b/resources/master.less
@@ -1,11 +1,4 @@
/* Typography */
-html, body {
- height: 100%;
- margin: 0;
- padding: 0;
-}
-
-
body {
color: #333;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
@@ -15,13 +8,6 @@
a {
color: #2B5ECF;
}
-
-.container {
- width: 1140px;
- margin: 0 auto;
- padding-top: 50px;
-}
-
h1 {
font: 3em 'Georgia', 'Times', serif;
@@ -164,20 +150,6 @@
/* Navbar */
.navbar {
- border-bottom: 2px solid #eee;
- position: fixed !important;
- top: 0;
- left: 0;
- z-index: 1;
- background-color: inherit;
- width: 100%;
- height: 50px;
- transition: left 0.2s;
-
- a {
- text-decoration: none;
- }
-
.search-input {
background: transparent;
border: none;
@@ -197,106 +169,6 @@
background-repeat: no-repeat;
outline: none;
box-shadow: none;
- }
- }
-
- form {
- display: inline-block;
- height: 100%;
- margin: 0;
- padding: 0;
- }
-
- ul.navbar-nav {
- display: inline-block;
- height: 100%;
- margin: 0;
- float: right;
- border-left: 2px solid #eee;
-
- li {
- margin: 15px 30px 10px 0;
- display: inline-block;
- }
- }
-
- .account-menu {
- width: 200px;
- float: right;
- color: #2B5ECF;
- padding-left: 30px;
- background-image: url(user.svg), url(caret-down.svg);
- background-position: center left, center right;
- background-repeat: no-repeat, no-repeat;
- }
-
- .navigation-menu {
- border-right: 2px solid #eee;
- min-width: 80px;
- padding-left: 30px;
- font-size: 0.9em;
- background-image: url(caret-down.svg);
- background-position: center right 10px;
- background-repeat: no-repeat;
-
- span {
- font-weight: bold;
- text-transform: uppercase;
- }
- }
-
- .dropdown-menu {
- border-left: 2px solid #eee;
- padding: 17px 30px;
- position: relative;
- display: inline-block;
- cursor: pointer;
- outline: none;
- }
-
- .dropdown-menu:focus {
- /* clicking on label should toggle the menu */
- pointer-events: none;
- }
-
- .dropdown-menu:focus .dropdown-menu-content {
- /* opacity is 1 in opened state (see below) */
- opacity: 1;
- visibility: visible;
-
- /* don't let pointer-events affect descendant elements */
- pointer-events: auto;
- }
-
- .dropdown-menu-content {
- position: absolute;
- z-index: 1;
-
- /* use opacity to fake immediate toggle */
- opacity: 0;
- visibility: hidden;
- transition: visibility 0.5s;
-
- background: #fff;
- border: 2px solid #eee;
- border-top: none;
- margin-left: -12px;
- margin-top: 15px;
- padding: 0;
-
- li {
- list-style: none;
- width: 200px;
-
- a {
- color: #333;
- padding: 5px 10px;
- display: block;
-
- &:hover {
- background: #eee;
- }
- }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/202719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79e2a4623d0149e2a05e3c971bd4de656be897cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Blueprint
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
__
[MediaWiki-commits] [Gerrit] fix indentation - change (mediawiki...Blueprint)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202718
Change subject: fix indentation
..
fix indentation
Change-Id: I4faab74de12de7c2e490dde4c4c6c8813e17fd7d
---
M templates/Skin.php
M templates/Skin.template
2 files changed, 144 insertions(+), 144 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint
refs/changes/18/202718/1
diff --git a/templates/Skin.php b/templates/Skin.php
index 5ec7d97..ced6709 100644
--- a/templates/Skin.php
+++ b/templates/Skin.php
@@ -221,71 +221,71 @@
-'.'
+'.'
-
-
-
-
'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('sitename')),
ENT_QUOTES, 'UTF-8').'
-
-'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('sidebar','navigation')), $in, true, function($cx, $in) {return '
'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('text')), ENT_QUOTES, 'UTF-8').'
-';}).'
+
+
+
+ '.htmlentities((string)$cx['funcs']['v']($cx,
$in, array('sitename')), ENT_QUOTES, 'UTF-8').'
+
+'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('sidebar','navigation')), $in, true, function($cx, $in) {return '
'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('text')), ENT_QUOTES, 'UTF-8').'
+';}).'
+
+
+
+
+
+
+
+
+'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $in) {return
''.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $cx['sp_vars'],
array('first' ? '
'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')), ENT_QUOTES,
'UTF-8').'
+' : '').'';}).'
+'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $in) {return '
'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')),
ENT_QUOTES, 'UTF-8').'
+';}).'
+
+
+
+ Desktop
+ Mobile
+
+
+
+
+
+
+
+ '.$cx['funcs']['v']($cx, $in, array('title')).'
+
+'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('content_navigation','views')), $in, true, function($cx, $in) {return '
+
'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')), ENT_QUOTES,
'UTF-8').'
+
+';}).'
+
+'.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $in,
array('isarticle' ? ' '.$cx['funcs']['ch']($cx, 'msg', array(array('tagline'),array()),
'enc').'
+' : '').'
+ '.$cx['funcs']['v']($cx, $in, array('subtitle')).'
+
+'.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $in,
array('undelete' ? ''.$cx['funcs']['v']($cx, $in, array('undelete')).'
+' : '').''.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $in,
array('newtalk' ? ''.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('newtalk')), ENT_QUOTES, 'UTF-8').'
+' : '').'
+ '.$cx['funcs']['v']($cx, $in, array('bodytext')).'
+
+'.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $in,
array('printfooter' ? '
+ '.$cx['funcs']['v']($cx, $in,
array('printfooter')).'
-
-
-
-
-
-
-
-'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $in) {return
''.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $cx['sp_vars'],
array('first' ? '
'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')), ENT_QUOTES,
'UTF-8').'
-' : '').'';}).'
-'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $in) {return '
'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')),
ENT_QUOTES, 'UTF-8').'
-';}).'
-
-
-
- Desktop
-
[MediaWiki-commits] [Gerrit] update the navbar - change (mediawiki...Blueprint)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202720
Change subject: update the navbar
..
update the navbar
Change-Id: I6fca6fedc6d8509dc6975882cdb0fe5bb85dab8d
---
M resources/master.less
M templates/Skin.php
M templates/Skin.template
3 files changed, 104 insertions(+), 70 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint
refs/changes/20/202720/1
diff --git a/resources/master.less b/resources/master.less
index b9e96a0..9e23981 100644
--- a/resources/master.less
+++ b/resources/master.less
@@ -49,6 +49,10 @@
line-height: 1.5;
}
+#content {
+ margin-top: 50px;
+}
+
.example_container {
margin: 2em 0;
padding: 1em;
@@ -149,7 +153,26 @@
/* Offscreen Navigation */
/* Navbar */
-.navbar {
+.navbar.navbar-fixed-top {
+ background: #fff;
+ border: none;
+ border-bottom: 2px solid #eee;
+
+ .navbar-brand {
+ background-color: #2B5ECF;
+ color: #fff;
+ text-transform: uppercase;
+ font-size: 0.9em;
+ font-weight: 500;
+ padding-left: 40px;
+ padding-right: 40px;
+ }
+
+ .navbar-form {
+ padding: 0;
+ margin: 0;
+ }
+
.search-input {
background: transparent;
border: none;
@@ -159,7 +182,7 @@
background-image: url( 'search.svg' );
background-position: center left;
background-repeat: no-repeat;
- padding-left: 30px;
+ padding: 25px 40px;
height: 30px;
font: 0.8em 'Helvetica Neue', Helvetica, Arial, sans-serif;
@@ -171,6 +194,17 @@
box-shadow: none;
}
}
+
+ .account-menu {
+ min-width: 200px;
+ padding-left: 50px;
+ padding-right: 50px;
+ margin-right: 15px;
+ border-left: 2px solid #eee;
+ background-image: url(user.svg), url(caret-down.svg);
+ background-position: center left 20px, center right 20px;
+ background-repeat: no-repeat, no-repeat;
+ }
}
/* Navbar */
diff --git a/templates/Skin.php b/templates/Skin.php
index ced6709..5a3fe55 100644
--- a/templates/Skin.php
+++ b/templates/Skin.php
@@ -224,36 +224,37 @@
'.'
-
-
- '.htmlentities((string)$cx['funcs']['v']($cx,
$in, array('sitename')), ENT_QUOTES, 'UTF-8').'
-
-'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('sidebar','navigation')), $in, true, function($cx, $in) {return '
'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('text')), ENT_QUOTES, 'UTF-8').'
-';}).'
+
+
+
+ '.htmlentities((string)$cx['funcs']['v']($cx, $in, array('sitename')),
ENT_QUOTES, 'UTF-8').'
+
+
+
+
+
+
+
+
+
+
+
+'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $in) {return
''.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $cx['sp_vars'],
array('first' ? '
'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')),
ENT_QUOTES, 'UTF-8').'
+' : '').'';}).'
+
+'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $in) {return '
'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')),
ENT_QUOTES, 'UTF-8').'
+';}).'
+
+
+
+
-
-
-
-
-
-
-
-'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $in) {return
''.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $cx['sp_vars'],
array('first' ? '
'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')), ENT_QUOTES,
'UTF-8').'
-' : '').'';}).'
-'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $
[MediaWiki-commits] [Gerrit] Gate PHP entry point - change (mediawiki...WikibaseJavaScriptApi)
JanZerebecki has submitted this change and it was merged. Change subject: Gate PHP entry point .. Gate PHP entry point Change-Id: I53b3283caa3e3b7ad9b81235510f5c573fb9327b --- M WikibaseJavaScriptApi.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Thiemo Mättig (WMDE): Looks good to me, but someone else must approve JanZerebecki: Verified; Looks good to me, approved diff --git a/WikibaseJavaScriptApi.php b/WikibaseJavaScriptApi.php index 068edd7..a3fd514 100644 --- a/WikibaseJavaScriptApi.php +++ b/WikibaseJavaScriptApi.php @@ -1,5 +1,10 @@ https://gerrit.wikimedia.org/r/183213 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I53b3283caa3e3b7ad9b81235510f5c573fb9327b Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/WikibaseJavaScriptApi Gerrit-Branch: master Gerrit-Owner: Adrian Lang Gerrit-Reviewer: Adrian Lang Gerrit-Reviewer: JanZerebecki Gerrit-Reviewer: Jeroen De Dauw Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (24e4428) - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/202722 Change subject: Update VE core submodule to master (24e4428) .. Update VE core submodule to master (24e4428) New changes: cee21ec Test untested branch nodes 494bc38 build: Fix rename of test-coverage to coverage in clean task 24e4428 Follow-up facbde556a: Fix showSelection fixup Change-Id: I213cded586bcc3419b68dc3579eb8587f2d7e794 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/22/202722/1 diff --git a/lib/ve b/lib/ve index 7058807..24e4428 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 70588074239437ba10972818a8100e06cd54bf8a +Subproject commit 24e4428a03481c9efcac9f173424e0f2fd86faa1 -- To view, visit https://gerrit.wikimedia.org/r/202722 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I213cded586bcc3419b68dc3579eb8587f2d7e794 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Un-deprecate $revisionId = 0 in EntityRevisionLookup - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202723
Change subject: Un-deprecate $revisionId = 0 in EntityRevisionLookup
..
Un-deprecate $revisionId = 0 in EntityRevisionLookup
As suggested in Ic45c727.
Using 0 for "latest revision from slave" is very, very common accross
core code. Why deprecate it?
Bug: T90893
Change-Id: Ia406fdd0191c854f271dcd6db9627ddd5fa32805
---
M lib/includes/store/CachingEntityRevisionLookup.php
M lib/includes/store/EntityRevisionLookup.php
M lib/includes/store/sql/WikiPageEntityRevisionLookup.php
M lib/tests/phpunit/MockRepository.php
4 files changed, 30 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/23/202723/1
diff --git a/lib/includes/store/CachingEntityRevisionLookup.php
b/lib/includes/store/CachingEntityRevisionLookup.php
index d269868..3c23c15 100644
--- a/lib/includes/store/CachingEntityRevisionLookup.php
+++ b/lib/includes/store/CachingEntityRevisionLookup.php
@@ -88,14 +88,15 @@
}
/**
-* @see EntityLookup::getEntity
+* @see EntityRevisionLookup::getEntityRevision
*
* @note: If this lookup is configured to verify revisions,
getLatestRevisionId()
* will be called on the underlying lookup to check whether the cached
revision is
* still the latest. Otherwise, any cached revision will be used if
$revisionId=0.
*
* @param EntityId $entityId
-* @param int|string $revisionId The desired revision id, or
LATEST_FROM_SLAVE or LATEST_FROM_MASTER.
+* @param int|string $revisionId The desired revision id, or
LATEST_FROM_SLAVE or
+* LATEST_FROM_MASTER. 0 is identical to LATEST_FROM_SLAVE.
*
* @throws StorageException
* @return EntityRevision|null
@@ -103,7 +104,12 @@
public function getEntityRevision( EntityId $entityId, $revisionId =
self::LATEST_FROM_SLAVE ) {
$key = $this->getCacheKey( $entityId );
- if ( $revisionId === 0 ) {
+ if ( $revisionId === 0 || $revisionId === false ) {
+ if ( is_bool( $revisionId ) ) {
+ wfWarn(
'EntityRevisionLookup::getEntityRevision called with $revisionId = false, '
+ . 'use
EntityRevisionLookup::LATEST_FROM_SLAVE instead.' );
+ }
+
$revisionId = self::LATEST_FROM_SLAVE;
}
diff --git a/lib/includes/store/EntityRevisionLookup.php
b/lib/includes/store/EntityRevisionLookup.php
index b43051b..ff1d5b9 100644
--- a/lib/includes/store/EntityRevisionLookup.php
+++ b/lib/includes/store/EntityRevisionLookup.php
@@ -41,9 +41,10 @@
* @since 0.4
*
* @param EntityId $entityId
-* @param int|string $revisionId The desired revision id, or
LATEST_FROM_SLAVE or LATEST_FROM_MASTER
-*to indicate that the latest revision is required.
LATEST_FROM_MASTER would force the
-*revision to be determined from the canonical master database.
+* @param int|string $revisionId The desired revision id, or
LATEST_FROM_SLAVE or
+* LATEST_FROM_MASTER to indicate that the latest revision is required.
LATEST_FROM_MASTER would
+* force the revision to be determined from the canonical master
database. 0 is identical to
+* LATEST_FROM_SLAVE.
*
* @throws StorageException
* @return EntityRevision|null
diff --git a/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
b/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
index e89f889..cbeef86 100644
--- a/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
+++ b/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
@@ -6,7 +6,6 @@
use MWContentSerializationException;
use Revision;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\Lib\Store\WikiPageEntityMetaDataLookup;
use Wikibase\EntityRevision;
/**
@@ -50,10 +49,11 @@
/**
* @since 0.4
-* @see EntityRevisionLookup::getEntityRevision
+* @see EntityRevisionLookup::getEntityRevision
*
* @param EntityId $entityId
-* @param int|string $revisionId The desired revision id, or
LATEST_FROM_SLAVE or LATEST_FROM_MASTER.
+* @param int|string $revisionId The desired revision id, or
LATEST_FROM_SLAVE or
+* LATEST_FROM_MASTER. 0 is identical to LATEST_FROM_SLAVE.
*
* @throws StorageException
* @return EntityRevision|null
@@ -62,10 +62,12 @@
wfDebugLog( __CLASS__, __FUNCTION__ . ': Looking up entity ' .
$entityId
. " (revision $revisionId)." );
- // default changed from false to 0 and then to LATEST_FROM_SLAVE
- if ( $revisionId === false |
[MediaWiki-commits] [Gerrit] Ignore vendor/ in jshint - change (mediawiki...WikibaseJavaScriptApi)
JanZerebecki has submitted this change and it was merged. Change subject: Ignore vendor/ in jshint .. Ignore vendor/ in jshint Change-Id: If9bafefb99df18ee3411d5143af526930fb32490 --- A .jshintignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Thiemo Mättig (WMDE): Looks good to me, approved JanZerebecki: Verified diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 000..05b7efe --- /dev/null +++ b/.jshintignore @@ -0,0 +1 @@ +vendor/** -- To view, visit https://gerrit.wikimedia.org/r/183444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If9bafefb99df18ee3411d5143af526930fb32490 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikibaseJavaScriptApi Gerrit-Branch: master Gerrit-Owner: Adrian Lang Gerrit-Reviewer: JanZerebecki Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add expect calls to test cases - change (mediawiki...WikibaseJavaScriptApi)
JanZerebecki has submitted this change and it was merged.
Change subject: Add expect calls to test cases
..
Add expect calls to test cases
MediaWiki's test runner passes requireExpects to QUnit.
Change-Id: I898f54508032b1484e4518659a296e061a4b3976
---
M tests/RepoApi.tests.js
M tests/RepoApiError.tests.js
2 files changed, 20 insertions(+), 0 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
JanZerebecki: Verified
diff --git a/tests/RepoApi.tests.js b/tests/RepoApi.tests.js
index e97ecdb..c6ae686 100644
--- a/tests/RepoApi.tests.js
+++ b/tests/RepoApi.tests.js
@@ -52,6 +52,7 @@
}
QUnit.test( 'createEntity()', function( assert ) {
+ assert.expect( 5 );
var mock = mockApi();
mock.api.createEntity( 'item' );
@@ -85,6 +86,7 @@
} );
QUnit.test( 'editEntity()', function( assert ) {
+ assert.expect( 6 );
var mock = mockApi();
mock.api.editEntity( 'entity id', 12345, { 'I am': 'entity data' },
true );
@@ -104,6 +106,7 @@
} );
QUnit.test( 'formatValue()', function( assert ) {
+ assert.expect( 10 );
var mock = mockApi( 'get' );
mock.api.formatValue(
@@ -140,6 +143,7 @@
} );
QUnit.test( 'getEntities()', function( assert ) {
+ assert.expect( 17 );
var mock = mockApi( 'get' );
mock.api.getEntities(
@@ -188,6 +192,7 @@
} );
QUnit.test( 'getEntitiesByPage()', function( assert ) {
+ assert.expect( 44 );
var mock = mockApi( 'get' );
mock.api.getEntitiesByPage(
@@ -282,6 +287,7 @@
} );
QUnit.test( 'parseValue()', function( assert ) {
+ assert.expect( 8 );
var mock = mockApi( 'get' );
mock.api.parseValue(
@@ -309,6 +315,7 @@
} );
QUnit.test( 'searchEntities()', function( assert ) {
+ assert.expect( 12 );
var mock = mockApi( 'get' );
mock.api.searchEntities( 'label', 'language code', 'entity type', 10, 5
);
@@ -336,6 +343,7 @@
} );
QUnit.test( 'setLabel(), setDescription()', function( assert ) {
+ assert.expect( 12 );
var subjects = ['Label', 'Description'];
for( var i = 0; i < subjects.length; i++ ) {
@@ -359,6 +367,7 @@
} );
QUnit.test( 'setAliases()', function( assert ) {
+ assert.expect( 7 );
var mock = mockApi();
mock.api.setAliases(
@@ -381,6 +390,7 @@
} );
QUnit.test( 'setClaim()', function( assert ) {
+ assert.expect( 8 );
var mock = mockApi();
mock.api.setClaim( { 'I am': 'a Claim serialization' }, 12345, 67890 );
@@ -410,6 +420,7 @@
} );
QUnit.test( 'createClaim()', function( assert ) {
+ assert.expect( 12 );
var mock = mockApi();
mock.api.createClaim( 'entity id', 12345, 'snak type', 'property id',
'snak value' );
@@ -437,6 +448,7 @@
} );
QUnit.test( 'removeClaim()', function( assert ) {
+ assert.expect( 6 );
var mock = mockApi();
mock.api.removeClaim( 'claim GUID', 12345 );
@@ -458,6 +470,7 @@
} );
QUnit.test( 'getClaims()', function( assert ) {
+ assert.expect( 12 );
var mock = mockApi( 'get' );
mock.api.getClaims( 'entity id', 'property id', 'claim GUID', 'rank',
'claim props' );
@@ -485,6 +498,7 @@
} );
QUnit.test( 'setClaimValue()', function( assert ) {
+ assert.expect( 12 );
var mock = mockApi();
mock.api.setClaimValue( 'claim GUID', 12345, 'snak type', 'property
id', 'snak value' );
@@ -512,6 +526,7 @@
} );
QUnit.test( 'setReference()', function( assert ) {
+ assert.expect( 12 );
var mock = mockApi();
mock.api.setReference(
@@ -548,6 +563,7 @@
} );
QUnit.test( 'removeReferences()', function( assert ) {
+ assert.expect( 8 );
var mock = mockApi();
mock.api.removeReferences( 'statement GUID', ['reference hash 1',
'reference hash 2'], 12345 );
@@ -571,6 +587,7 @@
} );
QUnit.test( 'setSitelink()', function( assert ) {
+ assert.expect( 12 );
var mock = mockApi();
mock.api.setSitelink(
@@ -600,6 +617,7 @@
} );
QUnit.test( 'mergeItems()', function( assert ) {
+ assert.expect( 14 );
var mock = mockApi();
mock.api.mergeItems(
diff --git a/tests/RepoApiError.tests.js b/tests/RepoApiError.tests.js
index 12a9e66..b35baba 100644
--- a/tests/RepoApiError.tests.js
+++ b/tests/RepoApiError.tests.js
@@ -9,6 +9,7 @@
QUnit.module( 'wikibase.api.RepoApiError' );
QUnit.test( 'Create and validate errors', function( assert ) {
+ assert.expect( 4 );
var error = new wb.api.RepoApiError( 'error-code', 'detailed
message' );
assert.equal(
@@ -40,6 +41,7 @@
} );
QUnit.test( 'Validate errors created via factory method', function(
assert ) {
+ assert.expect( 7 );
var error = wb.api.RepoApiError.newFromApiResponse( {
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4379275..91a4f4d - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/202724 Change subject: Syncronize VisualEditor: 4379275..91a4f4d .. Syncronize VisualEditor: 4379275..91a4f4d Change-Id: I319a9cd1dfaa582907c66c574fcc820da785c0b2 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/24/202724/1 diff --git a/VisualEditor b/VisualEditor index 4379275..91a4f4d 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4379275062f5285bcd3f73032460aa09e57f3920 +Subproject commit 91a4f4ddd36e5f4e8a5903d63f35f1d2e2991617 -- To view, visit https://gerrit.wikimedia.org/r/202724 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I319a9cd1dfaa582907c66c574fcc820da785c0b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (24e4428) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (24e4428) .. Update VE core submodule to master (24e4428) New changes: cee21ec Test untested branch nodes 494bc38 build: Fix rename of test-coverage to coverage in clean task 24e4428 Follow-up facbde556a: Fix showSelection fixup Change-Id: I213cded586bcc3419b68dc3579eb8587f2d7e794 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 7058807..24e4428 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 70588074239437ba10972818a8100e06cd54bf8a +Subproject commit 24e4428a03481c9efcac9f173424e0f2fd86faa1 -- To view, visit https://gerrit.wikimedia.org/r/202722 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I213cded586bcc3419b68dc3579eb8587f2d7e794 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Esanders Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4379275..91a4f4d - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 4379275..91a4f4d .. Syncronize VisualEditor: 4379275..91a4f4d Change-Id: I319a9cd1dfaa582907c66c574fcc820da785c0b2 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 4379275..91a4f4d 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4379275062f5285bcd3f73032460aa09e57f3920 +Subproject commit 91a4f4ddd36e5f4e8a5903d63f35f1d2e2991617 -- To view, visit https://gerrit.wikimedia.org/r/202724 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I319a9cd1dfaa582907c66c574fcc820da785c0b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add_ip6_mapped: enable token-based SLAAC for all jessie/trusty - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202725
Change subject: add_ip6_mapped: enable token-based SLAAC for all jessie/trusty
..
add_ip6_mapped: enable token-based SLAAC for all jessie/trusty
Bug: T94417
Change-Id: I0adea39136e6268aa27700d6f37c59cff2ac0e53
---
M modules/interface/manifests/add_ip6_mapped.pp
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/202725/1
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index b4b8c79..35a9653 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -28,9 +28,6 @@
prefixlen => '64'
}
-# XXX Temporary: testing on cp1008 first in a couple of different
scenarios...
-if $::hostname == 'cp1008' {
-
# 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
# in the present if not configured.
@@ -62,7 +59,5 @@
unless => $v6_token_check_cmd,
}
}
-
-} # XXX end cp1008 testing block
}
}
--
To view, visit https://gerrit.wikimedia.org/r/202725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0adea39136e6268aa27700d6f37c59cff2ac0e53
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added media.padil.gov.au to wgCopyUploadsDomains - change (operations/mediawiki-config)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/202726 Change subject: Added media.padil.gov.au to wgCopyUploadsDomains .. Added media.padil.gov.au to wgCopyUploadsDomains This source is the media serving domain of PaDIL, an Australian joint project which offers a rich CC-BY licensed content. Target category on Wikimedia Commons: https://commons.wikimedia.org/wiki/Category:Images_from_PaDIL Site policy about image use: http://www.padil.gov.au/imageuse Content license: http://creativecommons.org/licenses/by/3.0/au/deed.en Bug: T95328 Change-Id: I790d1da16d27aa34d40c27c797a4f14352e4563a --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/26/202726/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 1a55eb7..38fdf3e 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11195,6 +11195,7 @@ 'mapserver.library.wur.nl', // Wageningen University library map server - T91630 '*.loc.gov',// Library of Congress - T94017 'socrates.leidenuniv.nl', // Leiden University - T93757 + 'media.padil.gov.au', // PaDIL - T95328 ), ), -- To view, visit https://gerrit.wikimedia.org/r/202726 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I790d1da16d27aa34d40c27c797a4f14352e4563a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Conform to statsite metrics - change (mediawiki...parsoid)
Mobrovac has uploaded a new change for review. https://gerrit.wikimedia.org/r/202727 Change subject: Conform to statsite metrics .. Conform to statsite metrics The WMF is switching from TXStatsD to statsite, so metrics sending should be adjusted accordingly. Bug: T94053 Change-Id: I6646d41b94cc5309447ef5b63d83d3b1e0e162b3 --- M lib/mediawiki.Util.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/27/202727/1 diff --git a/lib/mediawiki.Util.js b/lib/mediawiki.Util.js index 6da9171..cd0af76 100644 --- a/lib/mediawiki.Util.js +++ b/lib/mediawiki.Util.js @@ -1476,7 +1476,7 @@ port: statsdPort, prefix: 'parsoid.', // prefix each stat for hierarchical namespacing suffix: '', - txstatsd : true, + txstatsd : false, globalize : false, cacheDns : true, mock : false -- To view, visit https://gerrit.wikimedia.org/r/202727 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6646d41b94cc5309447ef5b63d83d3b1e0e162b3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Modify access rules - change (analytics/camus)
Alexey has uploaded a new change for review. https://gerrit.wikimedia.org/r/202728 Change subject: Modify access rules .. Modify access rules --- M project.config 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/camus refs/changes/28/202728/1 diff --git a/project.config b/project.config index 0ca..f656800 100644 --- a/project.config +++ b/project.config @@ -15,3 +15,4 @@ forgeAuthor = group analytics-camus forgeCommitter = group analytics-camus push = +force group analytics-camus + exclusiveGroupPermissions = read forgeAuthor forgeCommitter push -- To view, visit https://gerrit.wikimedia.org/r/202728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4be7c36315a0111480d6119e0f166ac6406ee0c9 Gerrit-PatchSet: 1 Gerrit-Project: analytics/camus Gerrit-Branch: refs/meta/config Gerrit-Owner: Alexey ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Modify access rules - change (analytics/camus)
Alexey has uploaded a new change for review. https://gerrit.wikimedia.org/r/202729 Change subject: Modify access rules .. Modify access rules --- M groups M project.config 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/camus refs/changes/29/202729/1 diff --git a/groups b/groups index 7afd0ad..c8b2194 100644 --- a/groups +++ b/groups @@ -1,3 +1,4 @@ # UUID Group Name # fa6b17666ab10a2e3c2cfdc83675ddc8554c5d8c analytics-camus +global:Registered-UsersRegistered Users diff --git a/project.config b/project.config index 0ca..54a7ca4 100644 --- a/project.config +++ b/project.config @@ -11,7 +11,11 @@ wikimedia branch - working branch, used for submitting pull requests to LinkedIn.\n\ master branch - should be mirror of LinkedIn's master. [access "refs/*"] + owner = group Registered Users owner = group analytics-camus + forgeAuthor = group Registered Users forgeAuthor = group analytics-camus + forgeCommitter = group Registered Users forgeCommitter = group analytics-camus + push = group Registered Users push = +force group analytics-camus -- To view, visit https://gerrit.wikimedia.org/r/202729 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14726355bee91022b318db001aff805597e2cb61 Gerrit-PatchSet: 1 Gerrit-Project: analytics/camus Gerrit-Branch: refs/meta/config Gerrit-Owner: Alexey ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed unused variable $time from OAuthListConsumers - change (mediawiki...OAuth)
jenkins-bot has submitted this change and it was merged. Change subject: Removed unused variable $time from OAuthListConsumers .. Removed unused variable $time from OAuthListConsumers $time seems to be unused Change-Id: Ie774e508d155fd7f8b6513d2904ce9fd54583455 --- M frontend/specialpages/SpecialMWOAuthListConsumers.php 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Anomie: Looks good to me, approved jenkins-bot: Verified diff --git a/frontend/specialpages/SpecialMWOAuthListConsumers.php b/frontend/specialpages/SpecialMWOAuthListConsumers.php index 1116695..499859e 100644 --- a/frontend/specialpages/SpecialMWOAuthListConsumers.php +++ b/frontend/specialpages/SpecialMWOAuthListConsumers.php @@ -257,9 +257,6 @@ } $links = $this->getLanguage()->pipeList( $links ); - $time = $this->getLanguage()->timeanddate( - wfTimestamp( TS_MW, $cmr->get( 'registration' ) ), true ); - $encStageKey = htmlspecialchars( $stageKey ); // sanity $r = ""; -- To view, visit https://gerrit.wikimedia.org/r/202678 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie774e508d155fd7f8b6513d2904ce9fd54583455 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch: master Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com> Gerrit-Reviewer: Anomie Gerrit-Reviewer: Hoo man Gerrit-Reviewer: Legoktm Gerrit-Reviewer: TTO Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Specify ssh userkey policy for ganeti clusters - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202730
Change subject: Specify ssh userkey policy for ganeti clusters
..
Specify ssh userkey policy for ganeti clusters
Ganeti uses SSH internally a lot and goes as far as trying to manage
user and host keys. While some parts of that behaviour can be overriden
other parts can not or even make sense to keep. Allow ganeti clusters to
deviate from the policy or /etc/ssh/userkeys/%u.
Change-Id: Ieaf455f138bc7e1858e6dbf3d235a6578fffdb94
---
M hieradata/regex.yaml
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/202730/1
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index e99245e..da78184 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -30,3 +30,7 @@
- xenon.eqiad.wmnet
cassandra::max_heap_size: 4g
cassandra::heap_newsize: 1g
+
+ganeti:
+ __regex: !ruby/regexp /^ganeti[1-2][0-9]{3}\.(eqiad|codfw)\.wmnet$/
+ ssh::server::authorized_keys_file: /etc/ssh/userkeys/%u
/etc/ssh/userkeys/ganeti-%u
--
To view, visit https://gerrit.wikimedia.org/r/202730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaf455f138bc7e1858e6dbf3d235a6578fffdb94
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ssh::userkey: Allow a prefix to be specified for a key - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202731
Change subject: ssh::userkey: Allow a prefix to be specified for a key
..
ssh::userkey: Allow a prefix to be specified for a key
Allow to specify a prefix for a managed key that if defined, will be
prepended to the filename of the key allowing to populate specific
purpose keys.
Change-Id: I4c6292df03ebc3ac933226207f0e074775c8bbd3
---
M modules/ssh/manifests/userkey.pp
1 file changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/202731/1
diff --git a/modules/ssh/manifests/userkey.pp b/modules/ssh/manifests/userkey.pp
index 43d90aa..ccf441c 100644
--- a/modules/ssh/manifests/userkey.pp
+++ b/modules/ssh/manifests/userkey.pp
@@ -23,6 +23,10 @@
# Path to file containing configuration directives. Undefined by
# default. Mutually exclusive with 'content'.
#
+# [*prefix*]
+# If defined, it will prepend the prefix string to the filename of the key
+# path allowing to populate specific purpose keys.
+#
# === Examples
#
# ssh::userkey { 'john'
@@ -34,6 +38,7 @@
define ssh::userkey(
$ensure = present,
$user= $title,
+ $prefix = undef,
$source = undef,
$content = undef,
@@ -46,7 +51,13 @@
fail('"source" and "content" are mutually exclusive')
}
-file { "/etc/ssh/userkeys/${user}":
+if $prefix {
+$path = "/etc/ssh/userkeys/${prefix}-${user}"
+} else {
+$path = "/etc/ssh/userkeys/${user}"
+}
+
+file { $path:
ensure => $ensure,
force => true,
owner => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/202731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c6292df03ebc3ac933226207f0e074775c8bbd3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup ContentTranslation.hooks.php - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202733
Change subject: Cleanup ContentTranslation.hooks.php
..
Cleanup ContentTranslation.hooks.php
Whitespace, order and spelling.
Change-Id: Ia94d6e93003c3f5452ca2f300bd74ae61075ea37
---
M ContentTranslation.hooks.php
M ContentTranslation.php
2 files changed, 7 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/33/202733/1
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 268239a..7b487d5 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -39,7 +39,6 @@
BetaFeatures::isFeatureEnabled( $user, 'cx' );
}
-
/**
* Hook: BeforePageDisplay
*/
@@ -65,7 +64,7 @@
$out->addModules( 'ext.cx.redlink' );
}
- // Add a hover menu for contributions link in personal tool bar
+ // Add a hover menu for the contributions link in personal
toolbar
$out->addModules( 'ext.cx.campaigns.contributionsmenu' );
// The current guided tours are only for the user namespace,
@@ -147,13 +146,13 @@
$wgContentTranslationBrowserBlacklist,
$wgContentTranslationTargetNamespace;
- $vars['wgContentTranslationSiteTemplates'] =
$wgContentTranslationSiteTemplates;
$vars['wgContentTranslationTranslateInTarget'] =
$wgContentTranslationTranslateInTarget;
$vars['wgContentTranslationExperimentalFeatures'] =
$wgContentTranslationExperimentalFeatures;
$vars['wgContentTranslationDatabase'] =
$wgContentTranslationDatabase;
- $vars['wgContentTranslationTargetNamespace'] =
$wgContentTranslationTargetNamespace;
+ $vars['wgContentTranslationSiteTemplates'] =
$wgContentTranslationSiteTemplates;
$vars['wgContentTranslationCampaigns'] =
$wgContentTranslationCampaigns;
$vars['wgContentTranslationBrowserBlacklist'] =
$wgContentTranslationBrowserBlacklist;
+ $vars['wgContentTranslationTargetNamespace'] =
$wgContentTranslationTargetNamespace;
}
/**
@@ -170,8 +169,9 @@
/**
* Hook: EditPage::showEditForm:initial
*/
- public static function newArticleCampign( EditPage $newPage, OutputPage
$out ) {
+ public static function newArticleCampaign( EditPage $newPage,
OutputPage $out ) {
global $wgContentTranslationCampaigns,
$wgContentTranslationEventLogging;
+
$user = $out->getUser();
if (
@@ -209,10 +209,10 @@
$out->addModules(
array( 'ext.cx.betafeature.init',
'ext.cx.campaigns.contributionsmenu' )
);
+
// This make sure the auto-open contribution menu shown
exactly once.
// and it is not in Special:CX
$saveOptions['cx-know'] = true;
-
}
return true;
@@ -286,5 +286,4 @@
),
) + $resourcePaths;
}
-
}
diff --git a/ContentTranslation.php b/ContentTranslation.php
index c39e77d..a07d869 100644
--- a/ContentTranslation.php
+++ b/ContentTranslation.php
@@ -73,7 +73,7 @@
$GLOBALS['wgHooks']['ChangeTagsListActive'][] =
'ContentTranslationHooks::registerTags';
$GLOBALS['wgHooks']['UserSaveOptions'][] =
'ContentTranslationHooks::onSaveOptions';
$GLOBALS['wgHooks']['EditPage::showEditForm:initial'][] =
- 'ContentTranslationHooks::newArticleCampign';
+ 'ContentTranslationHooks::newArticleCampaign';
$GLOBALS['wgHooks']['ResourceLoaderTestModules'][] =
'ContentTranslationHooks::onResourceLoaderTestModules';
--
To view, visit https://gerrit.wikimedia.org/r/202733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia94d6e93003c3f5452ca2f300bd74ae61075ea37
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use PoolCounter for SiteStats updates - change (mediawiki/core)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202732
Change subject: Use PoolCounter for SiteStats updates
..
Use PoolCounter for SiteStats updates
Bug: T95426
Change-Id: Ide900219f7ee274968e9af5a9001019e1074d4fd
---
M RELEASE-NOTES-1.26
M includes/SiteStats.php
2 files changed, 23 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/32/202732/1
diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index c65226c..5f9421c 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -15,6 +15,7 @@
External libraries
=== Bug fixes in 1.26 ===
+* (T95426) Use PoolCounter for SiteStats updates.
=== Action API changes in 1.26 ===
diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 15c18f3..4bf97a4 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -371,21 +371,31 @@
public static function doAllAndCommit( $database, array $options =
array() ) {
$options += array( 'update' => false, 'activeUsers' => false );
- // Grab the object and count everything
- $counter = new SiteStatsInit( $database );
+ $work = new PoolCounterWorkViaCallback(
+ __METHOD__,
+ '',
+ array(
+ 'doWork' => function() use ( $database,
$options ) {
+ // Grab the object and count everything
+ $counter = new SiteStatsInit( $database
);
- $counter->edits();
- $counter->articles();
- $counter->pages();
- $counter->users();
- $counter->files();
+ $counter->edits();
+ $counter->articles();
+ $counter->pages();
+ $counter->users();
+ $counter->files();
- $counter->refresh();
+ $counter->refresh();
- // Count active users if need be
- if ( $options['activeUsers'] ) {
- SiteStatsUpdate::cacheUpdate( wfGetDB( DB_MASTER ) );
- }
+ // Count active users if need be
+ if ( $options['activeUsers'] ) {
+ SiteStatsUpdate::cacheUpdate(
wfGetDB( DB_MASTER ) );
+ }
+ }
+ )
+ );
+
+ $work->execute();
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/202732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide900219f7ee274968e9af5a9001019e1074d4fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create Wikidata ttl dumps on Mondays 23:00:00 (UTC) - change (operations/puppet)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/202734 Change subject: Create Wikidata ttl dumps on Mondays 23:00:00 (UTC) .. Create Wikidata ttl dumps on Mondays 23:00:00 (UTC) Change-Id: I66da5b2d374d6496f1f3f424d3ba4ba0ad5fa43d --- M modules/snapshot/manifests/wikidatadumps.pp 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/34/202734/1 diff --git a/modules/snapshot/manifests/wikidatadumps.pp b/modules/snapshot/manifests/wikidatadumps.pp index d6d28e2..4cb78f4 100644 --- a/modules/snapshot/manifests/wikidatadumps.pp +++ b/modules/snapshot/manifests/wikidatadumps.pp @@ -83,9 +83,9 @@ ensure => $ensure, command => $scriptPath, user=> $user, -minute => '15', -hour=> '3', -weekday => '3', +minute => '0', +hour=> '23', +weekday => '1', require => File[$scriptPath], } } -- To view, visit https://gerrit.wikimedia.org/r/202734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66da5b2d374d6496f1f3f424d3ba4ba0ad5fa43d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hoo man ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update jquery.uls from upstream - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Update jquery.uls from upstream
..
Update jquery.uls from upstream
To github version:
https://github.com/wikimedia/jquery.uls/commit/345097a8bd727cc77b5cf1a1bc523e507fcb7bf3
Show the Common language section only if the list is long enough
Bug: T76196
Change-Id: I6aa0d951657962103c356f6254ab4102e5ee765d
---
M lib/jquery.uls/src/jquery.uls.core.js
1 file changed, 30 insertions(+), 17 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.uls/src/jquery.uls.core.js
b/lib/jquery.uls/src/jquery.uls.core.js
index fba4859..201d384 100644
--- a/lib/jquery.uls/src/jquery.uls.core.js
+++ b/lib/jquery.uls/src/jquery.uls.core.js
@@ -54,6 +54,30 @@
/*jshint multistr:false */
/**
+* Count the number of keys in an object.
+* Works in a cross-browser way.
+* @param {Object} The object.
+*/
+ function objectLength ( obj ) {
+ var count, key;
+
+ // Some old browsers don't support Object.keys
+ if ( Object.keys ) {
+ return Object.keys( obj ).length;
+ }
+
+ count = 0;
+
+ for ( key in obj ) {
+ if ( Object.prototype.hasOwnProperty.call( obj, key ) )
{
+ count++;
+ }
+ }
+
+ return count;
+ }
+
+ /**
* ULS Public class definition
*/
ULS = function ( element, options ) {
@@ -208,7 +232,7 @@
* Bind the UI elements with their event listeners
*/
listen: function () {
- var lcd, columnsOptions,
+ var lcd, columnsOptions, languagesCount,
uls = this;
columnsOptions = {
@@ -235,10 +259,12 @@
this.$menu.on( 'keydown', $.proxy(
this.keypress, this ) );
}
+ languagesCount = objectLength( this.options.languages );
lcd = this.$resultsView.lcd( {
languages: this.languages,
columns: columnsOptions[ this.getMenuWidth() ],
- quickList: this.options.quickList,
+
+ quickList: languagesCount > 12 ?
this.options.quickList : false,
clickhandler: $.proxy( this.select, this ),
source: this.$languageFilter,
showRegions: this.options.showRegions,
@@ -354,26 +380,13 @@
* @return string
*/
getMenuWidth: function () {
- var language,
- languagesCount = 0;
+ var languagesCount;
if ( this.options.menuWidth ) {
return this.options.menuWidth;
}
- // IE8 does not support Object.keys
- if ( Object.keys ) {
- languagesCount = Object.keys(
this.options.languages ).length;
- } else {
- for ( language in this.options.languages ) {
- if (
Object.prototype.hasOwnProperty.call(
- this.options.languages,
- language
- ) ) {
- languagesCount++;
- }
- }
- }
+ languagesCount = objectLength( this.options.languages );
if ( languagesCount < 12 ) {
return 'narrow';
--
To view, visit https://gerrit.wikimedia.org/r/202710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6aa0d951657962103c356f6254ab4102e5ee765d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: KartikMistry
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 DOI, PMID, & PMCID have itemType journalArticle - change (mediawiki...citoid)
Mobrovac has submitted this change and it was merged.
Change subject: Make DOI, PMID, & PMCID have itemType journalArticle
..
Make DOI, PMID, & PMCID have itemType journalArticle
Ensure requests from DOI, PMID and PMCIDs have
itemType journalArticle in the returned
citation.
Amended all DOI/PMID/PCMID tests to check for
itemType.
Bug: T94597
Change-Id: I15058dec0082ee04768e0fbadac7e03f413f1c22
---
M lib/CitoidService.js
M test/features/scraping/index.js
2 files changed, 17 insertions(+), 1 deletion(-)
Approvals:
Mobrovac: Looks good to me, approved
diff --git a/lib/CitoidService.js b/lib/CitoidService.js
index e1f8072..2084481 100644
--- a/lib/CitoidService.js
+++ b/lib/CitoidService.js
@@ -142,7 +142,13 @@
citoidService.logger.log('debug/DOI', "Resolved DOI "
+ doiOpts.search + " to URL " + urlOpts.search +
"; Sending to requestFromURL");
- citoidService.requestFromURL(urlOpts, callback);
+ citoidService.requestFromURL(urlOpts, function(error,
statusCode, body){
+ // Ensure itemType in citation is journalArticle
+ if (!body[0].itemType || (body[0].itemType &&
body[0].itemType !== 'journalArticle')){
+ body[0].itemType = 'journalArticle';
+ }
+ callback(error, statusCode, body);
+ });
} else {
var message = 'Unable to resolve DOI ' + doiOpts.search;
var error = new Error(message);
@@ -185,7 +191,12 @@
self.requestFromPubMedURL(urlOpts, function(err, responseCode, body){
if (responseCode === 200){
+ // Ensure itemType in citation is journalArticle
+ if (!body[0].itemType || (body[0].itemType &&
body[0].itemType !== 'journalArticle')){
+ body[0].itemType = 'journalArticle';
+ }
callback(err, 200, body);
+
} else {
// Handle case where 404 is due to failed export
if (responseCode === 404 && body) {
diff --git a/test/features/scraping/index.js b/test/features/scraping/index.js
index 5538399..da5dc22 100644
--- a/test/features/scraping/index.js
+++ b/test/features/scraping/index.js
@@ -17,6 +17,7 @@
return server.query('14656957').then(function(res) {
assert.status(res, 200);
assert.checkCitation(res, 'Seventh report of the Joint
National Committee on Prevention, Detection, Evaluation, and Treatment of High
Blood Pressure');
+ assert.deepEqual(res.body[0].itemType,
'journalArticle', 'Wrong itemType; expected journalArticle, got' +
res.body[0].itemType);
});
});
@@ -24,6 +25,7 @@
return server.query('PMC3605911').then(function(res) {
assert.status(res, 200);
assert.checkCitation(res, 'Viral Phylodynamics');
+ assert.deepEqual(res.body[0].itemType,
'journalArticle', 'Wrong itemType; expected journalArticle, got' +
res.body[0].itemType);
});
});
@@ -31,6 +33,7 @@
return server.query('3605911').then(function(res) {
assert.status(res, 200);
assert.checkCitation(res, 'Viral Phylodynamics');
+ assert.deepEqual(res.body[0].itemType,
'journalArticle', 'Wrong itemType; expected journalArticle, got' +
res.body[0].itemType);
});
});
@@ -47,6 +50,7 @@
assert.status(res, 200);
assert.checkCitation(res);
assert.deepEqual(res.body[0].pages, '1764-1772', 'Wrong
pages item; expected e1002947, got ' + res.body[0].pages);
+ assert.deepEqual(res.body[0].itemType,
'journalArticle', 'Wrong itemType; expected journalArticle, got' +
res.body[0].itemType);
});
});
@@ -56,6 +60,7 @@
assert.status(res, 200);
assert.checkCitation(res);
assert.deepEqual(res.body[0].pages, 'e1002947', 'Wrong
pages item; expected e1002947, got ' + res.body[0].pages);
+ assert.deepEqual(res.body[0].itemType,
'journalArticle', 'Wrong itemType; expected journalArticle, got' +
res.body[0].itemType);
});
});
--
To view, visit https://gerrit.wikimedia.org/r/202387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15058dec0082ee04768e0fbadac7e03f413f1c22
Gerrit-PatchSet:
[MediaWiki-commits] [Gerrit] Trigger Echo notification when registered email address beco... - change (mediawiki...BounceHandler)
Tinaj1234 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202735
Change subject: Trigger Echo notification when registered email address becomes
unverified
..
Trigger Echo notification when registered email address becomes unverified
User is alerted using a Echo notification when his/her registered
email address becomes unverified. As of now a user finds out about
the unverified email address only when he navigates to Special:Preferences
page.
Bug: T94436
Change-Id: I43de1775fb2199c2d96c1bbe2cabd3fccecd7498
---
M BounceHandler.php
M BounceHandlerHooks.php
M i18n/en.json
M i18n/qqq.json
M includes/BounceHandlerActions.php
5 files changed, 51 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BounceHandler
refs/changes/35/202735/1
diff --git a/BounceHandler.php b/BounceHandler.php
index e7b9d39..b8d1544 100644
--- a/BounceHandler.php
+++ b/BounceHandler.php
@@ -46,6 +46,8 @@
//Register Hooks
$wgHooks['UserMailerChangeReturnPath'][] =
'BounceHandlerHooks::onVERPAddressGenerate';
$wgHooks['UnitTestsList'][] = 'BounceHandlerHooks::registerUnitTests';
+$wgHooks['BeforeCreateEchoEvent'][] =
'BounceHandlerHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] =
'BounceHandlerHooks::onEchoGetDefaultNotifiedUsers';
/*Messages Files */
$wgMessagesDirs['BounceHandler'] = $dir. '/i18n';
diff --git a/BounceHandlerHooks.php b/BounceHandlerHooks.php
index b1f88c8..fa406e0 100644
--- a/BounceHandlerHooks.php
+++ b/BounceHandlerHooks.php
@@ -94,4 +94,40 @@
return true;
}
+
+ /**
+* Add BounceHandler events to Echo
+* @param $notifications array of Echo notifications
+* @return bool
+*/
+ public static function onBeforeCreateEchoEvent( &$notifications ) {
+ $notifications['unsubscribe-bouncehandler'] = array(
+ 'category' => 'system',
+ 'title-message' => 'notification-bouncehandler',
+ 'flyout-message' => 'notification-bouncehandler-flyout'
+ );
+
+ return true;
+ }
+
+ /**
+* Add user to be notified on echo event
+* @param $event EchoEvent
+* @param $users array
+* @return bool
+*/
+ public static function onEchoGetDefaultNotifiedUsers( $event, &$users )
{
+ switch ( $event->getType() ) {
+ case 'unsubscribe-bouncehandler':
+ $extra = $event->getExtra();
+ if ( !$extra || !isset(
$extra['failed-user-id'] ) ) {
+ break;
+ }
+ $recipientId = $extra['failed-user-id'];
+ $recipient = User::newFromId( $recipientId );
+ $users[$recipientId] = $recipient;
+ break;
+ }
+ return true;
+ }
}
diff --git a/i18n/en.json b/i18n/en.json
index 2c3c0d2..97d43ac 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,5 +8,7 @@
"bouncehandler-notify_subject": "Returning temporary bounce",
"apihelp-bouncehandler-example-1": "Receive a bounce email for
processing with the content \"This is a test email\".",
"apihelp-bouncehandler-description": "Receive a bounce email and
process it to handle the failing recipient.",
- "apihelp-bouncehandler-param-email": "The bounced email."
+ "apihelp-bouncehandler-param-email": "The bounced email.",
+ "notification-bouncehandler": "Your registered email address is no
longer valid.",
+ "notification-bouncehandler-flyout": "Your registered email address is
no longer valid. Go to [[Special:Preferences]] to set another email address."
}
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 3e79b9e..a89e5fc 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -8,5 +8,7 @@
"bouncehandler-notify_subject": "Subject of notification email sent to
wiki administrators on a failed to parse bounce",
"apihelp-bouncehandler-example-1":
"{{doc-apihelp-example|bouncehandler}}",
"apihelp-bouncehandler-description":
"{{doc-apihelp-description|bouncehandler}}",
- "apihelp-bouncehandler-param-email":
"{{doc-apihelp-param|bouncehandler|email}}"
+ "apihelp-bouncehandler-param-email":
"{{doc-apihelp-param|bouncehandler|email}}",
+ "notification-bouncehandler": "{{Title message of Echo notification to
notify the user of his invalid email address}}",
+ "notification-bouncehandler-flyout": "{{Flyout message of Echo
notification to notify the user of his invalid email address}}"
}
diff --git a/includes/BounceHandlerActions.php
b/includes/BounceHandlerActions.php
index cab659c..92fa202 100644
---
[MediaWiki-commits] [Gerrit] Add language fallback for badge labels - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Add language fallback for badge labels
..
Add language fallback for badge labels
Bug: T94552
Change-Id: I158482cb9ff225ae9389c071919edf6a3f9a3aaa
---
M lib/includes/store/TermLookup.php
A repo/includes/EntityIdLabelFormatterFactory.php
M repo/includes/EntityParserOutputGenerator.php
M repo/includes/WikibaseRepo.php
A repo/tests/phpunit/includes/EntityIdLabelFormatterFactoryTest.php
M view/src/EntityViewFactory.php
M view/src/SiteLinksView.php
M view/tests/phpunit/EntityViewFactoryTest.php
M view/tests/phpunit/SiteLinksViewTest.php
9 files changed, 130 insertions(+), 98 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
Hoo man: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/lib/includes/store/TermLookup.php
b/lib/includes/store/TermLookup.php
index 4fb59b6..9af057b 100644
--- a/lib/includes/store/TermLookup.php
+++ b/lib/includes/store/TermLookup.php
@@ -31,8 +31,7 @@
/**
* Gets all labels of an Entity with the specified EntityId.
*
-* If $languages is given, the result will contain the entries for the
-* requested languages, if they exist.
+* The result will contain the entries for the requested languages, if
they exist.
*
* @param EntityId $entityId
* @param string[] $languageCodes The list of languages to fetch
diff --git a/repo/includes/EntityIdLabelFormatterFactory.php
b/repo/includes/EntityIdLabelFormatterFactory.php
new file mode 100644
index 000..f179fdd
--- /dev/null
+++ b/repo/includes/EntityIdLabelFormatterFactory.php
@@ -0,0 +1,38 @@
+getEditSection();
$usedEntityIds =
$this->referencedEntitiesFinder->findSnakLinks( $snaks );
+
+ // FIXME: Bad
+ if( $entity instanceof Item ) {
+ foreach( $entity->getSiteLinkList()->getIterator() as
$sitelink ) {
+ $usedEntityIds = array_merge( $usedEntityIds,
$sitelink->getBadges() );
+ }
+ }
+
$entityInfo = $this->getEntityInfo( $usedEntityIds );
$configVars = $this->configBuilder->build( $entity );
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index d495d0a..243f1eb 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1015,8 +1015,8 @@
$entityViewFactory = new EntityViewFactory(
$this->getEntityIdHtmlLinkFormatterFactory(),
+ new EntityIdLabelFormatterFactory(),
$this->getHtmlSnakFormatterFactory(),
- $this->getEntityLookup(),
$this->getSiteStore(),
$this->getDataTypeFactory(),
$templateFactory,
diff --git a/repo/tests/phpunit/includes/EntityIdLabelFormatterFactoryTest.php
b/repo/tests/phpunit/includes/EntityIdLabelFormatterFactoryTest.php
new file mode 100644
index 000..3562ca3
--- /dev/null
+++ b/repo/tests/phpunit/includes/EntityIdLabelFormatterFactoryTest.php
@@ -0,0 +1,38 @@
+getFormatterFactory();
+
+ $this->assertEquals( SnakFormatter::FORMAT_PLAIN,
$factory->getOutputFormat() );
+ }
+
+ public function testGetEntityIdFormatter() {
+ $factory = $this->getFormatterFactory();
+
+ $formatter = $factory->getEntityIdFormater( $this->getMock(
'Wikibase\Lib\Store\LabelLookup' ) );
+ $this->assertInstanceOf( 'Wikibase\Lib\EntityIdFormatter',
$formatter );
+ }
+
+}
diff --git a/view/src/EntityViewFactory.php b/view/src/EntityViewFactory.php
index 254dd42..1d7f6b0 100644
--- a/view/src/EntityViewFactory.php
+++ b/view/src/EntityViewFactory.php
@@ -10,7 +10,6 @@
use Wikibase\Lib\EntityIdFormatter;
use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\SnakFormatter;
-use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\LabelLookup;
use Wikibase\View\Template\TemplateFactory;
@@ -30,12 +29,12 @@
/**
* @var EntityIdFormatterFactory
*/
- private $idFormatterFactory;
+ private $htmlIdFormatterFactory;
/**
-* @var EntityLookup
+* @var EntityIdFormatterFactory
*/
- private $entityLookup;
+ private $plainTextIdFormatterFactory;
/**
* @var SiteStore
@@ -73,9 +72,9 @@
private $languageNameLookup;
/**
-* @param EntityIdFormatterFactory $idFormatterFactory
+* @param EntityIdFormatterFactory $htmlIdFormatterFactory
+* @param EntityIdFormatterFactory $plainTextIdFormatterFactory
* @param HtmlSnakFormatterFactory $htmlSnakFormatterFactory
-* @param EntityLookup $entityLookup
* @param SiteStore $siteStore
* @
[MediaWiki-commits] [Gerrit] Conform to statsite metrics - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: Conform to statsite metrics .. Conform to statsite metrics The WMF is switching from TXStatsD to statsite, so metrics sending should be adjusted accordingly. Note: the switch is happening 2015-04-09 at 10:00 UTC Bug: T94053 Change-Id: I6646d41b94cc5309447ef5b63d83d3b1e0e162b3 --- M lib/mediawiki.Util.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/mediawiki.Util.js b/lib/mediawiki.Util.js index 6da9171..cd0af76 100644 --- a/lib/mediawiki.Util.js +++ b/lib/mediawiki.Util.js @@ -1476,7 +1476,7 @@ port: statsdPort, prefix: 'parsoid.', // prefix each stat for hierarchical namespacing suffix: '', - txstatsd : true, + txstatsd : false, globalize : false, cacheDns : true, mock : false -- To view, visit https://gerrit.wikimedia.org/r/202727 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6646d41b94cc5309447ef5b63d83d3b1e0e162b3 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Arlolra Gerrit-Reviewer: Cscott Gerrit-Reviewer: GWicke Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IMPROV] Use unicode_literals - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] Use unicode_literals .. [IMPROV] Use unicode_literals This adds the unicode_literals import to the library. Bug: T89589 Change-Id: I033e6a71cc82e3b46b843c9895b7c152d102fc40 --- M pwb.py M pywikibot/__init__.py M pywikibot/backports.py M pywikibot/bot.py M pywikibot/botirc.py M pywikibot/comms/__init__.py M pywikibot/comms/http.py M pywikibot/comms/rcstream.py M pywikibot/comms/threadedhttp.py M pywikibot/compat/catlib.py M pywikibot/compat/query.py M pywikibot/compat/userlib.py M pywikibot/config2.py M pywikibot/data/__init__.py M pywikibot/data/api.py M pywikibot/data/wikidataquery.py M pywikibot/data/wikistats.py M pywikibot/date.py M pywikibot/diff.py M pywikibot/echo.py M pywikibot/editor.py M pywikibot/exceptions.py M pywikibot/families/__init__.py M pywikibot/families/anarchopedia_family.py M pywikibot/families/battlestarwiki_family.py M pywikibot/families/commons_family.py M pywikibot/families/i18n_family.py M pywikibot/families/incubator_family.py M pywikibot/families/lyricwiki_family.py M pywikibot/families/mediawiki_family.py M pywikibot/families/meta_family.py M pywikibot/families/omegawiki_family.py M pywikibot/families/osm_family.py M pywikibot/families/outreach_family.py M pywikibot/families/species_family.py M pywikibot/families/strategy_family.py M pywikibot/families/test_family.py M pywikibot/families/vikidia_family.py M pywikibot/families/wikia_family.py M pywikibot/families/wikibooks_family.py M pywikibot/families/wikidata_family.py M pywikibot/families/wikimedia_family.py M pywikibot/families/wikinews_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wikitech_family.py M pywikibot/families/wikiversity_family.py M pywikibot/families/wikivoyage_family.py M pywikibot/families/wiktionary_family.py M pywikibot/families/wowwiki_family.py M pywikibot/family.py M pywikibot/fixes.py M pywikibot/i18n.py M pywikibot/interwiki_graph.py M pywikibot/logentries.py M pywikibot/login.py M pywikibot/page.py M pywikibot/pagegenerators.py M pywikibot/plural.py M pywikibot/site.py M pywikibot/textlib.py M pywikibot/throttle.py M pywikibot/titletranslate.py M pywikibot/tools/__init__.py M pywikibot/tools/ip.py M pywikibot/userinterfaces/__init__.py M pywikibot/userinterfaces/cgi_interface.py M pywikibot/userinterfaces/gui.py M pywikibot/userinterfaces/terminal_interface.py M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/terminal_interface_unix.py M pywikibot/userinterfaces/terminal_interface_win32.py M pywikibot/userinterfaces/transliteration.py M pywikibot/userinterfaces/win32_unicode.py M pywikibot/version.py M pywikibot/weblib.py M pywikibot/xmlreader.py M scripts/add_text.py M scripts/archivebot.py M scripts/basic.py M scripts/blockpageschecker.py M scripts/blockreview.py M scripts/capitalize_redirects.py M scripts/casechecker.py M scripts/catall.py M scripts/category.py M scripts/category_redirect.py M scripts/cfd.py M scripts/checkimages.py M scripts/claimit.py M scripts/clean_sandbox.py M scripts/commons_link.py M scripts/commonscat.py M scripts/coordinate_import.py M scripts/cosmetic_changes.py M scripts/create_categories.py M scripts/data_ingestion.py M scripts/delete.py M scripts/disambredir.py M scripts/editarticle.py M scripts/featured.py M scripts/fixing_redirects.py M scripts/flickrripper.py M scripts/freebasemappingupload.py M scripts/harvest_template.py M scripts/illustrate_wikidata.py M scripts/image.py M scripts/imagerecat.py M scripts/imagetransfer.py M scripts/imageuncat.py M scripts/interwiki.py M scripts/isbn.py M scripts/listpages.py M scripts/login.py M scripts/lonelypages.py M scripts/maintenance/cache.py M scripts/maintenance/compat2core.py M scripts/maintenance/make_i18n_dict.py M scripts/maintenance/wikimedia_sites.py M scripts/makecat.py M scripts/match_images.py M scripts/misspelling.py M scripts/movepages.py M scripts/newitem.py M scripts/noreferences.py M scripts/nowcommons.py M scripts/pagefromfile.py M scripts/patrol.py M scripts/piper.py M scripts/protect.py M scripts/redirect.py M scripts/reflinks.py M scripts/replace.py M scripts/replicate_wiki.py M scripts/revertbot.py M scripts/script_wui.py M scripts/selflink.py M scripts/shell.py M scripts/solve_disambiguation.py M scripts/spamremove.py M scripts/states_redirect.py M scripts/template.py M scripts/templatecount.py M scripts/touch.py M scripts/transferbot.py M scripts/unlink.py M scripts/unusedfiles.py M scripts/upload.py M scripts/version.py M scripts/watchlist.py M scripts/weblinkchecker.py M scripts/welcome.py M tests/__init__.py M tests/api_tests.py M tests/archivebot_tests.py M tests/aspects.py M tests/cache_tests.py M tests/category_tests.py M tests/checkimages_tests.py M tests/data_ingestion_tests.py M tests/date_tests.py M t
[MediaWiki-commits] [Gerrit] Bump service-runner to 0.1.6 - change (mediawiki...citoid)
Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202737
Change subject: Bump service-runner to 0.1.6
..
Bump service-runner to 0.1.6
The new version switches metrics-reporting from TXStatsD to a pure
StatsD spec, needed to conform to the switch to statsite at the WMF.
Note: the switch is happening 2015-04-09 at 10:00 UTC
Bug: T94053
Change-Id: Iccff72e8f60e61a66172e32323438a386b5293b2
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/37/202737/1
diff --git a/package.json b/package.json
index fe8a9bf..cc644fa 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"node-uuid": "1.4.3",
"preq": "0.3.13",
"request": "2.49.0",
-"service-runner": "0.1.5"
+"service-runner": "0.1.6"
},
"devDependencies": {
"assert": "1.3.0",
--
To view, visit https://gerrit.wikimedia.org/r/202737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iccff72e8f60e61a66172e32323438a386b5293b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added ymt.adlibhosting.com to wgCopyUploadsDomains - change (operations/mediawiki-config)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/202736 Change subject: Added ymt.adlibhosting.com to wgCopyUploadsDomains .. Added ymt.adlibhosting.com to wgCopyUploadsDomains This souce is the media serving domain of the York Museums Trust. No site policy about image use. Public domain status is well documented. No clear license offered for photographies of 3D public domain objects. Change-Id: Ib8c3f3de2ca181c522891504d1465e2ef748b81d --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/36/202736/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 38fdf3e..40a787a 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11196,6 +11196,7 @@ '*.loc.gov',// Library of Congress - T94017 'socrates.leidenuniv.nl', // Leiden University - T93757 'media.padil.gov.au', // PaDIL - T95328 + 'ymt.adlibhosting.com', // York Museums Trust - T95418 ), ), -- To view, visit https://gerrit.wikimedia.org/r/202736 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8c3f3de2ca181c522891504d1465e2ef748b81d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable WikibaseView on client, as client has some dependenci... - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202738
Change subject: Enable WikibaseView on client, as client has some dependencies
on it
..
Enable WikibaseView on client, as client has some dependencies on it
things like jquery.wikibase.wbtooltip are in WikibaseView,
but needed in client for linkitem widget.
Possibly the lack of these things results in strange
effects like T95427.
Bug: T95427
Change-Id: I2ab2adf30d14dd8eef8cd2a4baf7c6b7ef7c051f
---
M client/WikibaseClient.php
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/38/202738/1
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index abf4be1..0640133 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -63,6 +63,14 @@
throw new Exception( 'WikibaseClient depends on the WikibaseLib
extension.' );
}
+if ( !defined( 'WIKIBASE_VIEW_VERSION' ) ) {
+ include_once( __DIR__ . '/../view/WikibaseView.php' );
+}
+
+if ( !defined( 'WIKIBASE_VIEW_VERSION' ) ) {
+ throw new Exception( 'Wikibase depends on WikibaseView.' );
+}
+
call_user_func( function() {
global $wgExtensionCredits, $wgExtensionMessagesFiles, $wgHooks;
global $wgAPIMetaModules, $wgAPIPropModules, $wgSpecialPages,
$wgResourceModules;
--
To view, visit https://gerrit.wikimedia.org/r/202738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ab2adf30d14dd8eef8cd2a4baf7c6b7ef7c051f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump service-runner to 0.1.6 - change (mediawiki...citoid)
Mobrovac has submitted this change and it was merged.
Change subject: Bump service-runner to 0.1.6
..
Bump service-runner to 0.1.6
The new version switches metrics-reporting from TXStatsD to a pure
StatsD spec, needed to conform to the switch to statsite at the WMF.
Note: the switch is happening 2015-04-09 at 10:00 UTC
Bug: T94053
Change-Id: Iccff72e8f60e61a66172e32323438a386b5293b2
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mobrovac: Looks good to me, approved
diff --git a/package.json b/package.json
index fe8a9bf..cc644fa 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"node-uuid": "1.4.3",
"preq": "0.3.13",
"request": "2.49.0",
-"service-runner": "0.1.5"
+"service-runner": "0.1.6"
},
"devDependencies": {
"assert": "1.3.0",
--
To view, visit https://gerrit.wikimedia.org/r/202737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iccff72e8f60e61a66172e32323438a386b5293b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: Mvolz
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Log promote to global renames in the global rename log - change (mediawiki...CentralAuth)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202739
Change subject: Log promote to global renames in the global rename log
..
Log promote to global renames in the global rename log
Bug: T93235
Change-Id: I472842bdca2c2490f2a1376819d8f422b63991ea
(cherry picked from commit e4708811a9584665fe0a252fbf7de425f9f5d282)
---
M CentralAuth.php
M i18n/en.json
M i18n/qqq.json
M includes/GlobalRename/GlobalRenameLogFormatter.php
M includes/GlobalRename/GlobalRenameUserLogger.php
M includes/specials/SpecialGlobalRenameQueue.php
6 files changed, 72 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/39/202739/1
diff --git a/CentralAuth.php b/CentralAuth.php
index a5e9b1e..3518eec 100644
--- a/CentralAuth.php
+++ b/CentralAuth.php
@@ -477,6 +477,7 @@
$wgLogActions['gblrights/groupprms3'] =
'centralauth-rightslog-entry-groupperms3';
$wgLogActionsHandlers['gblrights/grouprename'] = 'efHandleGrouprenameLogEntry';
$wgLogActionsHandlers['gblrename/rename'] = 'GlobalRenameLogFormatter';
+$wgLogActionsHandlers['gblrename/promote'] = 'GlobalRenameLogFormatter';
$wgLogActionsHandlers['gblrename/merge'] = 'GlobalUserMergeLogFormatter';
foreach ( array( 'newset', 'setrename', 'setnewtype', 'setchange', 'deleteset'
) as $type ) {
diff --git a/i18n/en.json b/i18n/en.json
index 54af761..d18b772 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -396,6 +396,7 @@
"log-name-gblrename": "Global rename log",
"log-description-gblrename": "This log tracks the global renaming of
users.",
"logentry-gblrename-rename" : "$1 globally {{GENDER:$2|renamed}} $4 to
$5",
+ "logentry-gblrename-promote" : "$1 globally {{GENDER:$2|renamed}} $4 to
$5",
"globalusermerge": "Merge global user",
"globalusermerge-legend": "Merge global user",
"centralauth-usermerge-form-newuser": "Final username",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ffc6e86..a316ac7 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -408,7 +408,8 @@
"centralauth-rename-confirm": "Confirmation text asking whether the
global account should really be renamed.\n\nSee also:\n*
{{msg-mw|Centralauth-usermerge-confirm}}",
"log-name-gblrename": "Log page title",
"log-description-gblrename": "Log page description",
- "logentry-gblrename-rename": "{{Logentry}}\nAdditional parameters:\n*
$4 - old username\n* $5 - new username\nSee also:\n*
{{msg-mw|Logentry-gblrename-merge}}",
+ "logentry-gblrename-rename": "{{Logentry}}\nAdditional parameters:\n*
$4 - old username\n* $5 - new username\nSee also:\n*
{{msg-mw|Logentry-gblrename-merge}}\n* {{mw-msg|logentry-gblrename-promote}}",
+ "logentry-gblrename-promote": "{{Logentry}}\nAdditional parameters:\n*
$4 - old username\n* $5 - new username\nSee also:\n*
{{msg-mw|Logentry-gblrename-merge}}\n* {{mw-msg|logentry-gblrename-rename}}",
"globalusermerge": "Name of special page",
"globalusermerge-legend": "Legend of fieldset surrounding the form",
"centralauth-usermerge-form-newuser": "Label for form field",
diff --git a/includes/GlobalRename/GlobalRenameLogFormatter.php
b/includes/GlobalRename/GlobalRenameLogFormatter.php
index d93771d..bf14164 100644
--- a/includes/GlobalRename/GlobalRenameLogFormatter.php
+++ b/includes/GlobalRename/GlobalRenameLogFormatter.php
@@ -1,14 +1,20 @@
extractParameters();
- $this->parsedParameters[3] = $this->getCentralAuthLink(
$params[3] );
+ if ( $this->entry->getSubtype() === 'promote' ) {
+ $this->parsedParameters[3] = $this->getLocalWikiLink(
$params[3], $params[5] );
+ } else { // rename
+ $this->parsedParameters[3] = $this->getCentralAuthLink(
$params[3] );
+ }
$this->parsedParameters[4] = $this->getCentralAuthLink(
$params[4] );
ksort( $this->parsedParameters );
@@ -27,4 +33,13 @@
return Message::rawParam( Linker::link( $title,
htmlspecialchars( $name ) ) );
}
+
+ protected function getLocalWikiLink( $name, $wiki ) {
+ $text = "User:$name@$wiki";
+ if ( $this->plaintext ) {
+ return "[[$text]]";
+ }
+
+ return Message::rawParam( WikiMap::foreignUserLink( $wiki,
$name, $text ) );
+ }
}
diff --git a/includes/GlobalRename/GlobalRenameUserLogger.php
b/includes/GlobalRename/GlobalRenameUserLogger.php
index 9c854d7..a1d1a3d 100644
--- a/includes/GlobalRename/GlobalRenameUserLogger.php
+++ b/includes/GlobalRename/GlobalRenameUserLogger.php
@@ -46,4 +46,35 @@
$logid = $logEntry->insert();
$logEntry->publish( $logid );
}
+
+ /**
+* Log the promotion of a local unattached to a global
+*
+*
[MediaWiki-commits] [Gerrit] Throttle rule for Editatón Ciencia y Tecnología en Chile - change (operations/mediawiki-config)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/202740 Change subject: Throttle rule for Editatón Ciencia y Tecnología en Chile .. Throttle rule for Editatón Ciencia y Tecnología en Chile New throttle rule: * Event name Editatón Ciencia y Tecnología en Chile * Event start ... 2015-04-11 05:00 UTC * Event end . 2015-04-12 21:00 UTC * IP 190.216.150.155 * Projects .. es.wikipedia, en.wikipedia * Attendees . 50 (margin set at 80) Cleaned past throttle rules. Bug: T95302 Change-Id: I4360c8d05eaac1a7803cfcfebe251655713e785b --- M wmf-config/throttle.php 1 file changed, 6 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/40/202740/1 diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 7ad710b..8da89d3 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -20,28 +20,12 @@ # (default: any project) ## Add throttling definitions below. -$wmgThrottlingExceptions[] = array( // T88203 - 'from' => '2015-02-26T00:00 +1:00', - 'to' => '2015-02-27T00:00 +1:00', - 'IP' => array( '195.113.132.25' ), - 'dbname' => array( 'cswiki', 'commonswiki' ), - 'value' => 25, -); - -$wmgThrottlingExceptions[] = array( // T90778 - 'from' => '2015-03-13T17:00 +0:00', - 'to' => '2015-03-14T23:00 +0:00', - 'IP' => array( '186.67.30.194' ), - 'dbname' => array( 'eswiki' ), - 'value' => 60, -); - -$wmgThrottlingExceptions[] = array( // T91936 - 'from' => '2015-03-08T12:00 -5:00', - 'to' => '2015-03-08T16:00 -5:00', - 'IP' => array( '65.116.184.106' ), - 'dbname' => array( 'enwiki', 'commonswiki' ), - 'value' => 100, +$wmgThrottlingExceptions[] = array( // T95302 + 'from' => '2015-04-11T05:00 +0:00', + 'to' => '2015-04-12T21:00 +0:00', + 'IP' => array( '190.216.150.155' ), + 'dbname' => array( 'eswiki', 'enwiki' ), + 'value' => 80, //50 participants expected ); ## Add throttling definitions above. -- To view, visit https://gerrit.wikimedia.org/r/202740 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4360c8d05eaac1a7803cfcfebe251655713e785b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add fatal log group - change (operations/mediawiki-config)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/202741 Change subject: Add fatal log group .. Add fatal log group Bug: T89169 Change-Id: I7b25ce403c059dab4b07acb9a667f0bdc4dc6f81 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/41/202741/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 1a55eb7..06913b4 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4174,6 +4174,7 @@ // 'error' => "udp://$wmfUdp2logDest/error", // Logs warnings, notices and such 'exception' => array( 'destination' => "udp://$wmfUdp2logDest/exception", 'logstash' => false ), // duplicates exception-json 'exception-json' => "udp://$wmfUdp2logDest/exception-json", + 'fatal' => "udp://$wmfUdp2logDest/fatal", 'session' => "udp://$wmfUdp2logDest/session", 'logging' => "udp://$wmfUdp2logDest/logging", 'SimpleAntiSpam' => "udp://$wmfUdp2logDest/spam", -- To view, visit https://gerrit.wikimedia.org/r/202741 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b25ce403c059dab4b07acb9a667f0bdc4dc6f81 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Install non-vendor services to /vagrant/srv - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Install non-vendor services to /vagrant/srv
..
Install non-vendor services to /vagrant/srv
MediaWiki-related and other actively developed services should be
installed to a location that's accessible on the host system.
Vendor services will remain in /srv to avoid the permissions and
performance issues that come with NFS/vboxsf.
Bug: T89919
Follows: I840d6291e9f69f0afb5c47fe742763c8fb50b831
Change-Id: I769c8da0509c8cd6d30955fe18228b19ffa9d216
---
M puppet/hieradata/common.yaml
A srv/.gitignore
2 files changed, 29 insertions(+), 24 deletions(-)
Approvals:
Sbisson: Checked; Looks good to me, but someone else must approve
BryanDavis: Looks good to me, but someone else must approve
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index b9dfa3f..31a1d5a 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -3,8 +3,12 @@
- '::role::mediawiki'
- '::puppet::agent'
+files_dir: /srv
+services_dir: /vagrant/srv
+vendor_dir: /srv
+
apache::docroot: /var/www
-arcanist::deploy_dir: /vagrant/phab
+arcanist::deploy_dir: "%{hiera('services_dir')}"
cdh::hue::secret_key: vagrant
cdh::hue::hive_server_host: "%{::fqdn}"
@@ -12,7 +16,7 @@
cdh::oozie::server::db_root_password: "%{hiera('mysql::root_password')}"
cdh::oozie::server::heapsize: 64
-crm::dir: /srv/org.wikimedia.civicrm
+crm::dir: "%{hiera('services_dir')}/org.wikimedia.civicrm"
crm::site_name: crm.dev
crm::drupal_db: drupal
crm::civicrm_db: civicrm
@@ -20,7 +24,7 @@
crm::db_pass: "%{hiera('mysql::root_password')}"
crm::drupal::dir: "%{hiera('crm::dir')/drupal}"
-crm::drupal::files_dir: '/srv/org.wikimedia.civicrm-files'
+crm::drupal::files_dir: "%{hiera('files_dir')}/org.wikimedia.civicrm-files"
hhvm::common_settings:
date:
@@ -103,7 +107,7 @@
hhvm::hhbc_dir: /var/run/hhvm
hhvm::logroot: /vagrant/logs
-kibana::deploy_dir: /srv/kibana
+kibana::deploy_dir: "%{hiera('vendor_dir')}/kibana"
kibana::default_route: /dashboard/elasticsearch/default
logstash::heap_memory_mb: 64
@@ -113,15 +117,15 @@
logstash::output::elasticsearch::manage_indices: true
logstash::output::elasticsearch::priority: 90
-mathoid::base_path: /vagrant/mathoid
-mathoid::node_path: /vagrant/mathoid/node_modules
-mathoid::conf_path: /vagrant/mathoid/mathoid.config.json
+mathoid::base_path: "%{hiera('services_dir')}/mathoid"
+mathoid::node_path: "%{hiera('mathoid::base_path')}/node_modules"
+mathoid::conf_path: "%{hiera('mathoid::base_path')}/mathoid.config.json"
mathoid::log_dir: /vagrant/logs
mathoid::port: 10042
-graphoid::base_path: /vagrant/graphoid
-graphoid::node_path: /vagrant/graphoid/node_modules
-graphoid::conf_path: /vagrant/graphoid/graphoid.config.json
+graphoid::base_path: "%{hiera('services_dir')}/graphoid"
+graphoid::node_path: "%{hiera('graphoid::base_path')}/node_modules"
+graphoid::conf_path: "%{hiera('graphoid::base_path')}/graphoid.config.json"
graphoid::log_dir: /vagrant/logs
graphoid::port: 11042
@@ -131,7 +135,7 @@
iegreview::db_name: iegreview
iegreview::db_user: iegreview
iegreview::db_pass: iegreview
-iegreview::deploy_dir: /vagrant/iegreview
+iegreview::deploy_dir: "%{hiera('services_dir')}/iegreview"
iegreview::cache_dir: /var/cache/iegreview
iegreview::log_file: /vagrant/logs/iegreview.log
iegreview::smtp_server: 127.0.0.1
@@ -142,8 +146,8 @@
mediawiki::cache_dir: /var/cache/mediawiki
mediawiki::settings_dir: /vagrant/settings.d
mediawiki::upload_dir: "%{hiera('mediawiki::upload_root')}/images"
-mediawiki::upload_root: /srv
-mediawiki::page_dir: /srv/pages
+mediawiki::upload_root: "%{hiera('files_dir')}"
+mediawiki::page_dir: "%{hiera('files_dir')}/pages"
mediawiki::db_name: "%{hiera('mysql::default_db_name')}"
mediawiki::db_user: root
mediawiki::db_pass: "%{hiera('mysql::root_password')}"
@@ -153,13 +157,13 @@
mediawiki::apache::docroot: "%{hiera('apache::docroot')}"
-mediawiki::jobrunner::dir: /srv/jobrunner
+mediawiki::jobrunner::dir: "%{hiera('services_dir')}/jobrunner"
mediawiki::multiwiki::base_domain: '.wiki.local.wmftest.net'
mediawiki::multiwiki::script_dir: "%{hiera('mediawiki::apache::docroot')}/w"
mediawiki::multiwiki::settings_root:
"%{hiera('mediawiki::settings_dir')}/wikis"
-mediawiki::parsoid::dir: /srv/parsoid
+mediawiki::parsoid::dir: "%{hiera('services_dir')}/parsoid"
mediawiki::parsoid::port: 8000
mediawiki::parsoid::use_php_preprocessor: true
mediawiki::parsoid::use_selser: true
@@ -169,16 +173,16 @@
mysql::default_db_name: wiki
mysql::root_password: vagrant
-phabricator::deploy_dir: /vagrant/phab
+phabricator::deploy_dir: "%{hiera('services_dir')}"
phabricator::vhost_name: phabricator.local.wmftest.net
-phpmailer::dir: /srv/phpmailer
+phpmailer::dir: "%{hiera('services_dir')}/phpmailer"
# We are masterless
[MediaWiki-commits] [Gerrit] Allow wikibase-time-precision-* to be translated, expand Qqq - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow wikibase-time-precision-* to be translated, expand Qqq
..
Allow wikibase-time-precision-* to be translated, expand Qqq
Although they're probably not terribly well covering all edge cases
in all the languages out there, having them translatable as they are
is still better than having them English only.
At some point we may come up with a better way to localize this,
but that's not going to happen soon, so we should rather have this
localized now.
Bug: T50962
Change-Id: I57bfb737b68010020b75a592e864f0298fe0046c
---
M lib/i18n/qqq.json
1 file changed, 12 insertions(+), 12 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/i18n/qqq.json b/lib/i18n/qqq.json
index f695e91..0bac9c6 100644
--- a/lib/i18n/qqq.json
+++ b/lib/i18n/qqq.json
@@ -82,18 +82,18 @@
"datatypes-type-wikibase-property": "The name of a data type for
properties in Wikibase.\n{{Identical|Property}}",
"datatypes-type-commonsMedia": "The name of a data type for media files
on Wikimedia Commons (proper name, capitalised in English; first letter
capitalised anyway in this message and
relatives).\n\n{{related|Datatypes-type}}",
"version-wikibase": "Name of the Wikibase extension collection, used on
[[Special:Version]]",
- "wikibase-time-precision-Gannum": "!!DO NOT TRANSLATE!! Used to present
a point in time with the precession of 1 billion of
years\n{{Related|Wikibase-time-precision}}",
- "wikibase-time-precision-Mannum": "!!DO NOT TRANSLATE!! Used to present
a point in time with the precession of 1 million of
years\n{{Related|Wikibase-time-precision}}",
- "wikibase-time-precision-annum": "!!DO NOT TRANSLATE!! Used to present
a point in time with the precession of 1 years to 10
years\n{{Related|Wikibase-time-precision}}",
- "wikibase-time-precision-millennium": "!!DO NOT TRANSLATE!! Used to
present a point in time with the precession of 1000
years\n{{Related|Wikibase-time-precision}}",
- "wikibase-time-precision-century": "!!DO NOT TRANSLATE!! Used to
present a point in time with the precession of 100
years\n{{Related|Wikibase-time-precision}}",
- "wikibase-time-precision-10annum": "!!DO NOT TRANSLATE!! Used to
present a point in time with the precession of 10
years\n{{Related|Wikibase-time-precision}}",
- "wikibase-time-precision-BCE-Gannum": "!!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 1
billion of years\n{{Related|Wikibase-time-precision}}",
- "wikibase-time-precision-BCE-Mannum": "!!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 1
million of years\n{{Related|Wikibase-time-precision}}",
- "wikibase-time-precision-BCE-annum": "!!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 1
years to 10 years\n{{Related|Wikibase-time-precision}}",
- "wikibase-time-precision-BCE-millennium": "!!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 1000
years\n{{Related|Wikibase-time-precision}}",
- "wikibase-time-precision-BCE-century": "!!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 100
years\n{{Related|Wikibase-time-precision}}",
- "wikibase-time-precision-BCE-10annum": "!!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 10
years\n{{Related|Wikibase-time-precision}}",
+ "wikibase-time-precision-Gannum": "Used to present a point in time with
the precession of 1 billion of years. $1 is the point in time in billion years,
rounded to billion years.\n{{Related|Wikibase-time-precision}}",
+ "wikibase-time-precision-Mannum": "Used to present a point in time with
the precession of 1 million of years. $1 is the point in time in million years,
rounded to million years.\n{{Related|Wikibase-time-precision}}",
+ "wikibase-time-precision-annum": "Used to present a point in time with
the precession of 1 years to 10 years. $1 is the point in time in
years, rounded to 1 or 10 years.\n{{Related|Wikibase-time-precision}}",
+ "wikibase-time-precision-millennium": "Used to present a point in time
with the precession of 1000 years. $1 is the millennium, given as year rounded
up to the next 1000 and divided by 1000.\n{{Related|Wikibase-time-precision}}",
+ "wikibase-time-precision-century": "Used to present a point in time
with the precession of 100 years. $1 is the century, given as year rounded up
the next hundred and divided by 100.\n{{Related|Wikibase-time-precision}}",
+ "wikibase-time-precision-10annum": "Used to present a point in time
with the precession
[MediaWiki-commits] [Gerrit] Log promote to global renames in the global rename log - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Log promote to global renames in the global rename log
..
Log promote to global renames in the global rename log
Bug: T93235
Change-Id: I472842bdca2c2490f2a1376819d8f422b63991ea
(cherry picked from commit e4708811a9584665fe0a252fbf7de425f9f5d282)
---
M CentralAuth.php
M i18n/en.json
M i18n/qqq.json
M includes/GlobalRename/GlobalRenameLogFormatter.php
M includes/GlobalRename/GlobalRenameUserLogger.php
M includes/specials/SpecialGlobalRenameQueue.php
6 files changed, 72 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CentralAuth.php b/CentralAuth.php
index a5e9b1e..3518eec 100644
--- a/CentralAuth.php
+++ b/CentralAuth.php
@@ -477,6 +477,7 @@
$wgLogActions['gblrights/groupprms3'] =
'centralauth-rightslog-entry-groupperms3';
$wgLogActionsHandlers['gblrights/grouprename'] = 'efHandleGrouprenameLogEntry';
$wgLogActionsHandlers['gblrename/rename'] = 'GlobalRenameLogFormatter';
+$wgLogActionsHandlers['gblrename/promote'] = 'GlobalRenameLogFormatter';
$wgLogActionsHandlers['gblrename/merge'] = 'GlobalUserMergeLogFormatter';
foreach ( array( 'newset', 'setrename', 'setnewtype', 'setchange', 'deleteset'
) as $type ) {
diff --git a/i18n/en.json b/i18n/en.json
index 54af761..d18b772 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -396,6 +396,7 @@
"log-name-gblrename": "Global rename log",
"log-description-gblrename": "This log tracks the global renaming of
users.",
"logentry-gblrename-rename" : "$1 globally {{GENDER:$2|renamed}} $4 to
$5",
+ "logentry-gblrename-promote" : "$1 globally {{GENDER:$2|renamed}} $4 to
$5",
"globalusermerge": "Merge global user",
"globalusermerge-legend": "Merge global user",
"centralauth-usermerge-form-newuser": "Final username",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ffc6e86..a316ac7 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -408,7 +408,8 @@
"centralauth-rename-confirm": "Confirmation text asking whether the
global account should really be renamed.\n\nSee also:\n*
{{msg-mw|Centralauth-usermerge-confirm}}",
"log-name-gblrename": "Log page title",
"log-description-gblrename": "Log page description",
- "logentry-gblrename-rename": "{{Logentry}}\nAdditional parameters:\n*
$4 - old username\n* $5 - new username\nSee also:\n*
{{msg-mw|Logentry-gblrename-merge}}",
+ "logentry-gblrename-rename": "{{Logentry}}\nAdditional parameters:\n*
$4 - old username\n* $5 - new username\nSee also:\n*
{{msg-mw|Logentry-gblrename-merge}}\n* {{mw-msg|logentry-gblrename-promote}}",
+ "logentry-gblrename-promote": "{{Logentry}}\nAdditional parameters:\n*
$4 - old username\n* $5 - new username\nSee also:\n*
{{msg-mw|Logentry-gblrename-merge}}\n* {{mw-msg|logentry-gblrename-rename}}",
"globalusermerge": "Name of special page",
"globalusermerge-legend": "Legend of fieldset surrounding the form",
"centralauth-usermerge-form-newuser": "Label for form field",
diff --git a/includes/GlobalRename/GlobalRenameLogFormatter.php
b/includes/GlobalRename/GlobalRenameLogFormatter.php
index d93771d..bf14164 100644
--- a/includes/GlobalRename/GlobalRenameLogFormatter.php
+++ b/includes/GlobalRename/GlobalRenameLogFormatter.php
@@ -1,14 +1,20 @@
extractParameters();
- $this->parsedParameters[3] = $this->getCentralAuthLink(
$params[3] );
+ if ( $this->entry->getSubtype() === 'promote' ) {
+ $this->parsedParameters[3] = $this->getLocalWikiLink(
$params[3], $params[5] );
+ } else { // rename
+ $this->parsedParameters[3] = $this->getCentralAuthLink(
$params[3] );
+ }
$this->parsedParameters[4] = $this->getCentralAuthLink(
$params[4] );
ksort( $this->parsedParameters );
@@ -27,4 +33,13 @@
return Message::rawParam( Linker::link( $title,
htmlspecialchars( $name ) ) );
}
+
+ protected function getLocalWikiLink( $name, $wiki ) {
+ $text = "User:$name@$wiki";
+ if ( $this->plaintext ) {
+ return "[[$text]]";
+ }
+
+ return Message::rawParam( WikiMap::foreignUserLink( $wiki,
$name, $text ) );
+ }
}
diff --git a/includes/GlobalRename/GlobalRenameUserLogger.php
b/includes/GlobalRename/GlobalRenameUserLogger.php
index 9c854d7..a1d1a3d 100644
--- a/includes/GlobalRename/GlobalRenameUserLogger.php
+++ b/includes/GlobalRename/GlobalRenameUserLogger.php
@@ -46,4 +46,35 @@
$logid = $logEntry->insert();
$logEntry->publish( $logid );
}
+
+ /**
+* Log the promotion of a local unattached to a global
+*
+* @param string $oldName
+* @param string $wiki
+
[MediaWiki-commits] [Gerrit] Update CentralAuth to 1.25wmf24 HEAD - change (mediawiki/core)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/202742 Change subject: Update CentralAuth to 1.25wmf24 HEAD .. Update CentralAuth to 1.25wmf24 HEAD Change-Id: I773fb51be0df4ceb6a760ea70c6b97d2e90aee03 --- M extensions/CentralAuth 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/42/202742/1 diff --git a/extensions/CentralAuth b/extensions/CentralAuth index ed30b6e..3d7bf89 16 --- a/extensions/CentralAuth +++ b/extensions/CentralAuth -Subproject commit ed30b6efe22462fb940f605e9cdf85a3f5dcb1aa +Subproject commit 3d7bf89841421bee6c1147f79e4951a4b6672e10 -- To view, visit https://gerrit.wikimedia.org/r/202742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I773fb51be0df4ceb6a760ea70c6b97d2e90aee03 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf24 Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dumps: add classes for zim dumps, add imagemagick - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: dumps: add classes for zim dumps, add imagemagick
..
dumps: add classes for zim dumps, add imagemagick
From T94457 we already now that ZIM dumps will require imagemagick and
other things.
Start with creating the role class and a new manifest that installs imagemagick.
Bug:T94457
Change-Id: Ibf58366c3e6e25f21184d9fa60b84b739bd0ce03
---
M manifests/role/dumps.pp
A modules/dumps/manifests/zim.pp
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/dumps.pp b/manifests/role/dumps.pp
index e2ef5e1..12e9289 100644
--- a/manifests/role/dumps.pp
+++ b/manifests/role/dumps.pp
@@ -9,4 +9,14 @@
description => 'HTTP',
check_command => 'check_http'
}
+
}
+
+# ZIM dumps - https://en.wikipedia.org/wiki/ZIM_%28file_format%29
+class role::dumps::zim {
+
+system::role { 'dumps::zim': description => 'ZIM dumps' }
+
+include ::dumps::zim
+}
+
diff --git a/modules/dumps/manifests/zim.pp b/modules/dumps/manifests/zim.pp
new file mode 100644
index 000..fb2175e
--- /dev/null
+++ b/modules/dumps/manifests/zim.pp
@@ -0,0 +1,8 @@
+# ZIM dumps - https://en.wikipedia.org/wiki/ZIM_%28file_format%29
+class dumps::zim {
+
+package { 'imagemagick':
+ensure => present,
+}
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/200725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf58366c3e6e25f21184d9fa60b84b739bd0ce03
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: ArielGlenn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: John F. Lewis
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Hierator puppetization - change (operations/puppet)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202743
Change subject: WIP: Hierator puppetization
..
WIP: Hierator puppetization
Change-Id: I3adf10603844b5e89eb6c6e329abb208df8f9f5a
---
M manifests/role/deployment.pp
A manifests/role/hierator.pp
A modules/jetty/manifests/init.pp
A modules/jetty/manifests/service.pp
A modules/jetty/templates/service.conf.erb
5 files changed, 97 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/202743/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 636cd95..047e71f 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -122,6 +122,14 @@
'gitfat_enabled' => true,
'upstream' =>
'https://gerrit.wikimedia.org/r/operations/software/dropwizard-metrics',
},
+'jetty/jetty-runner' => {
+'gitfat_enabled' => true,
+'upstream' =>
'https://gerrit.wikimedia.org/r/operations/software/jetty-runner',
+},
+'hierator/hierator' => {
+'gitfat_enabled' => true,
+'upstream' =>
'https://gerrit.wikimedia.org/r/software/services/hierator/deployment',
+},
}
}
diff --git a/manifests/role/hierator.pp b/manifests/role/hierator.pp
new file mode 100644
index 000..f4c9760
--- /dev/null
+++ b/manifests/role/hierator.pp
@@ -0,0 +1,16 @@
+class role::hierator {
+system::role { 'role::hierator':
+description => 'Hierator server',
+}
+
+package { 'hierator/hierator':
+ensure => present,
+provider => 'trebuchet',
+}
+
+::jetty::service { 'hierator':
+port => 4242,
+war => '/srv/deployment/hierator/hierator.war',
+memory_limit => '512M',
+}
+}
diff --git a/modules/jetty/manifests/init.pp b/modules/jetty/manifests/init.pp
new file mode 100644
index 000..653f7c9
--- /dev/null
+++ b/modules/jetty/manifests/init.pp
@@ -0,0 +1,16 @@
+# == Class: jetty
+#
+# Installs jetty-runner, an isolated Java servlet container
+#
+class jetty {
+include ::java::tools
+
+package { 'default-jre-headless':
+ensure => present,
+}
+
+package { 'jetty/jetty-runner':
+ensure => present,
+provider => 'trebuchet',
+}
+}
diff --git a/modules/jetty/manifests/service.pp
b/modules/jetty/manifests/service.pp
new file mode 100644
index 000..a9b8527
--- /dev/null
+++ b/modules/jetty/manifests/service.pp
@@ -0,0 +1,34 @@
+# == Class: jetty::service
+#
+# Defines a Java service
+#
+define jetty::service(
+$war,
+$port,
+$user = 'nobody',
+$log_channel = undef,
+$memory_limit = '64M',
+$java_options = '',
+) {
+include ::jetty
+
+$log = $log_channel ? {
+undef => $name,
+default => $log_channel,
+}
+
+file { "/etc/init/$name.conf":
+ensure => present,
+content => template( 'jetty/service.conf.erb' ),
+owner => 'root',
+group => 'root',
+mode => '0444',
+notify => Service[$name],
+}
+
+service { $name:
+ensure => 'running',
+provider => 'upstart',
+subscribe => Class['jetty'],
+}
+}
\ No newline at end of file
diff --git a/modules/jetty/templates/service.conf.erb
b/modules/jetty/templates/service.conf.erb
new file mode 100644
index 000..0fef573
--- /dev/null
+++ b/modules/jetty/templates/service.conf.erb
@@ -0,0 +1,23 @@
+# This file is managed by Puppet
+description "Jetty runner executing <%= scope['war'] %> on port <%=
scope['port'] %>"
+
+start on (runlevel [2345] and net-device-up IFACE!=lo)
+stop on runlevel [!2345]
+
+umask 022
+
+pre-start script
+ mkdir -p -m0755 /var/run/<%= scope['name'] %>
+end script
+
+script
+ exec start-stop-daemon --quiet --start --pidfile /var/run/<%= scope['name']
%>/pid \
+--chuid <%= scope['user'] %> --make-pidfile \
+--exec /usr/bin/java -- -Xms<%= scope['memory_limit'] %> -Xmx<%=
scope['memory_limit'] %> \
+<%= scope['java_options'] %> -jar /usr/share/java/jetty-runner.jar --port
<%= scope['port'] %> \
+<%= scope['war'] %> 2>&1 | logger -t <%= scope['log'] %>
+end script
+
+respawn
+
+# vim: set ft=upstart:
--
To view, visit https://gerrit.wikimedia.org/r/202743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3adf10603844b5e89eb6c6e329abb208df8f9f5a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
