[MediaWiki-commits] [Gerrit] Log font-change event - change (mediawiki...UniversalLanguageSelector)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79177
Change subject: Log font-change event
..
Log font-change event
Change-Id: I093e27d74d047a639082a5da6442944f590c67dc
---
M resources/js/ext.uls.displaysettings.js
M resources/js/ext.uls.eventlogger.js
2 files changed, 39 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/77/79177/1
diff --git a/resources/js/ext.uls.displaysettings.js
b/resources/js/ext.uls.displaysettings.js
index 8cffd85..2dde187 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -582,6 +582,19 @@
// Save the preferences
mw.webfonts.preferences.save( function ( result ) {
+ var newFonts =
mw.webfonts.preferences.registry.fonts || {},
+ oldFonts =
displaySettings.savedRegistry.registry.fonts || {};
+
+ if ( newFonts[displaySettings.uiLanguage] !==
oldFonts[displaySettings.uiLanguage] ) {
+ mw.hook( 'mw.uls.font.change' ).fire(
+ 'interface',
displaySettings.uiLanguage, newFonts[displaySettings.uiLanguage] );
+ }
+
+ if ( newFonts[displaySettings.contentLanguage]
!== oldFonts[displaySettings.contentLanguage] ) {
+ mw.hook( 'mw.uls.font.change' ).fire(
+ 'content',
displaySettings.contentLanguage, newFonts[displaySettings.contentLanguage] );
+ }
+
// closure for not losing the scope
displaySettings.onSave( result );
displaySettings.dirty = false;
diff --git a/resources/js/ext.uls.eventlogger.js
b/resources/js/ext.uls.eventlogger.js
index de6267f..32b9e9e 100644
--- a/resources/js/ext.uls.eventlogger.js
+++ b/resources/js/ext.uls.eventlogger.js
@@ -90,6 +90,7 @@
mw.hook( 'mw.uls.ime.morelanguages' ).add( $.proxy(
this.imeMoreLanguages, this ) );
mw.hook( 'mw.uls.interface.morelanguages' ).add( $.proxy(
this.interfaceMoreLanguages, this ) );
mw.hook( 'mw.uls.interface.language.change' ).add( $.proxy(
this.interfaceLanguageChange, this ) );
+ mw.hook( 'mw.uls.font.change' ).add( $.proxy( this.fontChange,
this ) );
},
@@ -173,6 +174,31 @@
action: 'more-languages-access',
context: 'interface'
} );
+ },
+
+ /**
+* Log font preference changes
+*
+* @param {Object} context Whether context is 'interface' or 'content'
+* @param {Object} language
+* @param {Object} font
+*/
+ fontChange: function ( context, language, font ) {
+ if ( context === 'interface' ) {
+ this.log( {
+ action: 'font-change',
+ context: context,
+ interfaceFont: font,
+ // Override in case the user changed the ui
language but hasn't applied it yet
+ interfaceLanguage: language
+ } );
+ } else {
+ this.log( {
+ action: 'font-change',
+ context: context,
+ contentFont: font
+ } );
+ }
}
};
--
To view, visit https://gerrit.wikimedia.org/r/79177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I093e27d74d047a639082a5da6442944f590c67dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove db1009 from action while investigating bug 52853 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/79178 Change subject: remove db1009 from action while investigating bug 52853 .. remove db1009 from action while investigating bug 52853 Change-Id: Ib9b0f76b20a0f785a28a21dd1e253d3a0bf68363 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/78/79178/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index e41778d..14c1061 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 's2' = array( 'db1034'= 0, 'db1002'= 400, - 'db1009'= 400, + #'db1009'= 400, 'db1018'= 100, # snaphsot ), /* s3 */ 'DEFAULT' = array( -- To view, visit https://gerrit.wikimedia.org/r/79178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9b0f76b20a0f785a28a21dd1e253d3a0bf68363 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove db1009 from action while investigating bug 52853 - change (operations/mediawiki-config)
Springle has submitted this change and it was merged. Change subject: remove db1009 from action while investigating bug 52853 .. remove db1009 from action while investigating bug 52853 Change-Id: Ib9b0f76b20a0f785a28a21dd1e253d3a0bf68363 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index e41778d..14c1061 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 's2' = array( 'db1034'= 0, 'db1002'= 400, - 'db1009'= 400, + #'db1009'= 400, 'db1018'= 100, # snaphsot ), /* s3 */ 'DEFAULT' = array( -- To view, visit https://gerrit.wikimedia.org/r/79178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9b0f76b20a0f785a28a21dd1e253d3a0bf68363 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: Tim Starling tstarl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix up private aliases class name for mchenry - change (operations/puppet)
ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/79179 Change subject: fix up private aliases class name for mchenry .. fix up private aliases class name for mchenry Change-Id: If1b06af624b54bd53b2c4f48a62093731f1602b4 --- M manifests/site.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/79179/1 diff --git a/manifests/site.pp b/manifests/site.pp index b6c6633..9393696 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1810,7 +1810,7 @@ nrpe, ldap::role::client::corp, backup::client, -exim::aliases::private, +privateexim::aliases::private, groups::wikidev, accounts::jdavis -- To view, visit https://gerrit.wikimedia.org/r/79179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1b06af624b54bd53b2c4f48a62093731f1602b4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn ar...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix up private aliases class name for mchenry - change (operations/puppet)
ArielGlenn has submitted this change and it was merged. Change subject: fix up private aliases class name for mchenry .. fix up private aliases class name for mchenry Change-Id: If1b06af624b54bd53b2c4f48a62093731f1602b4 --- M manifests/site.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index b6c6633..9393696 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1810,7 +1810,7 @@ nrpe, ldap::role::client::corp, backup::client, -exim::aliases::private, +privateexim::aliases::private, groups::wikidev, accounts::jdavis -- To view, visit https://gerrit.wikimedia.org/r/79179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1b06af624b54bd53b2c4f48a62093731f1602b4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Filter and sort $wgBabelCategoryNames correctly for Babel ex... - change (mediawiki...Wikibase)
Liangent has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79180
Change subject: Filter and sort $wgBabelCategoryNames correctly for Babel
extraction
..
Filter and sort $wgBabelCategoryNames correctly for Babel extraction
Change-Id: Iaf08f4448d1a9f5141717684b6794e418f1262f6
---
M lib/includes/LanguageFallbackChainFactory.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/80/79180/1
diff --git a/lib/includes/LanguageFallbackChainFactory.php
b/lib/includes/LanguageFallbackChainFactory.php
index fa7fb01..5ce24a8 100644
--- a/lib/includes/LanguageFallbackChainFactory.php
+++ b/lib/includes/LanguageFallbackChainFactory.php
@@ -239,7 +239,11 @@
if ( count( $wgBabelCategoryNames ) ) {
// A little redundant but it's the only way to get
required information with current Babel API.
$previousLevelBabel = array();
- foreach ( $wgBabelCategoryNames as $level = $_ ) {
+ $babelCategoryNames = array_filter(
$wgBabelCategoryNames, function( $category ) {
+ return $category !== false;
+ } );
+ krsort( $babelCategoryNames );
+ foreach ( $babelCategoryNames as $level = $_ ) {
// Make the current language at the top of the
chain.
$levelBabel = array_unique( array_merge(
$contextLanguage,
\Babel::getUserLanguages( $user, $level )
--
To view, visit https://gerrit.wikimedia.org/r/79180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf08f4448d1a9f5141717684b6794e418f1262f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Liangent liang...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use DerivativeRequest instead of FauxRequest - change (mediawiki...LiquidThreads)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79181
Change subject: Use DerivativeRequest instead of FauxRequest
..
Use DerivativeRequest instead of FauxRequest
Using a FauxRequest causes issues in recording CheckUser data, as
well as when calling the API internally.
Change-Id: I7d5f42d3c465f262feb180fb60711872d9532c49
---
M api/ApiThreadAction.php
1 file changed, 3 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads
refs/changes/81/79181/1
diff --git a/api/ApiThreadAction.php b/api/ApiThreadAction.php
index 50d4e99..67b4a84 100644
--- a/api/ApiThreadAction.php
+++ b/api/ApiThreadAction.php
@@ -298,9 +298,7 @@
if ( $user-isAllowed( 'bot' ) ) {
$requestData['bot'] = true;
}
-
- $editReq = new FauxRequest( $requestData, true );
- LqtView::fixFauxRequestSession( $editReq );
+ $editReq = new DerivativeRequest( $this-getRequest(),
$requestData, true );
$internalApi = new ApiMain( $editReq, true );
$internalApi-execute();
@@ -417,8 +415,7 @@
$requestData['bot'] = true;
}
- $editReq = new FauxRequest( $requestData, true );
- LqtView::fixFauxRequestSession( $editReq );
+ $editReq = new DerivativeRequest( $this-getRequest(),
$requestData, true );
$internalApi = new ApiMain( $editReq, true );
$internalApi-execute();
@@ -532,8 +529,7 @@
$requestData['bot'] = true;
}
- $editReq = new FauxRequest( $requestData, true );
- LqtView::fixFauxRequestSession( $editReq );
+ $editReq = new DerivativeRequest( $this-getRequest(),
$requestData, true );
$internalApi = new ApiMain( $editReq, true );
$internalApi-execute();
--
To view, visit https://gerrit.wikimedia.org/r/79181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d5f42d3c465f262feb180fb60711872d9532c49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix error in RemoveClaimsTest - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79182
Change subject: Fix error in RemoveClaimsTest
..
Fix error in RemoveClaimsTest
- RemoveClaimsTest was producing an error in ReferencedUrlFinder
when it was executed alone or in --group WikibaseAPI
because of an undefined property
Change-Id: I5f3e4e675ecb83659ca2733ae19ea195fc50
---
M repo/tests/phpunit/includes/api/RemoveClaimsTest.php
1 file changed, 15 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/82/79182/1
diff --git a/repo/tests/phpunit/includes/api/RemoveClaimsTest.php
b/repo/tests/phpunit/includes/api/RemoveClaimsTest.php
index 05d4eba..4d99b41 100644
--- a/repo/tests/phpunit/includes/api/RemoveClaimsTest.php
+++ b/repo/tests/phpunit/includes/api/RemoveClaimsTest.php
@@ -54,7 +54,10 @@
$entity-addClaim( $entity-newClaim( new
\Wikibase\PropertyNoValueSnak( 42 ) ) );
$entity-addClaim( $entity-newClaim( new
\Wikibase\PropertyNoValueSnak( 1 ) ) );
$entity-addClaim( $entity-newClaim( new
\Wikibase\PropertySomeValueSnak( 42 ) ) );
- $entity-addClaim( $entity-newClaim( new
\Wikibase\PropertyValueSnak( 9001, new \DataValues\StringValue( 'o_O' ) ) ) );
+ $entity-addClaim( $entity-newClaim( new
\Wikibase\PropertyValueSnak(
+ $this-getNewProperty( 'string' )-getId(),
+ new \DataValues\StringValue( 'o_O' ) ) )
+ );
$content-save( '' );
@@ -89,7 +92,6 @@
* @var Claim[] $claims
*/
$claims = $entity-getClaims();
-
while ( $claim = array_shift( $claims ) ) {
$this-makeTheRequest( array( $claim-getGuid() ) );
@@ -166,4 +168,15 @@
);
}
+ /**
+* @param string $type
+*/
+ protected function getNewProperty( $type ) {
+ $property = \Wikibase\Property::newFromType( $type );
+ $content = new \Wikibase\PropertyContent( $property );
+ $content-save( '', null, EDIT_NEW );
+
+ return $content-getEntity();
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/79182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f3e4e675ecb83659ca2733ae19ea195fc50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added missing messages for property auto-comments - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79183
Change subject: Added missing messages for property auto-comments
..
Added missing messages for property auto-comments
Change-Id: I2d6e919245c3c16170a8c8c5152f95de95678b23
---
M repo/Wikibase.i18n.php
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/83/79183/1
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 8747d0b..292abfc 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -336,8 +336,10 @@
'wikibase-property-summary-wbeditentity-create' = 'Created a new
property',
'wikibase-property-summary-wbeditentity-update' = 'Updated a property',
'wikibase-property-summary-wbeditentity-override' = 'Cleared a
property',
+ 'wikibase-property-summary-wbsetlabel-add' = 'Added [$2] label',
'wikibase-property-summary-wbsetlabel-set' = 'Changed [$2] label',
'wikibase-property-summary-wbsetlabel-remove' = 'Removed [$2] label',
+ 'wikibase-property-summary-wbsetdescription-add' = 'Added [$2]
description',
'wikibase-property-summary-wbsetdescription-set' = 'Changed [$2]
description',
'wikibase-property-summary-wbsetdescription-remove' = 'Removed [$2]
description',
'wikibase-property-summary-wbsetaliases-set' = 'Setting [$2]
{{PLURAL:$1|alias|aliases}}',
@@ -1054,11 +1056,15 @@
'wikibase-property-summary-wbeditentity-create' = 'Automatic edit
summary generated when creating a new property.',
'wikibase-property-summary-wbeditentity-update' = 'Automatic edit
summary generated when updating an existing property.',
'wikibase-property-summary-wbeditentity-override' = 'Automatic edit
summary generated when overriding an existing property.',
+ 'wikibase-property-summary-wbsetlabel-add' = 'Automatic edit summary
generated when adding a property label, which appears in the h1 heading at top
of the page. Example edit summary is Added [en] label: Egypt. Parameters:
+* $2 is the language code for the item page.',
'wikibase-property-summary-wbsetlabel-set' = 'Automatic edit summary
generated when editing a property label, which appears in the h1 heading at top
of the page. Example edit summary is Updated [en] label: Egypt. Parameters:
* $2 is the language code for the item page.',
'wikibase-property-summary-wbsetlabel-remove' = 'Automatic edit
summary generated when removing a property label. Example edit summary is
Removed [en] label. Parameters:
* $2 is the language code for the item page.',
- 'wikibase-property-summary-wbsetdescription-set' = 'Automatic edit
summary when creating or editing a property description. Example edit summary
is Updated [en] description: a country in Africa. Parameters:
+ 'wikibase-property-summary-wbsetdescription-add' = 'Automatic edit
summary when adding a property description. Example edit summary is Added [en]
description: a country in Africa. Parameters:
+* $2 is the language code for the item page.',
+ 'wikibase-property-summary-wbsetdescription-set' = 'Automatic edit
summary when editing a property description. Example edit summary is Updated
[en] description: a country in Africa. Parameters:
* $2 is the language code for the item page.',
'wikibase-property-summary-wbsetdescription-remove' = 'Automatic edit
summary when removing a property description. Example edit summary is Removed
[en] description. Parameters:
* $2 is the language code for the item page.',
--
To view, visit https://gerrit.wikimedia.org/r/79183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d6e919245c3c16170a8c8c5152f95de95678b23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TypeError: window.navigator.userLanguage is undefined - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: TypeError: window.navigator.userLanguage is undefined
..
TypeError: window.navigator.userLanguage is undefined
This can happen, when the user deletes the pref User languages from the
browser.
Change-Id: Ieaf783fbae113724704e2cce2e166e56935e8ce1
---
M resources/js/ext.uls.init.js
1 file changed, 11 insertions(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 543875e..96f6963 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -75,8 +75,18 @@
return $.parseJSON( previousLanguages ).slice( -5 );
};
+ /**
+* Returns the browser's user interface language or the system language.
+* The caller should check the validity of the returned language code.
+*
+* @return {string} Language code or empty string.
+*/
mw.uls.getBrowserLanguage = function () {
- return ( window.navigator.language ||
window.navigator.userLanguage ).split( '-' )[0];
+ // language is the standard property.
+ // userLanguage is only for IE and returns system locale.
+ // Empty string is a fallback in case both are undefined
+ // to avoid runtime error with split().
+ return ( window.navigator.language ||
window.navigator.userLanguage || '' ).split( '-' )[0];
};
/*jshint camelcase:false*/
--
To view, visit https://gerrit.wikimedia.org/r/73448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieaf783fbae113724704e2cce2e166e56935e8ce1
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mw.Target: Removed unreachable badtoken recovery code - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: mw.Target: Removed unreachable badtoken recovery code
..
mw.Target: Removed unreachable badtoken recovery code
This code caught badtoken errors on load, but we can't get those
any more since the API module was split and we no longer send a token
on load. badtoken handling on save is done in mw.ViewPageTarget.
Bug: 51253
Change-Id: Idb172ee46b7142681d41e593eacd9600b8f11a9a
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 4 insertions(+), 82 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index cdd638d..ba82cf4 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -93,13 +93,6 @@
*/
/**
- * @event tokenError
- * @param {jqXHR|null} jqXHR
- * @param {string} status Text status message
- * @param {Mixed|null} error HTTP status text
- */
-
-/**
* @event saveError
* @param {jqXHR|null} jqXHR
* @param {string} status Text status message
@@ -169,17 +162,10 @@
this, null, 'Invalid response in response from server',
null
);
} else if ( response.error || data.result === 'error' ) {
- if ( response.error.code === 'badtoken' !this.retriedToken )
{
- // Only retry once
- this.retriedToken = true;
- // Refresh the edit token and try again
- this.retryToken();
- } else {
- ve.init.mw.Target.onLoadError.call( this, null,
- response.error.code + ': ' +
response.error.info,
- null
- );
- }
+ ve.init.mw.Target.onLoadError.call( this, null,
+ response.error.code + ': ' + response.error.info,
+ null
+ );
} else if ( typeof data.content !== 'string' ) {
ve.init.mw.Target.onLoadError.call(
this, null, 'No HTML content in response from server',
null
@@ -248,37 +234,6 @@
};
/**
- * Handle response to a successful edit token refresh request.
- *
- * This method is called within the context of a target instance. If
successful the token will
- * be stored and load() will be called.
- *
- * @static
- * @method
- * @param {Object} response XHR Response object
- * @param {string} status Text status message
- * @emits tokenError
- */
-ve.init.mw.Target.onToken = function ( response ) {
- var token = response response.tokens response.tokens.edittoken;
- if ( token ) {
- this.editToken = token;
- mw.user.tokens.set( 'editToken', token );
- this.loading = false; // Otherwise this.load() doesn't do
anything
- this.load();
- } else if ( !response.error ) {
- ve.init.mw.Target.onTokenError.call(
- this, null, 'Invalid response in response from server',
null
- );
- } else {
- ve.init.mw.Target.onTokenError.call( this, null,
- response.error.code + ': ' + response.error.info,
- null
- );
- }
-};
-
-/**
* Handle both DOM and modules being loaded and ready.
*
* This method is called within the context of a target instance.
@@ -310,21 +265,6 @@
ve.init.mw.Target.onLoadError = function ( jqXHR, status, error ) {
this.loading = false;
this.emit( 'loadError', jqXHR, status, error );
-};
-
-/**
- * Handle an unsuccessful token refresh request.
- *
- * This method is called within the context of a target instance.
- *
- * @param {Object} jqXHR
- * @param {string} status Text status message
- * @param {Mixed} error HTTP status text
- * @emits tokenError
- */
-ve.init.mw.Target.onTokenError = function ( jqXHR, status, error ) {
- this.loading = false;
- this.emit( 'tokenError', jqXHR, status, error );
};
/**
@@ -587,24 +527,6 @@
'error': ve.bind( ve.init.mw.Target.onLoadError, this )
} );
return true;
-};
-
-/**
- * Refresh the edit token, then call load()
- */
-ve.init.mw.Target.prototype.retryToken = function () {
- $.ajax( {
- 'url': this.apiUrl,
- 'data': {
- 'action': 'tokens',
- 'format': 'json'
- },
- 'dataType': 'json',
- 'type': 'GET',
- 'cache': 'false',
- 'success': ve.bind( ve.init.mw.Target.onToken, this ),
- 'error': ve.bind( ve.init.mw.Target.onTokenError, this )
- } );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/76860
To
[MediaWiki-commits] [Gerrit] fixed: do not suppress rc-log-actions; added default option - change (mediawiki...OnlyRecentRecentChanges)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79185
Change subject: fixed: do not suppress rc-log-actions; added default option
..
fixed: do not suppress rc-log-actions; added default option
bumped to version 1.3.1
Change-Id: Id4c6d82e5dc6e1ae6c767d2000724f93a36752ae
---
M OnlyRecentRecentChanges.php
M README.md
2 files changed, 26 insertions(+), 16 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OnlyRecentRecentChanges
refs/changes/85/79185/1
diff --git a/OnlyRecentRecentChanges.php b/OnlyRecentRecentChanges.php
index c2c5d4a..8fb41b1 100644
--- a/OnlyRecentRecentChanges.php
+++ b/OnlyRecentRecentChanges.php
@@ -4,12 +4,12 @@
* OnlyRecentRecentChanges extension for MediaWiki
*
* The behaviour of the recent changes view is changed
- * so that any changed article is only listed once,
- * older changes are not listed any longer.
+ * so that any changed article is only listed once.
+ * Older changes are not listed any longer.
*
* Manual and homepage:
*
- * http://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges
+ * https://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges
*
* Installation:
*
@@ -18,7 +18,6 @@
*
* add the following to LocalSettings.php:
* require_once(
$IP/extensions/OnlyRecentRecentChanges/OnlyRecentRecentChanges.php );
- *
*
* @file
* @ingroup Extensions
@@ -41,7 +40,7 @@
'path' = __FILE__,
'name' = 'OnlyRecentRecentChanges',
'descriptionmsg' = 'onlyrecentrecentchanges-desc',
- 'version' = '1.2.0',
+ 'version' = '1.3.1',
'author' = 'Thomas Gries',
'url' =
'http://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges',
);
@@ -51,14 +50,31 @@
$wgHooks['GetPreferences'][] = 'onGetPreferences';
$wgHooks['SpecialRecentChangesQuery'][] = 'onSpecialRecentChangesQuery';
+# New option and its default value
+$wgDefaultUserOptions['onlyrecentrecentchanges-show-only-recent-change'] =
true;
// see http://www.mediawiki.org/wiki/Manual:Hooks/SpecialRecentChangesQuery
function onSpecialRecentChangesQuery( $conds, $tables, $join_conds, $opts,
$query_options, $select ) {
global $wgUser;
- if ( $wgUser-getOption( 'onlyrecentrecentchanges-tog' ) ) {
+ if ( $wgUser-getOption(
'onlyrecentrecentchanges-show-only-recent-change' ) ) {
+ $dbr = wfGetDB( DB_SLAVE );
+
if ( !in_array( 'page', $tables) ) array_unshift( $tables,
'page' );
- $conds[] = 'page_latest=rc_this_oldid';
+
+ $conds[] = $dbr-makeList(
+ array(
+ 'page_latest = rc_this_oldid',
+ 'rc_log_action != '
+ ),
+ LIST_OR
+ );
+
+ $join_conds['page'] = array(
+ 'LEFT JOIN',
+ 'page_latest = rc_this_oldid'
+ );
+
}
return true;
}
@@ -69,7 +85,7 @@
* @return bool
*/
function onGetPreferences( $user, $preferences ) {
- $preferences['onlyrecentrecentchanges-tog'] = array(
+ $preferences['onlyrecentrecentchanges-show-only-recent-change'] = array(
'section' = 'rc/advancedrc',
'type' = 'toggle',
'label-message' = 'onlyrecentrecentchanges-option'
diff --git a/README.md b/README.md
index a4bee7c..2f450a5 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@
The behaviour of the recent changes view is changed so that any changed
article is only listed once, older changes are not listed any longer.
### Manual and homepage of the extension
-http://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges
+https://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges
### Installation
```
cd $IP/extensions
-git clone
https://github.com/Wikinaut/MediaWiki-extension-OnlyRecentRecentChanges.git
OnlyRecentRecentChanges
+git clone
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/OnlyRecentRecentChanges
```
add the following line to your LocalSettings.php:
@@ -17,9 +17,3 @@
```
require_once(
$IP/extensions/OnlyRecentRecentChanges/OnlyRecentRecentChanges.php );
```
-
-### known bugs
-The current version also suppresses log events (delete, upload ...) because I
don't know how to avoid this unwanted side effect.
-
-### reporting bugs or improvements
-use the issue tracker
https://github.com/Wikinaut/MediaWiki-extension-OnlyRecentRecentChanges/issues
--
To view, visit https://gerrit.wikimedia.org/r/79185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4c6d82e5dc6e1ae6c767d2000724f93a36752ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OnlyRecentRecentChanges
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
[MediaWiki-commits] [Gerrit] fixed: do not suppress rc-log-actions; added default option - change (mediawiki...OnlyRecentRecentChanges)
Wikinaut has submitted this change and it was merged.
Change subject: fixed: do not suppress rc-log-actions; added default option
..
fixed: do not suppress rc-log-actions; added default option
bumped to version 1.3.1
Change-Id: Id4c6d82e5dc6e1ae6c767d2000724f93a36752ae
---
M OnlyRecentRecentChanges.php
M README.md
2 files changed, 26 insertions(+), 16 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
diff --git a/OnlyRecentRecentChanges.php b/OnlyRecentRecentChanges.php
index c2c5d4a..8fb41b1 100644
--- a/OnlyRecentRecentChanges.php
+++ b/OnlyRecentRecentChanges.php
@@ -4,12 +4,12 @@
* OnlyRecentRecentChanges extension for MediaWiki
*
* The behaviour of the recent changes view is changed
- * so that any changed article is only listed once,
- * older changes are not listed any longer.
+ * so that any changed article is only listed once.
+ * Older changes are not listed any longer.
*
* Manual and homepage:
*
- * http://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges
+ * https://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges
*
* Installation:
*
@@ -18,7 +18,6 @@
*
* add the following to LocalSettings.php:
* require_once(
$IP/extensions/OnlyRecentRecentChanges/OnlyRecentRecentChanges.php );
- *
*
* @file
* @ingroup Extensions
@@ -41,7 +40,7 @@
'path' = __FILE__,
'name' = 'OnlyRecentRecentChanges',
'descriptionmsg' = 'onlyrecentrecentchanges-desc',
- 'version' = '1.2.0',
+ 'version' = '1.3.1',
'author' = 'Thomas Gries',
'url' =
'http://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges',
);
@@ -51,14 +50,31 @@
$wgHooks['GetPreferences'][] = 'onGetPreferences';
$wgHooks['SpecialRecentChangesQuery'][] = 'onSpecialRecentChangesQuery';
+# New option and its default value
+$wgDefaultUserOptions['onlyrecentrecentchanges-show-only-recent-change'] =
true;
// see http://www.mediawiki.org/wiki/Manual:Hooks/SpecialRecentChangesQuery
function onSpecialRecentChangesQuery( $conds, $tables, $join_conds, $opts,
$query_options, $select ) {
global $wgUser;
- if ( $wgUser-getOption( 'onlyrecentrecentchanges-tog' ) ) {
+ if ( $wgUser-getOption(
'onlyrecentrecentchanges-show-only-recent-change' ) ) {
+ $dbr = wfGetDB( DB_SLAVE );
+
if ( !in_array( 'page', $tables) ) array_unshift( $tables,
'page' );
- $conds[] = 'page_latest=rc_this_oldid';
+
+ $conds[] = $dbr-makeList(
+ array(
+ 'page_latest = rc_this_oldid',
+ 'rc_log_action != '
+ ),
+ LIST_OR
+ );
+
+ $join_conds['page'] = array(
+ 'LEFT JOIN',
+ 'page_latest = rc_this_oldid'
+ );
+
}
return true;
}
@@ -69,7 +85,7 @@
* @return bool
*/
function onGetPreferences( $user, $preferences ) {
- $preferences['onlyrecentrecentchanges-tog'] = array(
+ $preferences['onlyrecentrecentchanges-show-only-recent-change'] = array(
'section' = 'rc/advancedrc',
'type' = 'toggle',
'label-message' = 'onlyrecentrecentchanges-option'
diff --git a/README.md b/README.md
index a4bee7c..2f450a5 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@
The behaviour of the recent changes view is changed so that any changed
article is only listed once, older changes are not listed any longer.
### Manual and homepage of the extension
-http://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges
+https://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges
### Installation
```
cd $IP/extensions
-git clone
https://github.com/Wikinaut/MediaWiki-extension-OnlyRecentRecentChanges.git
OnlyRecentRecentChanges
+git clone
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/OnlyRecentRecentChanges
```
add the following line to your LocalSettings.php:
@@ -17,9 +17,3 @@
```
require_once(
$IP/extensions/OnlyRecentRecentChanges/OnlyRecentRecentChanges.php );
```
-
-### known bugs
-The current version also suppresses log events (delete, upload ...) because I
don't know how to avoid this unwanted side effect.
-
-### reporting bugs or improvements
-use the issue tracker
https://github.com/Wikinaut/MediaWiki-extension-OnlyRecentRecentChanges/issues
--
To view, visit https://gerrit.wikimedia.org/r/79185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4c6d82e5dc6e1ae6c767d2000724f93a36752ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OnlyRecentRecentChanges
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: Wikinaut m...@tgries.de
___
MediaWiki-commits mailing
[MediaWiki-commits] [Gerrit] renamed README.md to README - change (mediawiki...OnlyRecentRecentChanges)
Wikinaut has uploaded a new change for review. https://gerrit.wikimedia.org/r/79186 Change subject: renamed README.md to README .. renamed README.md to README Change-Id: Id82e546f71dfdb62141e375c4ab2d03c698460d1 --- R README 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OnlyRecentRecentChanges refs/changes/86/79186/1 diff --git a/README.md b/README similarity index 100% rename from README.md rename to README -- To view, visit https://gerrit.wikimedia.org/r/79186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id82e546f71dfdb62141e375c4ab2d03c698460d1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OnlyRecentRecentChanges Gerrit-Branch: master Gerrit-Owner: Wikinaut m...@tgries.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] renamed README.md to README - change (mediawiki...OnlyRecentRecentChanges)
Wikinaut has submitted this change and it was merged. Change subject: renamed README.md to README .. renamed README.md to README Change-Id: Id82e546f71dfdb62141e375c4ab2d03c698460d1 --- R README 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Wikinaut: Verified; Looks good to me, approved diff --git a/README.md b/README similarity index 100% rename from README.md rename to README -- To view, visit https://gerrit.wikimedia.org/r/79186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id82e546f71dfdb62141e375c4ab2d03c698460d1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OnlyRecentRecentChanges Gerrit-Branch: master Gerrit-Owner: Wikinaut m...@tgries.de Gerrit-Reviewer: Wikinaut m...@tgries.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] README - change (mediawiki...OnlyRecentRecentChanges)
Wikinaut has uploaded a new change for review. https://gerrit.wikimedia.org/r/79187 Change subject: README .. README Change-Id: If5fe563e97c78187edbc6009f1618cb391089bc4 --- M README 1 file changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OnlyRecentRecentChanges refs/changes/87/79187/1 diff --git a/README b/README index 2f450a5..91200b6 100644 --- a/README +++ b/README @@ -1,19 +1,18 @@ -### MediaWiki extension OnlyRecentRecentChanges +MediaWiki extension OnlyRecentRecentChanges -The behaviour of the recent changes view is changed so that any changed article is only listed once, older changes are not listed any longer. +The behaviour of the recent changes view is changed +so that any changed article is only listed once, +older changes are not listed any longer. -### Manual and homepage of the extension +Manual and homepage of the extension + https://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges -### Installation +Installation + -``` cd $IP/extensions git clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/OnlyRecentRecentChanges -``` add the following line to your LocalSettings.php: - -``` require_once( $IP/extensions/OnlyRecentRecentChanges/OnlyRecentRecentChanges.php ); -``` -- To view, visit https://gerrit.wikimedia.org/r/79187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5fe563e97c78187edbc6009f1618cb391089bc4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OnlyRecentRecentChanges Gerrit-Branch: master Gerrit-Owner: Wikinaut m...@tgries.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] README - change (mediawiki...OnlyRecentRecentChanges)
Wikinaut has submitted this change and it was merged. Change subject: README .. README Change-Id: If5fe563e97c78187edbc6009f1618cb391089bc4 --- M README 1 file changed, 8 insertions(+), 9 deletions(-) Approvals: Wikinaut: Verified; Looks good to me, approved diff --git a/README b/README index 2f450a5..91200b6 100644 --- a/README +++ b/README @@ -1,19 +1,18 @@ -### MediaWiki extension OnlyRecentRecentChanges +MediaWiki extension OnlyRecentRecentChanges -The behaviour of the recent changes view is changed so that any changed article is only listed once, older changes are not listed any longer. +The behaviour of the recent changes view is changed +so that any changed article is only listed once, +older changes are not listed any longer. -### Manual and homepage of the extension +Manual and homepage of the extension + https://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges -### Installation +Installation + -``` cd $IP/extensions git clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/OnlyRecentRecentChanges -``` add the following line to your LocalSettings.php: - -``` require_once( $IP/extensions/OnlyRecentRecentChanges/OnlyRecentRecentChanges.php ); -``` -- To view, visit https://gerrit.wikimedia.org/r/79187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If5fe563e97c78187edbc6009f1618cb391089bc4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OnlyRecentRecentChanges Gerrit-Branch: master Gerrit-Owner: Wikinaut m...@tgries.de Gerrit-Reviewer: Wikinaut m...@tgries.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added missing messages for property auto-comments - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged.
Change subject: Added missing messages for property auto-comments
..
Added missing messages for property auto-comments
Change-Id: I2d6e919245c3c16170a8c8c5152f95de95678b23
---
M repo/Wikibase.i18n.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 8747d0b..292abfc 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -336,8 +336,10 @@
'wikibase-property-summary-wbeditentity-create' = 'Created a new
property',
'wikibase-property-summary-wbeditentity-update' = 'Updated a property',
'wikibase-property-summary-wbeditentity-override' = 'Cleared a
property',
+ 'wikibase-property-summary-wbsetlabel-add' = 'Added [$2] label',
'wikibase-property-summary-wbsetlabel-set' = 'Changed [$2] label',
'wikibase-property-summary-wbsetlabel-remove' = 'Removed [$2] label',
+ 'wikibase-property-summary-wbsetdescription-add' = 'Added [$2]
description',
'wikibase-property-summary-wbsetdescription-set' = 'Changed [$2]
description',
'wikibase-property-summary-wbsetdescription-remove' = 'Removed [$2]
description',
'wikibase-property-summary-wbsetaliases-set' = 'Setting [$2]
{{PLURAL:$1|alias|aliases}}',
@@ -1054,11 +1056,15 @@
'wikibase-property-summary-wbeditentity-create' = 'Automatic edit
summary generated when creating a new property.',
'wikibase-property-summary-wbeditentity-update' = 'Automatic edit
summary generated when updating an existing property.',
'wikibase-property-summary-wbeditentity-override' = 'Automatic edit
summary generated when overriding an existing property.',
+ 'wikibase-property-summary-wbsetlabel-add' = 'Automatic edit summary
generated when adding a property label, which appears in the h1 heading at top
of the page. Example edit summary is Added [en] label: Egypt. Parameters:
+* $2 is the language code for the item page.',
'wikibase-property-summary-wbsetlabel-set' = 'Automatic edit summary
generated when editing a property label, which appears in the h1 heading at top
of the page. Example edit summary is Updated [en] label: Egypt. Parameters:
* $2 is the language code for the item page.',
'wikibase-property-summary-wbsetlabel-remove' = 'Automatic edit
summary generated when removing a property label. Example edit summary is
Removed [en] label. Parameters:
* $2 is the language code for the item page.',
- 'wikibase-property-summary-wbsetdescription-set' = 'Automatic edit
summary when creating or editing a property description. Example edit summary
is Updated [en] description: a country in Africa. Parameters:
+ 'wikibase-property-summary-wbsetdescription-add' = 'Automatic edit
summary when adding a property description. Example edit summary is Added [en]
description: a country in Africa. Parameters:
+* $2 is the language code for the item page.',
+ 'wikibase-property-summary-wbsetdescription-set' = 'Automatic edit
summary when editing a property description. Example edit summary is Updated
[en] description: a country in Africa. Parameters:
* $2 is the language code for the item page.',
'wikibase-property-summary-wbsetdescription-remove' = 'Automatic edit
summary when removing a property description. Example edit summary is Removed
[en] description. Parameters:
* $2 is the language code for the item page.',
--
To view, visit https://gerrit.wikimedia.org/r/79183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d6e919245c3c16170a8c8c5152f95de95678b23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix error in RemoveClaimsTest - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix error in RemoveClaimsTest
..
Fix error in RemoveClaimsTest
- RemoveClaimsTest was producing an error in ReferencedUrlFinder
when it was executed alone or in --group WikibaseAPI
because of an undefined property
Change-Id: I5f3e4e675ecb83659ca2733ae19ea195fc50
---
M repo/tests/phpunit/includes/api/RemoveClaimsTest.php
1 file changed, 15 insertions(+), 2 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/api/RemoveClaimsTest.php
b/repo/tests/phpunit/includes/api/RemoveClaimsTest.php
index 05d4eba..4d99b41 100644
--- a/repo/tests/phpunit/includes/api/RemoveClaimsTest.php
+++ b/repo/tests/phpunit/includes/api/RemoveClaimsTest.php
@@ -54,7 +54,10 @@
$entity-addClaim( $entity-newClaim( new
\Wikibase\PropertyNoValueSnak( 42 ) ) );
$entity-addClaim( $entity-newClaim( new
\Wikibase\PropertyNoValueSnak( 1 ) ) );
$entity-addClaim( $entity-newClaim( new
\Wikibase\PropertySomeValueSnak( 42 ) ) );
- $entity-addClaim( $entity-newClaim( new
\Wikibase\PropertyValueSnak( 9001, new \DataValues\StringValue( 'o_O' ) ) ) );
+ $entity-addClaim( $entity-newClaim( new
\Wikibase\PropertyValueSnak(
+ $this-getNewProperty( 'string' )-getId(),
+ new \DataValues\StringValue( 'o_O' ) ) )
+ );
$content-save( '' );
@@ -89,7 +92,6 @@
* @var Claim[] $claims
*/
$claims = $entity-getClaims();
-
while ( $claim = array_shift( $claims ) ) {
$this-makeTheRequest( array( $claim-getGuid() ) );
@@ -166,4 +168,15 @@
);
}
+ /**
+* @param string $type
+*/
+ protected function getNewProperty( $type ) {
+ $property = \Wikibase\Property::newFromType( $type );
+ $content = new \Wikibase\PropertyContent( $property );
+ $content-save( '', null, EDIT_NEW );
+
+ return $content-getEntity();
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/79182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f3e4e675ecb83659ca2733ae19ea195fc50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix logical conflict from I8feefd9e8 - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79188
Change subject: Fix logical conflict from I8feefd9e8
..
Fix logical conflict from I8feefd9e8
onUpdate was renamed to update. Also neither event was
actually implemented so have just removed them.
Change-Id: Iaae1661a99f97272fa42c71223fc2cb832d50c66
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/88/79188/1
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index b0d17fa..916c6d0 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -30,10 +30,6 @@
ve.ce.ProtectedNode.call( this );
ve.ce.GeneratedContentNode.call( this );
- // Events
- this.model.connect( this, { 'update': 'onUpdate' } );
- this.$.on( 'click', ve.bind( this.onClick, this ) );
-
// DOM Changes
this.$.addClass( 've-ce-mwExtensionNode' );
};
--
To view, visit https://gerrit.wikimedia.org/r/79188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaae1661a99f97272fa42c71223fc2cb832d50c66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove regex in special page test assertions - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79189
Change subject: Remove regex in special page test assertions
..
Remove regex in special page test assertions
Change-Id: I219e90cfe2077897bb301007a73a1db4f6eb9de2
---
M lib/tests/phpunit/specials/SpecialPageTestBase.php
M repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
M repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
M repo/tests/phpunit/includes/specials/SpecialNewItemTest.php
M repo/tests/phpunit/includes/specials/SpecialNewPropertyTest.php
M repo/tests/phpunit/includes/specials/SpecialSetAliasesTest.php
M repo/tests/phpunit/includes/specials/SpecialSetDescriptionTest.php
M repo/tests/phpunit/includes/specials/SpecialSetLabelTest.php
M repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
9 files changed, 194 insertions(+), 136 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/89/79189/1
diff --git a/lib/tests/phpunit/specials/SpecialPageTestBase.php
b/lib/tests/phpunit/specials/SpecialPageTestBase.php
index f20eed6..2e3c146 100644
--- a/lib/tests/phpunit/specials/SpecialPageTestBase.php
+++ b/lib/tests/phpunit/specials/SpecialPageTestBase.php
@@ -123,19 +123,4 @@
return array( $text, $response );
}
- /**
-* Uses regex to assert that the given tag exists in a string
-* @param $text string to check
-* @param $tag string name of tag
-* @param $attributes array list of html attributes
-*/
- protected function assertHasHtmlTagWithElements( $text, $tag,
$attributes ){
- $parts = array();
- foreach( $attributes as $parm = $value ){
- $parts[] = preg_quote( {$parm}=\{$value}\, '/' );
- }
- $this-assertRegExp( '/' . $tag . '(\s[^]*?(' . implode( '|',
$parts ) . ')[^]*?){' . count( $parts ) . '}/' ,
- $text, Missing {$tag} tag in text );
- }
-
}
diff --git a/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
b/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
index e2d2c31..0181557 100644
--- a/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
@@ -44,33 +44,43 @@
public function testExecute() {
//TODO: Verify that more of the output is correct.
- $expectedInputs = array(
- 'site' = array(
+ $matchers['site'] = array(
+ 'tag' = 'input',
+ 'attributes' = array(
'id' = 'wb-itembytitle-sitename',
- 'name' = 'site' ),
- 'pagename' = array(
+ 'name' = 'site',
+ ) );
+ $matchers['page'] = array(
+ 'tag' = 'input',
+ 'attributes' = array(
'id' = 'pagename',
'class' = 'wb-input-text',
- 'name' = 'page' ),
- 'submit' = array(
+ 'name' = 'page',
+ ) );
+ $matchers['submit'] = array(
+ 'tag' = 'input',
+ 'attributes' = array(
'id' = 'wb-itembytitle-submit',
'class' = 'wb-input-button',
'type' = 'submit',
- 'name' = 'submit' ),
- );
+ 'name' = 'submit',
+ ) );
list( $output, ) = $this-executeSpecialPage( '' );
- // -- Make sure the special page loads with expected input
fields
- foreach( $expectedInputs as $expected ){
- $this-assertHasHtmlTagWithElements( $output, 'input',
$expected );
+ foreach( $matchers as $key = $matcher ){
+ $this-assertTag( $matcher, $output, Failed to match
html output with tag '{$key}'' );
}
list( $output, ) = $this-executeSpecialPage(
'SiteText/PageText' );
- // -- Make sure the subpage values have been passed to the
correct input fields
- $this-assertHasHtmlTagWithElements( $output, 'input',
- array_merge( $expectedInputs['site'], array( 'value' =
'SiteText' ) ) );
- $this-assertHasHtmlTagWithElements( $output, 'input',
- array_merge( $expectedInputs['pagename'], array(
'value' = 'PageText' ) ) );
+ foreach( $matchers as $key = $matcher ){
+ if( $key === 'site' ){
+
[MediaWiki-commits] [Gerrit] Reposition context menu after rerender - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79191
Change subject: Reposition context menu after rerender
..
Reposition context menu after rerender
Add rerender event to all image loads in MWExtensioNode.
MWHieroNode's implementation of onParseSuccess is now the same as
its parent so can be deleted.
Change-Id: Iaa4999372f1ba88a7bdf1490fc3f8640af77ceae
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
M modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
M modules/ve/ce/ve.ce.FocusableNode.js
3 files changed, 6 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/91/79191/1
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index 3590eab..3c6cc0b 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -82,6 +82,10 @@
ve.ce.MWExtensionNode.prototype.onParseSuccess = function ( deferred, response
) {
var data = response.visualeditor, contentNodes = $( data.content
).get();
deferred.resolve( contentNodes );
+ // Rerender after images load
+ this.$.find( 'img' ).on( 'load', ve.bind( function () {
+ this.emit( 'rerender' );
+ }, this ) );
};
/**
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
index b0d041e..4f12d4f 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
@@ -33,18 +33,6 @@
ve.ce.MWHieroNode.static.tagName = 'div';
-/* Methods */
-
-/** */
-ve.ce.MWHieroNode.prototype.onParseSuccess = function ( deferred, response ) {
- var data = response.visualeditor, contentNodes = $( data.content
).get();
- deferred.resolve( contentNodes );
- // Rerender after image load
- this.$.find( 'img' ).on( 'load', ve.bind( function () {
- this.emit( 'rerender' );
- }, this ) );
-};
-
/* Registration */
ve.ce.nodeFactory.register( ve.ce.MWHieroNode );
diff --git a/modules/ve/ce/ve.ce.FocusableNode.js
b/modules/ve/ce/ve.ce.FocusableNode.js
index 6647d3e..1afc40d 100644
--- a/modules/ve/ce/ve.ce.FocusableNode.js
+++ b/modules/ve/ce/ve.ce.FocusableNode.js
@@ -106,6 +106,8 @@
ve.ce.FocusableNode.prototype.onFocusableRerender = function () {
if ( this.focused ) {
this.redrawHighlight();
+ // reposition menu
+ this.surface.getSurface().getContext().show( true );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/79191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa4999372f1ba88a7bdf1490fc3f8640af77ceae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix MWAlienExtensionNode's extensionName in ce update - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79190
Change subject: Fix MWAlienExtensionNode's extensionName in ce update
..
Fix MWAlienExtensionNode's extensionName in ce update
Create getter for extensionsName which is overriden by
MWAlienExtensionNode.
Also removed angle brackets around Alien title as the inspector
already has an angle bracket icon, and a '' close button.
Change-Id: Ice8c5d73ed621f8e585b5f372788666f8c5aeb50
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
M modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
4 files changed, 23 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/90/79190/1
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index 916c6d0..3590eab 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -46,7 +46,9 @@
/** */
ve.ce.MWExtensionNode.prototype.generateContents = function () {
- var deferred = $.Deferred();
+ var deferred = $.Deferred(),
+ extensionName = this.getModel().getExtensionName();
+
$.ajax( {
'url': mw.util.wikiScript( 'api' ),
'data': {
@@ -54,9 +56,9 @@
'paction': 'parsefragment',
'page': mw.config.get( 'wgRelevantPageName' ),
'wikitext':
- '' +
this.getModel().constructor.static.extensionName + '' +
+ '' + extensionName + '' +
this.getModel().getAttribute( 'mw'
).body.extsrc +
- '/' +
this.getModel().constructor.static.extensionName + '',
+ '/' + extensionName + '',
'token': mw.user.tokens.get( 'editToken' ),
'format': 'json'
},
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js
index 353d297..9e07ce4 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js
@@ -34,6 +34,13 @@
ve.dm.MWAlienExtensionNode.static.tagName = 'div';
+/* Methods */
+
+/** */
+ve.dm.MWAlienExtensionNode.prototype.getExtensionName = function () {
+ return this.getAttribute('mw').name;
+};
+
/* Registration */
ve.dm.modelRegistry.register( ve.dm.MWAlienExtensionNode );
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
index 54becf6..99c3b1b 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
@@ -97,3 +97,13 @@
mw: dataElement.attributes.mw
};
};
+
+/* Methods */
+
+/**
+ * Get the extension's name
+ * @returns {string} Extension name
+ */
+ve.dm.MWExtensionNode.prototype.getExtensionName = function () {
+ return this.constructor.static.extensionName;
+};
\ No newline at end of file
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
b/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
index bb50a25..a008d70 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
@@ -43,7 +43,7 @@
};
ve.ui.MWAlienExtensionInspector.prototype.getTitle = function () {
- return '' +
this.surface.getView().getFocusedNode().getModel().getAttribute('mw').name +
'';
+ return
this.surface.getView().getFocusedNode().getModel().getExtensionName();
};
/* Registration */
--
To view, visit https://gerrit.wikimedia.org/r/79190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice8c5d73ed621f8e585b5f372788666f8c5aeb50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Get rid of deprecated method in WikiPageEntityLookupTest - change (mediawiki...Wikibase)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: Get rid of deprecated method in WikiPageEntityLookupTest
..
Get rid of deprecated method in WikiPageEntityLookupTest
Change-Id: I627423097c898f476be507bebdedd5f51e9d94f2
---
M lib/tests/phpunit/store/WikiPageEntityLookupTest.php
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/store/WikiPageEntityLookupTest.php
b/lib/tests/phpunit/store/WikiPageEntityLookupTest.php
index ec7e9eb..060176e 100644
--- a/lib/tests/phpunit/store/WikiPageEntityLookupTest.php
+++ b/lib/tests/phpunit/store/WikiPageEntityLookupTest.php
@@ -116,14 +116,17 @@
$entityRev = $lookup-getEntityRevision( $id, $revision );
if ( $shouldExist ) {
- $this-assertNotNull( $entityRev, ID .
$id-getPrefixedId() );
- $this-assertEquals( $id-getPrefixedId(),
$entityRev-getEntity()-getPrefixedId() );
+ $this-assertNotNull( $entityRev, ID .
$id-__toString() );
+ $this-assertEquals(
+ $id,
+ $entityRev-getEntity()-getId()
+ );
if ( $revision 0 ) {
$this-assertEquals( $revision,
$entityRev-getRevision() );
}
} else {
- $this-assertNull( $entityRev, ID .
$id-getPrefixedId() );
+ $this-assertNull( $entityRev, ID .
$id-__toString() );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/79040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I627423097c898f476be507bebdedd5f51e9d94f2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove regex in special page test assertions - change (mediawiki...Wikibase)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: Remove regex in special page test assertions
..
Remove regex in special page test assertions
Change-Id: I219e90cfe2077897bb301007a73a1db4f6eb9de2
---
M lib/tests/phpunit/specials/SpecialPageTestBase.php
M repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
M repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
M repo/tests/phpunit/includes/specials/SpecialNewItemTest.php
M repo/tests/phpunit/includes/specials/SpecialNewPropertyTest.php
M repo/tests/phpunit/includes/specials/SpecialSetAliasesTest.php
M repo/tests/phpunit/includes/specials/SpecialSetDescriptionTest.php
M repo/tests/phpunit/includes/specials/SpecialSetLabelTest.php
M repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
9 files changed, 194 insertions(+), 136 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/specials/SpecialPageTestBase.php
b/lib/tests/phpunit/specials/SpecialPageTestBase.php
index f20eed6..2e3c146 100644
--- a/lib/tests/phpunit/specials/SpecialPageTestBase.php
+++ b/lib/tests/phpunit/specials/SpecialPageTestBase.php
@@ -123,19 +123,4 @@
return array( $text, $response );
}
- /**
-* Uses regex to assert that the given tag exists in a string
-* @param $text string to check
-* @param $tag string name of tag
-* @param $attributes array list of html attributes
-*/
- protected function assertHasHtmlTagWithElements( $text, $tag,
$attributes ){
- $parts = array();
- foreach( $attributes as $parm = $value ){
- $parts[] = preg_quote( {$parm}=\{$value}\, '/' );
- }
- $this-assertRegExp( '/' . $tag . '(\s[^]*?(' . implode( '|',
$parts ) . ')[^]*?){' . count( $parts ) . '}/' ,
- $text, Missing {$tag} tag in text );
- }
-
}
diff --git a/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
b/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
index e2d2c31..0181557 100644
--- a/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
@@ -44,33 +44,43 @@
public function testExecute() {
//TODO: Verify that more of the output is correct.
- $expectedInputs = array(
- 'site' = array(
+ $matchers['site'] = array(
+ 'tag' = 'input',
+ 'attributes' = array(
'id' = 'wb-itembytitle-sitename',
- 'name' = 'site' ),
- 'pagename' = array(
+ 'name' = 'site',
+ ) );
+ $matchers['page'] = array(
+ 'tag' = 'input',
+ 'attributes' = array(
'id' = 'pagename',
'class' = 'wb-input-text',
- 'name' = 'page' ),
- 'submit' = array(
+ 'name' = 'page',
+ ) );
+ $matchers['submit'] = array(
+ 'tag' = 'input',
+ 'attributes' = array(
'id' = 'wb-itembytitle-submit',
'class' = 'wb-input-button',
'type' = 'submit',
- 'name' = 'submit' ),
- );
+ 'name' = 'submit',
+ ) );
list( $output, ) = $this-executeSpecialPage( '' );
- // -- Make sure the special page loads with expected input
fields
- foreach( $expectedInputs as $expected ){
- $this-assertHasHtmlTagWithElements( $output, 'input',
$expected );
+ foreach( $matchers as $key = $matcher ){
+ $this-assertTag( $matcher, $output, Failed to match
html output with tag '{$key}'' );
}
list( $output, ) = $this-executeSpecialPage(
'SiteText/PageText' );
- // -- Make sure the subpage values have been passed to the
correct input fields
- $this-assertHasHtmlTagWithElements( $output, 'input',
- array_merge( $expectedInputs['site'], array( 'value' =
'SiteText' ) ) );
- $this-assertHasHtmlTagWithElements( $output, 'input',
- array_merge( $expectedInputs['pagename'], array(
'value' = 'PageText' ) ) );
+ foreach( $matchers as $key = $matcher ){
+ if( $key === 'site' ){
+
[MediaWiki-commits] [Gerrit] (bug 48611) valueview expert test setups won't create instan... - change (mediawiki...DataValues)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: (bug 48611) valueview expert test setups won't create instances
anymore
..
(bug 48611) valueview expert test setups won't create instances anymore
Instead, the actual valueview instances will only created as part of the actual
tests. This will
prevent from side-effects happening during expert's initialization. E.g.
widgets being initialized,
causing global DOM nodes to be added to the body which would interfere with
other tests assumptions
about the state of the DOM.
Enhanced qunit.parameterize to take an array of functions returning objects as
test cases for this
to work conveniently.
Change-Id: Id3af61c498f4cd71e31b3424e71cce8d2eab4a83
---
M DataValues/resources/qunit.parameterize/qunit.parameterize.js
M ValueView/tests/qunit/jquery.valueview/valueview.tests.testExpert.js
2 files changed, 97 insertions(+), 72 deletions(-)
Approvals:
Henning Snater: Looks good to me, but someone else must approve
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DataValues/resources/qunit.parameterize/qunit.parameterize.js
b/DataValues/resources/qunit.parameterize/qunit.parameterize.js
index 24daae7..1ec6fbd 100644
--- a/DataValues/resources/qunit.parameterize/qunit.parameterize.js
+++ b/DataValues/resources/qunit.parameterize/qunit.parameterize.js
@@ -1,16 +1,20 @@
/**
- * Parameterize v 0.2
* A QUnit Addon For Running Parameterized Tests
*
+ * This is a fork of Parameterize v 0.2 from:
* @see https://github.com/AStepaniuk/qunit-parameterize
* @licence MIT licence
+ *
+ * @author Daniel Werner daniel.wer...@wikimedia.de
*
* @example code
* QUnit
* .cases( [
* { a : 2, b : 2, expectedSum : 4 },
* { a : 5, b : 5, expectedSum : 10 },
- * { a : 40, b : 2, expectedSum : 42 }
+ * function() {
+ * return { a : 40, b : 2, expectedSum : 42 }
+ * }
* ] )
* .test( 'Sum test', function( params, assert ) {
* var actualSum = sum( params.a, params.b );
@@ -23,24 +27,35 @@
/**
* @param {[]|Function} testCases An Array (or a callback returning
such an object) which
-*has to hold different Objects where each defines what will be
passed to tests which
-*will be registered to the Object returned by the function. By
providing a callback,
+*has to hold different Objects and/or Functions returning an
Object. Each of the
+*Objects results in a test case variation and defines what
will be passed to test
+*cases registered to the Object returned by the function. By
providing a callback,
*the parameters provided to the tests will be created
separately for each test. This
*allows to provide instances which involve state without
running into problems when
*manipulating state in one test case but expecting initial
state in another one.
* @return {Object}
*/
return function(testCases) {
- var createTest = function(methodName, title, expected,
callback, parameters) {
+ var createTest = function( methodName, title, expected,
callback, paramsOrProvider ) {
+ var finalCallback = function( assert ) {
+ var parameters = QUnit.is( 'function',
paramsOrProvider )
+ ? paramsOrProvider()
+ : paramsOrProvider;
+
+ return callback.call( this, parameters, assert
);
+ };
+
QUnit[methodName](
title,
expected,
- function(assert) { return callback.call(this,
parameters, assert); }
+ finalCallback
);
};
var iterateTestCases = function(methodName, title, expected,
callback) {
- if (!testCases) return;
+ if ( !testCases ) {
+ return;
+ }
if (!callback) {
callback = expected;
@@ -52,16 +67,16 @@
: testCases;
for (var i = 0; i testTestCases.length; ++i) {
- var parameters = testTestCases[i];
+ var testTestCase = testTestCases[i];
var testCaseTitle = title;
- if (parameters.title) {
- testCaseTitle += [ + parameters.title
+ ];
+ if( testTestCase.title ) {
+ testCaseTitle += [ +
[MediaWiki-commits] [Gerrit] Optimized entityselector auto-completion mechanism - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Optimized entityselector auto-completion mechanism
..
Optimized entityselector auto-completion mechanism
(bug 44884)
If an entity whose label string starts with the string of one of its aliases is
returned,
the auto-completion mechanism is supposed to auto-complete the alias instead of
the label
since another entity that might have the search term as actual label would be
dropped from
the result set immediately when performing auto-completion.
Change-Id: Iee46d20dee5c7ea6d650254c124d2581f344b1cf
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
2 files changed, 109 insertions(+), 24 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index d7ed5df..10cd9a8 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -443,14 +443,7 @@
// Aliases array is returned
only when there is a search hit on an alias.
// If the label does not start
with the search string, auto-complete the
// alias.
- if ( firstMatch.aliases
-(
-
!firstMatch.label // consider label not set at all
- ||
firstMatch.label.toLowerCase().indexOf(
-
searchTerm.toLowerCase()
- ) !== 0
- )
- ) {
+ if (
this._shouldAutocompleteOnAlias( firstMatch, searchTerm ) ) {
stringToAutocomplete =
firstMatch.aliases[0];
}
@@ -493,6 +486,35 @@
}
},
+ _shouldAutocompleteOnAlias: function( firstMatch, searchTerm ) {
+ if( !firstMatch.aliases ) {
+ return false;
+ }
+
+ var label = ( firstMatch.label )
+ ? firstMatch.label.toLowerCase()
+ : null; // Entity does not have a label.
+
+ return !label
+ || label.indexOf( searchTerm.toLowerCase() )
!== 0
+ || this._labelStartsWithAlias( label,
firstMatch );
+ },
+
+ _labelStartsWithAlias: function( label, firstMatch ) {
+ // If the label string starts with one of the alias
strings,
+ // auto-complete the alias to not cause dropping of
other search
+ // results (see QUnit tests):
+ for( var i = 0; i firstMatch.aliases.length; i++ ) {
+ var alias = firstMatch.aliases[i].toLowerCase();
+
+ if( label.indexOf( alias ) === 0 ) {
+ return true;
+ }
+ }
+
+ return false;
+ },
+
/**
* Checks whether the value specified in the input box matches
the first suggested item.
* If not, the user changed the input value after selecting an
item, so the actual value
diff --git
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
index 2064ac0..5b352a1 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
@@ -35,8 +35,8 @@
} ) );
QUnit.test( 'Basic tests', function( assert ) {
- var input = newTestEntitySelector();
- var entityselector = input.data( 'entityselector' );
+ var $input = newTestEntitySelector();
+ var entityselector = $input.data( 'entityselector' );
var exampleResponse = {
searchinfo: {
totalhits: 3,
@@ -65,19 +65,19 @@
success: 1
};
[MediaWiki-commits] [Gerrit] Remove deprecated method now unused - change (mediawiki...WikibaseDataModel)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove deprecated method now unused
..
Remove deprecated method now unused
Should not be mreged before 48a87f7 in Wikibase.git
Change-Id: I2236f4d81bf7860820679b07bc7f92d32877db85
---
M DataModel/Entity/Entity.php
1 file changed, 0 insertions(+), 12 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DataModel/Entity/Entity.php b/DataModel/Entity/Entity.php
index 3c2fdf5..ae569f5 100644
--- a/DataModel/Entity/Entity.php
+++ b/DataModel/Entity/Entity.php
@@ -185,18 +185,6 @@
}
/**
-* Returns a prefixed version of the entity's id or null if it is not
in the datastore yet.
-*
-* @since 0.2
-* @deprecated since 0.4
-*
-* @return string|null
-*/
- public function getPrefixedId() {
- return $this-getId() === null ? null :
$this-getId()-getPrefixedId();
- }
-
- /**
* Sets the ID.
* Should only be set to something determined by the store and not by
the user (to avoid duplicate IDs).
*
--
To view, visit https://gerrit.wikimedia.org/r/78800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2236f4d81bf7860820679b07bc7f92d32877db85
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikibaseDataModel
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Filter and sort $wgBabelCategoryNames correctly for Babel ex... - change (mediawiki...Wikibase)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: Filter and sort $wgBabelCategoryNames correctly for Babel
extraction
..
Filter and sort $wgBabelCategoryNames correctly for Babel extraction
Change-Id: Iaf08f4448d1a9f5141717684b6794e418f1262f6
---
M lib/includes/LanguageFallbackChainFactory.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/LanguageFallbackChainFactory.php
b/lib/includes/LanguageFallbackChainFactory.php
index fa7fb01..5ce24a8 100644
--- a/lib/includes/LanguageFallbackChainFactory.php
+++ b/lib/includes/LanguageFallbackChainFactory.php
@@ -239,7 +239,11 @@
if ( count( $wgBabelCategoryNames ) ) {
// A little redundant but it's the only way to get
required information with current Babel API.
$previousLevelBabel = array();
- foreach ( $wgBabelCategoryNames as $level = $_ ) {
+ $babelCategoryNames = array_filter(
$wgBabelCategoryNames, function( $category ) {
+ return $category !== false;
+ } );
+ krsort( $babelCategoryNames );
+ foreach ( $babelCategoryNames as $level = $_ ) {
// Make the current language at the top of the
chain.
$levelBabel = array_unique( array_merge(
$contextLanguage,
\Babel::getUserLanguages( $user, $level )
--
To view, visit https://gerrit.wikimedia.org/r/79180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf08f4448d1a9f5141717684b6794e418f1262f6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Liangent liang...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Denny Vrandecic denny.vrande...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce NPath complexity and improve readability - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79192
Change subject: Reduce NPath complexity and improve readability
..
Reduce NPath complexity and improve readability
Change-Id: I7961b2c507da3661ce4c0a8bbaf994e80001b672
---
M lib/includes/LanguageFallbackChainFactory.php
1 file changed, 43 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/92/79192/1
diff --git a/lib/includes/LanguageFallbackChainFactory.php
b/lib/includes/LanguageFallbackChainFactory.php
index 5ce24a8..7df40f6 100644
--- a/lib/includes/LanguageFallbackChainFactory.php
+++ b/lib/includes/LanguageFallbackChainFactory.php
@@ -216,7 +216,6 @@
* @return LanguageFallbackChain
*/
public function newFromUserAndLanguageCode( User $user, $languageCode )
{
- global $wgBabelCategoryNames;
wfProfileIn( __METHOD__ );
if ( !class_exists( 'Babel' ) || $user-isAnon() ) {
@@ -233,28 +232,7 @@
return $cached;
}
- $babel = array();
- $contextLanguage = array( $languageCode );
-
- if ( count( $wgBabelCategoryNames ) ) {
- // A little redundant but it's the only way to get
required information with current Babel API.
- $previousLevelBabel = array();
- $babelCategoryNames = array_filter(
$wgBabelCategoryNames, function( $category ) {
- return $category !== false;
- } );
- krsort( $babelCategoryNames );
- foreach ( $babelCategoryNames as $level = $_ ) {
- // Make the current language at the top of the
chain.
- $levelBabel = array_unique( array_merge(
- $contextLanguage,
\Babel::getUserLanguages( $user, $level )
- ) );
- $babel[$level] = array_diff( $levelBabel,
$previousLevelBabel );
- $previousLevelBabel = $levelBabel;
- }
- } else {
- // Just in case
- $babel['N'] = $contextLanguage;
- }
+ $babel = $this-getBabel( $languageCode, $user );
$chain = $this-buildFromBabel( $babel );
$languageFallbackChain = new LanguageFallbackChain( $chain );
@@ -265,6 +243,48 @@
return $languageFallbackChain;
}
+ protected function getBabel( $languageCode, $user ) {
+ $babel = array();
+ $contextLanguage = array( $languageCode );
+
+ $babelCategoryNames = $this-getBabelCategoryNames();
+
+ if ( count( $babelCategoryNames ) ) {
+ // A little redundant but it's the only way to get
required information with current Babel API.
+ $previousLevelBabel = array();
+
+ foreach ( $babelCategoryNames as $level = $_ ) {
+ // Make the current language at the top of the
chain.
+ $levelBabel = array_unique( array_merge(
+ $contextLanguage,
\Babel::getUserLanguages( $user, $level )
+ ) );
+
+ $babel[$level] = array_diff( $levelBabel,
$previousLevelBabel );
+ $previousLevelBabel = $levelBabel;
+ }
+ } else {
+ // Just in case
+ $babel['N'] = $contextLanguage;
+ }
+
+ return $babel;
+ }
+
+ protected function getBabelCategoryNames() {
+ global $wgBabelCategoryNames;
+
+ $babelCategoryNames = array_filter(
+ $wgBabelCategoryNames,
+ function( $category ) {
+ return $category !== false;
+ }
+ );
+
+ krsort( $babelCategoryNames );
+
+ return $babelCategoryNames;
+ }
+
/**
* Build fallback chain array for a given babel array.
*
--
To view, visit https://gerrit.wikimedia.org/r/79192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7961b2c507da3661ce4c0a8bbaf994e80001b672
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Fix alias right in i18n - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79193
Change subject: Fix alias right in i18n
..
Fix alias right in i18n
Bug: 52785
Change-Id: I8b19118200a70142505fdc1bb738d5d9c7a8d059
---
M repo/Wikibase.i18n.php
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/93/79193/1
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 8747d0b..bddd08d 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -407,9 +407,8 @@
'right-property-override' = 'Override properties',
'right-property-create' = 'Create properties',
'right-property-remove' = 'Remove properties',
- 'right-alias-add' = 'Add aliases',
- 'right-alias-set' = 'Set aliases',
'right-alias-remove' = 'Remove aliases',
+ 'right-alias-update' = 'Update aliases',
'right-sitelink-remove' = 'Remove site links',
'right-sitelink-update' = 'Update site links',
'right-linktitles-update' = 'Update link titles',
@@ -1118,9 +1117,8 @@
'right-property-override' = '{{doc-right|property-override}}',
'right-property-create' = '{{doc-right|property-create}}',
'right-property-remove' = '{{doc-right|property-remove}}',
- 'right-alias-add' = '{{doc-right|alias-add}}',
- 'right-alias-set' = '{{doc-right|alias-set}}',
'right-alias-remove' = '{{doc-right|alias-remove}}',
+ 'right-alias-update' = '{{doc-right|alias-update}}',
'right-sitelink-remove' = '{{doc-right|sitelink-remove}}',
'right-sitelink-update' = '{{doc-right|sitelink-update}}',
'right-linktitles-update' = '{{doc-right|linktitles-update}}',
--
To view, visit https://gerrit.wikimedia.org/r/79193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b19118200a70142505fdc1bb738d5d9c7a8d059
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 52193) Pass back siteid for conflicting links - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/79194 Change subject: (bug 52193) Pass back siteid for conflicting links .. (bug 52193) Pass back siteid for conflicting links Change-Id: I0d8ae757e41b55113ee3f93a3238223ddbd5e9bb --- M repo/includes/content/ItemContent.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/94/79194/1 diff --git a/repo/includes/content/ItemContent.php b/repo/includes/content/ItemContent.php index c2f763f..712b327 100644 --- a/repo/includes/content/ItemContent.php +++ b/repo/includes/content/ItemContent.php @@ -179,7 +179,7 @@ // $pageUrl shouldn't be a raw param (it's causing the link not to be parsed) return new \Message( 'wikibase-error-sitelink-already-used', - array( $pageUrl, $conflict['sitePage'], $conflictingPage-getTitle()-getFullText() ) + array( $pageUrl, $conflict['sitePage'], $conflictingPage-getTitle()-getFullText(), $conflict['siteId'] ) ); } -- To view, visit https://gerrit.wikimedia.org/r/79194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d8ae757e41b55113ee3f93a3238223ddbd5e9bb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pierwsza zmiana - change (test...examples)
Yorg666 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79195
Change subject: pierwsza zmiana
..
pierwsza zmiana
Change-Id: Ib8f446239f7f27210942b019c1fa02131200fa6c
---
M Example/Example.body.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/test/mediawiki/extensions/examples
refs/changes/95/79195/1
diff --git a/Example/Example.body.php b/Example/Example.body.php
index a4a7826..688a270 100644
--- a/Example/Example.body.php
+++ b/Example/Example.body.php
@@ -18,6 +18,6 @@
}
function getVersion() {
-return '0.043';
+return '0.01';
}
}
--
To view, visit https://gerrit.wikimedia.org/r/79195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8f446239f7f27210942b019c1fa02131200fa6c
Gerrit-PatchSet: 1
Gerrit-Project: test/mediawiki/extensions/examples
Gerrit-Branch: master
Gerrit-Owner: Yorg666 krispr...@o2.pl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add basic tests for EntitiesWithout* special pages - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79196
Change subject: Add basic tests for EntitiesWithout* special pages
..
Add basic tests for EntitiesWithout* special pages
Change-Id: I813f41093f676521972e3d6e6e64ab8e3fb35f04
---
M repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutDescriptionTest.php
M repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutLabelTest.php
2 files changed, 38 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/96/79196/1
diff --git
a/repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutDescriptionTest.php
b/repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutDescriptionTest.php
index 0d84539..9b6b5e4 100644
---
a/repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutDescriptionTest.php
+++
b/repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutDescriptionTest.php
@@ -32,6 +32,7 @@
*
* @licence GNU GPL v2+
* @author Bene* benestar.wikime...@googlemail.com
+ * @author Adam Shorland
*/
class SpecialEntitiesWithoutDescriptionTest extends SpecialPageTestBase {
@@ -40,14 +41,27 @@
}
public function testExecute() {
- //TODO: Actually verify that the output is correct.
- // Currently this just tests that there is no fatal error,
- // and that the restriction handling is working and doesn't
- // block. That is, the default should let the user execute
- // the page.
+
+ $matchers['language'] = array(
+ 'tag' = 'input',
+ 'attributes' = array(
+ 'id' = 'wb-entitieswithoutpage-language',
+ 'name' = 'language',
+ ) );
+ $matchers['submit'] = array(
+ 'tag' = 'input',
+ 'attributes' = array(
+ 'id' = 'wikibase-entitieswithoutpage-submit',
+ 'class' = 'wb-input-button',
+ 'type' = 'submit',
+ 'name' = 'submit',
+ ) );
+
list( $output, ) = $this-executeSpecialPage( '' );
- $this-assertTrue( true, 'Calling execute without any subpage
value' );
+ foreach( $matchers as $key = $matcher ){
+ $this-assertTag( $matcher, $output, Failed to match
html output with tag '{$key}'' );
+ }
list( $output, ) = $this-executeSpecialPage( 'en' );
$this-assertTrue( true, 'Calling execute with a subpage value'
); //TODO: assert output
diff --git
a/repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutLabelTest.php
b/repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutLabelTest.php
index f570b99..27a5712 100644
--- a/repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutLabelTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutLabelTest.php
@@ -41,14 +41,26 @@
}
public function testExecute() {
- //TODO: Actually verify that the output is correct.
- // Currently this just tests that there is no fatal error,
- // and that the restriction handling is working and doesn't
- // block. That is, the default should let the user execute
- // the page.
+
+ $matchers['language'] = array(
+ 'tag' = 'input',
+ 'attributes' = array(
+ 'id' = 'wb-entitieswithoutpage-language',
+ 'name' = 'language',
+ ) );
+ $matchers['submit'] = array(
+ 'tag' = 'input',
+ 'attributes' = array(
+ 'id' = 'wikibase-entitieswithoutpage-submit',
+ 'class' = 'wb-input-button',
+ 'type' = 'submit',
+ 'name' = 'submit',
+ ) );
list( $output, ) = $this-executeSpecialPage( '' );
- $this-assertTrue( true, 'Calling execute without any subpage
value' );
+ foreach( $matchers as $key = $matcher ){
+ $this-assertTag( $matcher, $output, Failed to match
html output with tag '{$key}'' );
+ }
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/79196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I813f41093f676521972e3d6e6e64ab8e3fb35f04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch:
[MediaWiki-commits] [Gerrit] Reduce NPath complexity and improve readability - change (mediawiki...Wikibase)
Liangent has submitted this change and it was merged.
Change subject: Reduce NPath complexity and improve readability
..
Reduce NPath complexity and improve readability
Change-Id: I7961b2c507da3661ce4c0a8bbaf994e80001b672
---
M lib/includes/LanguageFallbackChainFactory.php
1 file changed, 42 insertions(+), 23 deletions(-)
Approvals:
Liangent: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/LanguageFallbackChainFactory.php
b/lib/includes/LanguageFallbackChainFactory.php
index 5ce24a8..b2106f6 100644
--- a/lib/includes/LanguageFallbackChainFactory.php
+++ b/lib/includes/LanguageFallbackChainFactory.php
@@ -216,7 +216,6 @@
* @return LanguageFallbackChain
*/
public function newFromUserAndLanguageCode( User $user, $languageCode )
{
- global $wgBabelCategoryNames;
wfProfileIn( __METHOD__ );
if ( !class_exists( 'Babel' ) || $user-isAnon() ) {
@@ -233,28 +232,7 @@
return $cached;
}
- $babel = array();
- $contextLanguage = array( $languageCode );
-
- if ( count( $wgBabelCategoryNames ) ) {
- // A little redundant but it's the only way to get
required information with current Babel API.
- $previousLevelBabel = array();
- $babelCategoryNames = array_filter(
$wgBabelCategoryNames, function( $category ) {
- return $category !== false;
- } );
- krsort( $babelCategoryNames );
- foreach ( $babelCategoryNames as $level = $_ ) {
- // Make the current language at the top of the
chain.
- $levelBabel = array_unique( array_merge(
- $contextLanguage,
\Babel::getUserLanguages( $user, $level )
- ) );
- $babel[$level] = array_diff( $levelBabel,
$previousLevelBabel );
- $previousLevelBabel = $levelBabel;
- }
- } else {
- // Just in case
- $babel['N'] = $contextLanguage;
- }
+ $babel = $this-getBabel( $languageCode, $user );
$chain = $this-buildFromBabel( $babel );
$languageFallbackChain = new LanguageFallbackChain( $chain );
@@ -265,6 +243,47 @@
return $languageFallbackChain;
}
+ protected function getBabel( $languageCode, $user ) {
+ $babel = array();
+
+ $babelCategoryNames = $this-getBabelCategoryNames();
+
+ if ( count( $babelCategoryNames ) ) {
+ // A little redundant but it's the only way to get
required information with current Babel API.
+ $previousLevelBabel = array();
+
+ foreach ( $babelCategoryNames as $level = $_ ) {
+ // Make the current language at the top of the
chain.
+ $levelBabel = array_unique( array_merge(
+ array( $languageCode ),
+ \Babel::getUserLanguages( $user, $level
)
+ ) );
+
+ $babel[$level] = array_diff( $levelBabel,
$previousLevelBabel );
+ $previousLevelBabel = $levelBabel;
+ }
+ } else {
+ $babel['N'] = array( $languageCode );
+ }
+
+ return $babel;
+ }
+
+ protected function getBabelCategoryNames() {
+ global $wgBabelCategoryNames;
+
+ $babelCategoryNames = array_filter(
+ $wgBabelCategoryNames,
+ function( $category ) {
+ return $category !== false;
+ }
+ );
+
+ krsort( $babelCategoryNames );
+
+ return $babelCategoryNames;
+ }
+
/**
* Build fallback chain array for a given babel array.
*
--
To view, visit https://gerrit.wikimedia.org/r/79192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7961b2c507da3661ce4c0a8bbaf994e80001b672
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Denny Vrandecic denny.vrande...@wikimedia.de
Gerrit-Reviewer: Liangent liang...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
[MediaWiki-commits] [Gerrit] Special page for entities without description - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Special page for entities without description
..
Special page for entities without description
New base class SpecialEntitiesWithoutPage and subpages
SpecialEntitiesWithoutLabel and SpecialEntitiesWithoutDescription
Bug: 42102
Change-Id: I16570b0844653c9e8a2fb1e75c2efa72b586d5d5
---
M repo/Wikibase.classes.php
M repo/Wikibase.i18n.alias.php
M repo/Wikibase.i18n.php
M repo/Wikibase.php
A repo/includes/specials/SpecialEntitiesWithoutDescription.php
M repo/includes/specials/SpecialEntitiesWithoutLabel.php
A repo/includes/specials/SpecialEntitiesWithoutPage.php
A repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutDescriptionTest.php
8 files changed, 410 insertions(+), 163 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.classes.php b/repo/Wikibase.classes.php
index 272a82a..cd41d0d 100644
--- a/repo/Wikibase.classes.php
+++ b/repo/Wikibase.classes.php
@@ -126,7 +126,9 @@
'SpecialSetDescription' =
'includes/specials/SpecialSetDescription.php',
'SpecialSetAliases' =
'includes/specials/SpecialSetAliases.php',
'SpecialSetSiteLink' =
'includes/specials/SpecialSetSiteLink.php',
+ 'SpecialEntitiesWithoutPage' =
'includes/specials/SpecialEntitiesWithoutPage.php',
'SpecialEntitiesWithoutLabel' =
'includes/specials/SpecialEntitiesWithoutLabel.php',
+ 'SpecialEntitiesWithoutDescription' =
'includes/specials/SpecialEntitiesWithoutDescription.php',
'SpecialItemsWithoutSitelinks' =
'includes/specials/SpecialItemsWithoutSitelinks.php',
'SpecialListDatatypes' =
'includes/specials/SpecialListDatatypes.php',
'SpecialDispatchStats' =
'includes/specials/SpecialDispatchStats.php',
diff --git a/repo/Wikibase.i18n.alias.php b/repo/Wikibase.i18n.alias.php
index 13d8630..cb60c3d 100644
--- a/repo/Wikibase.i18n.alias.php
+++ b/repo/Wikibase.i18n.alias.php
@@ -28,6 +28,7 @@
'SetAliases' = array( 'SetAliases' ),
'SetSiteLink' = array( 'SetSiteLink' ),
'EntitiesWithoutLabel' = array( 'EntitiesWithoutLabel' ),
+ 'EntitiesWithoutDescription' = array( 'EntitiesWithoutDescription' ),
'ItemsWithoutSitelinks' = array( 'ItemsWithoutSitelinks' ),
'MyLanguageFallbackChain' = array( 'MyLanguageFallbackChain' ),
);
@@ -84,6 +85,7 @@
'SetAliases' = array( 'Aliasse_festlegen' ),
'SetSiteLink' = array( 'Websitelink_festlegen' ),
'EntitiesWithoutLabel' = array( 'Objekte_ohne_Bezeichnung' ),
+ 'EntitiesWithoutDescription' = array( 'Objekte_ohne_Beschreibung' ),
'ItemsWithoutSitelinks' = array( 'Objekte_ohne_Websitelinks' ),
'MyLanguageFallbackChain' = array( 'Meine_Sprachfallbackkette' ),
);
@@ -300,4 +302,4 @@
'SetAliases' = array( '設置別名' ),
'EntitiesWithoutLabel' = array( '沒有標籤的實體' ),
'ItemsWithoutSitelinks' = array( '沒有條目連結的項目' ),
-);
\ No newline at end of file
+);
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 96e0629..1bc6d7f 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -211,6 +211,8 @@
'wikibase-listdatatypes-intro' = 'This is a list of all datatypes
currently in use on this installation:',
'wikibase-history-title-with-label' = 'Revision history of $2 ($1)',
'wikibase-history-title-without-label' = 'Revision history of ($1)',
+ 'special-entitieswithoutdescription' = 'Entities without description',
+ 'wikibase-entitieswithoutdescription-legend' = 'Get list of entities
without description',
'special-entitieswithoutlabel' = 'Entities without label',
'wikibase-entitieswithoutlabel-legend' = 'Get list of entities without
label',
'wikibase-entitieswithoutlabel-label-language' = 'Language:',
@@ -868,6 +870,9 @@
* $2 - the localized label, it is usually in quotes',
'wikibase-history-title-without-label' = 'The title of the history
page with only a prefixed id. Parameters:
* $1 - the prefixed id, the id is usually in parenthesis',
+ 'special-entitieswithoutdescription' =
'{{doc-special|EntitiesWithoutDescription}}
+This special page returns a list of entities without description for a given
language',
+ 'wikibase-entitieswithoutdescription-legend' = 'Legend of the form
that allow to change the language.',
'special-entitieswithoutlabel' = '{{doc-special|EntitiesWithoutLabel}}
This special page returns a list of entities without label for a given
language',
'wikibase-entitieswithoutlabel-legend' = 'Legend of the form that
allow to change the language.',
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index a208162..6dcca9a 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -133,7 +133,7 @@
[MediaWiki-commits] [Gerrit] Add several additional user groups for ckbwiki - change (operations/mediawiki-config)
TTO has uploaded a new change for review. https://gerrit.wikimedia.org/r/79197 Change subject: Add several additional user groups for ckbwiki .. Add several additional user groups for ckbwiki Groups added: eliminator, interface_editor, trusted, editprotected Bug: 52866 Change-Id: Ibac3c765006fe75e02ce0c78aeb5dca09096f0a3 --- M wmf-config/InitialiseSettings.php 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/97/79197/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fb9f255..0893271 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -6750,6 +6750,26 @@ 'reupload' = true, 'movefile' = true, ), // bug 51232 + 'eliminator' = array( + 'delete' = true, + 'nuke' = true, + 'suppressredirect' = true, + 'undelete' = true, + 'browsearchive' = true, + 'deletedhistory' = true, + 'deletedtext' = true, + ), // bug 52866 + 'interface_editor' = array( + 'editinterface' = true, + 'editusercss' = true, + 'edituserjs' = true, + ), // bug 52866 + 'trusted' = array( + 'block' = true, + 'blockemail' = true, + 'protect' = true, + ), // bug 52866 + 'editprotected' = array( 'editprotected' = true ), // bug 52866 'flood' = array( 'bot' = true ), // bug 51803 'botadmin' = array( 'protect' = true, -- To view, visit https://gerrit.wikimedia.org/r/79197 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibac3c765006fe75e02ce0c78aeb5dca09096f0a3 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: TTO at.li...@live.com.au ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re-enable multiwrites for Ceph - change (operations/mediawiki-config)
Faidon has uploaded a new change for review. https://gerrit.wikimedia.org/r/79198 Change subject: Re-enable multiwrites for Ceph .. Re-enable multiwrites for Ceph Swift remains the multiMaster, for now. Change-Id: If001f6e148fd63cdd94958bd1a8457ac8ac46176 --- M wmf-config/filebackend.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/98/79198/1 diff --git a/wmf-config/filebackend.php b/wmf-config/filebackend.php index 7a94004..ee872b8 100644 --- a/wmf-config/filebackend.php +++ b/wmf-config/filebackend.php @@ -144,10 +144,10 @@ 'backends'= array( # DO NOT change the master backend unless it is fully trusted or autoRsync is off array( 'template' = 'local-swift', 'isMultiMaster' = true ), - #array( 'template' = 'local-ceph', 'isMultiMaster' = true ) -- aaron 5/30/2013 + array( 'template' = 'local-ceph', 'isMultiMaster' = false ) ), 'syncChecks' = ( 1 | 4 ), // (size sha1) - 'autoResync' = 'conservative' // bug 39221 + #'autoResync' = 'conservative' // bug 39221 ); $wgFileBackends[] = array( 'class' = 'FileBackendMultiWrite', @@ -158,10 +158,10 @@ 'backends'= array( # DO NOT change the master backend unless it is fully trusted or autoRsync is off array( 'template' = 'shared-swift', 'isMultiMaster' = true ), - #array( 'template' = 'shared-ceph', 'isMultiMaster' = true ) -- aaron 5/30/2013 + array( 'template' = 'shared-ceph', 'isMultiMaster' = false ) ), 'syncChecks' = ( 1 | 4 ), // (size sha1) - 'autoResync' = 'conservative' // bug 39221 + #'autoResync' = 'conservative' // bug 39221 ); $wgFileBackends[] = array( 'class' = 'FileBackendMultiWrite', @@ -171,10 +171,10 @@ 'backends'= array( # DO NOT change the master backend unless it is fully trusted or autoRsync is off array( 'template' = 'global-swift', 'isMultiMaster' = true ), - #array( 'template' = 'global-ceph', 'isMultiMaster' = true ) -- aaron 5/30/2013 + array( 'template' = 'global-ceph', 'isMultiMaster' = false ) ), 'syncChecks' = ( 1 | 4 ), // (size sha1) - 'autoResync' = 'conservative' + #'autoResync' = 'conservative' ); /* end multiwrite backend config */ -- To view, visit https://gerrit.wikimedia.org/r/79198 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If001f6e148fd63cdd94958bd1a8457ac8ac46176 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Faidon fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix capitalization - change (mediawiki...Flow)
Shirayuki has uploaded a new change for review. https://gerrit.wikimedia.org/r/79199 Change subject: Fix capitalization .. Fix capitalization * Fix capitalization * Fix br / tags * Give grep a chance to find the usages Change-Id: I9be306c43b3a778ea59786d22b091ad48d57168f --- M Flow.i18n.php M templates/post.html.php 2 files changed, 12 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/99/79199/1 diff --git a/Flow.i18n.php b/Flow.i18n.php index 6920bf4..c258832 100644 --- a/Flow.i18n.php +++ b/Flow.i18n.php @@ -8,11 +8,11 @@ * English */ $messages['en'] = array( - 'flow-desc' = 'Workflow Management system', + 'flow-desc' = 'Workflow management system', 'flow-specialpage' = '$1 ndash; Flow', - 'flow-edit-summary-link' = 'Edit Summary', + 'flow-edit-summary-link' = 'Edit summary', - 'flow-disclaimer' = By clicking the \Add Message\ button, you agree to the Terms of Use, + 'flow-disclaimer' = By clicking the \Add message\ button, you agree to the Terms of Use, and you irrevocably agree to release your contribution under the CC-BY-SA 3.0 License and the GFDL. You agree that a hyperlink or URL is sufficient attribution under the Creative Commons license., 'flow-post-deleted' = '[post deleted]', @@ -20,23 +20,23 @@ 'flow-topic-actions' = 'actions', 'flow-cancel' = 'Cancel', - 'flow-newtopic-title-placeholder' = 'Message Subject', - 'flow-newtopic-content-placeholder' = 'Message Text. Be nice!', + 'flow-newtopic-title-placeholder' = 'Message subject', + 'flow-newtopic-content-placeholder' = 'Message text. Be nice!', 'flow-newtopic-header' = 'Add a new topic', - 'flow-newtopic-save' = 'Add Topic', + 'flow-newtopic-save' = 'Add topic', 'flow-newtopic-start-placeholder' = 'Click here to start a new discussion. Be nice!', 'flow-reply-placeholder' = 'Click to reply to $1. Be nice!', - 'flow-reply-submit' = 'Post Reply', + 'flow-reply-submit' = 'Post reply', 'flow-post-action-delete-post' = 'Delete post', 'flow-post-action-restore-post' = 'Restore post', - 'flow-topic-action-edit-title' = 'Edit Title', + 'flow-topic-action-edit-title' = 'Edit title', 'flow-error-http' = 'An error occurred while contacting the server. Your post was not saved.', // Needs real copy 'flow-error-other' = 'An unexpected error occurred. Your post was not saved.', - 'flow-error-external' = 'An error occurred while saving your post. Your post was not saved.br/smallThe error message received was: $1/small', - 'flow-error-external-multi' = 'Errors were encountered while saving your post. Your post was not saved. br/ $1', + 'flow-error-external' = 'An error occurred while saving your post. Your post was not saved.br /smallThe error message received was: $1/small', + 'flow-error-external-multi' = 'Errors were encountered while saving your post. Your post was not saved.br /$1', 'flow-error-missing-content' = 'Post has no content. Content is required to save a new post.', 'flow-error-missing-title' = 'Topic has no title. Title is required to save a new topic.', diff --git a/templates/post.html.php b/templates/post.html.php index c5803fa..dfddf00 100644 --- a/templates/post.html.php +++ b/templates/post.html.php @@ -18,6 +18,8 @@ 'value' = $value, ) ); } + // Give grep a chance to find the usages: + // flow-post-action-delete-post, flow-post-action-restore-post $output .= Html::element( 'input', array( 'type' = 'submit', 'class' = 'mw-ui-button '.$class, -- To view, visit https://gerrit.wikimedia.org/r/79199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9be306c43b3a778ea59786d22b091ad48d57168f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 52193) Pass back siteid for conflicting links - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: (bug 52193) Pass back siteid for conflicting links .. (bug 52193) Pass back siteid for conflicting links Change-Id: I0d8ae757e41b55113ee3f93a3238223ddbd5e9bb --- M repo/includes/content/ItemContent.php 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/content/ItemContent.php b/repo/includes/content/ItemContent.php index c2f763f..6327797 100644 --- a/repo/includes/content/ItemContent.php +++ b/repo/includes/content/ItemContent.php @@ -179,7 +179,12 @@ // $pageUrl shouldn't be a raw param (it's causing the link not to be parsed) return new \Message( 'wikibase-error-sitelink-already-used', - array( $pageUrl, $conflict['sitePage'], $conflictingPage-getTitle()-getFullText() ) + array( + $pageUrl, + $conflict['sitePage'], + $conflictingPage-getTitle()-getFullText(), + $conflict['siteId'], + ) ); } -- To view, visit https://gerrit.wikimedia.org/r/79194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d8ae757e41b55113ee3f93a3238223ddbd5e9bb Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactor applyPermission out of the Test - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Refactor applyPermission out of the Test
..
Refactor applyPermission out of the Test
Change-Id: Icb881141144fb940d7d1dc2857fdfad6e8638733
---
M repo/Wikibase.classes.php
M repo/tests/phpunit/includes/EditEntityTest.php
A repo/tests/phpunit/includes/PermissionsHelper.php
M repo/tests/phpunit/includes/api/PermissionsTest.php
M repo/tests/phpunit/includes/content/EntityContentTest.php
5 files changed, 63 insertions(+), 33 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.classes.php b/repo/Wikibase.classes.php
index 272a82a..ed31986 100644
--- a/repo/Wikibase.classes.php
+++ b/repo/Wikibase.classes.php
@@ -174,6 +174,7 @@
'Wikibase\Test\Api\LangAttributeTestCase' =
'tests/phpunit/includes/api/LangAttributeTestCase.php',
'Wikibase\Test\Api\LangAttributeTestHelper' =
'tests/phpunit/includes/api/LangAttributeTestHelper.php',
'Wikibase\Test\Api\EntityTestHelper' =
'tests/phpunit/includes/api/EntityTestHelper.php',
+ 'Wikibase\Test\PermissionsHelper' =
'tests/phpunit/includes/PermissionsHelper.php',
'Wikibase\Test\EntityContentTest' =
'tests/phpunit/includes/content/EntityContentTest.php',
'Wikibase\Test\EntityHandlerTest' =
'tests/phpunit/includes/content/EntityHandlerTest.php',
'Wikibase\Test\RdfBuilderTest' =
'tests/phpunit/includes/rdf/RdfBuilderTest.php',
diff --git a/repo/tests/phpunit/includes/EditEntityTest.php
b/repo/tests/phpunit/includes/EditEntityTest.php
index bb7c603..d08fbbe 100644
--- a/repo/tests/phpunit/includes/EditEntityTest.php
+++ b/repo/tests/phpunit/includes/EditEntityTest.php
@@ -7,7 +7,6 @@
use \Wikibase\ItemContent;
use \Wikibase\Item;
use \Status;
-use Wikibase\Test\Api\PermissionsTest;
/**
* Test EditEntity.
@@ -430,7 +429,7 @@
}
if ( $permissions !== null ) {
- PermissionsTest::applyPermissions( array(
+ PermissionsHelper::applyPermissions( array(
'*' = $permissions,
'user' = $permissions,
$group = $permissions,
diff --git a/repo/tests/phpunit/includes/PermissionsHelper.php
b/repo/tests/phpunit/includes/PermissionsHelper.php
new file mode 100644
index 000..b6ac1de
--- /dev/null
+++ b/repo/tests/phpunit/includes/PermissionsHelper.php
@@ -0,0 +1,58 @@
+?php
+
+namespace Wikibase\Test;
+
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @since 0.4
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ * @author Adam Shorland
+ */
+class PermissionsHelper {
+
+ /**
+* Utility function for applying a set of permissions to
$wgGroupPermissions.
+* Automatically resets the rights cache for $wgUser.
+* No measures are taken to restore the original permissions later,
this is up to the caller.
+*
+* @param $permissions
+*/
+ public static function applyPermissions( $permissions ) {
+ global $wgGroupPermissions;
+ global $wgUser;
+
+ if ( !$permissions ) {
+ return;
+ }
+
+ foreach ( $permissions as $group = $rights ) {
+ if ( !empty( $wgGroupPermissions[ $group ] ) ) {
+ $wgGroupPermissions[ $group ] = array_merge(
$wgGroupPermissions[ $group ], $rights );
+ } else {
+ $wgGroupPermissions[ $group ] = $rights;
+ }
+ }
+
+ // reset rights cache
+ $wgUser-addGroup( dummy );
+ $wgUser-removeGroup( dummy );
+ }
+
+}
diff --git a/repo/tests/phpunit/includes/api/PermissionsTest.php
b/repo/tests/phpunit/includes/api/PermissionsTest.php
index ff36a0c..b8588e5 100644
--- a/repo/tests/phpunit/includes/api/PermissionsTest.php
+++ b/repo/tests/phpunit/includes/api/PermissionsTest.php
@@ -3,6 +3,7 @@
namespace
[MediaWiki-commits] [Gerrit] (bug 52785) Fix alias right in i18n - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 52785) Fix alias right in i18n
..
(bug 52785) Fix alias right in i18n
Change-Id: I8b19118200a70142505fdc1bb738d5d9c7a8d059
---
M repo/Wikibase.i18n.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 8747d0b..bddd08d 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -407,9 +407,8 @@
'right-property-override' = 'Override properties',
'right-property-create' = 'Create properties',
'right-property-remove' = 'Remove properties',
- 'right-alias-add' = 'Add aliases',
- 'right-alias-set' = 'Set aliases',
'right-alias-remove' = 'Remove aliases',
+ 'right-alias-update' = 'Update aliases',
'right-sitelink-remove' = 'Remove site links',
'right-sitelink-update' = 'Update site links',
'right-linktitles-update' = 'Update link titles',
@@ -1118,9 +1117,8 @@
'right-property-override' = '{{doc-right|property-override}}',
'right-property-create' = '{{doc-right|property-create}}',
'right-property-remove' = '{{doc-right|property-remove}}',
- 'right-alias-add' = '{{doc-right|alias-add}}',
- 'right-alias-set' = '{{doc-right|alias-set}}',
'right-alias-remove' = '{{doc-right|alias-remove}}',
+ 'right-alias-update' = '{{doc-right|alias-update}}',
'right-sitelink-remove' = '{{doc-right|sitelink-remove}}',
'right-sitelink-update' = '{{doc-right|sitelink-update}}',
'right-linktitles-update' = '{{doc-right|linktitles-update}}',
--
To view, visit https://gerrit.wikimedia.org/r/79193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b19118200a70142505fdc1bb738d5d9c7a8d059
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Anja Jentzsch a...@anjeve.de
Gerrit-Reviewer: Ataherivand abraham.taheriv...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Daniel Werner daniel.wer...@wikimedia.de
Gerrit-Reviewer: Denny Vrandecic denny.vrande...@wikimedia.de
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jens Ohlig jens.oh...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: John Erling Blad jeb...@gmail.com
Gerrit-Reviewer: Liangent liang...@gmail.com
Gerrit-Reviewer: Lydia Pintscher lydia.pintsc...@wikimedia.de
Gerrit-Reviewer: Markus Kroetzsch mar...@semantic-mediawiki.org
Gerrit-Reviewer: Nikola Smolenski smole...@eunet.rs
Gerrit-Reviewer: Nilesh nil...@nileshc.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing parameters to message call - change (mediawiki...AbuseFilter)
Grunny has uploaded a new change for review. https://gerrit.wikimedia.org/r/79201 Change subject: Add missing parameters to message call .. Add missing parameters to message call Add missing parameters for abusefilter-edit-lastmod-text message on the global filter list view. Two of the missing parameters are used by the German translation of the message. Bug: 51780 Change-Id: Iec5cf4f37f3d5f512c6c57de234e0f7b3a3ba502 --- M Views/AbuseFilterViewList.php 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/01/79201/1 diff --git a/Views/AbuseFilterViewList.php b/Views/AbuseFilterViewList.php index f294e72..f84687f 100644 --- a/Views/AbuseFilterViewList.php +++ b/Views/AbuseFilterViewList.php @@ -380,7 +380,11 @@ $user = $row-af_user_text; return $this-msg( 'abusefilter-edit-lastmod-text', - $lang-timeanddate( $value, true ), $user + $lang-timeanddate( $value, true ), + $user, + $lang-date( $value, true ), + $lang-time( $value, true ), + $user )-parse(); case 'af_group': // If this is global, local name probably doesn't exist, but try -- To view, visit https://gerrit.wikimedia.org/r/79201 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec5cf4f37f3d5f512c6c57de234e0f7b3a3ba502 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Grunny mwgru...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add to README - change (mediawiki...SemanticMediaWiki)
Jeroen De Dauw has uploaded a new change for review. https://gerrit.wikimedia.org/r/79202 Change subject: Add to README .. Add to README Change-Id: Icdfcdca48a306fcad27d9e7bb905acf8a56a2dfd --- M README.md 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki refs/changes/02/79202/1 diff --git a/README.md b/README.md index 53212e8..522314d 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,11 @@ Notes on installing Semantic MediaWiki are found in the file INSTALL. [](http://travis-ci.org/wikimedia/mediawiki-extensions-SemanticMediaWiki) +[](https://coveralls.io/r/wikimedia/mediawiki-extensions-SemanticMediaWiki?branch=master) +[](https://www.versioneye.com/package/php--mediawiki--semantic-mediawiki) + +[](https://packagist.org/packages/mediawiki/semantic-mediawiki) +[](https://packagist.org/packages/mediawiki/semantic-mediawiki) Contact --- -- To view, visit https://gerrit.wikimedia.org/r/79202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icdfcdca48a306fcad27d9e7bb905acf8a56a2dfd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticMediaWiki Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add to README - change (mediawiki...SemanticMediaWiki)
Jeroen De Dauw has submitted this change and it was merged. Change subject: Add to README .. Add to README Change-Id: Icdfcdca48a306fcad27d9e7bb905acf8a56a2dfd --- M README.md 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jeroen De Dauw: Verified; Looks good to me, approved diff --git a/README.md b/README.md index 53212e8..522314d 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,11 @@ Notes on installing Semantic MediaWiki are found in the file INSTALL. [](http://travis-ci.org/wikimedia/mediawiki-extensions-SemanticMediaWiki) +[](https://coveralls.io/r/wikimedia/mediawiki-extensions-SemanticMediaWiki?branch=master) +[](https://www.versioneye.com/package/php--mediawiki--semantic-mediawiki) + +[](https://packagist.org/packages/mediawiki/semantic-mediawiki) +[](https://packagist.org/packages/mediawiki/semantic-mediawiki) Contact --- -- To view, visit https://gerrit.wikimedia.org/r/79202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icdfcdca48a306fcad27d9e7bb905acf8a56a2dfd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticMediaWiki Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] eventlogger module for ULS - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: eventlogger module for ULS
..
eventlogger module for ULS
Separating event logging out of ULS functionality. Event logging
is now loosely coupled with ULS. ULS core modules can emit an event
whenever EventLogging is required. The eventlogger module will act
on the event if configured.
Change-Id: I59dfcfb25c1acb85376b56239f2355ee7c4aff1e
---
M Resources.php
M UniversalLanguageSelector.hooks.php
M resources/js/ext.uls.displaysettings.js
A resources/js/ext.uls.eventlogger.js
M resources/js/ext.uls.ime.js
M resources/js/ext.uls.init.js
M resources/js/ext.uls.inputsettings.js
M resources/js/ext.uls.interface.js
8 files changed, 215 insertions(+), 98 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 6ae9c6b..c80b22a 100644
--- a/Resources.php
+++ b/Resources.php
@@ -66,6 +66,11 @@
'position' = 'top',
) + $resourcePaths;
+$wgResourceModules['ext.uls.eventlogger'] = array(
+ 'scripts' = 'resources/js/ext.uls.eventlogger.js',
+ 'dependencies' = 'schema.UniversalLanguageSelector',
+) + $resourcePaths;
+
$wgResourceModules['ext.uls.i18n'] = array(
'scripts' = 'resources/js/ext.uls.i18n.js',
'dependencies' = 'jquery.i18n',
diff --git a/UniversalLanguageSelector.hooks.php
b/UniversalLanguageSelector.hooks.php
index 0450ca1..3fc37be 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -48,9 +48,13 @@
// Load the style for users without JS, to hide the useless
links
$out-addModuleStyles( 'ext.uls.nojs' );
- // If EventLogging integration is enabled, load the schema
module.
+ // If EventLogging integration is enabled, load the schema
module
+ // and the event logging functions module
if ( $wgULSEventLogging ) {
- $out-addModules( 'schema.UniversalLanguageSelector' );
+ $out-addModules( array(
+ 'schema.UniversalLanguageSelector',
+ 'ext.uls.eventlogger',
+ ) );
}
// If the extension is enabled, basic features (API, language
data) available.
diff --git a/resources/js/ext.uls.displaysettings.js
b/resources/js/ext.uls.displaysettings.js
index 0e6a51e..8cffd85 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -159,18 +159,17 @@
new mw.Api().parse( $.i18n(
'ext-uls-display-settings-anon-log-in-cta' ) )
.done( function ( parsedCta ) {
$loginCta.html( parsedCta );
- // Because browsers navigate
away when clicking a link,
- // we are are overriding the
normal click behavior to
- // allow the event be logged
first - currently there is no
- // local queue for events. The
timeout is there to make sure
- // the user gets to the new
page even if event logging is slow
- // or fails.
$loginCta.find( 'a' ).click(
function ( event ) {
event.preventDefault();
- mw.uls.logEvent( {
action: 'login-click' }, 500 )
- .always(
function () {
-
window.location.href = event.target.href;
- } );
+ // Because browsers
navigate away when clicking a link,
+ // we are are
overriding the normal click behavior to
+ // allow the event be
logged first - currently there is no
+ // local queue for
events. The timeout is there to make sure
+ // the user gets to the
new page even if event logging is slow
+ // or fails.
+ mw.hook(
'mw.uls.login.click' ).fire( function () {
+
window.location.href = event.target.href;
+
[MediaWiki-commits] [Gerrit] Fixed bug when reading empty string - change (operations...incremental)
Petr Onderka has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79203
Change subject: Fixed bug when reading empty string
..
Fixed bug when reading empty string
Change-Id: I85399aabcd68fd7769f07b4c9e695caa7995b144
---
M DumpObjects/DumpTraits.h
1 file changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/incremental
refs/changes/03/79203/1
diff --git a/DumpObjects/DumpTraits.h b/DumpObjects/DumpTraits.h
index 4916e04..faa5a9f 100644
--- a/DumpObjects/DumpTraits.h
+++ b/DumpObjects/DumpTraits.h
@@ -18,8 +18,6 @@
using std::ostream;
using std::vector;
-// TODO: add non-template wrapper with template methods, so that type
inference can work?
-
templatetypename T, typename = void
class DumpTraits
{
@@ -193,7 +191,8 @@
{
std::string bytes(count, '\0');
-stream.read(bytes.at(0), count);
+if (count 0)
+stream.read(bytes.at(0), count);
return bytes;
}
--
To view, visit https://gerrit.wikimedia.org/r/79203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85399aabcd68fd7769f07b4c9e695caa7995b144
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/incremental
Gerrit-Branch: gsoc
Gerrit-Owner: Petr Onderka gsv...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed bug when reading empty string - change (operations...incremental)
Petr Onderka has submitted this change and it was merged.
Change subject: Fixed bug when reading empty string
..
Fixed bug when reading empty string
Change-Id: I85399aabcd68fd7769f07b4c9e695caa7995b144
---
M DumpObjects/DumpTraits.h
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Petr Onderka: Verified; Looks good to me, approved
diff --git a/DumpObjects/DumpTraits.h b/DumpObjects/DumpTraits.h
index 4916e04..faa5a9f 100644
--- a/DumpObjects/DumpTraits.h
+++ b/DumpObjects/DumpTraits.h
@@ -18,8 +18,6 @@
using std::ostream;
using std::vector;
-// TODO: add non-template wrapper with template methods, so that type
inference can work?
-
templatetypename T, typename = void
class DumpTraits
{
@@ -193,7 +191,8 @@
{
std::string bytes(count, '\0');
-stream.read(bytes.at(0), count);
+if (count 0)
+stream.read(bytes.at(0), count);
return bytes;
}
--
To view, visit https://gerrit.wikimedia.org/r/79203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85399aabcd68fd7769f07b4c9e695caa7995b144
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/incremental
Gerrit-Branch: gsoc
Gerrit-Owner: Petr Onderka gsv...@gmail.com
Gerrit-Reviewer: Petr Onderka gsv...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for gerrit.wikimedia.org to the misc cluster - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Add support for gerrit.wikimedia.org to the misc cluster
..
Add support for gerrit.wikimedia.org to the misc cluster
Change-Id: I4133658096669422346bee1259c54080e7d88913
---
M manifests/role/cache.pp
M templates/varnish/misc.inc.vcl.erb
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 6cb9c7e..d871621 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1141,10 +1141,10 @@
'ssl_proxies' = $wikimedia_networks,
'default_backend' = 'antimony',# FIXME
},
- backends = [ 'antimony.wikimedia.org' ],
+ backends = [ 'antimony.wikimedia.org',
'manganese.wikimedia.org' ],
backend_options = [
{
- 'backend_match' = '^antimony',
+ 'backend_match' = '^(antimony|manganese)',
'port' = 8080,
},
{
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 6e0961e..1bca91c 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -7,6 +7,9 @@
set req.http.X-Forwarded-Proto = https;
set req.http.X-Forwarded-Port = 443;
return (lookup);
+ } elsif (req.http.Host == gerrit.wikimedia.org) {
+ set req.backend = manganese;
+ return (lookup);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/79204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4133658096669422346bee1259c54080e7d88913
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for gerrit.wikimedia.org to the misc cluster - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79204
Change subject: Add support for gerrit.wikimedia.org to the misc cluster
..
Add support for gerrit.wikimedia.org to the misc cluster
Change-Id: I4133658096669422346bee1259c54080e7d88913
---
M manifests/role/cache.pp
M templates/varnish/misc.inc.vcl.erb
2 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/79204/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 6cb9c7e..d871621 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1141,10 +1141,10 @@
'ssl_proxies' = $wikimedia_networks,
'default_backend' = 'antimony',# FIXME
},
- backends = [ 'antimony.wikimedia.org' ],
+ backends = [ 'antimony.wikimedia.org',
'manganese.wikimedia.org' ],
backend_options = [
{
- 'backend_match' = '^antimony',
+ 'backend_match' = '^(antimony|manganese)',
'port' = 8080,
},
{
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 6e0961e..1bca91c 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -7,6 +7,9 @@
set req.http.X-Forwarded-Proto = https;
set req.http.X-Forwarded-Port = 443;
return (lookup);
+ } elsif (req.http.Host == gerrit.wikimedia.org) {
+ set req.backend = manganese;
+ return (lookup);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/79204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4133658096669422346bee1259c54080e7d88913
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP continuing Headings test scenarios - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged.
Change subject: WIP continuing Headings test scenarios
..
WIP continuing Headings test scenarios
Change-Id: I383ee621e1808b046a8e2995a041b4131aad733b
---
A features/step_definitions/visual_editor_headings_steps.rb
M features/support/pages/visual_editor_page.rb
A features/visual_editor_headings.feature
3 files changed, 121 insertions(+), 0 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/features/step_definitions/visual_editor_headings_steps.rb
b/features/step_definitions/visual_editor_headings_steps.rb
new file mode 100644
index 000..c4e24af
--- /dev/null
+++ b/features/step_definitions/visual_editor_headings_steps.rb
@@ -0,0 +1,64 @@
+When(/^I click the Headings pull\-down menu$/) do
+ on(VisualEditorPage).ve_heading_menu_element.when_present.click
+ end
+
+Given(/^I can see the Headings interface$/) do
+ on(VisualEditorPage).ve_heading_ui.should match Regexp.escape('Paragraph')
+end
+
+When(/^I click the down arrow$/) do
+ on(VisualEditorPage).downarrow_element.when_present.click
+end
+
+When(/^I click Paragraph$/) do
+ on(VisualEditorPage).paragraph_element.when_present.click
+end
+
+Then(/^a paragraph should appear in the diff view$/) do
+ on(VisualEditorPage) do |page|
+page.wait_until(10) do
+ page.paragraph_diff_view.include? 'Editing '
+end
+page.paragraph_diff_view.should match Regexp.escape('Editing with ')
+ end
+end
+
+When(/^I click Heading$/) do
+ on(VisualEditorPage).heading_element.when_present.click
+end
+
+Then(/^a heading should appear in the diff view$/) do
+ on(VisualEditorPage) do |page|
+page.wait_until(10) do
+ page.heading_diff_view.include? '==Editing '
+end
+page.heading_diff_view.should match Regexp.escape('==Editing with ')
+ end
+end
+
+When(/^I click Sub\-Heading1$/) do
+ on(VisualEditorPage).subheading1_element.when_present.click
+end
+
+Then(/^a sub\-heading1 should appear in the diff view$/) do
+ on(VisualEditorPage) do |page|
+page.wait_until(10) do
+ page.heading_diff_view.include? '===Editing '
+end
+page.heading_diff_view.should match Regexp.escape('===Editing with ')
+ end
+end
+
+When(/^I click Sub\-Heading2$/) do
+ on(VisualEditorPage).subheading2_element.when_present.click
+end
+
+Then(/^a sub\-heading2 should appear in the diff view$/) do
+ on(VisualEditorPage) do |page|
+page.wait_until(10) do
+ page.heading_diff_view.include? 'Editing '
+end
+page.heading_diff_view.should match Regexp.escape('Editing with ')
+ end
+end
+
diff --git a/features/support/pages/visual_editor_page.rb
b/features/support/pages/visual_editor_page.rb
index 282f7c0..9fa0d56 100644
--- a/features/support/pages/visual_editor_page.rb
+++ b/features/support/pages/visual_editor_page.rb
@@ -9,8 +9,10 @@
text_area(:describe_change, id:
've-init-mw-viewPageTarget-saveDialog-editSummary')
div(:diff_view, class: 've-init-mw-viewPageTarget-saveDialog-viewer')
a(:edit_ve, text: 'Edit')
+ div(:heading_diff_view, class: 've-init-mw-viewPageTarget-saveDialog-viewer')
div(:insert_references, class: 've-ui-window-title')
div(:internal_diff_view, class:
've-init-mw-viewPageTarget-saveDialog-viewer')
+ div(:paragraph_diff_view, class:
've-init-mw-viewPageTarget-saveDialog-viewer')
div(:ip_warning, class:
've-init-mw-viewPageTarget-toolbar-editNotices-notice')
span(:looks_good, class: 've-ui-labeledElement-label', text: 'Looks good to
me')
checkbox(:minor_edit, id: 'wpMinoredit')
@@ -22,6 +24,7 @@
span(:save_page, class: 've-ui-labeledElement-label', text: 'Save page')
span(:second_save_page, class: 've-ui-labeledElement-label', text: 'Save
page', index: 1)
span(:ve_link_icon, class: 've-ui-buttonTool-icon ve-ui-icon-link')
+ div(:ve_heading_menu, class: 've-ui-dropdownTool-icon ve-ui-icon-down')
span(:ve_references, class: 've-ui-buttonTool-icon ve-ui-icon-reference')
div(:visual_editor_toolbar, class: 've-ui-toolbar-tools')
span(:transclusion, class: 've-ui-buttonTool-icon ve-ui-icon-template')
@@ -32,19 +35,25 @@
span(:apply_changes, text: 'Apply changes', frame: frame)
text_field(:content_box, index: 0, frame: frame)
span(:create_new, text:'Insert reference', frame: frame)
+div(:downarrow, class: 've-ui-dropdownTool-icon ve-ui-icon-down')
+span(:heading, text: 'Heading')
div(:insert_reference, class: 've-ui-widget ve-ui-flaggableElement-primary
ve-ui-buttonWidget ve-ui-window-applyButton', frame: frame)
a(:leftarrowclose, class: 've-ui-widget ve-ui-iconButtonWidget
ve-ui-icon-previous ve-ui-inspector-closeButton', frame: frame)
span(:internal_linksuggestion, text: 'Main Page')
span(:linksuggestion, text: 'http://www.example.com')
span(:newpage_linksuggestion, text: 'DoesNotExist')
text_field(:parameter_box, index: 0, frame:
[MediaWiki-commits] [Gerrit] Add a function that returns a list of categories the page is... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add a function that returns a list of categories the page is a
member of
..
Add a function that returns a list of categories the page is a member of
Main reason is so internal code does not have to recreate the database query
each time. This will also be useful for extensions.
Change-Id: Ia80c051ff0691087564710f2864ed617d5b9ee96
---
M includes/WikiPage.php
1 file changed, 23 insertions(+), 0 deletions(-)
Approvals:
Parent5446: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 9d61abc..ce26fb9 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -2979,6 +2979,29 @@
/**#@-*/
/**
+* Returns a list of categories this page is a member of.
+* Results will include hidden categories
+*
+* @return TitleArray
+*/
+ public function getCategories() {
+ $id = $this-getId();
+ if ( $id == 0 ) {
+ return TitleArray::newFromResult( new
FakeResultWrapper( array() ) );
+ }
+
+ $dbr = wfGetDB( DB_SLAVE );
+ $res = $dbr-select( 'categorylinks',
+ array( 'cl_to AS page_title, ' . NS_CATEGORY . ' AS
page_namespace' ),
+ // Have to do that since
DatabaseBase::fieldNamesWithAlias treats numeric indexes
+ // as not being aliases, and NS_CATEGORY is numeric
+ array( 'cl_from' = $id ),
+ __METHOD__ );
+
+ return TitleArray::newFromResult( $res );
+ }
+
+ /**
* Returns a list of hidden categories this page is a member of.
* Uses the page_props and categorylinks tables.
*
--
To view, visit https://gerrit.wikimedia.org/r/78343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia80c051ff0691087564710f2864ed617d5b9ee96
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added qqq msg description texts - change (mediawiki...OnlyRecentRecentChanges)
Wikinaut has submitted this change and it was merged.
Change subject: added qqq msg description texts
..
added qqq msg description texts
follow up to https://gerrit.wikimedia.org/r/#/c/79187/
Change-Id: I12dee6cbf6096ece0dfcb704b8fe6e2f6abc80ee
---
M OnlyRecentRecentChanges.i18n.php
M OnlyRecentRecentChanges.php
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
diff --git a/OnlyRecentRecentChanges.i18n.php b/OnlyRecentRecentChanges.i18n.php
index 24bccd5..cac923d 100644
--- a/OnlyRecentRecentChanges.i18n.php
+++ b/OnlyRecentRecentChanges.i18n.php
@@ -16,7 +16,9 @@
'onlyrecentrecentchanges-option' = 'Show only the most recent change
of any changed page (in the limits of {{int:prefs-displayrc}} as shown above)'
);
-/** Message documentation (Message documentation)
+/** Message documentation
*/
$messages['qqq'] = array(
+ 'onlyrecentrecentchanges-desc' =
'{{desc|name=OnlyRecentRecentChanges|url=https://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges}}',
+ 'onlyrecentrecentchanges-option' = 'Label (description) text for the
user option in the user preferences tab Recent changes'
);
diff --git a/OnlyRecentRecentChanges.php b/OnlyRecentRecentChanges.php
index 8fb41b1..7e3efa2 100644
--- a/OnlyRecentRecentChanges.php
+++ b/OnlyRecentRecentChanges.php
@@ -40,13 +40,13 @@
'path' = __FILE__,
'name' = 'OnlyRecentRecentChanges',
'descriptionmsg' = 'onlyrecentrecentchanges-desc',
- 'version' = '1.3.1',
+ 'version' = '1.3.2',
'author' = 'Thomas Gries',
- 'url' =
'http://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges',
+ 'url' =
'https://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges',
);
$dir = dirname( __FILE__ );
-$wgExtensionMessagesFiles['onlyrecentrecentchanges'] = $dir .
'/OnlyRecentRecentChanges.i18n.php';
+$wgExtensionMessagesFiles['OnlyRecentRecentChanges'] = $dir .
'/OnlyRecentRecentChanges.i18n.php';
$wgHooks['GetPreferences'][] = 'onGetPreferences';
$wgHooks['SpecialRecentChangesQuery'][] = 'onSpecialRecentChangesQuery';
--
To view, visit https://gerrit.wikimedia.org/r/79206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12dee6cbf6096ece0dfcb704b8fe6e2f6abc80ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OnlyRecentRecentChanges
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: Wikinaut m...@tgries.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added qqq msg description texts - change (mediawiki...OnlyRecentRecentChanges)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79206
Change subject: added qqq msg description texts
..
added qqq msg description texts
follow up to https://gerrit.wikimedia.org/r/#/c/79187/
Change-Id: I12dee6cbf6096ece0dfcb704b8fe6e2f6abc80ee
---
M OnlyRecentRecentChanges.i18n.php
M OnlyRecentRecentChanges.php
2 files changed, 6 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OnlyRecentRecentChanges
refs/changes/06/79206/1
diff --git a/OnlyRecentRecentChanges.i18n.php b/OnlyRecentRecentChanges.i18n.php
index 24bccd5..cac923d 100644
--- a/OnlyRecentRecentChanges.i18n.php
+++ b/OnlyRecentRecentChanges.i18n.php
@@ -16,7 +16,9 @@
'onlyrecentrecentchanges-option' = 'Show only the most recent change
of any changed page (in the limits of {{int:prefs-displayrc}} as shown above)'
);
-/** Message documentation (Message documentation)
+/** Message documentation
*/
$messages['qqq'] = array(
+ 'onlyrecentrecentchanges-desc' =
'{{desc|name=OnlyRecentRecentChanges|url=https://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges}}',
+ 'onlyrecentrecentchanges-option' = 'Label (description) text for the
user option in the user preferences tab Recent changes'
);
diff --git a/OnlyRecentRecentChanges.php b/OnlyRecentRecentChanges.php
index 8fb41b1..7e3efa2 100644
--- a/OnlyRecentRecentChanges.php
+++ b/OnlyRecentRecentChanges.php
@@ -40,13 +40,13 @@
'path' = __FILE__,
'name' = 'OnlyRecentRecentChanges',
'descriptionmsg' = 'onlyrecentrecentchanges-desc',
- 'version' = '1.3.1',
+ 'version' = '1.3.2',
'author' = 'Thomas Gries',
- 'url' =
'http://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges',
+ 'url' =
'https://www.mediawiki.org/wiki/Extension:OnlyRecentRecentChanges',
);
$dir = dirname( __FILE__ );
-$wgExtensionMessagesFiles['onlyrecentrecentchanges'] = $dir .
'/OnlyRecentRecentChanges.i18n.php';
+$wgExtensionMessagesFiles['OnlyRecentRecentChanges'] = $dir .
'/OnlyRecentRecentChanges.i18n.php';
$wgHooks['GetPreferences'][] = 'onGetPreferences';
$wgHooks['SpecialRecentChangesQuery'][] = 'onSpecialRecentChangesQuery';
--
To view, visit https://gerrit.wikimedia.org/r/79206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12dee6cbf6096ece0dfcb704b8fe6e2f6abc80ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OnlyRecentRecentChanges
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tweak gitblit header text - change (operations/puppet)
Jeremyb has uploaded a new change for review. https://gerrit.wikimedia.org/r/79208 Change subject: tweak gitblit header text .. tweak gitblit header text Change-Id: I7fe6b0162d7afd7b404459ed1a75f54747397b9a --- M files/gitblit/header.md 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/08/79208/1 diff --git a/files/gitblit/header.md b/files/gitblit/header.md index 57ffc3b..9c7d2a6 100644 --- a/files/gitblit/header.md +++ b/files/gitblit/header.md @@ -1,3 +1,3 @@ -Wikimedia Git repository browser. +[Wikimedia](https://www.wikimedia.org/) Git repository browser. -For contributing to Gerrit, you need [developer access](https://www.mediawiki.org/wiki/Developer_access) +Patches welcome! To submit patches to repositories hosted on [Gerrit](https://gerrit.wikimedia.org/), please [sign up for a developer account](https://www.mediawiki.org/wiki/Developer_access). -- To view, visit https://gerrit.wikimedia.org/r/79208 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fe6b0162d7afd7b404459ed1a75f54747397b9a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jeremyb jer...@tuxmachine.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added italics around a reference to Display options in rc ... - change (mediawiki...OnlyRecentRecentChanges)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79207
Change subject: added italics around a reference to Display options in rc
preference tab
..
added italics around a reference to Display options in rc preference tab
Change-Id: Id93dc0d510577acdaae382940a2b7c3f6dec6637
---
M OnlyRecentRecentChanges.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OnlyRecentRecentChanges
refs/changes/07/79207/1
diff --git a/OnlyRecentRecentChanges.i18n.php b/OnlyRecentRecentChanges.i18n.php
index cac923d..55ef3cc 100644
--- a/OnlyRecentRecentChanges.i18n.php
+++ b/OnlyRecentRecentChanges.i18n.php
@@ -13,7 +13,7 @@
*/
$messages['en'] = array(
'onlyrecentrecentchanges-desc' = 'Show pages in the list of recent
changes only once when they were recently changed',
- 'onlyrecentrecentchanges-option' = 'Show only the most recent change
of any changed page (in the limits of {{int:prefs-displayrc}} as shown above)'
+ 'onlyrecentrecentchanges-option' = Show only the most recent change
of any changed page (in the limits of ''{{int:prefs-displayrc}}'' as shown
above)
);
/** Message documentation
--
To view, visit https://gerrit.wikimedia.org/r/79207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id93dc0d510577acdaae382940a2b7c3f6dec6637
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OnlyRecentRecentChanges
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug 52207: Support reCaptcha - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Bug 52207: Support reCaptcha
..
Bug 52207: Support reCaptcha
Show cruft instead of empty string
Change-Id: Ibae3ba6495969df17c388dbab88cbd5c401c035e
---
M includes/skins/UserAccountCreateMobileTemplate.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/UserAccountCreateMobileTemplate.php
b/includes/skins/UserAccountCreateMobileTemplate.php
index 31a84f4..a530ffa 100644
--- a/includes/skins/UserAccountCreateMobileTemplate.php
+++ b/includes/skins/UserAccountCreateMobileTemplate.php
@@ -124,7 +124,7 @@
}
// make sure we've gotten the captchaId
if ( !isset( $matches[1] ) ) {
- return '';
+ return $header;
}
$captchaId = $matches[1];
--
To view, visit https://gerrit.wikimedia.org/r/79162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibae3ba6495969df17c388dbab88cbd5c401c035e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Future proof assert message. - change (mediawiki...Parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79209
Change subject: Future proof assert message.
..
Future proof assert message.
In case someone unexpectedly adds more fields to t.
Change-Id: Ie318b4911a4e25bd4f4397667b7789ad3459607b
---
M js/lib/mediawiki.TokenTransformManager.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/09/79209/1
diff --git a/js/lib/mediawiki.TokenTransformManager.js
b/js/lib/mediawiki.TokenTransformManager.js
index b7f9cea..4d3bc5c 100644
--- a/js/lib/mediawiki.TokenTransformManager.js
+++ b/js/lib/mediawiki.TokenTransformManager.js
@@ -173,7 +173,7 @@
// assure no duplicate transformers
console.assert( tArray.every(function ( tr ) {
return tr.rank !== t.rank;
- }), Trying to add a duplicate transformer: +
JSON.stringify(t) );
+ }), Trying to add a duplicate transformer: + t.name );
tArray.push(t);
tArray.sort(this._cmpTransformations);
--
To view, visit https://gerrit.wikimedia.org/r/79209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie318b4911a4e25bd4f4397667b7789ad3459607b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rebuild IW cache after viwikivoyage - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/79211 Change subject: Rebuild IW cache after viwikivoyage .. Rebuild IW cache after viwikivoyage Change-Id: If034793c70378baadf5213801bde8a629daec826 --- M wmf-config/interwiki.cdb 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/11/79211/1 diff --git a/wmf-config/interwiki.cdb b/wmf-config/interwiki.cdb index 7136a27..69e8623 100644 --- a/wmf-config/interwiki.cdb +++ b/wmf-config/interwiki.cdb Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/79211 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If034793c70378baadf5213801bde8a629daec826 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add wmf13 symlinks - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/79210 Change subject: Add wmf13 symlinks .. Add wmf13 symlinks Change-Id: I81b937dcad55a5090e67e0acd09b8fccec96e046 --- A docroot/bits/static-1.22wmf13/extensions A docroot/bits/static-1.22wmf13/resources A docroot/bits/static-1.22wmf13/skins A w/static-1.22wmf13/extensions A w/static-1.22wmf13/resources A w/static-1.22wmf13/skins 6 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/10/79210/1 diff --git a/docroot/bits/static-1.22wmf13/extensions b/docroot/bits/static-1.22wmf13/extensions new file mode 12 index 000..e1c5663 --- /dev/null +++ b/docroot/bits/static-1.22wmf13/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.22wmf13/resources b/docroot/bits/static-1.22wmf13/resources new file mode 12 index 000..bab844f --- /dev/null +++ b/docroot/bits/static-1.22wmf13/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/resources \ No newline at end of file diff --git a/docroot/bits/static-1.22wmf13/skins b/docroot/bits/static-1.22wmf13/skins new file mode 12 index 000..0c5d64f --- /dev/null +++ b/docroot/bits/static-1.22wmf13/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/skins/ \ No newline at end of file diff --git a/w/static-1.22wmf13/extensions b/w/static-1.22wmf13/extensions new file mode 12 index 000..e1c5663 --- /dev/null +++ b/w/static-1.22wmf13/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/extensions \ No newline at end of file diff --git a/w/static-1.22wmf13/resources b/w/static-1.22wmf13/resources new file mode 12 index 000..bab844f --- /dev/null +++ b/w/static-1.22wmf13/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/resources \ No newline at end of file diff --git a/w/static-1.22wmf13/skins b/w/static-1.22wmf13/skins new file mode 12 index 000..27cbad5 --- /dev/null +++ b/w/static-1.22wmf13/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/79210 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81b937dcad55a5090e67e0acd09b8fccec96e046 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Renamed mwoauthupdateconsumer = mwoauthupdateownconsumer - change (mediawiki...OAuth)
CSteipp has submitted this change and it was merged.
Change subject: Renamed mwoauthupdateconsumer = mwoauthupdateownconsumer
..
Renamed mwoauthupdateconsumer = mwoauthupdateownconsumer
Change-Id: I49bdb7d67b067bcddc8de43f8b38e2e4b21f744c
---
M OAuth.config.php
M control/MWOAuthConsumerSubmitControl.php
M frontend/language/MWOAuth.i18n.php
M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
4 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
CSteipp: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/OAuth.config.php b/OAuth.config.php
index 87fb243..bcab084 100644
--- a/OAuth.config.php
+++ b/OAuth.config.php
@@ -136,7 +136,7 @@
$wgMWOAuthRequestExpirationAge = 30 * 86400;
$wgAvailableRights[] = 'mwoauthproposeconsumer';
-$wgAvailableRights[] = 'mwoauthupdateconsumer';
+$wgAvailableRights[] = 'mwoauthupdateownconsumer';
$wgAvailableRights[] = 'mwoauthmanageconsumer';
$wgAvailableRights[] = 'mwoauthsuppress';
$wgAvailableRights[] = 'mwoauthviewsuppressed';
diff --git a/control/MWOAuthConsumerSubmitControl.php
b/control/MWOAuthConsumerSubmitControl.php
index b7dbe9d..a85e5f4 100644
--- a/control/MWOAuthConsumerSubmitControl.php
+++ b/control/MWOAuthConsumerSubmitControl.php
@@ -171,7 +171,7 @@
return $this-success( $cmr );
case 'update':
- if ( !$user-isAllowed( 'mwoauthupdateconsumer' ) ) {
+ if ( !$user-isAllowed( 'mwoauthupdateownconsumer' ) ) {
return $this-failure( 'permission_denied',
'badaccess-group0' );
}
diff --git a/frontend/language/MWOAuth.i18n.php
b/frontend/language/MWOAuth.i18n.php
index 330fa8f..f19b240 100644
--- a/frontend/language/MWOAuth.i18n.php
+++ b/frontend/language/MWOAuth.i18n.php
@@ -233,7 +233,7 @@
'mwoauth-callback-not-oob' = 'oauth_callback must be set, and must be
set to oob (case-sensitive)',
'right-mwoauthproposeconsumer' = 'Propose new OAuth consumers',
- 'right-mwoauthupdateconsumer' = 'Update OAuth consumers',
+ 'right-mwoauthupdateownconsumer' = 'Update OAuth consumers you
control',
'right-mwoauthmanageconsumer' = 'Manage OAuth consumers',
'right-mwoauthsuppress' = 'Suppress OAuth consumers',
'right-mwoauthviewsuppressed' = 'View suppressed OAuth consumers',
@@ -243,7 +243,7 @@
'action-mwoauthmanageconsumer' = 'manage OAuth consumers',
'action-mwoauthmanagemygrants' = 'manage your OAuth grants',
'action-mwoauthproposeconsumer' = 'propose new OAuth consumers',
- 'action-mwoauthupdateconsumer' = 'update OAuth consumers',
+ 'action-mwoauthupdateownconsumer' = 'update OAuth consumers you
control',
'action-mwoauthviewsuppressed' = 'view suppressed OAuth consumers',
);
@@ -527,7 +527,7 @@
{{Identical|View your watchlist}}',
'mwoauth-callback-not-oob' = 'Warning that the OAuth developer failed
to include the required oauth_callback parameter, which must be set to the
case-sensitive string oob',
'right-mwoauthproposeconsumer' =
'{{doc-right|mwoauthproposeconsumer}}',
- 'right-mwoauthupdateconsumer' = '{{doc-right|mwoauthupdateconsumer}}',
+ 'right-mwoauthupdateownconsumer' =
'{{doc-right|mwoauthupdateownconsumer}}',
'right-mwoauthmanageconsumer' = '{{doc-right|mwoauthmanageconsumer}}
{{Identical|Manage OAuth consumer}}',
'right-mwoauthsuppress' = '{{doc-right|mwoauthsuppress}}',
@@ -538,7 +538,7 @@
{{Identical|Manage OAuth consumer}}',
'action-mwoauthmanagemygrants' =
'{{Doc-action|mwoauthmanagemygrants}}',
'action-mwoauthproposeconsumer' =
'{{Doc-action|mwoauthproposeconsumer}}',
- 'action-mwoauthupdateconsumer' =
'{{Doc-action|mwoauthupdateconsumer}}',
+ 'action-mwoauthupdateownconsumer' =
'{{Doc-action|mwoauthupdateownconsumer}}',
'action-mwoauthviewsuppressed' =
'{{Doc-action|mwoauthviewsuppressed}}',
);
diff --git a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
index 9107886..95417e5 100644
--- a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
+++ b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
@@ -172,8 +172,8 @@
}
break;
case 'update':
- if ( !$user-isAllowed( 'mwoauthupdateconsumer' ) ) {
- throw new PermissionsError(
'mwoauthupdateconsumer' );
+ if ( !$user-isAllowed( 'mwoauthupdateownconsumer' ) ) {
+ throw new PermissionsError(
'mwoauthupdateownconsumer' );
}
$dbr = MWOAuthUtils::getCentralDB( DB_SLAVE );
--
To view, visit https://gerrit.wikimedia.org/r/79166
To unsubscribe,
[MediaWiki-commits] [Gerrit] Rebuild IW cache after viwikivoyage - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Rebuild IW cache after viwikivoyage .. Rebuild IW cache after viwikivoyage Change-Id: If034793c70378baadf5213801bde8a629daec826 --- M wmf-config/interwiki.cdb 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/interwiki.cdb b/wmf-config/interwiki.cdb index 7136a27..69e8623 100644 --- a/wmf-config/interwiki.cdb +++ b/wmf-config/interwiki.cdb Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/79211 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If034793c70378baadf5213801bde8a629daec826 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add wmf13 symlinks - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add wmf13 symlinks .. Add wmf13 symlinks Change-Id: I81b937dcad55a5090e67e0acd09b8fccec96e046 --- A docroot/bits/static-1.22wmf13/extensions A docroot/bits/static-1.22wmf13/resources A docroot/bits/static-1.22wmf13/skins A w/static-1.22wmf13/extensions A w/static-1.22wmf13/resources A w/static-1.22wmf13/skins 6 files changed, 6 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/bits/static-1.22wmf13/extensions b/docroot/bits/static-1.22wmf13/extensions new file mode 12 index 000..e1c5663 --- /dev/null +++ b/docroot/bits/static-1.22wmf13/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.22wmf13/resources b/docroot/bits/static-1.22wmf13/resources new file mode 12 index 000..bab844f --- /dev/null +++ b/docroot/bits/static-1.22wmf13/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/resources \ No newline at end of file diff --git a/docroot/bits/static-1.22wmf13/skins b/docroot/bits/static-1.22wmf13/skins new file mode 12 index 000..0c5d64f --- /dev/null +++ b/docroot/bits/static-1.22wmf13/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/skins/ \ No newline at end of file diff --git a/w/static-1.22wmf13/extensions b/w/static-1.22wmf13/extensions new file mode 12 index 000..e1c5663 --- /dev/null +++ b/w/static-1.22wmf13/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/extensions \ No newline at end of file diff --git a/w/static-1.22wmf13/resources b/w/static-1.22wmf13/resources new file mode 12 index 000..bab844f --- /dev/null +++ b/w/static-1.22wmf13/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/resources \ No newline at end of file diff --git a/w/static-1.22wmf13/skins b/w/static-1.22wmf13/skins new file mode 12 index 000..27cbad5 --- /dev/null +++ b/w/static-1.22wmf13/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf13/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/79210 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81b937dcad55a5090e67e0acd09b8fccec96e046 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] 1.22wmf13 phase one wikis to 1.22wmf13 - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/79212 Change subject: 1.22wmf13 phase one wikis to 1.22wmf13 .. 1.22wmf13 phase one wikis to 1.22wmf13 Change-Id: I2cc6cf3cd0f68b55ae1274340267eb1d9a2040ca --- M wikiversions.dat 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/12/79212/1 diff --git a/wikiversions.dat b/wikiversions.dat index 00371dd..1757422 100644 --- a/wikiversions.dat +++ b/wikiversions.dat @@ -465,7 +465,7 @@ lvwiktionary php-1.22wmf12 * map_bmswiki php-1.22wmf12 * mdfwiki php-1.22wmf12 * -mediawikiwiki php-1.22wmf12 * +mediawikiwiki php-1.22wmf13 * metawiki php-1.22wmf12 * mgwikibooks php-1.22wmf12 * mgwiki php-1.22wmf12 * @@ -731,9 +731,9 @@ tawikisource php-1.22wmf12 * tawiktionary php-1.22wmf12 * tenwiki php-1.22wmf12 * -test2wiki php-1.22wmf12 * -testwiki php-1.22wmf12 * -testwikidatawiki php-1.22wmf12 * +test2wiki php-1.22wmf13 * +testwiki php-1.22wmf13 * +testwikidatawiki php-1.22wmf13 * tetwiki php-1.22wmf12 * tewikibooks php-1.22wmf12 * tewiki php-1.22wmf12 * -- To view, visit https://gerrit.wikimedia.org/r/79212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cc6cf3cd0f68b55ae1274340267eb1d9a2040ca Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed wrong comments - change (mediawiki...OAuth)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79213
Change subject: Fixed wrong comments
..
Fixed wrong comments
Change-Id: Ic64633ada890526e3251061669b4be35eac3211b
---
M backend/MWOAuthUtils.php
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth
refs/changes/13/79213/1
diff --git a/backend/MWOAuthUtils.php b/backend/MWOAuthUtils.php
index 759e713..0af3a17 100644
--- a/backend/MWOAuthUtils.php
+++ b/backend/MWOAuthUtils.php
@@ -234,7 +234,7 @@
}
/**
-* Given a central wiki user ID, get a local User object
+* Given a central wiki user ID, get a central user name
*
* @param integer $userId
* @return string|bool User name or false if not found
@@ -244,8 +244,6 @@
if ( $wgMWOAuthSharedUserIDs ) { // global ID required via hook
$namesById = array( $userId = false );
- // Let extensions check that central wiki user ID is
attached to a global account
- // and that return the user on this wiki that is
attached to that global account
wfRunHooks( 'OAuthGetUserNamesFromCentralIds',
array( $wgMWOAuthCentralWiki, $namesById ) );
$name = $namesById[$userId];
--
To view, visit https://gerrit.wikimedia.org/r/79213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic64633ada890526e3251061669b4be35eac3211b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Future proof assert message. - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Future proof assert message.
..
Future proof assert message.
In case someone unexpectedly adds more fields to t.
Change-Id: Ie318b4911a4e25bd4f4397667b7789ad3459607b
---
M js/lib/mediawiki.TokenTransformManager.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/mediawiki.TokenTransformManager.js
b/js/lib/mediawiki.TokenTransformManager.js
index b7f9cea..4d3bc5c 100644
--- a/js/lib/mediawiki.TokenTransformManager.js
+++ b/js/lib/mediawiki.TokenTransformManager.js
@@ -173,7 +173,7 @@
// assure no duplicate transformers
console.assert( tArray.every(function ( tr ) {
return tr.rank !== t.rank;
- }), Trying to add a duplicate transformer: +
JSON.stringify(t) );
+ }), Trying to add a duplicate transformer: + t.name );
tArray.push(t);
tArray.sort(this._cmpTransformations);
--
To view, visit https://gerrit.wikimedia.org/r/79209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie318b4911a4e25bd4f4397667b7789ad3459607b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed wrong comments - change (mediawiki...OAuth)
CSteipp has submitted this change and it was merged.
Change subject: Fixed wrong comments
..
Fixed wrong comments
Change-Id: Ic64633ada890526e3251061669b4be35eac3211b
---
M backend/MWOAuthUtils.php
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
CSteipp: Verified; Looks good to me, approved
diff --git a/backend/MWOAuthUtils.php b/backend/MWOAuthUtils.php
index 759e713..0af3a17 100644
--- a/backend/MWOAuthUtils.php
+++ b/backend/MWOAuthUtils.php
@@ -234,7 +234,7 @@
}
/**
-* Given a central wiki user ID, get a local User object
+* Given a central wiki user ID, get a central user name
*
* @param integer $userId
* @return string|bool User name or false if not found
@@ -244,8 +244,6 @@
if ( $wgMWOAuthSharedUserIDs ) { // global ID required via hook
$namesById = array( $userId = false );
- // Let extensions check that central wiki user ID is
attached to a global account
- // and that return the user on this wiki that is
attached to that global account
wfRunHooks( 'OAuthGetUserNamesFromCentralIds',
array( $wgMWOAuthCentralWiki, $namesById ) );
$name = $namesById[$userId];
--
To view, visit https://gerrit.wikimedia.org/r/79213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic64633ada890526e3251061669b4be35eac3211b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tweak gitblit header text - change (operations/puppet)
Faidon has submitted this change and it was merged. Change subject: tweak gitblit header text .. tweak gitblit header text Change-Id: I7fe6b0162d7afd7b404459ed1a75f54747397b9a --- M files/gitblit/header.md 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Greg Grossmeier: Looks good to me, but someone else must approve Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/files/gitblit/header.md b/files/gitblit/header.md index 57ffc3b..9c7d2a6 100644 --- a/files/gitblit/header.md +++ b/files/gitblit/header.md @@ -1,3 +1,3 @@ -Wikimedia Git repository browser. +[Wikimedia](https://www.wikimedia.org/) Git repository browser. -For contributing to Gerrit, you need [developer access](https://www.mediawiki.org/wiki/Developer_access) +Patches welcome! To submit patches to repositories hosted on [Gerrit](https://gerrit.wikimedia.org/), please [sign up for a developer account](https://www.mediawiki.org/wiki/Developer_access). -- To view, visit https://gerrit.wikimedia.org/r/79208 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7fe6b0162d7afd7b404459ed1a75f54747397b9a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jeremyb jer...@tuxmachine.com Gerrit-Reviewer: Demon ch...@wikimedia.org Gerrit-Reviewer: Faidon fai...@wikimedia.org Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org Gerrit-Reviewer: MZMcBride w...@mzmcbride.com Gerrit-Reviewer: Sumanah suma...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up I33462. Some stupid issues with gallery patch - change (mediawiki/core)
Brian Wolff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79214
Change subject: Follow-up I33462. Some stupid issues with gallery patch
..
Follow-up I33462. Some stupid issues with gallery patch
Fix some embarrassing issues with my previous patch
Change-Id: I0a9a58ca854326ea594a9b8bd9499c89a0aca6c3
---
M RELEASE-NOTES-1.22
M includes/specials/SpecialNewimages.php
2 files changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/14/79214/1
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 780feb9..e6836da 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -176,7 +176,6 @@
* (bug 30713) New mw.hook wikipage.content.
* (bug 40430) jquery.placeholder gets a new parameter to set the attribute
value
to be used.
- .merge_file_rX8GYk
* $wgHTCPMulticastRouting renamed $wgHTCPRouting since it accepts unicast.
* $wgHTCPRouting rules can now be passed an array of hosts/ports to send purge
too. Can be used whenever several multicast group could be interested by a
@@ -188,10 +187,8 @@
setcookie() or setrawcookie() should begin using this instead.
* New hook WebResponseSetCookie, called from WebResponse::setcookie().
* New hook ResetSessionID, called when the session id is reset.
-===
* Add a mode parameter to gallery tag with potential options of
traditional,
nolines, packed, packed-overlay, or packed-hover.
- .merge_file_gNstr1
=== Bug fixes in 1.22 ===
* Disable Special:PasswordReset when $wgEnableEmail is false. Previously one
diff --git a/includes/specials/SpecialNewimages.php
b/includes/specials/SpecialNewimages.php
index cf5a01e..fa9b2d3 100644
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -118,7 +118,7 @@
function getStartBody() {
if ( !$this-gallery ) {
$this-gallery = ImageGalleryBase::factory();
- $this-gallery-setContext( $this-getContext );
+ $this-gallery-setContext( $this-getContext() );
}
return '';
--
To view, visit https://gerrit.wikimedia.org/r/79214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a9a58ca854326ea594a9b8bd9499c89a0aca6c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff bawolff...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix logical conflict from I8feefd9e8 - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix logical conflict from I8feefd9e8
..
Fix logical conflict from I8feefd9e8
onUpdate was renamed to update. Also neither event was
actually implemented so have just removed them.
Change-Id: Iaae1661a99f97272fa42c71223fc2cb832d50c66
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index b0d17fa..916c6d0 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -30,10 +30,6 @@
ve.ce.ProtectedNode.call( this );
ve.ce.GeneratedContentNode.call( this );
- // Events
- this.model.connect( this, { 'update': 'onUpdate' } );
- this.$.on( 'click', ve.bind( this.onClick, this ) );
-
// DOM Changes
this.$.addClass( 've-ce-mwExtensionNode' );
};
--
To view, visit https://gerrit.wikimedia.org/r/79188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaae1661a99f97272fa42c71223fc2cb832d50c66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix MWAlienExtensionNode's extensionName in ce update - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix MWAlienExtensionNode's extensionName in ce update
..
Fix MWAlienExtensionNode's extensionName in ce update
Create getter for extensionsName which is overriden by
MWAlienExtensionNode.
Also removed angle brackets around Alien title as the inspector
already has an angle bracket icon, and a '' close button.
Change-Id: Ice8c5d73ed621f8e585b5f372788666f8c5aeb50
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
M modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
4 files changed, 23 insertions(+), 4 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index 916c6d0..3590eab 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -46,7 +46,9 @@
/** */
ve.ce.MWExtensionNode.prototype.generateContents = function () {
- var deferred = $.Deferred();
+ var deferred = $.Deferred(),
+ extensionName = this.getModel().getExtensionName();
+
$.ajax( {
'url': mw.util.wikiScript( 'api' ),
'data': {
@@ -54,9 +56,9 @@
'paction': 'parsefragment',
'page': mw.config.get( 'wgRelevantPageName' ),
'wikitext':
- '' +
this.getModel().constructor.static.extensionName + '' +
+ '' + extensionName + '' +
this.getModel().getAttribute( 'mw'
).body.extsrc +
- '/' +
this.getModel().constructor.static.extensionName + '',
+ '/' + extensionName + '',
'token': mw.user.tokens.get( 'editToken' ),
'format': 'json'
},
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js
index 353d297..9e07ce4 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js
@@ -34,6 +34,13 @@
ve.dm.MWAlienExtensionNode.static.tagName = 'div';
+/* Methods */
+
+/** */
+ve.dm.MWAlienExtensionNode.prototype.getExtensionName = function () {
+ return this.getAttribute('mw').name;
+};
+
/* Registration */
ve.dm.modelRegistry.register( ve.dm.MWAlienExtensionNode );
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
index 54becf6..99c3b1b 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
@@ -97,3 +97,13 @@
mw: dataElement.attributes.mw
};
};
+
+/* Methods */
+
+/**
+ * Get the extension's name
+ * @returns {string} Extension name
+ */
+ve.dm.MWExtensionNode.prototype.getExtensionName = function () {
+ return this.constructor.static.extensionName;
+};
\ No newline at end of file
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
b/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
index bb50a25..a008d70 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
@@ -43,7 +43,7 @@
};
ve.ui.MWAlienExtensionInspector.prototype.getTitle = function () {
- return '' +
this.surface.getView().getFocusedNode().getModel().getAttribute('mw').name +
'';
+ return
this.surface.getView().getFocusedNode().getModel().getExtensionName();
};
/* Registration */
--
To view, visit https://gerrit.wikimedia.org/r/79190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice8c5d73ed621f8e585b5f372788666f8c5aeb50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up I33462. Some stupid issues with gallery patch - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Follow-up I33462. Some stupid issues with gallery patch
..
Follow-up I33462. Some stupid issues with gallery patch
Fix some embarrassing issues with my previous patch
Change-Id: I0a9a58ca854326ea594a9b8bd9499c89a0aca6c3
(cherry picked from commit 63a38f8980e777ec00fa20411d1d61f9d03c7670)
---
M RELEASE-NOTES-1.22
M includes/specials/SpecialNewimages.php
2 files changed, 1 insertion(+), 4 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 780feb9..e6836da 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -176,7 +176,6 @@
* (bug 30713) New mw.hook wikipage.content.
* (bug 40430) jquery.placeholder gets a new parameter to set the attribute
value
to be used.
- .merge_file_rX8GYk
* $wgHTCPMulticastRouting renamed $wgHTCPRouting since it accepts unicast.
* $wgHTCPRouting rules can now be passed an array of hosts/ports to send purge
too. Can be used whenever several multicast group could be interested by a
@@ -188,10 +187,8 @@
setcookie() or setrawcookie() should begin using this instead.
* New hook WebResponseSetCookie, called from WebResponse::setcookie().
* New hook ResetSessionID, called when the session id is reset.
-===
* Add a mode parameter to gallery tag with potential options of
traditional,
nolines, packed, packed-overlay, or packed-hover.
- .merge_file_gNstr1
=== Bug fixes in 1.22 ===
* Disable Special:PasswordReset when $wgEnableEmail is false. Previously one
diff --git a/includes/specials/SpecialNewimages.php
b/includes/specials/SpecialNewimages.php
index cf5a01e..fa9b2d3 100644
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -118,7 +118,7 @@
function getStartBody() {
if ( !$this-gallery ) {
$this-gallery = ImageGalleryBase::factory();
- $this-gallery-setContext( $this-getContext );
+ $this-gallery-setContext( $this-getContext() );
}
return '';
--
To view, visit https://gerrit.wikimedia.org/r/79215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a9a58ca854326ea594a9b8bd9499c89a0aca6c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf13
Gerrit-Owner: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reposition context menu after rerender - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Reposition context menu after rerender
..
Reposition context menu after rerender
Add rerender event to all image loads in MWExtensioNode.
MWHieroNode's implementation of onParseSuccess is now the same as
its parent so can be deleted.
Change-Id: Iaa4999372f1ba88a7bdf1490fc3f8640af77ceae
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
M modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
M modules/ve/ce/ve.ce.FocusableNode.js
3 files changed, 6 insertions(+), 12 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index 3590eab..3c6cc0b 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -82,6 +82,10 @@
ve.ce.MWExtensionNode.prototype.onParseSuccess = function ( deferred, response
) {
var data = response.visualeditor, contentNodes = $( data.content
).get();
deferred.resolve( contentNodes );
+ // Rerender after images load
+ this.$.find( 'img' ).on( 'load', ve.bind( function () {
+ this.emit( 'rerender' );
+ }, this ) );
};
/**
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
index b0d041e..4f12d4f 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
@@ -33,18 +33,6 @@
ve.ce.MWHieroNode.static.tagName = 'div';
-/* Methods */
-
-/** */
-ve.ce.MWHieroNode.prototype.onParseSuccess = function ( deferred, response ) {
- var data = response.visualeditor, contentNodes = $( data.content
).get();
- deferred.resolve( contentNodes );
- // Rerender after image load
- this.$.find( 'img' ).on( 'load', ve.bind( function () {
- this.emit( 'rerender' );
- }, this ) );
-};
-
/* Registration */
ve.ce.nodeFactory.register( ve.ce.MWHieroNode );
diff --git a/modules/ve/ce/ve.ce.FocusableNode.js
b/modules/ve/ce/ve.ce.FocusableNode.js
index 6647d3e..1afc40d 100644
--- a/modules/ve/ce/ve.ce.FocusableNode.js
+++ b/modules/ve/ce/ve.ce.FocusableNode.js
@@ -106,6 +106,8 @@
ve.ce.FocusableNode.prototype.onFocusableRerender = function () {
if ( this.focused ) {
this.redrawHighlight();
+ // reposition menu
+ this.surface.getSurface().getContext().show( true );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/79191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa4999372f1ba88a7bdf1490fc3f8640af77ceae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up I33462. Some stupid issues with gallery patch - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Follow-up I33462. Some stupid issues with gallery patch
..
Follow-up I33462. Some stupid issues with gallery patch
Fix some embarrassing issues with my previous patch
Change-Id: I0a9a58ca854326ea594a9b8bd9499c89a0aca6c3
---
M RELEASE-NOTES-1.22
M includes/specials/SpecialNewimages.php
2 files changed, 1 insertion(+), 4 deletions(-)
Approvals:
Reedy: Looks good to me, approved
MarkTraceur: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 780feb9..e6836da 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -176,7 +176,6 @@
* (bug 30713) New mw.hook wikipage.content.
* (bug 40430) jquery.placeholder gets a new parameter to set the attribute
value
to be used.
- .merge_file_rX8GYk
* $wgHTCPMulticastRouting renamed $wgHTCPRouting since it accepts unicast.
* $wgHTCPRouting rules can now be passed an array of hosts/ports to send purge
too. Can be used whenever several multicast group could be interested by a
@@ -188,10 +187,8 @@
setcookie() or setrawcookie() should begin using this instead.
* New hook WebResponseSetCookie, called from WebResponse::setcookie().
* New hook ResetSessionID, called when the session id is reset.
-===
* Add a mode parameter to gallery tag with potential options of
traditional,
nolines, packed, packed-overlay, or packed-hover.
- .merge_file_gNstr1
=== Bug fixes in 1.22 ===
* Disable Special:PasswordReset when $wgEnableEmail is false. Previously one
diff --git a/includes/specials/SpecialNewimages.php
b/includes/specials/SpecialNewimages.php
index cf5a01e..fa9b2d3 100644
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -118,7 +118,7 @@
function getStartBody() {
if ( !$this-gallery ) {
$this-gallery = ImageGalleryBase::factory();
- $this-gallery-setContext( $this-getContext );
+ $this-gallery-setContext( $this-getContext() );
}
return '';
--
To view, visit https://gerrit.wikimedia.org/r/79214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a9a58ca854326ea594a9b8bd9499c89a0aca6c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Matmarex matma@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Simplify Multi-wiki setups - change (mediawiki...OAuth)
Aaron Schulz has submitted this change and it was merged.
Change subject: Simplify Multi-wiki setups
..
Simplify Multi-wiki setups
* Only allow the OAuth handshake to occure on the central wiki. This
could be changed in the future, but simplifies the logic for now.
* Add check during handshake to ensure central wiki user is valid
* Fix error message display for /authorize phase
Change-Id: I8d482961d58251e931d5454533537b8e719e8357
---
M frontend/MWOAuthUI.setup.php
M frontend/language/MWOAuth.i18n.php
M frontend/specialpages/SpecialMWOAuth.php
3 files changed, 15 insertions(+), 1 deletion(-)
Approvals:
Aaron Schulz: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/frontend/MWOAuthUI.setup.php b/frontend/MWOAuthUI.setup.php
index e0e1969..cf29b6f 100644
--- a/frontend/MWOAuthUI.setup.php
+++ b/frontend/MWOAuthUI.setup.php
@@ -10,9 +10,9 @@
*/
public static function defineSpecialPages( array $pages, array
$groups ) {
// Pages available on all wikis
- $pages['MWOAuth'] = 'SpecialMWOAuth';
// Pages specific to the central OAuth management wiki
if ( MWOAuthUtils::isCentralWiki() ) {
+ $pages['MWOAuth'] = 'SpecialMWOAuth';
$pages['MWOAuthConsumerRegistration'] =
'SpecialMWOAuthConsumerRegistration';
$groups['MWOAuthConsumerRegistration'] = 'users';
$pages['MWOAuthManageConsumers'] =
'SpecialMWOAuthManageConsumers';
diff --git a/frontend/language/MWOAuth.i18n.php
b/frontend/language/MWOAuth.i18n.php
index f19b240..59372a2 100644
--- a/frontend/language/MWOAuth.i18n.php
+++ b/frontend/language/MWOAuth.i18n.php
@@ -207,6 +207,8 @@
'mwoauth-authorize-form-description' = 'Application description: $1',
'mwoauth-authorize-form-version' = 'Application version: $1',
'mwoauth-authorize-form-wiki' = 'Wiki: $1',
+ 'mwoauth-authorize-form-invalid-user' = 'This user account cannot use
OAuth, because the account on this wiki, and the account on the central OAuth
wiki are not linked.',
+ 'mwoauth-error' = 'OAuth Error',
'mwoauth-grants-heading' = 'Requested permissions: ',
'mwoauth-grants-nogrants' = 'The application has not requested any
permissions.',
@@ -478,6 +480,8 @@
'mwoauth-authorize-form-description' = '{{Identical|Application
description}}',
'mwoauth-authorize-form-version' = '{{Identical|Application version}}',
'mwoauth-authorize-form-wiki' = '{{Identical|Wiki}}',
+ 'mwoauth-authorize-form-invalid-user' = 'Text of the error page when
the user cannot use OAuth.',
+ 'mwoauth-error' = 'Heading on the page, whenever an OAuth error is
presented to a user.',
'mwoauth-grants-heading' = 'Used as label for the grants list.
See also:
diff --git a/frontend/specialpages/SpecialMWOAuth.php
b/frontend/specialpages/SpecialMWOAuth.php
index c539b3d..d5110fe 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -48,6 +48,16 @@
return;
}
+ // Check to make sure this user is the
same user
+ // on the central wiki
+ $centralId =
MWOAuthUtils::getCentralIdFromLocalUser( $mwUser );
+ if ( !$centralId ) {
+ // For now, just abort and give
them hints to fix in
+ // the error message. TODO: if
we can fix the issue with
+ // a few redirects, do that
here.
+ throw new MWOAuthException(
'mwoauth-authorize-form-invalid-user' );
+ }
+
if ( $request-getVal( 'doAuthorize',
false ) ) {
// Require POST
if ( !$request-wasPosted() ) {
--
To view, visit https://gerrit.wikimedia.org/r/77267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d482961d58251e931d5454533537b8e719e8357
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] edit-post action for Topic block - change (mediawiki...Flow)
EBernhardson (WMF) has submitted this change and it was merged.
Change subject: edit-post action for Topic block
..
edit-post action for Topic block
Includes some refactoring of Parsoid, and a few other unrelated changes.
Change-Id: Ie62ff67ae09ec131ae49acce3ffe779311203842
---
M Flow.i18n.php
M Flow.php
M includes/Block/Topic.php
M includes/Block/TopicList.php
M includes/Model/PostRevision.php
M includes/Model/UUID.php
M includes/Model/Workflow.php
A includes/ParsoidUtils.php
M includes/Templating.php
M includes/UrlGenerator.php
M includes/api/ApiQueryFlow.php
M modules/base/ext.flow.base.js
M modules/discussion/base.css
M modules/discussion/discussion.js
A templates/edit-post.html.php
M templates/post.html.php
M templates/topic.html.php
17 files changed, 502 insertions(+), 117 deletions(-)
Approvals:
EBernhardson (WMF): Verified; Looks good to me, approved
diff --git a/Flow.i18n.php b/Flow.i18n.php
index 38844e0..2914ba7 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -29,7 +29,13 @@
'flow-reply-placeholder' = 'Click to reply to $1. Be nice!',
'flow-reply-submit' = 'Post Reply',
+ 'flow-edit-post-submit' = 'Submit changes',
+
+ 'flow-post-action-view' = 'Permalink',
+ 'flow-post-action-post-history' = 'Post history',
'flow-post-action-delete-post' = 'Delete post',
+ 'flow-post-action-edit-post' = 'Edit post',
+ 'flow-post-action-edit' = 'Edit',
'flow-post-action-restore-post' = 'Restore post',
'flow-topic-action-edit-title' = 'Edit Title',
diff --git a/Flow.php b/Flow.php
index 2ba0fee..10508c5 100755
--- a/Flow.php
+++ b/Flow.php
@@ -40,7 +40,7 @@
'descriptionmsg' = 'flow-desc',
);
-$dir = dirname( __FILE__ ) . '/';
+$dir = __DIR__ . '/';
$wgExtensionMessagesFiles['Flow'] = $dir . 'Flow.i18n.php';
// Classes fulfilling the mediawiki extension architecture
@@ -51,6 +51,7 @@
$wgAutoloadClasses['Pimple'] = $dir . 'vendor/Pimple.php';
$wgAutoloadClasses['Flow\Container'] = $dir . 'includes/Container.php';
$wgAutoloadClasses['Flow\DbFactory'] = $dir . 'includes/DbFactory.php';
+$wgAutoloadClasses['Flow\ParsoidUtils'] = $dir . 'includes/ParsoidUtils.php';
$wgAutoloadClasses['Flow\Templating'] = $dir . 'includes/Templating.php';
$wgAutoloadClasses['Flow\UrlGenerator'] = $dir . 'includes/UrlGenerator.php';
$wgAutoloadClasses['Flow\WorkflowLoader'] = $dir .
'includes/WorkflowLoader.php';
@@ -158,6 +159,7 @@
'flow-error-external',
'flow-error-external-multi',
'flow-edit-title-submit',
+ 'flow-edit-post-submit',
),
),
);
@@ -190,6 +192,6 @@
$wgFlowUseParsoid = false;
$wgFlowParsoidURL = 'http://localhost:8000';
-$wgFlowParsoidPrefix = '_wikitext';
+$wgFlowParsoidPrefix = 'localhost';
$wgFlowParsoidTimeout = 100;
diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index 59f5a9b..66ddb02 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -8,6 +8,7 @@
use Flow\Data\ManagerGroup;
use Flow\Data\RootPostLoader;
use Flow\DbFactory;
+use Flow\ParsoidUtils;
use Flow\Templating;
use User;
@@ -17,8 +18,12 @@
protected $topicTitle;
protected $rootLoader;
protected $newRevision;
+ protected $requestedPost;
- protected $supportedActions = array( 'edit-title', 'reply',
'delete-topic', 'delete-post', 'restore-post' );
+ protected $supportedActions = array(
+ 'edit-post', 'delete-post', 'restore-post',
+ 'reply', 'delete-topic',
+ );
public function __construct( Workflow $workflow, ManagerGroup $storage,
$root ) {
parent::__construct( $workflow, $storage );
@@ -56,6 +61,10 @@
$this-validateRestorePost();
break;
+ case 'edit-post':
+ $this-validateEditPost();
+ break;
+
default:
throw new \MWException( Unexpected action:
{$this-action} );
}
@@ -80,7 +89,7 @@
if ( empty( $this-submitted['content'] ) ) {
$this-errors['content'] = wfMessage(
'flow-error-missing-content' );
} else {
- $this-parsedContent = $this-convertWikitextToHtml5(
$this-submitted['content'] );
+ $this-parsedContent =
ParsoidUtils::convertWikitextToHtml5( $this-submitted['content'],
$this-workflow-getArticleTitle() );
if ( empty( $this-parsedContent ) ) {
$this-errors['content'] = wfMessage(
'flow-error-parsoid-failure' );
}
@@ -153,45 +162,25 @@
}
}
- // @todo: I assume not only topic reply, but also TopicListBlock
SummaryBlock's content need to
[MediaWiki-commits] [Gerrit] Make tapping more responsive - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Make tapping more responsive
..
Make tapping more responsive
Until now we used the click event to make links and buttons do
something. This, unfortunately, causes a 300ms delays on all mobile
browsers between the actual tap (touchend) and the callback being
invoked.
This patch introduces a small library that adds a tap event for a more
responsive UI. On browsers without touch events it falls back to click
events.
I added it in alpha in several places for now: hamburger, overlay close
button, search input and page actions. If it works well, we could use it
everywhere instead of using click events.
Change-Id: Ib487355d86803fb09f169b573575b2a34f456ada
---
M includes/Resources.php
M javascripts/common/Drawer.js
M javascripts/common/Overlay.js
M javascripts/common/navigation.js
M javascripts/common/user.js
A javascripts/externals/micro.tap.js
M javascripts/modules/editor/editor.js
M javascripts/modules/mf-toggle.js
M javascripts/modules/mf-watchstar.js
M javascripts/modules/search/search.js
M javascripts/modules/talk.js
M less/common/common-js.less
M stylesheets/common/common-js.css
13 files changed, 104 insertions(+), 24 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 49d2bdd..9ed51d1 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -353,6 +353,7 @@
'stylesheets/modules/nearbypages.css',
),
'scripts' = array(
+ 'javascripts/externals/micro.tap.js',
'javascripts/modules/mf-inline-style-scrubber.js',
'javascripts/common/history-alpha.js',
'javascripts/modules/mf-tables.js',
diff --git a/javascripts/common/Drawer.js b/javascripts/common/Drawer.js
index 74107d9..c002485 100644
--- a/javascripts/common/Drawer.js
+++ b/javascripts/common/Drawer.js
@@ -24,7 +24,9 @@
if ( !this.locked ) {
// ignore a possible click that called
show()
setTimeout( function() {
- $( window ).one( 'scroll.drawer
click.drawer', $.proxy( self, 'hide' ) );
+ $( window ).one(
'scroll.drawer', $.proxy( self, 'hide' ) );
+ // FIXME change when
micro.tap.js in stable
+ $( '#mw-mf-page-center' ).one(
( mw.config.get( 'wgMFMode' ) === 'alpha' ? 'tap' : 'click' ) + '.drawer',
$.proxy( self, 'hide' ) );
}, this.minHideDelay );
}
}
@@ -35,6 +37,7 @@
// .one() registers one callback for scroll and click
independently
// if one fired, get rid of the other one
$( window ).off( '.drawer' );
+ $( '#mw-mf-page-center' ).off( '.drawer' );
},
isVisible: function() {
diff --git a/javascripts/common/Overlay.js b/javascripts/common/Overlay.js
index db576e0..2737c16 100644
--- a/javascripts/common/Overlay.js
+++ b/javascripts/common/Overlay.js
@@ -34,7 +34,8 @@
},
postRender: function() {
var self = this;
- this.$( '.cancel,.confirm' ).click( function( ev ) {
+ // FIXME change when micro.tap.js in stable
+ this.$( '.cancel, .confirm' ).on( mw.config.get(
'wgMFMode' ) === 'alpha' ? 'tap' : 'click', function( ev ) {
ev.preventDefault();
if ( self.closeOnBack ) {
window.history.back();
diff --git a/javascripts/common/navigation.js b/javascripts/common/navigation.js
index ff5f09b..9f3b169 100644
--- a/javascripts/common/navigation.js
+++ b/javascripts/common/navigation.js
@@ -3,6 +3,7 @@
var m = ( function( $ ) {
var
menu,
+ inAlpha = mw.config.get( 'wgMFMode' ) === 'alpha',
inBeta = mw.config.get( 'wgMFMode' ) === 'beta';
function openNavigation() {
@@ -33,23 +34,46 @@
closeNavigation();
}
}
- $( '#mw-mf-main-menu-button' ).click( function( ev ) {
- toggleNavigation();
- ev.preventDefault();
- } ).on( 'touchend mouseup', function( ev ) {
- ev.stopPropagation();
- } );
- // close navigation if content tapped
- $( '#mw-mf-page-center' ).
[MediaWiki-commits] [Gerrit] ceph: more detailed status output for nagios check - change (operations/puppet)
Faidon has uploaded a new change for review. https://gerrit.wikimedia.org/r/79217 Change subject: ceph: more detailed status output for nagios check .. ceph: more detailed status output for nagios check Don't return 2 (critical) on HEALTH_WARN. Instead, use proper all possible nagios plugin return codes: map HEALTH_WARN to WARNING, HEALTH_ERR to CRITICAL and HEALTH_OK to OK (duh). If none of these are detected, fall back to UNKNOWN. Change-Id: I40a2d01e0f4f6905d1f2b296d4d9520251c092cf --- M modules/ceph/templates/check_ceph_health.erb 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/17/79217/1 diff --git a/modules/ceph/templates/check_ceph_health.erb b/modules/ceph/templates/check_ceph_health.erb index 3eaa8f3..42209c1 100755 --- a/modules/ceph/templates/check_ceph_health.erb +++ b/modules/ceph/templates/check_ceph_health.erb @@ -9,6 +9,10 @@ echo Ceph $HEALTH if echo $HEALTH | grep -q OK; then exit 0 -else +elif echo $HEALTH | grep -q WARN; then + exit 1 +elif echo $HEALTH | grep -q ERR; then exit 2 +else + exit 3 fi -- To view, visit https://gerrit.wikimedia.org/r/79217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40a2d01e0f4f6905d1f2b296d4d9520251c092cf Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ceph: more detailed status output for nagios check - change (operations/puppet)
Faidon has submitted this change and it was merged. Change subject: ceph: more detailed status output for nagios check .. ceph: more detailed status output for nagios check Don't return 2 (critical) on HEALTH_WARN. Instead, use proper all possible nagios plugin return codes: map HEALTH_WARN to WARNING, HEALTH_ERR to CRITICAL and HEALTH_OK to OK (duh). If none of these are detected, fall back to UNKNOWN. Change-Id: I40a2d01e0f4f6905d1f2b296d4d9520251c092cf --- M modules/ceph/templates/check_ceph_health.erb 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Faidon: Verified; Looks good to me, approved diff --git a/modules/ceph/templates/check_ceph_health.erb b/modules/ceph/templates/check_ceph_health.erb index 3eaa8f3..42209c1 100755 --- a/modules/ceph/templates/check_ceph_health.erb +++ b/modules/ceph/templates/check_ceph_health.erb @@ -9,6 +9,10 @@ echo Ceph $HEALTH if echo $HEALTH | grep -q OK; then exit 0 -else +elif echo $HEALTH | grep -q WARN; then + exit 1 +elif echo $HEALTH | grep -q ERR; then exit 2 +else + exit 3 fi -- To view, visit https://gerrit.wikimedia.org/r/79217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I40a2d01e0f4f6905d1f2b296d4d9520251c092cf Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon fai...@wikimedia.org Gerrit-Reviewer: Faidon fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New topic action: thread-history - change (mediawiki...Flow)
EBernhardson (WMF) has submitted this change and it was merged. Change subject: New topic action: thread-history .. New topic action: thread-history New index on PostRevision indexes revisions by the root post of their topic tree. Creates a query-only 'topic_root' field which when queried with options matching the index will return the sorted history of that topic. Also includes a few other minor fixes. Change-Id: I6f0553f06a98e42f739bcad388cbec340db3718d --- M Flow.i18n.php M Flow.php M container.php M includes/Block/Summary.php M includes/Block/Topic.php M includes/Data/ObjectManager.php M includes/Data/RevisionStorage.php M includes/Model/AbstractRevision.php M includes/Repository/TreeRepository.php A templates/topic-history.html.php 10 files changed, 160 insertions(+), 11 deletions(-) Approvals: EBernhardson (WMF): Verified; Looks good to me, approved diff --git a/Flow.i18n.php b/Flow.i18n.php index f8a55c0..afd13ad 100644 --- a/Flow.i18n.php +++ b/Flow.i18n.php @@ -37,7 +37,9 @@ 'flow-post-action-edit-post' = 'Edit post', 'flow-post-action-edit' = 'Edit', 'flow-post-action-restore-post' = 'Restore post', - 'flow-topic-action-edit-title' = 'Edit Title', + + 'flow-topic-action-edit-title' = 'Edit title', + 'flow-topic-action-history' = 'Topic history', 'flow-error-http' = 'An error occurred while contacting the server. Your post was not saved.', // Needs real copy 'flow-error-other' = 'An unexpected error occurred. Your post was not saved.', @@ -58,6 +60,13 @@ 'flow-edit-title-submit' = 'Change title', + 'flow-rev-message-reply' = 'New reply posted', + 'flow-rev-message-new-post' = 'Topic created', + + 'flow-topic-history' = 'Topic history', + + 'flow-comment-restored' = 'Restored comment', + 'flow-comment-deleted' = 'Deleted comment', ); /** Message documentation (Message documentation) diff --git a/Flow.php b/Flow.php index 10508c5..7ff4339 100755 --- a/Flow.php +++ b/Flow.php @@ -75,8 +75,9 @@ $wgAutoloadClasses['Flow\Data\ObjectManager'] = $dir . 'includes/Data/ObjectManager.php'; $wgAutoloadClasses['Flow\Data\LifecycleHandler'] = $dir . 'includes/Data/ObjectManager.php'; $wgAutoloadClasses['Flow\Data\Index'] = $dir . 'includes/Data/ObjectManager.php'; -$wgAutoloadClasses['Flow\Data\UniqueIndex'] = $dir . 'includes/Data/ObjectManager.php'; -$wgAutoloadClasses['Flow\Data\SecondaryIndex'] = $dir . 'includes/Data/ObjectManager.php'; +$wgAutoloadClasses['Flow\Data\UniqueFeatureIndex'] = $dir . 'includes/Data/ObjectManager.php'; +$wgAutoloadClasses['Flow\Data\TopKIndex'] = $dir . 'includes/Data/ObjectManager.php'; +$wgAutoloadClasses['Flow\Data\TopicHistoryIndex'] = $dir . 'includes/Data/ObjectManager.php'; $wgAutoloadClasses['Flow\Data\ObjectStorage'] = $dir . 'includes/Data/ObjectManager.php'; $wgAutoloadClasses['Flow\Data\BasicDbStorage'] = $dir . 'includes/Data/ObjectManager.php'; $wgAutoloadClasses['Flow\Data\ObjectMapper'] = $dir . 'includes/Data/ObjectManager.php'; diff --git a/container.php b/container.php index 401f24f..65d6bc1 100644 --- a/container.php +++ b/container.php @@ -56,6 +56,7 @@ use Flow\Data\SummaryRevisionStorage; use Flow\Data\UniqueFeatureIndex; use Flow\Data\TopKIndex; +use Flow\Data\TopicHistoryIndex; use Flow\Data\ObjectMapper; use Flow\Data\ObjectManager; @@ -182,6 +183,7 @@ $pk = new UniqueFeatureIndex( $cache, $storage, 'flow_revision:pk', array( 'rev_id' ) ); $indexes = array( $pk, + // revision history new TopKIndex( $cache, $storage, 'flow_revision:descendant', array( 'tree_rev_descendant_id' ), array( @@ -194,6 +196,7 @@ return $row['rev_parent_id'] === null; }, ) ), + // most recent revision new TopKIndex( $cache, $storage, 'flow_revision:latest_post', array( 'tree_rev_descendant_id' ), array( @@ -205,6 +208,23 @@ return $row['rev_parent_id'] === null; }, ) ), + // topic history -- to keep a history by topic we have to know what topic every post + // belongs to, not just its parent. TopicHistoryIndex is a slight tweak to TopKIndex + // using TreeRepository for extra information and stuffing it into topic_root while indexing + new TopicHistoryIndex( $cache, $storage, $c['repository.tree'], 'flow_revision:topic', + array( 'topic_root' ), + array( + 'limit' = 500, + 'sort' = 'rev_id', + 'order' = 'DESC', +
[MediaWiki-commits] [Gerrit] ytterbium install troubleshooting - change (operations/puppet)
RobH has submitted this change and it was merged. Change subject: ytterbium install troubleshooting .. ytterbium install troubleshooting Change-Id: I4b8fd41546e1ac71925a234f6b1b1d977f46e580 --- M files/autoinstall/netboot.cfg 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg index 5a8761a..a5dd998 100755 --- a/files/autoinstall/netboot.cfg +++ b/files/autoinstall/netboot.cfg @@ -40,7 +40,7 @@ capella) echo partman/lvs.cfg ;; \ cp102[1-9]|cp10[3-6][0-9]|cp1070|cp30[0-9][0-9]|sq6[7-9]|sq70|dysprosium) echo partman/raid1-varnish.cfg ;; \ antimony|barium|caesium|celsus|cerium|erbium|europium|gadolinium|holmium|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium|titanium|xenon|wtp100[1-4]) echo partman/lvm.cfg ;; \ - constable|kuo|lardner|mexia|tola) echo partman/lvm.cfg ;; \ + constable|kuo|lardner|mexia|tola|ytterbium) echo partman/lvm.cfg ;; \ lvs*) echo partman/lvs.cfg ;; \ ekrem) echo partman/raid1.cfg ;; \ eeden) echo partman/raid1-1partition.cfg ;; \ @@ -65,7 +65,7 @@ search[0-9]*) echo partman/search.cfg ;; \ snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \ stat1002) echo partman/lvm-noraid-large.a.cfg ;; \ - copper|emery|neon|harmon|ssl[1-3]0[0-9][0-9]|ssl[0-9]|ytterbium|zirconium) echo partman/raid1-lvm.cfg ;; \ + copper|emery|neon|harmon|ssl[1-3]0[0-9][0-9]|ssl[0-9]|zirconium) echo partman/raid1-lvm.cfg ;; \ solr[1-3]|solr100[1-3]) echo partman/lvm.cfg ;; \ virt[5-9]|virt1[0-1]) echo partman/virt-raid10-cisco.cfg ;; \ virt100[1-3]) echo partman/virt-raid10-cisco-ceph.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/79216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b8fd41546e1ac71925a234f6b1b1d977f46e580 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH r...@wikimedia.org Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid Transaction already in progress errors in SiteStatsU... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid Transaction already in progress errors in
SiteStatsUpdate::doUpdate
..
Avoid Transaction already in progress errors in SiteStatsUpdate::doUpdate
* Also fixed TRX callback code to match documentation (wrong since 3b7c4f6)
Change-Id: I8c4ea7412e9f96912939c441c68090eacc42b3d4
---
M includes/SiteStats.php
M includes/db/Database.php
2 files changed, 48 insertions(+), 43 deletions(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 199c64f..6e2359a 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -297,50 +297,56 @@
if ( $rate ( $rate 0 || mt_rand( 0, $rate - 1 ) != 0 ) ) {
$this-doUpdatePendingDeltas();
} else {
- $dbw = wfGetDB( DB_MASTER );
-
- $lockKey = wfMemcKey( 'site_stats' ); // prepend wiki ID
- if ( $rate ) {
- // Lock the table so we don't have double
DB/memcached updates
- if ( !$dbw-lockIsFree( $lockKey, __METHOD__ )
- || !$dbw-lock( $lockKey, __METHOD__, 1
) // 1 sec timeout
- ) {
- $this-doUpdatePendingDeltas();
- return;
- }
- $pd = $this-getPendingDeltas();
- // Piggy-back the async deltas onto those of
this stats update
- $this-views += ( $pd['ss_total_views']['+'] -
$pd['ss_total_views']['-'] );
- $this-edits += ( $pd['ss_total_edits']['+'] -
$pd['ss_total_edits']['-'] );
- $this-articles += (
$pd['ss_good_articles']['+'] - $pd['ss_good_articles']['-'] );
- $this-pages += ( $pd['ss_total_pages']['+'] -
$pd['ss_total_pages']['-'] );
- $this-users += ( $pd['ss_users']['+'] -
$pd['ss_users']['-'] );
- $this-images += ( $pd['ss_images']['+'] -
$pd['ss_images']['-'] );
- }
-
// Need a separate transaction because this a global
lock
- $dbw-begin( __METHOD__ );
+ wfGetDB( DB_MASTER )-onTransactionIdle( array( $this,
'tryDBUpdateInternal' ) );
+ }
+ }
- // Build up an SQL query of deltas and apply them...
- $updates = '';
- $this-appendUpdate( $updates, 'ss_total_views',
$this-views );
- $this-appendUpdate( $updates, 'ss_total_edits',
$this-edits );
- $this-appendUpdate( $updates, 'ss_good_articles',
$this-articles );
- $this-appendUpdate( $updates, 'ss_total_pages',
$this-pages );
- $this-appendUpdate( $updates, 'ss_users', $this-users
);
- $this-appendUpdate( $updates, 'ss_images',
$this-images );
- if ( $updates != '' ) {
- $dbw-update( 'site_stats', array( $updates ),
array(), __METHOD__ );
+ /**
+* Do not call this outside of SiteStatsUpdate
+*
+* @return void
+*/
+ public function tryDBUpdateInternal() {
+ global $wgSiteStatsAsyncFactor;
+
+ $dbw = wfGetDB( DB_MASTER );
+ $lockKey = wfMemcKey( 'site_stats' ); // prepend wiki ID
+ if ( $wgSiteStatsAsyncFactor ) {
+ // Lock the table so we don't have double DB/memcached
updates
+ if ( !$dbw-lockIsFree( $lockKey, __METHOD__ )
+ || !$dbw-lock( $lockKey, __METHOD__, 1 ) // 1
sec timeout
+ ) {
+ $this-doUpdatePendingDeltas();
+ return;
}
+ $pd = $this-getPendingDeltas();
+ // Piggy-back the async deltas onto those of this stats
update
+ $this-views += ( $pd['ss_total_views']['+'] -
$pd['ss_total_views']['-'] );
+ $this-edits += ( $pd['ss_total_edits']['+'] -
$pd['ss_total_edits']['-'] );
+ $this-articles += ( $pd['ss_good_articles']['+'] -
$pd['ss_good_articles']['-'] );
+ $this-pages += ( $pd['ss_total_pages']['+'] -
$pd['ss_total_pages']['-'] );
+ $this-users += ( $pd['ss_users']['+'] -
$pd['ss_users']['-'] );
+ $this-images += ( $pd['ss_images']['+'] -
$pd['ss_images']['-'] );
+
[MediaWiki-commits] [Gerrit] Fix bugs in + make improvements to tpl-param serialization - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix bugs in + make improvements to tpl-param serialization
..
Fix bugs in + make improvements to tpl-param serialization
This patch fixes the following bugs and edge cases in
serialization of transclusion params.
1. Fixes RTing of {{echo|1=x}} vs. {{echo|x}}. So far, both
versions would RT back to {{echo|x}} -- I've seen this happen
a couple times in production diffs as well. This patch
fixes the RTing of the first snippet by recording an additional
'named: true' flag in the data-parsoid param info object
and using it during serialization.
2. PHP parser does not strip WS for positional params. Parsoid used
to strip trailing WS for positional params, but we decided to
replicate PHP behavior to minimize confusion especially since we
use PHP preprocessor for expanding transclusions.
Consolidated existing tests into new tests for this behavior.
The positional param ws-stripping test still fails wt2html
because of unrelated bugs where some whitespace is being lost
in our transforms for snippets like this: {{echo| }}a.
Will be investigated separately.
3. This patch also fixes another known bug in production. Consider
the following wikitext:
{{quote
|sign=
|text=This is a quote
}}
If you edit this template in VE to add a value for the 'sign'
param to say 'bar', Parsoid would then serialize this to:
{{quote
|sign=
bar|text=This is a quote
}}
For empty param values, the newline after sign= was treated as
a newline *before* an empty value instead of a newlined *after*
an empty value. On serialization, this led to the newline being
output before bar.
NOTE that for param-keys, the existing behavior is correct.
- This patch fixes this bug which in turn fixes the post-edit
serialization of the above snippet.
- We have to figure out a way of testing this behavior.
Since WS-info is part of data-parsoid, we cannot test this
without adding data-parsoid to parser tests.
Is this the best solution? To be figured out.
Change-Id: I8a9609520a1af4fabe18c423378870edf2922482
---
M js/lib/ext.core.TemplateHandler.js
M js/lib/mediawiki.WikitextSerializer.js
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
4 files changed, 117 insertions(+), 113 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/ext.core.TemplateHandler.js
b/js/lib/ext.core.TemplateHandler.js
index c5d3f73..089ca5e 100644
--- a/js/lib/ext.core.TemplateHandler.js
+++ b/js/lib/ext.core.TemplateHandler.js
@@ -812,6 +812,7 @@
}
k = kSrc.trim();
+ v = vSrc;
// Number positional parameters
var isPositional;
@@ -819,31 +820,46 @@
isPositional = true;
k = argIndex.toString();
argIndex++;
- // Only strip trailing space for positional parameters
- v = vSrc.replace(/([^\s])\s+$/, '$1');
} else {
isPositional = false;
// strip ws from named parameter values
- v = vSrc.trim();
+ v = v.trim();
}
-
if (dict[k] === undefined) {
paramInfo = {
k: k
};
- // Preserve key and value space prefix / postfix, if any
+
var keySpaceMatch = kSrc.match(/^(\s*)[^]*?(\s*)$/),
- valueSpaceMatch =
vSrc.match(/^(\s*)[^]*?(\s*)$/);
- if (keySpaceMatch[1] || keySpaceMatch[2] !== ' ' ||
- // Leading space in positional
parameters is part of the
- // value, so don't need to remember it
- (!isPositional valueSpaceMatch[1]
!== ' ') ||
- valueSpaceMatch[2]) {
- // Remember non-standard spacing
- paramInfo.spc = [keySpaceMatch[1],
keySpaceMatch[2],
- valueSpaceMatch[1], valueSpaceMatch[2]];
+ valueSpaceMatch;
+
+ if (isPositional) {
+ valueSpaceMatch = ['', '', ''];
+ } else {
+ paramInfo.named = true;
+ valueSpaceMatch = v ?
vSrc.match(/^(\s*)[^]*?(\s*)$/) : ['', '', vSrc];
}
+
+ // Preserve key and value space prefix / postfix, if
any.
+ // = is the default spacing used by the serializer,
+
[MediaWiki-commits] [Gerrit] Apply the same fix in 5ff4ad75 for /_rt/ endpoint - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Apply the same fix in 5ff4ad75 for /_rt/ endpoint
..
Apply the same fix in 5ff4ad75 for /_rt/ endpoint
* This will let us duplicate errors on localhost and the wmflabs
install of parsoid -- useful for debugging.
Change-Id: If4d71b1c24c66d3732032dab5c5fb2079d9ccb28
---
M js/api/ParserService.js
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/api/ParserService.js b/js/api/ParserService.js
index 006daea..d3d3ea8 100644
--- a/js/api/ParserService.js
+++ b/js/api/ParserService.js
@@ -19,6 +19,7 @@
// global includes
var express = require('express'),
+ domino = require( 'domino' ),
jsDiff = require('diff'),
childProc = require('child_process'),
spawn = childProc.spawn,
@@ -257,6 +258,9 @@
res.end('\n/body/html');
};
+ // Re-parse the HTML to uncover foster-parenting issues
+ document = domino.createDocument(document.outerHTML);
+
// Always use the regular serializer for round-trip diff tests
// since these will never have any edits for selser to do any work.
new WikitextSerializer({env: env}).serializeDOM( document.body,
--
To view, visit https://gerrit.wikimedia.org/r/79028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4d71b1c24c66d3732032dab5c5fb2079d9ccb28
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add optional id parameter; make extension working in templates - change (mediawiki...AJAXPoll)
Wikinaut has submitted this change and it was merged.
Change subject: add optional id parameter; make extension working in templates
..
add optional id parameter; make extension working in templates
as proposed in
https://www.mediawiki.org/w/index.php?title=Extension_talk:AJAXPolldir=prevoffset=20130129204525limit=20lqt_mustshow=31153#Does_not_work_properly_within_templates_31145
and
https://www.mediawiki.org/w/index.php?title=Extension_talk:AJAXPolldir=prevoffset=20130129204525limit=20lqt_mustshow=31153#adding_an_id_parameter_would_be_helpful_31153
Change-Id: I5e633c1e76cbef9e78a5b1225794e11492b44c3c
---
M AJAXPoll.php
M AJAXPoll_body.php
2 files changed, 11 insertions(+), 7 deletions(-)
Approvals:
Parent5446: Looks good to me, but someone else must approve
Wikinaut: Verified; Looks good to me, approved
diff --git a/AJAXPoll.php b/AJAXPoll.php
index 7c7c017..553dba5 100644
--- a/AJAXPoll.php
+++ b/AJAXPoll.php
@@ -35,7 +35,7 @@
* @author Jack Phoenix j...@countervandalism.net
* @author Thomas Gries
* @maintainer Thomas Gries
- * @version 1.84
+ * @version 1.85
* @link http://www.mediawiki.org/wiki/Extension:AJAX_Poll Documentation
*/
@@ -47,7 +47,7 @@
$wgExtensionCredits['parserhook'][] = array(
'path' = __FILE__,
'name' = 'AJAX Poll',
- 'version' = '1.84 20130605',
+ 'version' = '1.85 20130728',
'author' = array( 'Dariusz Siedlecki', 'Jack Phoenix', 'Thomas Gries'
),
'descriptionmsg' = 'ajaxpoll-desc',
'url' = 'https://www.mediawiki.org/wiki/Extension:AJAX_Poll',
diff --git a/AJAXPoll_body.php b/AJAXPoll_body.php
index a6fcb45..a178661 100644
--- a/AJAXPoll_body.php
+++ b/AJAXPoll_body.php
@@ -29,7 +29,7 @@
}
# The callback function for converting the input text to HTML output
- static function AJAXPollRender( $input, $args = array(), Parser $parser
) {
+ static function AJAXPollRender( $input, $args = array(), Parser
$parser, $frame ) {
global $wgUser, $wgOut, $wgTitle, $wgScriptPath, $wgUseAjax;
$parser-disableCache();
@@ -42,11 +42,15 @@
}
// ID of the poll
- $id = strtoupper( md5( $input ) );
+ if ( isset( $args[id] ) ) {
+ $id = $args[id];
+ } else {
+ $id = strtoupper( md5( $input ) );
+ }
- $par = new Parser();
- $input = $par-parse( $input, $wgTitle, $wgOut-parserOptions()
);
- $input = trim( strip_tags( $input-getText() ) );
+ // get the input
+ $input = $parser-recursiveTagParse( $input, $frame );
+ $input = trim( strip_tags( $input ) );
$lines = explode( \n, trim( $input ) );
// compatibility for non-ajax requests - just in case
--
To view, visit https://gerrit.wikimedia.org/r/76351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e633c1e76cbef9e78a5b1225794e11492b44c3c
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Wikinaut m...@tgries.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] declare hafnium node in site.pp grant sudo to myself - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79218
Change subject: declare hafnium node in site.pp grant sudo to myself
..
declare hafnium node in site.pp grant sudo to myself
Host was set up by Chris per RT 5514.
Change-Id: Ia77f6413df22279f33a2d6625590b02d8a274dca
---
M manifests/site.pp
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/79218/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 9393696..51a7987 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2845,6 +2845,14 @@
}
}
+node 'hafnium.wikimedia.org' {
+include standard
+
+sudo_user { 'olivneh':
+privileges = ['ALL = (ALL) NOPASSWD: ALL'],
+}
+}
+
node virt1000.wikimedia.org {
$cluster = virt
$ganglia_aggregator = true
--
To view, visit https://gerrit.wikimedia.org/r/79218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia77f6413df22279f33a2d6625590b02d8a274dca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing Vector submodule in vain effort to fix it - change (mediawiki/extensions)
Demon has uploaded a new change for review. https://gerrit.wikimedia.org/r/79219 Change subject: Removing Vector submodule in vain effort to fix it .. Removing Vector submodule in vain effort to fix it Change-Id: I1ffd84f3d4cc749c474aebf21d6ada02cfe52c43 --- M .gitmodules D Vector 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/19/79219/1 diff --git a/.gitmodules b/.gitmodules index 9b54558..c23ddc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2114,10 +2114,6 @@ path = Variables url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Variables.git branch = . -[submodule Vector] - path = Vector - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Vector.git - branch = . [submodule Video] path = Video url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Video.git diff --git a/Vector b/Vector deleted file mode 16 index b1f8243..000 --- a/Vector +++ /dev/null -Subproject commit b1f8243b9d991d477c8c1390379d0d27cff70f3a -- To view, visit https://gerrit.wikimedia.org/r/79219 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ffd84f3d4cc749c474aebf21d6ada02cfe52c43 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Demon ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing Vector submodule in vain effort to fix it - change (mediawiki/extensions)
Demon has submitted this change and it was merged. Change subject: Removing Vector submodule in vain effort to fix it .. Removing Vector submodule in vain effort to fix it Change-Id: I1ffd84f3d4cc749c474aebf21d6ada02cfe52c43 --- M .gitmodules D Vector 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: Demon: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index 9b54558..c23ddc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2114,10 +2114,6 @@ path = Variables url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Variables.git branch = . -[submodule Vector] - path = Vector - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Vector.git - branch = . [submodule Video] path = Video url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Video.git diff --git a/Vector b/Vector deleted file mode 16 index b1f8243..000 --- a/Vector +++ /dev/null -Subproject commit b1f8243b9d991d477c8c1390379d0d27cff70f3a -- To view, visit https://gerrit.wikimedia.org/r/79219 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ffd84f3d4cc749c474aebf21d6ada02cfe52c43 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Demon ch...@wikimedia.org Gerrit-Reviewer: Demon ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] declare hafnium node in site.pp grant sudo to myself - change (operations/puppet)
Faidon has submitted this change and it was merged.
Change subject: declare hafnium node in site.pp grant sudo to myself
..
declare hafnium node in site.pp grant sudo to myself
Host was set up by Chris per RT 5514.
Change-Id: Ia77f6413df22279f33a2d6625590b02d8a274dca
---
M manifests/site.pp
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 9393696..70b036a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2845,6 +2845,16 @@
}
}
+# Hosts visualization / monitoring of EventLogging event streams
+# and MediaWiki errors. Non-critical at the moment. See RT #5514.
+node 'hafnium.wikimedia.org' {
+include standard
+
+sudo_user { 'olivneh':
+privileges = ['ALL = (ALL) NOPASSWD: ALL'],
+}
+}
+
node virt1000.wikimedia.org {
$cluster = virt
$ganglia_aggregator = true
--
To view, visit https://gerrit.wikimedia.org/r/79218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia77f6413df22279f33a2d6625590b02d8a274dca
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Faidon fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] 1.22wmf13 phase one wikis to 1.22wmf13 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: 1.22wmf13 phase one wikis to 1.22wmf13 .. 1.22wmf13 phase one wikis to 1.22wmf13 Change-Id: I2cc6cf3cd0f68b55ae1274340267eb1d9a2040ca --- M wikiversions.dat 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wikiversions.dat b/wikiversions.dat index 00371dd..40646c2 100644 --- a/wikiversions.dat +++ b/wikiversions.dat @@ -451,7 +451,7 @@ lnwikibooks php-1.22wmf12 * lnwiki php-1.22wmf12 * lnwiktionary php-1.22wmf12 * -loginwiki php-1.22wmf12 * +loginwiki php-1.22wmf13 * lowiki php-1.22wmf12 * lowiktionary php-1.22wmf12 * ltgwiki php-1.22wmf12 * @@ -465,7 +465,7 @@ lvwiktionary php-1.22wmf12 * map_bmswiki php-1.22wmf12 * mdfwiki php-1.22wmf12 * -mediawikiwiki php-1.22wmf12 * +mediawikiwiki php-1.22wmf13 * metawiki php-1.22wmf12 * mgwikibooks php-1.22wmf12 * mgwiki php-1.22wmf12 * @@ -731,9 +731,9 @@ tawikisource php-1.22wmf12 * tawiktionary php-1.22wmf12 * tenwiki php-1.22wmf12 * -test2wiki php-1.22wmf12 * -testwiki php-1.22wmf12 * -testwikidatawiki php-1.22wmf12 * +test2wiki php-1.22wmf13 * +testwiki php-1.22wmf13 * +testwikidatawiki php-1.22wmf13 * tetwiki php-1.22wmf12 * tewikibooks php-1.22wmf12 * tewiki php-1.22wmf12 * -- To view, visit https://gerrit.wikimedia.org/r/79212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2cc6cf3cd0f68b55ae1274340267eb1d9a2040ca Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix *another* bug in the parsoid-regressions job... then tur... - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Fix *another* bug in the parsoid-regressions job... then turn it off. .. Fix *another* bug in the parsoid-regressions job... then turn it off. We don't really use this job anyway: we have our own blacklist used to protect against regressions. So patch the job to fix it... but then turn it off, to be *sure* that we won't be getting these spurious failures any more. Change-Id: Id85596a043f89d60ea670db4a36eec559c29d55c --- M parsoid.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/parsoid.yaml b/parsoid.yaml index c0aa3ae..cdd15ab 100644 --- a/parsoid.yaml +++ b/parsoid.yaml @@ -103,7 +103,7 @@ - xunit: types: - junit: -pattern: results.xml +pattern: '**/results.xml' thresholdmode: 'number' thresholds: - failed: @@ -247,7 +247,7 @@ jobs: - parsoid-parsertests - parsoid-parsertests-run -- parsoid-regressions +# - parsoid-regressions - parsoid-server-sanity-check - parsoid-parse-tool-check - parsoid-roundtrip-test-check -- To view, visit https://gerrit.wikimedia.org/r/77471 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id85596a043f89d60ea670db4a36eec559c29d55c Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Cscott canan...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Parsoid test: run parsoid's parserTests file using PHP p... - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: New Parsoid test: run parsoid's parserTests file using PHP parser. .. New Parsoid test: run parsoid's parserTests file using PHP parser. This helps ensure that we don't commit tests to our fork of parserTests.txt that will break when we try to merge them with core. Change-Id: I49d3551676893bfdf7fdf408e90d7477a33608a7 --- M parsoid.yaml 1 file changed, 36 insertions(+), 0 deletions(-) Approvals: Subramanya Sastry: Looks good to me, but someone else must approve MarkTraceur: Looks good to me, approved GWicke: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/parsoid.yaml b/parsoid.yaml index cdd15ab..c8e46a2 100644 --- a/parsoid.yaml +++ b/parsoid.yaml @@ -51,6 +51,41 @@ files: '**/results.xml' - job-template: +name: parsoid-php-parsertests +node: hasSlaveScripts +wrappers: +- timeout: +timeout: 10 +fail: true +defaults: +use-zuul +triggers: +- zuul +scm: +- git: +url: '/srv/ssd/zuul/git/mediawiki/extensions/Parsoid' +refspec: '$ZUUL_REF' +name: 'origin' +disable-submodules: true +- git: +url: 'https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Parsoid/js/contrib.git' +branches: +- master +basedir: contrib +- git: +url: 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git' +branches: +- master +basedir: core +builders: +# run our parserTests.txt file using core's php parser to ensure +# that non-parsoid only tests are actually correct wrt the PHP parser. +- shell: | +# If any of these commands fail, something is wrong +set -e +php core/tests/parserTests.php --color=no --file=js/tests/parserTests.txt --quiet + +- job-template: name: parsoid-parsertests node: hasSlaveScripts triggers: @@ -252,3 +287,4 @@ - parsoid-parse-tool-check - parsoid-roundtrip-test-check - parsoid-parsertests-run-harder +- parsoid-php-parsertests -- To view, visit https://gerrit.wikimedia.org/r/79013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49d3551676893bfdf7fdf408e90d7477a33608a7 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Cscott canan...@wikimedia.org Gerrit-Reviewer: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Removing Vector submodule in vain effort to fix it - change (mediawiki/extensions)
Demon has submitted this change and it was merged. Change subject: Revert Removing Vector submodule in vain effort to fix it .. Revert Removing Vector submodule in vain effort to fix it Vector != VisualEditor This reverts commit 592a0023e7a3f4d1bdd0354bdcf216b34cc606e8. Change-Id: I353b5b878b72666ebf0c47f8c0ab67015703f0da --- M .gitmodules A Vector 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Demon: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index c23ddc7..9b54558 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2114,6 +2114,10 @@ path = Variables url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Variables.git branch = . +[submodule Vector] + path = Vector + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Vector.git + branch = . [submodule Video] path = Video url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Video.git diff --git a/Vector b/Vector new file mode 16 index 000..b1f8243 --- /dev/null +++ b/Vector +Subproject commit b1f8243b9d991d477c8c1390379d0d27cff70f3a -- To view, visit https://gerrit.wikimedia.org/r/79220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I353b5b878b72666ebf0c47f8c0ab67015703f0da Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Demon ch...@wikimedia.org Gerrit-Reviewer: Demon ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] EditPage: Wrap the pipe between Cancel and Editing help ... - change (mediawiki/core)
TheDJ has submitted this change and it was merged.
Change subject: EditPage: Wrap the pipe between Cancel and Editing help
links in a span
..
EditPage: Wrap the pipe between Cancel and Editing help links in a span
This will make it possible to hide or style it without nasty hacks
like the one Vector extension's ext.vector.footerCleanup module uses.
Bug: 43689
Change-Id: Id9269876939d3453c53473f7e3650c375f6fdd22
---
M includes/EditPage.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 22cf795..f8788b7 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2881,7 +2881,9 @@
$cancel = $this-getCancelLink();
if ( $cancel !== '' ) {
- $cancel .= wfMessage( 'pipe-separator' )-text();
+ $cancel .= Html::element( 'span',
+ array( 'class' =
'mw-editButtons-pipe-separator' ),
+ wfMessage( 'pipe-separator' )-text() );
}
$edithelpurl = Skin::makeInternalOrExternalUrl( wfMessage(
'edithelppage' )-inContentLanguage()-text() );
$edithelp = 'a target=helpwindow href=' . $edithelpurl .
'' .
--
To view, visit https://gerrit.wikimedia.org/r/76068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9269876939d3453c53473f7e3650c375f6fdd22
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matmarex matma@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: MZMcBride w...@mzmcbride.com
Gerrit-Reviewer: Matmarex matma@gmail.com
Gerrit-Reviewer: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.action.edit: Add styles for edit form's footer - change (mediawiki/core)
TheDJ has submitted this change and it was merged.
Change subject: mediawiki.action.edit: Add styles for edit form's footer
..
mediawiki.action.edit: Add styles for edit form's footer
Copied verbatim from Vector extension's ext.vector.footerCleanup module.
Bug: 43689
Change-Id: I1b92499961b7ea1949e1d1e48ced6f562822d1cd
---
M includes/EditPage.php
M resources/Resources.php
A resources/mediawiki.action/mediawiki.action.edit.styles.css
3 files changed, 50 insertions(+), 0 deletions(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 17a1946..22cf795 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1920,6 +1920,7 @@
global $wgOut, $wgUser;
$wgOut-addModules( 'mediawiki.action.edit' );
+ $wgOut-addModuleStyles( 'mediawiki.action.edit.styles' );
if ( $wgUser-getOption( 'uselivepreview', false ) ) {
$wgOut-addModules( 'mediawiki.action.edit.preview' );
diff --git a/resources/Resources.php b/resources/Resources.php
index 6352843..565f0f4 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -719,12 +719,17 @@
'mediawiki.action.edit' = array(
'scripts' =
'resources/mediawiki.action/mediawiki.action.edit.js',
'dependencies' = array(
+ 'mediawiki.action.edit.styles',
'mediawiki.legacy.wikibits',
'jquery.textSelection',
'jquery.byteLimit',
),
'position' = 'top',
),
+ 'mediawiki.action.edit.styles' = array(
+ 'styles' =
'resources/mediawiki.action/mediawiki.action.edit.styles.css',
+ 'position' = 'top',
+ ),
'mediawiki.action.edit.collapsibleFooter' = array(
'scripts' =
'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
'styles' =
'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
diff --git a/resources/mediawiki.action/mediawiki.action.edit.styles.css
b/resources/mediawiki.action/mediawiki.action.edit.styles.css
new file mode 100644
index 000..4a2bab3
--- /dev/null
+++ b/resources/mediawiki.action/mediawiki.action.edit.styles.css
@@ -0,0 +1,44 @@
+/**
+ * Styles for elements of the editing form.
+ */
+
+/* General layout */
+#wpTextbox1 {
+ margin: 0;
+ display: block;
+}
+
+.editOptions {
+ background-color: #F0F0F0;
+ border: 1px solid silver;
+ border-top: none;
+ padding: 1em 1em 1.5em 1em;
+ margin-bottom: 2em;
+}
+
+/* Adjustments to edit form elements */
+.editCheckboxes {
+ margin-bottom: 1em;
+}
+
+.editCheckboxes input:first-child {
+ margin-left: 0;
+}
+
+.cancelLink {
+ margin-left: 0.5em;
+}
+
+#editpage-copywarn {
+ font-size: 0.9em;
+}
+
+#wpSummary {
+ display: block;
+ margin-top: 0;
+ margin-bottom: 0.5em;
+}
+
+.editButtons input:first-child {
+ margin-left: .1em;
+}
--
To view, visit https://gerrit.wikimedia.org/r/76067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b92499961b7ea1949e1d1e48ced6f562822d1cd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matmarex matma@gmail.com
Gerrit-Reviewer: Matmarex matma@gmail.com
Gerrit-Reviewer: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing VisualEditor in vain effort to fix it - change (mediawiki/extensions)
Demon has submitted this change and it was merged. Change subject: Removing VisualEditor in vain effort to fix it .. Removing VisualEditor in vain effort to fix it Change-Id: I39fea6d5ff1e100c9086c2dd10c1d21a03d66f89 --- M .gitmodules D VisualEditor 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: Demon: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index 9b54558..5c6dc4b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2130,10 +2130,6 @@ path = VipsScaler url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/VipsScaler.git branch = . -[submodule VisualEditor] - path = VisualEditor - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/VisualEditor.git - branch = . [submodule VisualWiki] path = VisualWiki url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/VisualWiki.git diff --git a/VisualEditor b/VisualEditor deleted file mode 16 index ddf748e..000 --- a/VisualEditor +++ /dev/null -Subproject commit ddf748e53b0b8e5086151669e0f0603652d48aa0 -- To view, visit https://gerrit.wikimedia.org/r/79221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39fea6d5ff1e100c9086c2dd10c1d21a03d66f89 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Demon ch...@wikimedia.org Gerrit-Reviewer: Demon ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing VisualEditor in vain effort to fix it - change (mediawiki/extensions)
Demon has uploaded a new change for review. https://gerrit.wikimedia.org/r/79221 Change subject: Removing VisualEditor in vain effort to fix it .. Removing VisualEditor in vain effort to fix it Change-Id: I39fea6d5ff1e100c9086c2dd10c1d21a03d66f89 --- M .gitmodules D VisualEditor 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/21/79221/1 diff --git a/.gitmodules b/.gitmodules index 9b54558..5c6dc4b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2130,10 +2130,6 @@ path = VipsScaler url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/VipsScaler.git branch = . -[submodule VisualEditor] - path = VisualEditor - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/VisualEditor.git - branch = . [submodule VisualWiki] path = VisualWiki url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/VisualWiki.git diff --git a/VisualEditor b/VisualEditor deleted file mode 16 index ddf748e..000 --- a/VisualEditor +++ /dev/null -Subproject commit ddf748e53b0b8e5086151669e0f0603652d48aa0 -- To view, visit https://gerrit.wikimedia.org/r/79221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39fea6d5ff1e100c9086c2dd10c1d21a03d66f89 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Demon ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Readding VisualEditor extension, plus fixed a few others - change (mediawiki/extensions)
Demon has uploaded a new change for review. https://gerrit.wikimedia.org/r/79222 Change subject: Readding VisualEditor extension, plus fixed a few others .. Readding VisualEditor extension, plus fixed a few others Change-Id: Id4a12e3ccf233d4f56df99f84d993b32bd6e9ef9 --- M .gitmodules A VisualEditor 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/22/79222/1 diff --git a/.gitmodules b/.gitmodules index 5c6dc4b..6f70f2d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2337,27 +2337,40 @@ [submodule HotCat] path = HotCat url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/HotCat.git + branch = . [submodule News] path = News url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/News.git + branch = . [submodule UpdateMediaWiki] path = UpdateMediaWiki url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/UpdateMediaWiki.git + branch = . [submodule BayesianFilter] path = BayesianFilter url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/BayesianFilter.git + branch = . [submodule LifeWeb] path = LifeWeb url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/LifeWeb.git + branch = . [submodule LifeWebCore] path = LifeWebCore url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/LifeWebCore.git + branch = . [submodule MultimediaViewer] path = MultimediaViewer url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/MultimediaViewer.git + branch = . [submodule QuizTabulate] path = QuizTabulate url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/QuizTabulate.git + branch = . [submodule VersionView] path = VersionView url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/VersionView.git + branch = . +[submodule VisualEditor] + path = VisualEditor + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/VisualEditor.git + branch = . diff --git a/VisualEditor b/VisualEditor new file mode 16 index 000..37b461f --- /dev/null +++ b/VisualEditor +Subproject commit 37b461fe56e9f2c30d47f55082b5256f730dd8f2 -- To view, visit https://gerrit.wikimedia.org/r/79222 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4a12e3ccf233d4f56df99f84d993b32bd6e9ef9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Demon ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hide MediaWiki's Editing help link, as we provide it in th... - change (mediawiki...WikiEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Hide MediaWiki's Editing help link, as we provide it in the
toolbar
..
Hide MediaWiki's Editing help link, as we provide it in the toolbar
Ported from Vector extension's ext.vector.footerCleanup module, but
with less hacks. Depends on change Id9269876 in MediaWiki core.
Also remove unhelpful comments.
Bug: 43689
Change-Id: I36ecd06b6fc0cc5ce95bc43db303b1b542e6c81b
---
M modules/ext.wikiEditor.css
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikiEditor.css b/modules/ext.wikiEditor.css
index f066573..30a2732 100644
--- a/modules/ext.wikiEditor.css
+++ b/modules/ext.wikiEditor.css
@@ -2,19 +2,16 @@
* CSS for WikiEditor
*/
-/* This ID (#editform) could change in MediaWiki */
form#editform {
margin: 0;
padding: 0;
}
-/* These IDs (#wpSummaryLabel and #wpSummary) could change in MediaWiki */
#wpSummary,
#wpSummaryLabel {
margin-bottom: 1em;
}
-/* This ID (#wpTextbox1) could change in MediaWiki */
.wikiEditor-ui textarea#wpTextbox1 {
border: none;
padding: 0;
@@ -26,3 +23,9 @@
.wikiEditor-ui .wikiEditor-ui-text textarea#wpTextbox1 {
margin: 0;
}
+
+/* Hide vanilla MediaWiki's Editing help link, as we provide it in the
toolbar */
+.editButtons .editHelp,
+.editButtons .mw-editButtons-pipe-separator {
+ display: none;
+}
--
To view, visit https://gerrit.wikimedia.org/r/76069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36ecd06b6fc0cc5ce95bc43db303b1b542e6c81b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Matmarex matma@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: MZMcBride w...@mzmcbride.com
Gerrit-Reviewer: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] More bug fixes and cleanup in roundtrip-test.js diffing code - change (mediawiki...Parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79223
Change subject: More bug fixes and cleanup in roundtrip-test.js diffing code
..
More bug fixes and cleanup in roundtrip-test.js diffing code
* Removed unnecessary DOM walking when not required
* Ensured that matching nodes in a desired DSR range are not lost.
* More cleanup possible: global 'waitingForEndMatch' flag could
possibly be eliminated.
* Test case: node roundtrip-test.js Jehan_de_Bethancourt
This used to report a semantic diff in place of a syntactic diff
Change-Id: I0267c7583e4c960a3eb10e9adb7cd04021da4621
---
M js/lib/mediawiki.DOMUtils.js
M js/tests/roundtrip-test.js
2 files changed, 43 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/23/79223/1
diff --git a/js/lib/mediawiki.DOMUtils.js b/js/lib/mediawiki.DOMUtils.js
index d7f8efb..b5ba1d4 100644
--- a/js/lib/mediawiki.DOMUtils.js
+++ b/js/lib/mediawiki.DOMUtils.js
@@ -897,17 +897,15 @@
},
/**
-* If 'node' has about-id, it is assumed that it is generated by
-* templates or extensions. This function skips over all
+* Given a 'node' that has an about-id, it is assumed that it is
generated
+* by templates or extensions. This function skips over all
* following content nodes and returns the first non-template node
* that follows it.
+*
+* Will crash if called with a non-template node.
*/
skipOverEncapsulatedContent: function(node) {
var about = node.getAttribute('about');
- if (!about) {
- return node;
- }
-
return this.getAboutSiblings(node, about).last().nextSibling;
},
diff --git a/js/tests/roundtrip-test.js b/js/tests/roundtrip-test.js
index 64dc6c6..c5bd618 100755
--- a/js/tests/roundtrip-test.js
+++ b/js/tests/roundtrip-test.js
@@ -6,6 +6,7 @@
domino = require( 'domino' ),
Util = require( '../lib/mediawiki.Util.js' ).Util,
+ DU = require( '../lib/mediawiki.DOMUtils.js' ).DOMUtils,
WikitextSerializer = require(
'../lib/mediawiki.WikitextSerializer.js').WikitextSerializer,
TemplateRequest = require( '../lib/mediawiki.ApiRequest.js'
).TemplateRequest,
ParsoidConfig = require( '../lib/mediawiki.ParsoidConfig'
).ParsoidConfig,
@@ -100,23 +101,21 @@
return output;
};
-var findDsr = function (root, targetRange, sourceLen) {
+var findMatchingNodes = function (root, targetRange, sourceLen) {
var currentOffset = null, wasWaiting = false, waitingForEndMatch =
false;
function walkDOM(element) {
- var j, matchedChildren, childAttribs, attribs, start, end,
- elements = [], precedingNodes = [];
-
- attribs = element.getAttribute( 'data-parsoid' );
- if ( attribs ) {
- attribs = JSON.parse( attribs );
- } else {
- attribs = {};
- }
+ var elements = [],
+ precedingNodes = [],
+ attribs = JSON.parse(element.getAttribute(
'data-parsoid' ) || '{}');
if ( attribs.dsr attribs.dsr.length ) {
- start = attribs.dsr[0] || 0;
- end = attribs.dsr[1] || sourceLen - 1;
+ var start = attribs.dsr[0] || 0,
+ end = attribs.dsr[1] || sourceLen - 1;
+
+ if ( (targetRange.end - 1) start ||
targetRange.start (end - 1) ) {
+ return null;
+ }
if ( waitingForEndMatch ) {
if ( end = targetRange.end ) {
@@ -129,23 +128,22 @@
return { done: true, nodes: [element] };
} else if ( targetRange.start === start ) {
waitingForEndMatch = true;
- }
-
- if ( (targetRange.end - 1) start ) {
- return null;
- } else if ( targetRange.start (end - 1) ) {
- return null;
+ if (end targetRange.end) {
+ // No need to walk children
+ return { done: false, nodes: [element]
};
+ }
+ } else if (start targetRange.start end
targetRange.end) {
+ // No need to walk children
+ return { done: false, nodes: [element] };
}
}
- var children = element.childNodes;
-
