[MediaWiki-commits] [Gerrit] HHVM: send profiling data to port 3812 on tungsten - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: HHVM: send profiling data to port 3812 on tungsten
..
HHVM: send profiling data to port 3812 on tungsten
By default, profiling data is sent on 3811. Send profiling data from HHVM app
servers on 3812, so we can have a separate profiler-to-carbon instance.
Change-Id: I5a43ae47ae835d2eb9d109b3540dea03dc154000
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d3e8f2b..4268641 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -467,6 +467,7 @@
if( $wmfRealm == 'production' ) {
$wgUDPProfilerHost = '10.64.0.18'; // tungsten
+ $wgUDPProfilerPort = defined( 'HHVM_VERSION' ) ? '3812' : '3811';
$wgAggregateStatsID = $wgVersion;
}
--
To view, visit https://gerrit.wikimedia.org/r/163801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a43ae47ae835d2eb9d109b3540dea03dc154000
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] HHVM: send profiling data to port 3812 on tungsten - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163801
Change subject: HHVM: send profiling data to port 3812 on tungsten
..
HHVM: send profiling data to port 3812 on tungsten
By default, profiling data is sent on 3811. Send profiling data from HHVM app
servers on 3812, so we can have a separate profiler-to-carbon instance.
Change-Id: I5a43ae47ae835d2eb9d109b3540dea03dc154000
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/01/163801/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d3e8f2b..4268641 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -467,6 +467,7 @@
if( $wmfRealm == 'production' ) {
$wgUDPProfilerHost = '10.64.0.18'; // tungsten
+ $wgUDPProfilerPort = defined( 'HHVM_VERSION' ) ? '3812' : '3811';
$wgAggregateStatsID = $wgVersion;
}
--
To view, visit https://gerrit.wikimedia.org/r/163801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a43ae47ae835d2eb9d109b3540dea03dc154000
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
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] Replace hardcoded wikipedia urls in link tool - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163802
Change subject: Replace hardcoded wikipedia urls in link tool
..
Replace hardcoded wikipedia urls in link tool
Inject SiteMapper and make getLink to actually return a promise.
Change-Id: I0eb288096b21cce7f19acd96926c40265d4d7dda
---
M modules/tools/ext.cx.tools.link.js
1 file changed, 28 insertions(+), 18 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/02/163802/1
diff --git a/modules/tools/ext.cx.tools.link.js
b/modules/tools/ext.cx.tools.link.js
index 6f151a1..7a67676 100644
--- a/modules/tools/ext.cx.tools.link.js
+++ b/modules/tools/ext.cx.tools.link.js
@@ -15,14 +15,17 @@
/**
* Link Card
* @class
+* @param {mw.cx.SiteMapper} siteMapper
*/
- function LinkCard() {
+ function LinkCard( siteMapper ) {
this.$card = null;
this.$removeLink = null;
this.$addLink = null;
this.$link = null;
this.$sourceLinkCard = null;
this.$targetLinkCard = null;
+
+ this.siteMapper = siteMapper;
}
/**
@@ -122,20 +125,20 @@
/**
* Get the link data for a given title and language.
+* @param {mediawiki.Api} api
* @param {string} title
* @param {string} language
* @return {jQuery.Promise}
*/
- function getLink( title, language ) {
- var request, api;
+ function getLink( api, title, language ) {
+ var request;
// Normalize
title = mw.Title.newFromText( title ).toString();
if ( cache[ title ] cache[ title ][ language ] ) {
- return cache[ title ][ language ];
+ return cache[ title ][ language ].promise();
}
- api = new mw.Api();
request = api.get( {
action: 'query',
titles: title,
@@ -145,7 +148,6 @@
redirects: true,
format: 'json'
}, {
- url: '//' + language + '.wikipedia.org/w/api.php',
dataType: 'jsonp',
// This prevents warnings about the unrecognized
parameter _
cache: true
@@ -153,7 +155,8 @@
cache[ title ] = cache[ title ] || {};
cache[ title ][ language ] = request;
- return request;
+
+ return request.promise();
}
/**
@@ -175,14 +178,13 @@
* @return {jQuery.Promise}
*/
LinkCard.prototype.adapt = function ( titles, language ) {
- var api, deferred;
+ var deferred = $.Deferred();
- api = new mw.Api();
- deferred = $.Deferred();
if ( !$.isArray( titles ) ) {
titles = new Array( titles );
}
- api.get( {
+
+ this.siteMapper.getApi( mw.cx.sourceLanguage ).get( {
action: 'query',
titles: titles.join( '|' ),
prop: 'langlinks',
@@ -190,7 +192,6 @@
redirects: true,
format: 'json'
}, {
- url: '//' + mw.cx.sourceLanguage +
'.wikipedia.org/w/api.php',
dataType: 'jsonp',
// This prevents warnings about the unrecognized
parameter _
cache: true
@@ -230,6 +231,7 @@
// No need to make this error visible beyond logging
deferred.resolve( {} );
} );
+
return deferred.promise();
};
@@ -342,13 +344,15 @@
* @param {string} language Source language code
*/
LinkCard.prototype.prepareSourceLinkCard = function ( title, language )
{
- var linkCard = this;
+ var api,
+ linkCard = this;
if ( !title ) {
return;
}
- getLink( title, language ).done( function ( response ) {
+ api = this.siteMapper.getApi( language );
+ getLink( api, title, language ).done( function ( response ) {
var imgSrc, pageId, page;
pageId = Object.keys( response.query.pages )[ 0 ];
@@ -382,12 +386,15 @@
* @param {string} language Target language code
*/
LinkCard.prototype.prepareTargetLinkCard = function ( title, language )
{
- var linkCard = this;
+ var api,
+ linkCard =
[MediaWiki-commits] [Gerrit] Replace hardcoded wikipedia url in image tool - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163803
Change subject: Replace hardcoded wikipedia url in image tool
..
Replace hardcoded wikipedia url in image tool
Change-Id: I13dbff65d1f5aadda04c13a2388f962bf3b10147
---
M modules/tools/ext.cx.tools.images.js
1 file changed, 4 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/03/163803/1
diff --git a/modules/tools/ext.cx.tools.images.js
b/modules/tools/ext.cx.tools.images.js
index 5dd879d..04d63c3 100644
--- a/modules/tools/ext.cx.tools.images.js
+++ b/modules/tools/ext.cx.tools.images.js
@@ -24,20 +24,19 @@
* @return {jQuery.Promise}
*/
function getImageNamespaceTranslation( targetLanguage ) {
- var api = new mw.Api(),
- deferred = $.Deferred();
+ var deferred = new $.Deferred();
if ( cachedNamespaces[ targetLanguage ] ) {
- return deferred.resolve( cachedNamespaces[
targetLanguage ] );
+ return deferred.resolve( cachedNamespaces[
targetLanguage ] ).promise();
}
- api.get( {
+ // @todo refactor to avoid global reference
+ mw.cx.siteMapper.getApi( targetLanguage ).get( {
action: 'query',
meta: 'siteinfo',
siprop: 'namespaces',
format: 'json'
}, {
- url: '//' + targetLanguage + '.wikipedia.org/w/api.php',
dataType: 'jsonp',
// This prevents warnings about the unrecognized
parameter _
cache: true
--
To view, visit https://gerrit.wikimedia.org/r/163803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13dbff65d1f5aadda04c13a2388f962bf3b10147
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added 'name' value to jsConfigBlock, init cleanup - change (mediawiki...ZeroBanner)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163804
Change subject: Added 'name' value to jsConfigBlock, init cleanup
..
Added 'name' value to jsConfigBlock, init cleanup
* A localized 'name' will be included in the js config block if available
* ext initialization has been cleaned up a bit
Change-Id: Ic4aaf5883496c53e3dc43c22131700d4cdc533b2
---
M ZeroBanner.php
M includes/PageRendering.php
M includes/ZeroSpecialPage.php
3 files changed, 29 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroBanner
refs/changes/04/163804/1
diff --git a/ZeroBanner.php b/ZeroBanner.php
index 2d06d09..f8e34db 100644
--- a/ZeroBanner.php
+++ b/ZeroBanner.php
@@ -26,35 +26,34 @@
'url' = 'https://www.mediawiki.org/wiki/Extension:ZeroBanner',
);
-$cwd = __DIR__ . DIRECTORY_SEPARATOR;
-$wgMessagesDirs['ZeroBanner'] = $cwd . 'i18n';
-$wgExtensionMessagesFiles['ZeroBanner'] = $cwd . 'ZeroBanner.i18n.php';
-$wgExtensionMessagesFiles['ZeroBannerAlias'] = $cwd . ZeroBanner.alias.php;
+$zbDir = __DIR__ . DIRECTORY_SEPARATOR;
+$wgMessagesDirs['ZeroBanner'] = $zbDir . 'i18n';
+$wgExtensionMessagesFiles['ZeroBanner'] = $zbDir . 'ZeroBanner.i18n.php';
+$wgExtensionMessagesFiles['ZeroBannerAlias'] = $zbDir . ZeroBanner.alias.php;
$wgSpecialPages['ZeroRatedMobileAccess'] = 'ZeroBanner\ZeroSpecialPage';
$wgSpecialPageGroups['ZeroRatedMobileAccess'] = 'other';
-$wgExtensionMessagesFiles['ZeroRatedMobileAccessAlias'] = $cwd .
ZeroBanner.alias.php;
+$wgExtensionMessagesFiles['ZeroRatedMobileAccessAlias'] = $zbDir .
ZeroBanner.alias.php;
// autoload extension classes
-$cwd .= 'includes' . DIRECTORY_SEPARATOR;
-$autoloadClasses = array (
- 'ApiRawJsonPrinter' = 'ApiZeroBanner',
- 'ApiZeroBanner' = 'ApiZeroBanner',
- 'MccMncLogging' = 'MccMncLogging',
- 'PageRendering' = 'PageRendering',
- 'PageRenderingHooks' = 'PageRenderingHooks',
- 'ZeroConfig' = 'ZeroConfig',
- 'ZeroSpecialPage' = 'ZeroSpecialPage',
-);
-foreach ( $autoloadClasses as $className = $classFilename ) {
- $wgAutoloadClasses['ZeroBanner\\' . $className] = $cwd . $classFilename
. '.php';
+$zbDir .= 'includes' . DIRECTORY_SEPARATOR;
+foreach ( array(
+ 'ApiRawJsonPrinter' = 'ApiZeroBanner',
+ 'ApiZeroBanner',
+ 'MccMncLogging',
+ 'PageRendering',
+ 'PageRenderingHooks',
+ 'ZeroConfig',
+ 'ZeroSpecialPage',
+ ) as $key = $class ) {
+ $wgAutoloadClasses['ZeroBanner\\' . ( is_string( $key ) ? $key : $class
)] = $zbDir . $class . '.php';
}
+unset( $zbDir );
-$localBasePath = __DIR__;
$remoteExtPath = 'ZeroBanner';
$wgResourceModules['zerobanner.styles'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = 'mobile',
'styles' = array( 'modules/banner.css', 'modules/redux.less' ),
@@ -62,7 +61,7 @@
// this resource is used by the ZeroPortal to display banners on the desktop
site
$wgResourceModules['zerobanner.config.styles'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = array( 'desktop', 'mobile' ),
'styles' = 'modules/banner.css',
@@ -70,9 +69,9 @@
$wgResourceModules['zerobanner'] = array(
'dependencies' = array( 'mobile.stable', 'mobile.templates',
'zerobanner.styles', 'mobile.overlays' ),
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
- 'localTemplateBasePath' = $localBasePath . '/templates',
+ 'localTemplateBasePath' = __DIR__ . '/templates',
'templates' = array( 'interstitial.hogan', 'zeroinfo.hogan' ),
// Use Mantle Resource Loader module
'class' = 'ResourceLoaderTemplateModule',
@@ -97,14 +96,14 @@
);
$wgResourceModules['zerobanner.special.scripts'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = array( 'mobile' ),
'scripts' = array( 'modules/forms.js' ),
);
$wgResourceModules['zerobanner.special.styles'] = array(
- 'localBasePath' = $localBasePath,
+ 'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPath,
'targets' = array( 'mobile' ),
'styles' = array( 'modules/forms.css' ),
diff --git a/includes/PageRendering.php b/includes/PageRendering.php
index 3016b1d..88bcb95 100644
--- a/includes/PageRendering.php
+++ b/includes/PageRendering.php
@@ -70,12 +70,13 @@
}
/**
+* @param \ContextSource|\SpecialPage $ctxSrc
* @param string $id
* @param null|ZeroConfig $config
* @param bool $enabled
[MediaWiki-commits] [Gerrit] Badge selector: Reposition menu when initializing - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163805
Change subject: Badge selector: Reposition menu when initializing
..
Badge selector: Reposition menu when initializing
Instead of at the end of the body, the menu is shown next to badge initially,
providing
user feedback about the menu actually loading.
Change-Id: I47e38eacdcad6851ef5355f288bbcd6095c29095
---
M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/05/163805/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
index 1eab2a6..6ef165c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
@@ -239,6 +239,8 @@
deferred = $.Deferred(),
$menu = this._getMenu();
+ self.repositionMenu();
+
this._fillMenu()
.done( function() {
$menu.children( 'li' ).each( function() {
--
To view, visit https://gerrit.wikimedia.org/r/163805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47e38eacdcad6851ef5355f288bbcd6095c29095
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] badge selector: Adapt styles of existing selectors - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163806
Change subject: badge selector: Adapt styles of existing selectors
..
badge selector: Adapt styles of existing selectors
Change-Id: Iad95dde0080afa2809337f98e48d5bff017527a8
---
M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
M lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
2 files changed, 3 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/06/163806/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
index 6ef165c..2654401 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
@@ -247,7 +247,9 @@
var $li = $( this ),
badgeId = $li.data( self.widgetName +
'-menuitem-badge' );
- $li.toggleClass( 'ui-state-active', $.inArray(
badgeId, self.value() ) !== -1 );
+ $li
+ .addClass( 'ui-menu-item' )
+ .toggleClass( 'ui-state-active', $.inArray(
badgeId, self.value() ) !== -1 );
} );
$menu.hide();
diff --git
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
index 086fe33..2a77766 100644
---
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
+++
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
@@ -14,14 +14,6 @@
z-index: 2; /* Monobook #content has 2 */
}
-.wikibase-badgeselector-menu.ui-widget-content li {
- border: none;
-}
-
-.wikibase-badgeselector-menu li.ui-state-active a:hover {
- text-decoration: underline;
-}
-
.wikibase-badgeselector-menu li a {
display: inline-block;
}
--
To view, visit https://gerrit.wikimedia.org/r/163806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad95dde0080afa2809337f98e48d5bff017527a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] badge selector: Display item id if no label exists - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163807
Change subject: badge selector: Display item id if no label exists
..
badge selector: Display item id if no label exists
Change-Id: Ia1ff367daede7c18f309fea84972781a4d0cc777
---
M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/07/163807/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
index 2654401..84b7eb7 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
@@ -288,9 +288,11 @@
} );
if( item ) {
- $item.text( item.getLabel(
self.options.languageCode ) );
+ $item.text( item.getLabel(
self.options.languageCode ) || item.getId() );
} else {
- $item.append(
wb.utilities.ui.buildMissingEntityInfo( itemId, wb.datamodel.Item.TYPE ) );
+ $item.append(
+
wb.utilities.ui.buildMissingEntityInfo( itemId, wb.datamodel.Item.TYPE )
+ );
}
$( 'li/' )
--
To view, visit https://gerrit.wikimedia.org/r/163807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1ff367daede7c18f309fea84972781a4d0cc777
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for page status indicators - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163808
Change subject: Add support for page status indicators
..
Add support for page status indicators
Depends on I2389ff9a5332a2 and I90a8ae15ac8275d0
Change-Id: Ide9bd37cffcc4c4fd153cfd40b96ea4eaf7ed42b
---
M TranslateUtils.php
M resources/css/ext.translate.helplink.css
2 files changed, 20 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/08/163808/1
diff --git a/TranslateUtils.php b/TranslateUtils.php
index a7151c1..f2e10c9 100644
--- a/TranslateUtils.php
+++ b/TranslateUtils.php
@@ -331,7 +331,7 @@
* @since 2012-01-12
*/
public static function addSpecialHelpLink( OutputPage $out, $to,
$overrideBaseUrl = false ) {
- $out-addModules( 'ext.translate.helplink' );
+ $out-addModuleStyles( 'ext.translate.helplink' );
$text = wfMessage( 'translate-gethelp' )-escaped();
if ( $overrideBaseUrl ) {
@@ -344,11 +344,18 @@
'a',
array(
'href' = $helpUrl,
- 'target' = '_blank'
+ 'target' = '_blank',
+ 'class' = 'mw-translate-helplink',
),
- $text );
- $wrapper = Html::rawElement( 'div', array( 'class' =
'mw-translate-helplink' ), $link );
- $out-addHtml( $wrapper );
+ $text
+ );
+
+ if ( method_exists( $out, 'addIndicators' ) ) {
+ $out-addIndicators( array( 'translate-help' = $link )
);
+ } else {
+ $wrapper = Html::rawElement( 'div', array( 'class' =
'mw-translate-helplink-wrapper' ), $link );
+ $out-addHtml( $wrapper );
+ }
}
/**
diff --git a/resources/css/ext.translate.helplink.css
b/resources/css/ext.translate.helplink.css
index fd521b4..c6887e9 100644
--- a/resources/css/ext.translate.helplink.css
+++ b/resources/css/ext.translate.helplink.css
@@ -1,4 +1,11 @@
.mw-translate-helplink {
+ /* @embed */
+ background: url(../images/help.png) no-repeat scroll left center
transparent;
+ padding-left: 20px;
+}
+
+/* BC for MW = 1.24 */
+.mw-translate-helplink-wrapper {
float: right;
width: 100%;
display: block;
@@ -6,9 +13,6 @@
margin-bottom: -10px;
}
-.mw-translate-helplink a {
- /* @embed */
- background: url(../images/help.png) no-repeat scroll left center
transparent;
- padding-left: 20px;
+.mw-translate-helplink-wrapper .mw-translate-helplink {
float: right;
}
--
To view, visit https://gerrit.wikimedia.org/r/163808
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide9bd37cffcc4c4fd153cfd40b96ea4eaf7ed42b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace hardcoded wikipedia urls in link tool - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace hardcoded wikipedia urls in link tool
..
Replace hardcoded wikipedia urls in link tool
Inject SiteMapper and make getLink to actually return a promise.
Change-Id: I0eb288096b21cce7f19acd96926c40265d4d7dda
---
M modules/tools/ext.cx.tools.link.js
1 file changed, 28 insertions(+), 18 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.link.js
b/modules/tools/ext.cx.tools.link.js
index 6f151a1..7a67676 100644
--- a/modules/tools/ext.cx.tools.link.js
+++ b/modules/tools/ext.cx.tools.link.js
@@ -15,14 +15,17 @@
/**
* Link Card
* @class
+* @param {mw.cx.SiteMapper} siteMapper
*/
- function LinkCard() {
+ function LinkCard( siteMapper ) {
this.$card = null;
this.$removeLink = null;
this.$addLink = null;
this.$link = null;
this.$sourceLinkCard = null;
this.$targetLinkCard = null;
+
+ this.siteMapper = siteMapper;
}
/**
@@ -122,20 +125,20 @@
/**
* Get the link data for a given title and language.
+* @param {mediawiki.Api} api
* @param {string} title
* @param {string} language
* @return {jQuery.Promise}
*/
- function getLink( title, language ) {
- var request, api;
+ function getLink( api, title, language ) {
+ var request;
// Normalize
title = mw.Title.newFromText( title ).toString();
if ( cache[ title ] cache[ title ][ language ] ) {
- return cache[ title ][ language ];
+ return cache[ title ][ language ].promise();
}
- api = new mw.Api();
request = api.get( {
action: 'query',
titles: title,
@@ -145,7 +148,6 @@
redirects: true,
format: 'json'
}, {
- url: '//' + language + '.wikipedia.org/w/api.php',
dataType: 'jsonp',
// This prevents warnings about the unrecognized
parameter _
cache: true
@@ -153,7 +155,8 @@
cache[ title ] = cache[ title ] || {};
cache[ title ][ language ] = request;
- return request;
+
+ return request.promise();
}
/**
@@ -175,14 +178,13 @@
* @return {jQuery.Promise}
*/
LinkCard.prototype.adapt = function ( titles, language ) {
- var api, deferred;
+ var deferred = $.Deferred();
- api = new mw.Api();
- deferred = $.Deferred();
if ( !$.isArray( titles ) ) {
titles = new Array( titles );
}
- api.get( {
+
+ this.siteMapper.getApi( mw.cx.sourceLanguage ).get( {
action: 'query',
titles: titles.join( '|' ),
prop: 'langlinks',
@@ -190,7 +192,6 @@
redirects: true,
format: 'json'
}, {
- url: '//' + mw.cx.sourceLanguage +
'.wikipedia.org/w/api.php',
dataType: 'jsonp',
// This prevents warnings about the unrecognized
parameter _
cache: true
@@ -230,6 +231,7 @@
// No need to make this error visible beyond logging
deferred.resolve( {} );
} );
+
return deferred.promise();
};
@@ -342,13 +344,15 @@
* @param {string} language Source language code
*/
LinkCard.prototype.prepareSourceLinkCard = function ( title, language )
{
- var linkCard = this;
+ var api,
+ linkCard = this;
if ( !title ) {
return;
}
- getLink( title, language ).done( function ( response ) {
+ api = this.siteMapper.getApi( language );
+ getLink( api, title, language ).done( function ( response ) {
var imgSrc, pageId, page;
pageId = Object.keys( response.query.pages )[ 0 ];
@@ -382,12 +386,15 @@
* @param {string} language Target language code
*/
LinkCard.prototype.prepareTargetLinkCard = function ( title, language )
{
- var linkCard = this;
+ var api,
+ linkCard = this;
if ( !title ) {
return;
[MediaWiki-commits] [Gerrit] Replace hardcoded wikipedia url in image tool - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace hardcoded wikipedia url in image tool
..
Replace hardcoded wikipedia url in image tool
Change-Id: I13dbff65d1f5aadda04c13a2388f962bf3b10147
---
M modules/tools/ext.cx.tools.images.js
1 file changed, 4 insertions(+), 5 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.images.js
b/modules/tools/ext.cx.tools.images.js
index 5dd879d..04d63c3 100644
--- a/modules/tools/ext.cx.tools.images.js
+++ b/modules/tools/ext.cx.tools.images.js
@@ -24,20 +24,19 @@
* @return {jQuery.Promise}
*/
function getImageNamespaceTranslation( targetLanguage ) {
- var api = new mw.Api(),
- deferred = $.Deferred();
+ var deferred = new $.Deferred();
if ( cachedNamespaces[ targetLanguage ] ) {
- return deferred.resolve( cachedNamespaces[
targetLanguage ] );
+ return deferred.resolve( cachedNamespaces[
targetLanguage ] ).promise();
}
- api.get( {
+ // @todo refactor to avoid global reference
+ mw.cx.siteMapper.getApi( targetLanguage ).get( {
action: 'query',
meta: 'siteinfo',
siprop: 'namespaces',
format: 'json'
}, {
- url: '//' + targetLanguage + '.wikipedia.org/w/api.php',
dataType: 'jsonp',
// This prevents warnings about the unrecognized
parameter _
cache: true
--
To view, visit https://gerrit.wikimedia.org/r/163803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13dbff65d1f5aadda04c13a2388f962bf3b10147
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift_new: include role::swift::base - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163809
Change subject: swift_new: include role::swift::base
..
swift_new: include role::swift::base
The new swift roles did not include role::swift::base, which includes
the standard base class.
Change-Id: I58ae101dc806c806b1f721bba7ef2bc67c66427c
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/role/swift.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/163809/1
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 9547217..870ac35 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -322,6 +322,8 @@
# initially only codfw, to be followed by esams and eqiad
class role::swift::stats_reporter {
+include role::swift::base
+
system::role { 'role::swift::stats_reporter':
description = 'swift statistics reporter',
}
@@ -332,6 +334,8 @@
}
class role::swift::proxy {
+include role::swift::base
+
system::role { 'role::swift::proxy':
description = 'swift frontend proxy',
}
@@ -360,6 +364,8 @@
class role::swift::storage {
+include role::swift::base
+
system::role { 'role::swift::proxy':
description = 'swift storage brick',
}
--
To view, visit https://gerrit.wikimedia.org/r/163809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58ae101dc806c806b1f721bba7ef2bc67c66427c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert i18n to JSON - change (mediawiki...MobileDetect)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163810
Change subject: Convert i18n to JSON
..
Convert i18n to JSON
While I am at it: Remove . from end of sentence for consistency
Change-Id: I60fd92a690be3a2320c1c11b7de85feac55a1695
---
M MobileDetect.i18n.php
M MobileDetect.php
A i18n/en.json
A i18n/es.json
A i18n/qqq.json
5 files changed, 53 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileDetect
refs/changes/10/163810/1
diff --git a/MobileDetect.i18n.php b/MobileDetect.i18n.php
index 8a227a1..3eaa541 100644
--- a/MobileDetect.i18n.php
+++ b/MobileDetect.i18n.php
@@ -1,30 +1,35 @@
?php
/**
- * Internationalisation for MobileDetect extension
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
*
- * @file
- * @ingroup Extensions
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
*/
-
$messages = array();
+if ( !function_exists( 'wfJsonI18nShim9f9518fdf44e8f14' ) ) {
+ function wfJsonI18nShim9f9518fdf44e8f14( $cache, $code, $cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
-/** English
- * @author Luis Felipe Schenone
- */
-$messages['en'] = array(
- 'mobiledetect-desc' = 'Detects mobile devices and allows to control
the content visible in each case with the lt;nomobilegt; and
lt;mobileonlygt; tags.',
-);
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
-/** Message documentation (Message documentation)
- * @author Luis Felipe Schenone
- */
-$messages['qqq'] = array(
- 'mobiledetect-desc' =
'{{desc|name=MobileDetect|url=https://www.mediawiki.org/wiki/Extension:MobileDetect}}',
-);
-
-/** Spanish (español)
- * @author Luis Felipe Schenone
- */
-$messages['es'] = array(
- 'mobiledetect-desc' = 'Detecta dispositivos móbiles y permite
controlar el contenido visible en cada caso con las etiquetas lt;nomobilegt;
y lt;mobileonlygt;',
-);
\ No newline at end of file
+ $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim9f9518fdf44e8f14';
+}
diff --git a/MobileDetect.php b/MobileDetect.php
index 39e9126..6859c69 100644
--- a/MobileDetect.php
+++ b/MobileDetect.php
@@ -10,6 +10,7 @@
);
$wgExtensionMessagesFiles['MobileDetect'] = __DIR__ . '/MobileDetect.i18n.php';
+$wgMessagesDirs['MobileDetect'] = __DIR__ . '/i18n';
$wgAutoloadClasses['MobileDetect'] = __DIR__ . '/MobileDetect.body.php';
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..72b369f
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Luis Felipe Schenone
+ ]
+ },
+ mobiledetect-desc: Detects mobile devices and allows to control the
content visible in each case with the lt;nomobilegt; and lt;mobileonlygt;
tags
+}
diff --git a/i18n/es.json b/i18n/es.json
new file mode 100644
index 000..2cb1063
--- /dev/null
+++ b/i18n/es.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Luis Felipe Schenone
+ ]
+ },
+ mobiledetect-desc: Detecta dispositivos móbiles y permite controlar
el contenido visible en cada caso con las etiquetas lt;nomobilegt; y
lt;mobileonlygt;
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..7bf8b3d
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Luis Felipe Schenone
+ ]
+ },
+ mobiledetect-desc:
{{desc|name=MobileDetect|url=https://www.mediawiki.org/wiki/Extension:MobileDetect}};
+}
--
[MediaWiki-commits] [Gerrit] [GlobalUserPage] Register separate i18n file for central wiki - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/163811 Change subject: [GlobalUserPage] Register separate i18n file for central wiki .. [GlobalUserPage] Register separate i18n file for central wiki https://gerrit.wikimedia.org/r/#/c/159112/ Change-Id: Ic62db043405ff1a6bbef2a1f1690cc09cabddac6 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/11/163811/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 1a2866d..3ce11fc 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -995,6 +995,9 @@ Global User Page +Global User Page - Central +file = GlobalUserPage/i18n-central/%CODE%.json + Global Userrights # Aliases conflict with CentralAuth's #aliasfile = GlobalUserrights/GlobalUserrights.alias.php -- To view, visit https://gerrit.wikimedia.org/r/163811 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic62db043405ff1a6bbef2a1f1690cc09cabddac6 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [GlobalUserPage] Register separate i18n file for central wiki - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [GlobalUserPage] Register separate i18n file for central wiki .. [GlobalUserPage] Register separate i18n file for central wiki https://gerrit.wikimedia.org/r/#/c/159112/ Change-Id: Ic62db043405ff1a6bbef2a1f1690cc09cabddac6 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 1a2866d..3ce11fc 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -995,6 +995,9 @@ Global User Page +Global User Page - Central +file = GlobalUserPage/i18n-central/%CODE%.json + Global Userrights # Aliases conflict with CentralAuth's #aliasfile = GlobalUserrights/GlobalUserrights.alias.php -- To view, visit https://gerrit.wikimedia.org/r/163811 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic62db043405ff1a6bbef2a1f1690cc09cabddac6 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@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] Reenable Apache lint check - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163812 Change subject: Reenable Apache lint check .. Reenable Apache lint check The MediaWiki apache lint checker has been broken since we migrated the configuration files from operations/apache-config.git to Puppet. * Use Zuul cloner so we can trigger the job from both repositories. * Instrucsts Zuul cloner that operations/puppet fallback branch is named 'production' * Tweak the configuration files using sed. That is not ideal honestly. Updates job operations-apache-config-lint Bug: 70068 Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b --- M operations-apache-config.yaml 1 file changed, 30 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/12/163812/1 diff --git a/operations-apache-config.yaml b/operations-apache-config.yaml index e3b1813..73810ba 100644 --- a/operations-apache-config.yaml +++ b/operations-apache-config.yaml @@ -1,25 +1,20 @@ - job-template: name: 'operations-apache-config-lint' -defaults: use-remote-zuul # only works there cause it needs mod_rewrite which is not on other slaves # apparently. node: gallium - triggers: - zuul builders: - # Snapshot operations/mediawiki-config.git which contains - # the Apache document roots. + # Phase 1, assert redirects.dat has been updated + - zuul-cloner: + projects: --project-branch operations/puppet=production operations/puppet - shell: | -git archive \ ---remote=/srv/ssd/gerrit/operations/mediawiki-config.git \ ---prefix=mediawiki-config/ \ -master \ -| ( cd $WORKSPACE tar xf -) - - - shell: | +#!/bin/bash -eu echo Regenerating redirects.conf should not have changed +cd src/operations/puppet/modules/mediawiki/files/apache/sites/redirects + ./refreshDomainRedirects set +e @@ -35,16 +30,35 @@ echo Continuing.. fi + # Phase2, lint Apache configuration files + - zuul-cloner: + projects: operations/mediawiki-config + - shell: | -/bin/sed -i s%/etc/apache2/[^/]*/%% *.conf -/bin/sed -i s%/usr/local/apache/conf/%% *.conf -/bin/sed -i s%/usr/local/apache/common/%$WORKSPACE/mediawiki-config/% *.conf +#!/bin/bash -eu +export CI_APACHE_SERVER_ROOT=$WORKSPACE/src/operations/puppet/modules/mediawiki/files/apache + +# Generate list of .conf files +find $CI_APACHE_SERVER_ROOT -type f -name '*.conf' apache_files.txt +# Pass commands on them +while read apache_file; do +echo Tweaking $apache_file +/bin/sed -i s%/etc/apache2/[^/]*/%$CI_APACHE_SERVER_ROOT% $apache_file +/bin/sed -i s%/srv/mediawiki/%$WORKSPACE/src/operations/mediawiki-config/% $apache_file +done apache_files.txt + +# Hijack unexisting 'apache' username +/bin/sed -i -r s/(User|Group) apache/\1 $USER/ \ +$CI_APACHE_SERVER_ROOT/apache2.conf + +ln -s $CI_APACHE_SERVER_ROOT/sites $CI_APACHE_SERVER_ROOT/sites-enabled + /usr/sbin/apache2 -t \ --d $WORKSPACE \ +-d $CI_APACHE_SERVER_ROOT \ -C 'Include /etc/apache2/mods-enabled/*.load' \ -C 'Include /etc/apache2/mods-enabled/*.conf' \ -C 'Include /etc/apache2/mods-available/expires.load' \ --f all.conf +-f apache2.conf - project: name: 'operations-apache-config' -- To view, visit https://gerrit.wikimedia.org/r/163812 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Retrigger operations-apache-config-lint (non voting) - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163813 Change subject: Retrigger operations-apache-config-lint (non voting) .. Retrigger operations-apache-config-lint (non voting) The MediaWiki apache lint checker has been broken since we migrated the configuration files from operations/apache-config.git to Puppet. Triggers operations-apache-config-lint from the two repositories: operations/puppet operations/mediawiki-config Made non voting for now. Bug: 70068 Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b --- M layout.yaml 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/13/163813/1 diff --git a/layout.yaml b/layout.yaml index f2f6fde..68901d9 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1461,7 +1461,7 @@ - '^.*\.(pl|pm)$' - name: operations-apache-config-lint -branch: ^master$ +voting: false - name: operations-puppet-puppetlint-lenient voting: false @@ -2357,9 +2357,11 @@ test: - operations-mw-config-phplint - operations-mw-config-tests + - operations-apache-config-lint gate-and-submit: - operations-mw-config-phplint - operations-mw-config-tests + - operations-apache-config-lint postmerge: - beta-mediawiki-config-update-eqiad @@ -2375,9 +2377,10 @@ - operations-puppet-typos # Same for trusted user test: - # rspec unit testing! + # testing - operations-puppet-spec - operations-puppet-tox-data_admin_lint + - operations-apache-config-lint # Same as `check` pipeline: - operations-puppet-erblint-HEAD - operations-puppet-pplint-HEAD -- To view, visit https://gerrit.wikimedia.org/r/163813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert i18n to JSON - change (mediawiki...MobileDetect)
Luis Felipe Schenone has submitted this change and it was merged.
Change subject: Convert i18n to JSON
..
Convert i18n to JSON
While I am at it: Remove . from end of sentence for consistency
Change-Id: I60fd92a690be3a2320c1c11b7de85feac55a1695
---
M MobileDetect.i18n.php
M MobileDetect.php
A i18n/en.json
A i18n/es.json
A i18n/qqq.json
5 files changed, 53 insertions(+), 23 deletions(-)
Approvals:
Luis Felipe Schenone: Verified; Looks good to me, approved
diff --git a/MobileDetect.i18n.php b/MobileDetect.i18n.php
index 8a227a1..3eaa541 100644
--- a/MobileDetect.i18n.php
+++ b/MobileDetect.i18n.php
@@ -1,30 +1,35 @@
?php
/**
- * Internationalisation for MobileDetect extension
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
*
- * @file
- * @ingroup Extensions
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
*/
-
$messages = array();
+if ( !function_exists( 'wfJsonI18nShim9f9518fdf44e8f14' ) ) {
+ function wfJsonI18nShim9f9518fdf44e8f14( $cache, $code, $cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
-/** English
- * @author Luis Felipe Schenone
- */
-$messages['en'] = array(
- 'mobiledetect-desc' = 'Detects mobile devices and allows to control
the content visible in each case with the lt;nomobilegt; and
lt;mobileonlygt; tags.',
-);
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
-/** Message documentation (Message documentation)
- * @author Luis Felipe Schenone
- */
-$messages['qqq'] = array(
- 'mobiledetect-desc' =
'{{desc|name=MobileDetect|url=https://www.mediawiki.org/wiki/Extension:MobileDetect}}',
-);
-
-/** Spanish (español)
- * @author Luis Felipe Schenone
- */
-$messages['es'] = array(
- 'mobiledetect-desc' = 'Detecta dispositivos móbiles y permite
controlar el contenido visible en cada caso con las etiquetas lt;nomobilegt;
y lt;mobileonlygt;',
-);
\ No newline at end of file
+ $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim9f9518fdf44e8f14';
+}
diff --git a/MobileDetect.php b/MobileDetect.php
index 39e9126..6859c69 100644
--- a/MobileDetect.php
+++ b/MobileDetect.php
@@ -10,6 +10,7 @@
);
$wgExtensionMessagesFiles['MobileDetect'] = __DIR__ . '/MobileDetect.i18n.php';
+$wgMessagesDirs['MobileDetect'] = __DIR__ . '/i18n';
$wgAutoloadClasses['MobileDetect'] = __DIR__ . '/MobileDetect.body.php';
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..72b369f
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Luis Felipe Schenone
+ ]
+ },
+ mobiledetect-desc: Detects mobile devices and allows to control the
content visible in each case with the lt;nomobilegt; and lt;mobileonlygt;
tags
+}
diff --git a/i18n/es.json b/i18n/es.json
new file mode 100644
index 000..2cb1063
--- /dev/null
+++ b/i18n/es.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Luis Felipe Schenone
+ ]
+ },
+ mobiledetect-desc: Detecta dispositivos móbiles y permite controlar
el contenido visible en cada caso con las etiquetas lt;nomobilegt; y
lt;mobileonlygt;
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..7bf8b3d
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Luis Felipe Schenone
+ ]
+ },
+ mobiledetect-desc:
{{desc|name=MobileDetect|url=https://www.mediawiki.org/wiki/Extension:MobileDetect}};
+}
--
To view, visit https://gerrit.wikimedia.org/r/163810
To
[MediaWiki-commits] [Gerrit] Retrigger operations-apache-config-lint (non voting) - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Retrigger operations-apache-config-lint (non voting) .. Retrigger operations-apache-config-lint (non voting) The MediaWiki apache lint checker has been broken since we migrated the configuration files from operations/apache-config.git to Puppet. Triggers operations-apache-config-lint from the two repositories: operations/puppet operations/mediawiki-config Made non voting for now. Bug: 70068 Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b --- M layout.yaml 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index f2f6fde..68901d9 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1461,7 +1461,7 @@ - '^.*\.(pl|pm)$' - name: operations-apache-config-lint -branch: ^master$ +voting: false - name: operations-puppet-puppetlint-lenient voting: false @@ -2357,9 +2357,11 @@ test: - operations-mw-config-phplint - operations-mw-config-tests + - operations-apache-config-lint gate-and-submit: - operations-mw-config-phplint - operations-mw-config-tests + - operations-apache-config-lint postmerge: - beta-mediawiki-config-update-eqiad @@ -2375,9 +2377,10 @@ - operations-puppet-typos # Same for trusted user test: - # rspec unit testing! + # testing - operations-puppet-spec - operations-puppet-tox-data_admin_lint + - operations-apache-config-lint # Same as `check` pipeline: - operations-puppet-erblint-HEAD - operations-puppet-pplint-HEAD -- To view, visit https://gerrit.wikimedia.org/r/163813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (operations/mediawiki-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163815 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/15/163815/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/163815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163814 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/14/163814/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/163814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: check device, not partition for xfs - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163816
Change subject: swift: check device, not partition for xfs
..
swift: check device, not partition for xfs
Change-Id: Ica4a8e68e0256423e9ea7ddd872428e5887c6797
---
M modules/swift_new/manifests/init_device.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/163816/1
diff --git a/modules/swift_new/manifests/init_device.pp
b/modules/swift_new/manifests/init_device.pp
index 95685c6..c6b8c27 100644
--- a/modules/swift_new/manifests/init_device.pp
+++ b/modules/swift_new/manifests/init_device.pp
@@ -24,7 +24,7 @@
path= '/sbin/:/usr/sbin/',
require = Package['xfsprogs'],
before = Exec[parted-${title}],
-unless = xfs_admin -l ${title},
+unless = xfs_admin -l ${dev},
}
swift_new::label_filesystem { $dev:
--
To view, visit https://gerrit.wikimedia.org/r/163816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica4a8e68e0256423e9ea7ddd872428e5887c6797
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: check device, not partition for xfs - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: check device, not partition for xfs
..
swift: check device, not partition for xfs
Change-Id: Ica4a8e68e0256423e9ea7ddd872428e5887c6797
---
M modules/swift_new/manifests/init_device.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/swift_new/manifests/init_device.pp
b/modules/swift_new/manifests/init_device.pp
index 95685c6..c6b8c27 100644
--- a/modules/swift_new/manifests/init_device.pp
+++ b/modules/swift_new/manifests/init_device.pp
@@ -24,7 +24,7 @@
path= '/sbin/:/usr/sbin/',
require = Package['xfsprogs'],
before = Exec[parted-${title}],
-unless = xfs_admin -l ${title},
+unless = xfs_admin -l ${dev},
}
swift_new::label_filesystem { $dev:
--
To view, visit https://gerrit.wikimedia.org/r/163816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica4a8e68e0256423e9ea7ddd872428e5887c6797
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] When MT is user-disabled, fill sections with empty content - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163818
Change subject: When MT is user-disabled, fill sections with empty content
..
When MT is user-disabled, fill sections with empty content
Changed the second parameter of mw.cx.translation.add for increased
flexibility. Removed reference to undefined showRestore. Made it so
that restore is not shown if MT is usre-disabled.
Change-Id: I5c1a4e0455062ca4a6e36f85dca5d02bdf8f2624
---
M hooks.md
M modules/tools/ext.cx.tools.mt.js
M modules/translation/ext.cx.translation.js
3 files changed, 38 insertions(+), 22 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/18/163818/1
diff --git a/hooks.md b/hooks.md
index 03773f2..cd17b59 100644
--- a/hooks.md
+++ b/hooks.md
@@ -88,7 +88,7 @@
## mw.cx.translation.add
-Used to trigger the pre-translation for a source section. Source section id is
passed as argument. Second argument is a boolean which controls whether machine
translation should be applied to the text. The translation module listens for
this.
+Used to trigger the pre-translation for a source section. Source section id is
passed as argument. Second argument is a string which explains what action is
appropriate. Known values are: clear, click, mt-disabled, non-editable,
restore, service-failure.
## mw.cx.translation.change
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 29e783d..f9b4be4 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -70,7 +70,9 @@
$provider: MTControlCard.provider
} );
- return $.post( mtURL, sourceHtml );
+ return $.post( mtURL, sourceHtml ).then( null, function () {
+ return new $.Deferred().reject( 'service-failure',
arguments ).promise();
+ } );
}
function markMTLoading( $section ) {
@@ -112,9 +114,13 @@
translateSection( $section );
} );
}
- // Check if the section is ediable or provider is disabled
- if ( MTControlCard.provider === disableMT || $section.data(
'editable' ) === false ) {
- return $.Deferred().reject().promise();
+
+ if ( MTControlCard.provider === disableMT ) {
+ return $.Deferred().reject( 'mt-disabled' ).promise();
+ }
+
+ if ( $section.data( 'editable' ) === false ) {
+ return $.Deferred().reject( 'non-editable' ).promise();
}
sectionId = $section.prop( 'id' );
@@ -166,8 +172,8 @@
$section = $( '#cx' + sourceId );
}
} )
- .fail( function () {
- mw.hook( 'mw.cx.translation.add' ).fire(
sourceId, false );
+ .fail( function ( reason ) {
+ mw.hook( 'mw.cx.translation.add' ).fire(
sourceId, reason );
} )
.always( function () {
$section.data( 'cx-mt', true );
@@ -247,7 +253,7 @@
MTControlCard.prototype.useSource = function () {
var sourceId = this.$section.data( 'source' );
// Use the source without machine translation
- mw.hook( 'mw.cx.translation.add' ).fire( sourceId, false );
+ mw.hook( 'mw.cx.translation.add' ).fire( sourceId, 'source' );
};
/**
@@ -258,7 +264,7 @@
MTControlCard.prototype.restoreTranslation = function () {
var sourceId = this.$section.data( 'source' );
// Use the source without machine translation
- mw.hook( 'mw.cx.translation.add' ).fire( sourceId, true );
+ mw.hook( 'mw.cx.translation.add' ).fire( sourceId, 'restore' );
this.stop();
};
@@ -298,8 +304,6 @@
this.$restore
.on( 'click', $.proxy( this.restoreTranslation, this )
);
-
- mw.hook( 'mw.cx.translation.change' ).add( $.proxy(
this.showRestore, this ) );
};
MTControlCard.prototype.buildProvidersMenu = function () {
@@ -371,7 +375,7 @@
this.$section = $section;
this.selectProvider( MTControlCard.provider );
- if ( this.$section.data( 'cx-mt' ) ) {
+ if ( this.$section.data( 'cx-mt' ) || MTControlCard.provider
=== disableMT ) {
this.$restore.addClass( 'hidden' );
} else {
this.$restore.removeClass( 'hidden' );
diff --git a/modules/translation/ext.cx.translation.js
[MediaWiki-commits] [Gerrit] Remove legacy mediawiki core jobs - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163817 Change subject: Remove legacy mediawiki core jobs .. Remove legacy mediawiki core jobs Stop triggering mediawiki-core-phpunit* and mediawiki-core-install-sqlite jobs. They are superseeded by the Zuul cloner based job mediawiki-vendor-integration which runs the whole test suite. The job pass on wmf branches. Change-Id: Idf44bb9e6256818660cb04f090cf72dcbde0f421 --- M layout.yaml 1 file changed, 0 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/17/163817/1 diff --git a/layout.yaml b/layout.yaml index 68901d9..b19ad6c 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1547,7 +1547,6 @@ branch: ^(master|REL.*)$ # bug 50325 - name: mediawiki-vendor-integration -branch: ^(master|REL.*)$ # probably fails on wmf branches queue-name: mediawiki - name: mediawiki-core-qunit @@ -1555,12 +1554,6 @@ # (times out or doesn't start in the first place). branch: (?!REL1_19) queue-name: mediawiki - - # Old splitted phpunit jobs superseeded by mediawiki-vendor-integration - - name: ^mediawiki-core-phpunit-.*$ -branch: ^(?!master|REL.*) # covered by mediawiki-vendor-integration - - name: ^mediawiki-core-install-.*$ -branch: ^(?!master|REL.*) # covered by mediawiki-vendor-integration - name: ^mwext-Wikibase-qunit$ voting: false @@ -1827,12 +1820,7 @@ - mediawiki-core-npm - mediawiki-core-phplint: - mediawiki-vendor-integration -- mediawiki-core-phpunit-databaseless - mediawiki-core-qunit -- mediawiki-core-install-sqlite: - - mediawiki-core-phpunit-api - - mediawiki-core-phpunit-misc - - mediawiki-core-phpunit-parser - mediawiki-core-ruby1.9.3lint - php-composer-validate gate-and-submit: @@ -1844,12 +1832,7 @@ - mediawiki-core-npm - mediawiki-core-phplint: - mediawiki-vendor-integration -- mediawiki-core-phpunit-databaseless - mediawiki-core-qunit -- mediawiki-core-install-sqlite: - - mediawiki-core-phpunit-api - - mediawiki-core-phpunit-misc - - mediawiki-core-phpunit-parser - mediawiki-core-ruby1.9.3lint - php-composer-validate experimental: -- To view, visit https://gerrit.wikimedia.org/r/163817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf44bb9e6256818660cb04f090cf72dcbde0f421 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove legacy mediawiki core jobs - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Remove legacy mediawiki core jobs .. Remove legacy mediawiki core jobs Stop triggering mediawiki-core-phpunit* and mediawiki-core-install-sqlite jobs. They are superseeded by the Zuul cloner based job mediawiki-vendor-integration which runs the whole test suite. The job pass on wmf branches. Change-Id: Idf44bb9e6256818660cb04f090cf72dcbde0f421 --- M layout.yaml 1 file changed, 0 insertions(+), 17 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 68901d9..b19ad6c 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1547,7 +1547,6 @@ branch: ^(master|REL.*)$ # bug 50325 - name: mediawiki-vendor-integration -branch: ^(master|REL.*)$ # probably fails on wmf branches queue-name: mediawiki - name: mediawiki-core-qunit @@ -1555,12 +1554,6 @@ # (times out or doesn't start in the first place). branch: (?!REL1_19) queue-name: mediawiki - - # Old splitted phpunit jobs superseeded by mediawiki-vendor-integration - - name: ^mediawiki-core-phpunit-.*$ -branch: ^(?!master|REL.*) # covered by mediawiki-vendor-integration - - name: ^mediawiki-core-install-.*$ -branch: ^(?!master|REL.*) # covered by mediawiki-vendor-integration - name: ^mwext-Wikibase-qunit$ voting: false @@ -1827,12 +1820,7 @@ - mediawiki-core-npm - mediawiki-core-phplint: - mediawiki-vendor-integration -- mediawiki-core-phpunit-databaseless - mediawiki-core-qunit -- mediawiki-core-install-sqlite: - - mediawiki-core-phpunit-api - - mediawiki-core-phpunit-misc - - mediawiki-core-phpunit-parser - mediawiki-core-ruby1.9.3lint - php-composer-validate gate-and-submit: @@ -1844,12 +1832,7 @@ - mediawiki-core-npm - mediawiki-core-phplint: - mediawiki-vendor-integration -- mediawiki-core-phpunit-databaseless - mediawiki-core-qunit -- mediawiki-core-install-sqlite: - - mediawiki-core-phpunit-api - - mediawiki-core-phpunit-misc - - mediawiki-core-phpunit-parser - mediawiki-core-ruby1.9.3lint - php-composer-validate experimental: -- To view, visit https://gerrit.wikimedia.org/r/163817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf44bb9e6256818660cb04f090cf72dcbde0f421 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@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] Remove legacy mediawiki core jobs - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163819
Change subject: Remove legacy mediawiki core jobs
..
Remove legacy mediawiki core jobs
Superseeded by mediawiki-vendor-integration which supports
mediawiki/vendor and runs all PHPUnit tests.
Removes:
'{name}-install-{databasetype}'
Change-Id: I2b8f7b20bb74b7b6df10b50a06648766cb498cbc
---
M mediawiki.yaml
1 file changed, 0 insertions(+), 21 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/19/163819/1
diff --git a/mediawiki.yaml b/mediawiki.yaml
index df24a17..37f8c81 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -197,24 +197,6 @@
logrotate:
daysToKeep: 90
-# A job template to install MediaWiki against a specific DB backend
-#
-# @param name name Jenkins job prefix to use
-# @param databasetype Suffix for an ant target 'installdb-{databasetype}'
-- job-template:
-name: '{name}-install-{databasetype}'
-defaults: use-zuul
-logrotate:
-daysToKeep: 15
-scm:
- - git-mwcore
-triggers:
- - zuul
-
-builders:
- # FIXME no more supports databasetype
- - mw-install-sqlite
-
- job-template:
name: 'mediawiki-core-release'
concurrent: true
@@ -265,7 +247,6 @@
- '{name}-phpcs-strict'
- '{name}-phpcs-strict-HEAD'
- '{name}-phpunit-{phpunit-group}'
- - '{name}-install-{databasetype}'
- project:
name: mediawiki-core
@@ -274,8 +255,6 @@
- databaseless
- misc
- parser
-databasetype:
- - sqlite
jobs:
- '{name}-phplint'
- mediawiki-gate
--
To view, visit https://gerrit.wikimedia.org/r/163819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b8f7b20bb74b7b6df10b50a06648766cb498cbc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove legacy mediawiki core jobs - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163820
Change subject: Remove legacy mediawiki core jobs
..
Remove legacy mediawiki core jobs
Superseeded by mediawiki-vendor-integration which supports
mediawiki/vendor and runs all PHPUnit tests.
Removes:
'{name}-install-{databasetype}'
Change-Id: Idf44bb9e6256818660cb04f090cf72dcbde0f421
---
M mediawiki.yaml
1 file changed, 0 insertions(+), 21 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/20/163820/1
diff --git a/mediawiki.yaml b/mediawiki.yaml
index df24a17..37f8c81 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -197,24 +197,6 @@
logrotate:
daysToKeep: 90
-# A job template to install MediaWiki against a specific DB backend
-#
-# @param name name Jenkins job prefix to use
-# @param databasetype Suffix for an ant target 'installdb-{databasetype}'
-- job-template:
-name: '{name}-install-{databasetype}'
-defaults: use-zuul
-logrotate:
-daysToKeep: 15
-scm:
- - git-mwcore
-triggers:
- - zuul
-
-builders:
- # FIXME no more supports databasetype
- - mw-install-sqlite
-
- job-template:
name: 'mediawiki-core-release'
concurrent: true
@@ -265,7 +247,6 @@
- '{name}-phpcs-strict'
- '{name}-phpcs-strict-HEAD'
- '{name}-phpunit-{phpunit-group}'
- - '{name}-install-{databasetype}'
- project:
name: mediawiki-core
@@ -274,8 +255,6 @@
- databaseless
- misc
- parser
-databasetype:
- - sqlite
jobs:
- '{name}-phplint'
- mediawiki-gate
--
To view, visit https://gerrit.wikimedia.org/r/163820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf44bb9e6256818660cb04f090cf72dcbde0f421
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add metilli.com to wgCopyUploadsDomains - change (operations/mediawiki-config)
Mushroom has uploaded a new change for review. https://gerrit.wikimedia.org/r/163821 Change subject: Add metilli.com to wgCopyUploadsDomains .. Add metilli.com to wgCopyUploadsDomains Add domain metilli.com to the whitelist in order to allow Wikipedian in Residence User:Mushroom to upload images of public domain artworks preserved at the Mart Museum in Italy using GWToolset. Bug: 71460 Change-Id: I5dcb0bcc8d2843404cf7df78cdbd5d8696f43ed7 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/21/163821/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index dfc35c9..87a04e1 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10727,6 +10727,7 @@ 'www.veikkos-archiv.com', // Veikkos-archiv - bug 69777 '*.scienceimage.csiro.au', // CSIRO - bug 70771 '*.beeldbank.cultureelerfgoed.nl', // Cultureel Erfgoed - bug 70840 + '*.metilli.com',// Mart Museum - bug 71460 ), ), -- To view, visit https://gerrit.wikimedia.org/r/163821 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5dcb0bcc8d2843404cf7df78cdbd5d8696f43ed7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Mushroom wikimushr...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] When MT is user-disabled, fill sections with empty content - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: When MT is user-disabled, fill sections with empty content
..
When MT is user-disabled, fill sections with empty content
Changed the second parameter of mw.cx.translation.add for increased
flexibility. Removed reference to undefined showRestore. Made it so
that restore is not shown if MT is user-disabled.
Change-Id: I5c1a4e0455062ca4a6e36f85dca5d02bdf8f2624
---
M hooks.md
M modules/tools/ext.cx.tools.mt.js
M modules/translation/ext.cx.translation.js
3 files changed, 34 insertions(+), 22 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hooks.md b/hooks.md
index 03773f2..cd17b59 100644
--- a/hooks.md
+++ b/hooks.md
@@ -88,7 +88,7 @@
## mw.cx.translation.add
-Used to trigger the pre-translation for a source section. Source section id is
passed as argument. Second argument is a boolean which controls whether machine
translation should be applied to the text. The translation module listens for
this.
+Used to trigger the pre-translation for a source section. Source section id is
passed as argument. Second argument is a string which explains what action is
appropriate. Known values are: clear, click, mt-disabled, non-editable,
restore, service-failure.
## mw.cx.translation.change
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 29e783d..f9b4be4 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -70,7 +70,9 @@
$provider: MTControlCard.provider
} );
- return $.post( mtURL, sourceHtml );
+ return $.post( mtURL, sourceHtml ).then( null, function () {
+ return new $.Deferred().reject( 'service-failure',
arguments ).promise();
+ } );
}
function markMTLoading( $section ) {
@@ -112,9 +114,13 @@
translateSection( $section );
} );
}
- // Check if the section is ediable or provider is disabled
- if ( MTControlCard.provider === disableMT || $section.data(
'editable' ) === false ) {
- return $.Deferred().reject().promise();
+
+ if ( MTControlCard.provider === disableMT ) {
+ return $.Deferred().reject( 'mt-disabled' ).promise();
+ }
+
+ if ( $section.data( 'editable' ) === false ) {
+ return $.Deferred().reject( 'non-editable' ).promise();
}
sectionId = $section.prop( 'id' );
@@ -166,8 +172,8 @@
$section = $( '#cx' + sourceId );
}
} )
- .fail( function () {
- mw.hook( 'mw.cx.translation.add' ).fire(
sourceId, false );
+ .fail( function ( reason ) {
+ mw.hook( 'mw.cx.translation.add' ).fire(
sourceId, reason );
} )
.always( function () {
$section.data( 'cx-mt', true );
@@ -247,7 +253,7 @@
MTControlCard.prototype.useSource = function () {
var sourceId = this.$section.data( 'source' );
// Use the source without machine translation
- mw.hook( 'mw.cx.translation.add' ).fire( sourceId, false );
+ mw.hook( 'mw.cx.translation.add' ).fire( sourceId, 'source' );
};
/**
@@ -258,7 +264,7 @@
MTControlCard.prototype.restoreTranslation = function () {
var sourceId = this.$section.data( 'source' );
// Use the source without machine translation
- mw.hook( 'mw.cx.translation.add' ).fire( sourceId, true );
+ mw.hook( 'mw.cx.translation.add' ).fire( sourceId, 'restore' );
this.stop();
};
@@ -298,8 +304,6 @@
this.$restore
.on( 'click', $.proxy( this.restoreTranslation, this )
);
-
- mw.hook( 'mw.cx.translation.change' ).add( $.proxy(
this.showRestore, this ) );
};
MTControlCard.prototype.buildProvidersMenu = function () {
@@ -371,7 +375,7 @@
this.$section = $section;
this.selectProvider( MTControlCard.provider );
- if ( this.$section.data( 'cx-mt' ) ) {
+ if ( this.$section.data( 'cx-mt' ) || MTControlCard.provider
=== disableMT ) {
this.$restore.addClass( 'hidden' );
} else {
this.$restore.removeClass( 'hidden' );
diff --git a/modules/translation/ext.cx.translation.js
b/modules/translation/ext.cx.translation.js
index d5fe03d..5717b06 100644
---
[MediaWiki-commits] [Gerrit] Avoid too much recursion in jquery.wikibase.sitelinklistview - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163822
Change subject: Avoid too much recursion in jquery.wikibase.sitelinklistview
..
Avoid too much recursion in jquery.wikibase.sitelinklistview
Bug: 71453
Change-Id: I34553e7f5265c386071f40e9ebc05a66c6257739
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/22/163822/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index ef80587..fce3526 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -362,7 +362,11 @@
self._saveSiteLink( emptySiteLink )
.done( function() {
self._afterRemove();
- next();
+
+ // Use setTimeout here to break
out of the current call stack.
+ // This is needed because the
stack can get very large (if the queue
+ // is very large), eventually
leading to failures.
+ setTimeout( next, 0 );
} )
.fail( function( error ) {
self.setError( error );
@@ -387,7 +391,10 @@
$queue.queue( 'stopediting', function( next ) {
sitelinkview.element
.one(
'sitelinkviewafterstopediting.sitelinklistview', function( event ) {
- next();
+ // Use setTimeout here to break out of
the current call stack.
+ // This is needed because the stack can
get very large (if the queue
+ // is very large), eventually leading
to failures.
+ setTimeout( next, 0 );
} );
sitelinkview.stopEditing( dropValue );
} );
--
To view, visit https://gerrit.wikimedia.org/r/163822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34553e7f5265c386071f40e9ebc05a66c6257739
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add constructor for setting initialization parameters (v 0.5.0) - change (mediawiki...Mpdf)
Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163823
Change subject: add constructor for setting initialization parameters (v 0.5.0)
..
add constructor for setting initialization parameters (v 0.5.0)
Change-Id: Iac99b95f412b0e14ccf3cf273b104eb10a42f5d7
---
M Mpdf.hooks.php
M Mpdf.php
2 files changed, 40 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Mpdf
refs/changes/23/163823/1
diff --git a/Mpdf.hooks.php b/Mpdf.hooks.php
index 6f7372b..733de56 100644
--- a/Mpdf.hooks.php
+++ b/Mpdf.hooks.php
@@ -37,7 +37,45 @@
print $html;
}
else { //return pdf file
- $mpdf=new mPDF();
+ $mode = 'utf-8';
+ $format = 'A4';
+ $marginLeft = 15;
+ $marginRight = 15;
+ $marginTop = 16;
+ $marginBottom = 16;
+ $marginHeader = 9;
+ $marginFooter = 9;
+ $orientation = 'P';
+ list( ,$constr ) =
explode('!--mpdfconstructor', $html, 2 );
+ if ( $constr ) {
+ list( $constr ) = explode( '/',
$constr, 1 );
+ $matches = array();
+ if ( preg_match(
'/format\s*=\s*(.*?)/', $constr, $matches ) ){
+ $format = $matches[1];
+ }
+ if ( preg_match(
'/margin-left\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginLeft =
(float)$matches[1];
+ }
+ if ( preg_match(
'/margin-right\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginRight =
(float)$matches[1];
+ }
+ if ( preg_match(
'/margin-top\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginTop = (float)$matches[1];
+ }
+ if ( preg_match(
'/margin-bottom\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginBottom =
(float)$matches[1];
+ }
+ if ( preg_match(
'/margin-header\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginHeader =
(float)$matches[1];
+ }
+ if ( preg_match(
'/margin-footer\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginFooter =
(float)$matches[1];
+ }
+ if ( preg_match(
'/orientation\s*=\s*(.*?)/', $constr, $matches ) ){
+ $orientation = $matches[1];
+ }
+ }
+ $mpdf=new mPDF( $mode, $format, 0, '',
$marginLeft, $marginRight, $marginTop, $marginBottom, $marginHeader,
$marginFooter, $orientation );
$mpdf-WriteHTML( $html );
$mpdf-Output( $filename.'.pdf', 'D' );
diff --git a/Mpdf.php b/Mpdf.php
index 3d9e476..6325790 100644
--- a/Mpdf.php
+++ b/Mpdf.php
@@ -19,7 +19,7 @@
*/
if( !defined( 'MEDIAWIKI' ) ) die( Not an entry point. );
-define( 'MPDF_VERSION', 0.4.2, 2014-08-07 );
+define( 'MPDF_VERSION', 0.5.0, 2014-09-30 );
$wgAutoloadClasses['MpdfHooks'] = __DIR__ .
'/Mpdf.hooks.php';
$wgAutoloadClasses['mPDF'] = __DIR__ .
'/mpdf/mpdf.php';
--
To view, visit https://gerrit.wikimedia.org/r/163823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac99b95f412b0e14ccf3cf273b104eb10a42f5d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Mpdf
Gerrit-Branch: master
Gerrit-Owner: Pastakhov pastak...@yandex.ru
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add constructor for setting initialization parameters (v 0.5.0) - change (mediawiki...Mpdf)
Pastakhov has submitted this change and it was merged.
Change subject: add constructor for setting initialization parameters (v 0.5.0)
..
add constructor for setting initialization parameters (v 0.5.0)
Change-Id: Iac99b95f412b0e14ccf3cf273b104eb10a42f5d7
---
M Mpdf.hooks.php
M Mpdf.php
2 files changed, 40 insertions(+), 2 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Mpdf.hooks.php b/Mpdf.hooks.php
index 6f7372b..733de56 100644
--- a/Mpdf.hooks.php
+++ b/Mpdf.hooks.php
@@ -37,7 +37,45 @@
print $html;
}
else { //return pdf file
- $mpdf=new mPDF();
+ $mode = 'utf-8';
+ $format = 'A4';
+ $marginLeft = 15;
+ $marginRight = 15;
+ $marginTop = 16;
+ $marginBottom = 16;
+ $marginHeader = 9;
+ $marginFooter = 9;
+ $orientation = 'P';
+ list( ,$constr ) =
explode('!--mpdfconstructor', $html, 2 );
+ if ( $constr ) {
+ list( $constr ) = explode( '/',
$constr, 1 );
+ $matches = array();
+ if ( preg_match(
'/format\s*=\s*(.*?)/', $constr, $matches ) ){
+ $format = $matches[1];
+ }
+ if ( preg_match(
'/margin-left\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginLeft =
(float)$matches[1];
+ }
+ if ( preg_match(
'/margin-right\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginRight =
(float)$matches[1];
+ }
+ if ( preg_match(
'/margin-top\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginTop = (float)$matches[1];
+ }
+ if ( preg_match(
'/margin-bottom\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginBottom =
(float)$matches[1];
+ }
+ if ( preg_match(
'/margin-header\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginHeader =
(float)$matches[1];
+ }
+ if ( preg_match(
'/margin-footer\s*=\s*?([0-9\.]+)/', $constr, $matches ) ){
+ $marginFooter =
(float)$matches[1];
+ }
+ if ( preg_match(
'/orientation\s*=\s*(.*?)/', $constr, $matches ) ){
+ $orientation = $matches[1];
+ }
+ }
+ $mpdf=new mPDF( $mode, $format, 0, '',
$marginLeft, $marginRight, $marginTop, $marginBottom, $marginHeader,
$marginFooter, $orientation );
$mpdf-WriteHTML( $html );
$mpdf-Output( $filename.'.pdf', 'D' );
diff --git a/Mpdf.php b/Mpdf.php
index 3d9e476..6325790 100644
--- a/Mpdf.php
+++ b/Mpdf.php
@@ -19,7 +19,7 @@
*/
if( !defined( 'MEDIAWIKI' ) ) die( Not an entry point. );
-define( 'MPDF_VERSION', 0.4.2, 2014-08-07 );
+define( 'MPDF_VERSION', 0.5.0, 2014-09-30 );
$wgAutoloadClasses['MpdfHooks'] = __DIR__ .
'/Mpdf.hooks.php';
$wgAutoloadClasses['mPDF'] = __DIR__ .
'/mpdf/mpdf.php';
--
To view, visit https://gerrit.wikimedia.org/r/163823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac99b95f412b0e14ccf3cf273b104eb10a42f5d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Mpdf
Gerrit-Branch: master
Gerrit-Owner: Pastakhov pastak...@yandex.ru
Gerrit-Reviewer: Pastakhov pastak...@yandex.ru
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 too much recursion in jquery.wikibase.sitelinklistview - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid too much recursion in jquery.wikibase.sitelinklistview
..
Avoid too much recursion in jquery.wikibase.sitelinklistview
Bug: 71453
Change-Id: I34553e7f5265c386071f40e9ebc05a66c6257739
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Henning Snater: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index b8a47ed..435fdd7 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -362,7 +362,11 @@
self._saveSiteLink( emptySiteLink )
.done( function() {
self._afterRemove();
- next();
+
+ // Use setTimeout here to break
out of the current call stack.
+ // This is needed because the
stack can get very large (if the queue
+ // is very large), eventually
leading to failures.
+ setTimeout( next, 0 );
} )
.fail( function( error ) {
self.setError( error );
@@ -387,7 +391,10 @@
$queue.queue( 'stopediting', function( next ) {
sitelinkview.element
.one(
'sitelinkviewafterstopediting.sitelinklistview', function( event ) {
- next();
+ // Use setTimeout here to break out of
the current call stack.
+ // This is needed because the stack can
get very large (if the queue
+ // is very large), eventually leading
to failures.
+ setTimeout( next, 0 );
} );
sitelinkview.stopEditing( dropValue );
} );
--
To view, visit https://gerrit.wikimedia.org/r/163778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34553e7f5265c386071f40e9ebc05a66c6257739
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Lydia Pintscher lydia.pintsc...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@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] Don't try to get entity null or undefined from store - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163824
Change subject: Don't try to get entity null or undefined from store
..
Don't try to get entity null or undefined from store
Change-Id: I1ae21cf5f6d33bf6a50737ff00931591812faa3f
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/snakview/snakview.js
M lib/resources/wikibase.store/store.CombiningEntityStore.js
3 files changed, 26 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/24/163824/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index f16f25d..bde5e84 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -194,21 +194,22 @@
: this.options.predefined.mainSnak.property;
var deferred = $.Deferred();
- var oldHelpMessage = this.options.helpMessage;
+ var helpMessage = this.options.helpMessage;
this.options.helpMessage = deferred.promise();
- this.options.entityStore.get( property ).done(
function( fetchedProperty ) {
- var helpMessage;
- if( fetchedProperty ) {
- helpMessage = mw.msg(
-
'wikibase-claimview-snak-tooltip',
-
wb.utilities.ui.buildPrettyEntityLabelText( fetchedProperty.getContent() )
- );
- } else {
- helpMessage = oldHelpMessage;
- }
+ if( property ) {
+ this.options.entityStore.get( property ).done(
function( fetchedProperty ) {
+ if( fetchedProperty ) {
+ helpMessage = mw.msg(
+
'wikibase-claimview-snak-tooltip',
+
wb.utilities.ui.buildPrettyEntityLabelText( fetchedProperty.getContent() )
+ );
+ }
+ deferred.resolve( helpMessage );
+ } );
+ } else {
deferred.resolve( helpMessage );
- } );
+ }
}
},
diff --git a/lib/resources/jquery.wikibase/snakview/snakview.js
b/lib/resources/jquery.wikibase/snakview/snakview.js
index 7fd6f33..3ebd418 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.js
@@ -725,12 +725,16 @@
// NOTE: Order of these shouldn't matter; If for any reasons
draw functions start changing
// the outcome of the variation (or Snak type), then something
must be incredibly wrong!
- this._entityStore.get( this._propertyId ).done( function(
fetchedProperty ) {
- self.drawProperty(
- fetchedProperty ? fetchedProperty.getContent()
: null,
- fetchedProperty ? fetchedProperty.getTitle() :
null
- );
- } );
+ if( this._propertyId ) {
+ this._entityStore.get( this._propertyId ).done(
function( fetchedProperty ) {
+ self.drawProperty(
+ fetchedProperty ?
fetchedProperty.getContent() : null,
+ fetchedProperty ?
fetchedProperty.getTitle() : null
+ );
+ } );
+ } else {
+ this.drawProperty( null, null );
+ }
this.drawSnakTypeSelector();
this.drawVariation();
},
diff --git a/lib/resources/wikibase.store/store.CombiningEntityStore.js
b/lib/resources/wikibase.store/store.CombiningEntityStore.js
index 2147b08..8cb8fa5 100644
--- a/lib/resources/wikibase.store/store.CombiningEntityStore.js
+++ b/lib/resources/wikibase.store/store.CombiningEntityStore.js
@@ -55,14 +55,9 @@
* @see wikibase.store.Entity.store.get
*/
get: function( entityId ) {
- if( !entityId ) {
- // FIXME: This should probably be fixed on the
caller's side
-
[MediaWiki-commits] [Gerrit] Refactor message group selector - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Refactor message group selector
..
Refactor message group selector
* Store references to dom nodes in member variables to avoid querying
them over and over again
* Refactor some code into separate functions for clarity
* Consistency and style improvements:
** New line after dom node creation
** groupSelector = this
** use $.proxy when possible
** use .then() to transform return values in promises
* Fixes a bug where filter was not applied if user was typing before
groups were loaded
* Use 'one' for the event to close the menu to avoid extra processing
Change-Id: I8175a78e1becb3276550b360d6dbbd41b800de64
---
M resources/js/ext.translate.groupselector.js
1 file changed, 149 insertions(+), 134 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.groupselector.js
b/resources/js/ext.translate.groupselector.js
index ba7cb61..e77ff7a 100644
--- a/resources/js/ext.translate.groupselector.js
+++ b/resources/js/ext.translate.groupselector.js
@@ -1,7 +1,7 @@
( function ( $, mw ) {
'use strict';
- var groupLoader, delay;
+ var groupsLoader, recentGroupsLoader, delay;
/**
* options
@@ -12,6 +12,10 @@
function TranslateMessageGroupSelector( element, options ) {
this.$trigger = $( element );
this.$menu = null;
+ this.$search = null;
+ this.$list = null;
+ this.$loader = null;
+
this.parentGroupId = null;
this.options = $.extend( true, {},
$.fn.msggroupselector.defaults, options );
// Store the explicitly given options, which can be passed to
subgroup
@@ -23,7 +27,6 @@
}
TranslateMessageGroupSelector.prototype = {
- loader: null,
constructor: TranslateMessageGroupSelector,
/**
@@ -43,11 +46,8 @@
$listFilters,
$listFiltersGroup,
$search,
- $searchInput,
$searchIcon,
- $searchGroup,
- $loader,
- $msgGroupList;
+ $searchGroup;
this.$menu = $( 'div' )
.addClass( 'tux-groupselector' )
@@ -65,17 +65,17 @@
$searchIcon = $( 'div' )
.addClass( 'two columns
tux-groupselector__filter__search__icon' );
- $searchInput = $( 'input' )
+ this.$search = $( 'input' )
.prop( 'type', 'text' )
.addClass(
'tux-groupselector__filter__search__input' );
- if ( mw.translate.isPlaceholderSupported( $searchInput
) ) {
- $searchInput.prop( 'placeholder', mw.msg(
'translate-msggroupselector-search-placeholder' ) );
+ if ( mw.translate.isPlaceholderSupported( this.$search
) ) {
+ this.$search.prop( 'placeholder', mw.msg(
'translate-msggroupselector-search-placeholder' ) );
}
$search = $( 'div' )
.addClass( 'ten columns' )
- .append( $searchInput );
+ .append( this.$search );
$listFilters = $( 'div' )
.addClass( 'tux-groupselector__filter__tabs' )
@@ -99,14 +99,14 @@
.addClass( 'row' )
.append( $listFilters, $searchGroup );
- $msgGroupList = $( 'div' )
+ this.$list = $( 'div' )
.addClass( 'tux-grouplist' )
.addClass( 'row' );
- $loader = $( 'div' )
+ this.$loader = $( 'div' )
.addClass( 'tux-loading-indicator
tux-loading-indicator--centered' );
- this.$menu.append( $groupTitle, $listFiltersGroup,
$loader, $msgGroupList );
+ this.$menu.append( $groupTitle, $listFiltersGroup,
this.$loader, this.$list );
$( 'body' ).append( this.$menu );
},
@@ -121,33 +121,20 @@
.hide();
this.$menu.addClass( 'open' ).show();
this.position();
- // Keep the focus in the message group search box.
- this.$menu.find(
'.tux-groupselector__filter__search__input'
[MediaWiki-commits] [Gerrit] swift: fix filesystem provisioning - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163825
Change subject: swift: fix filesystem provisioning
..
swift: fix filesystem provisioning
Change-Id: Ice08c75a61cd82400743398c118f1056b45e1968
---
M modules/swift_new/manifests/init_device.pp
M modules/swift_new/manifests/label_filesystem.pp
M modules/swift_new/manifests/mount_filesystem.pp
3 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/163825/1
diff --git a/modules/swift_new/manifests/init_device.pp
b/modules/swift_new/manifests/init_device.pp
index c6b8c27..632724e 100644
--- a/modules/swift_new/manifests/init_device.pp
+++ b/modules/swift_new/manifests/init_device.pp
@@ -10,7 +10,6 @@
$fs_label = swift-${dev_suffix}
$parted_cmd= parted --script --align optimal ${title}
$parted_script = mklabel gpt mkpart ${fs_label} 0 100%
-$mkfs_cmd = mkfs -t xfs -i size=512 ${dev}
exec { parted-${title}:
path= '/usr/bin:/bin:/usr/sbin:/sbin',
@@ -19,17 +18,14 @@
creates = $dev,
}
-exec { mkfs-${title}:
-command = $mkfs_cmd,
+exec { mkfs-${dev}:
+command = mkfs -t xfs -L $fs_label -i size=512 ${dev},
path= '/sbin/:/usr/sbin/',
-require = Package['xfsprogs'],
-before = Exec[parted-${title}],
+require = [Package['xfsprogs'], Exec[parted-${title}]],
unless = xfs_admin -l ${dev},
}
-swift_new::label_filesystem { $dev:
-before = Exec[mkfs-${title}],
+swift_new::mount_filesystem { $dev:
+require = Exec[mkfs-${dev}],
}
-
-swift_new::mount_filesystem { $dev: }
}
diff --git a/modules/swift_new/manifests/label_filesystem.pp
b/modules/swift_new/manifests/label_filesystem.pp
index 65a7cee..c9d2159 100644
--- a/modules/swift_new/manifests/label_filesystem.pp
+++ b/modules/swift_new/manifests/label_filesystem.pp
@@ -3,7 +3,7 @@
$dev_suffix = regsubst($dev, '^\/dev\/(.*)$', '\1')
$fs_label = swift-${dev_suffix}
-exec { fs_label-${dev}:
+exec { xfs_label-${dev}:
command = xfs_admin -L ${fs_label} ${dev},
path= '/usr/sbin:/usr/bin:/sbin:/bin',
require = Package['xfsprogs'],
diff --git a/modules/swift_new/manifests/mount_filesystem.pp
b/modules/swift_new/manifests/mount_filesystem.pp
index 4b9c13b..66235f0 100644
--- a/modules/swift_new/manifests/mount_filesystem.pp
+++ b/modules/swift_new/manifests/mount_filesystem.pp
@@ -14,7 +14,11 @@
}
mount { $mount_point:
-# XXX this won't mount the disks the first time they are added to fstab
+# XXX this won't mount the disks the first time they are added to
+# fstab.
+# We don't want puppet to keep the FS mounted, otherwise
+# it would conflict with swift-drive-auditor trying to keep FS
+# unmounted.
ensure = 'present',
device = LABEL=swift-${dev_suffix},
name = $mount_point,
--
To view, visit https://gerrit.wikimedia.org/r/163825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice08c75a61cd82400743398c118f1056b45e1968
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: fix filesystem provisioning - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: fix filesystem provisioning
..
swift: fix filesystem provisioning
Change-Id: Ice08c75a61cd82400743398c118f1056b45e1968
---
M modules/swift_new/manifests/init_device.pp
M modules/swift_new/manifests/label_filesystem.pp
M modules/swift_new/manifests/mount_filesystem.pp
3 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/swift_new/manifests/init_device.pp
b/modules/swift_new/manifests/init_device.pp
index c6b8c27..632724e 100644
--- a/modules/swift_new/manifests/init_device.pp
+++ b/modules/swift_new/manifests/init_device.pp
@@ -10,7 +10,6 @@
$fs_label = swift-${dev_suffix}
$parted_cmd= parted --script --align optimal ${title}
$parted_script = mklabel gpt mkpart ${fs_label} 0 100%
-$mkfs_cmd = mkfs -t xfs -i size=512 ${dev}
exec { parted-${title}:
path= '/usr/bin:/bin:/usr/sbin:/sbin',
@@ -19,17 +18,14 @@
creates = $dev,
}
-exec { mkfs-${title}:
-command = $mkfs_cmd,
+exec { mkfs-${dev}:
+command = mkfs -t xfs -L $fs_label -i size=512 ${dev},
path= '/sbin/:/usr/sbin/',
-require = Package['xfsprogs'],
-before = Exec[parted-${title}],
+require = [Package['xfsprogs'], Exec[parted-${title}]],
unless = xfs_admin -l ${dev},
}
-swift_new::label_filesystem { $dev:
-before = Exec[mkfs-${title}],
+swift_new::mount_filesystem { $dev:
+require = Exec[mkfs-${dev}],
}
-
-swift_new::mount_filesystem { $dev: }
}
diff --git a/modules/swift_new/manifests/label_filesystem.pp
b/modules/swift_new/manifests/label_filesystem.pp
index 65a7cee..c9d2159 100644
--- a/modules/swift_new/manifests/label_filesystem.pp
+++ b/modules/swift_new/manifests/label_filesystem.pp
@@ -3,7 +3,7 @@
$dev_suffix = regsubst($dev, '^\/dev\/(.*)$', '\1')
$fs_label = swift-${dev_suffix}
-exec { fs_label-${dev}:
+exec { xfs_label-${dev}:
command = xfs_admin -L ${fs_label} ${dev},
path= '/usr/sbin:/usr/bin:/sbin:/bin',
require = Package['xfsprogs'],
diff --git a/modules/swift_new/manifests/mount_filesystem.pp
b/modules/swift_new/manifests/mount_filesystem.pp
index 4b9c13b..66235f0 100644
--- a/modules/swift_new/manifests/mount_filesystem.pp
+++ b/modules/swift_new/manifests/mount_filesystem.pp
@@ -14,7 +14,11 @@
}
mount { $mount_point:
-# XXX this won't mount the disks the first time they are added to fstab
+# XXX this won't mount the disks the first time they are added to
+# fstab.
+# We don't want puppet to keep the FS mounted, otherwise
+# it would conflict with swift-drive-auditor trying to keep FS
+# unmounted.
ensure = 'present',
device = LABEL=swift-${dev_suffix},
name = $mount_point,
--
To view, visit https://gerrit.wikimedia.org/r/163825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice08c75a61cd82400743398c118f1056b45e1968
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust styles for the columns' subheadings - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163826
Change subject: Adjust styles for the columns' subheadings
..
Adjust styles for the columns' subheadings
* Put both subheadings definitions in base.less, because
they are the same.
* Apply word-wrap: break-word; to cx-column__content,
because it's relevant there, but not to the subheadings.
* Set explicit for the subheading height, because
the language name and the view page link can be longer
than one line.
Change-Id: Ie6fdc0657e5cfdfef9e91f234c2dc1b53b6be5be
---
M modules/base/styles/ext.cx.base.less
M modules/source/styles/ext.cx.source.less
M modules/translation/styles/ext.cx.translation.less
3 files changed, 11 insertions(+), 16 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/26/163826/1
diff --git a/modules/base/styles/ext.cx.base.less
b/modules/base/styles/ext.cx.base.less
index 264c09f..80140a7 100644
--- a/modules/base/styles/ext.cx.base.less
+++ b/modules/base/styles/ext.cx.base.less
@@ -49,17 +49,24 @@
.cx-column {
.mw-ui-item;
.mw-ui-one-third;
- word-wrap: break-word;
.mw-ui-gutter(3%);
}
.cx-column--source,
.cx-column--translation {
.mw-ui-one-half(@palm);
-}
-.cx-column__content {
- clear: both;
+ .cx-column__sub-heading {
+ .mw-ui-item;
+ .mw-ui-one-whole;
+ padding-bottom: 10px;
+ height: 3em;
+ }
+
+ .cx-column__content {
+ clear: both;
+ word-wrap: break-word;
+ }
}
.cx-column--tools {
diff --git a/modules/source/styles/ext.cx.source.less
b/modules/source/styles/ext.cx.source.less
index 36945ea..9cbc40e 100644
--- a/modules/source/styles/ext.cx.source.less
+++ b/modules/source/styles/ext.cx.source.less
@@ -4,12 +4,6 @@
@link-highlight-color: #BDD4FF;
.cx-column--source {
- .cx-column__sub-heading {
- .mw-ui-item;
- .mw-ui-one-whole;
- padding-bottom: 10px;
- }
-
.cx-column__language-label,
.cx-column__sub-heading__view-page {
.mw-ui-item;
diff --git a/modules/translation/styles/ext.cx.translation.less
b/modules/translation/styles/ext.cx.translation.less
index d99389c..4e58bf3 100644
--- a/modules/translation/styles/ext.cx.translation.less
+++ b/modules/translation/styles/ext.cx.translation.less
@@ -12,12 +12,6 @@
background-image: repeating-linear-gradient(135deg,#eee,#eee
5px,#ddd 5px,#ddd 10px);
}
- .cx-column__sub-heading {
- .mw-ui-item;
- .mw-ui-one-whole;
- padding-bottom: 10px;
- }
-
.cx-highlight {
background-color: @text-highlight-color;
box-shadow: 0px 0px 0 2px @text-highlight-color;
--
To view, visit https://gerrit.wikimedia.org/r/163826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6fdc0657e5cfdfef9e91f234c2dc1b53b6be5be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable actions just done until change - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163827
Change subject: Disable actions just done until change
..
Disable actions just done until change
Replaced data-cx-mt and data-cx-source with data-cx-state which has
the possible values of mt, source, empty. On change this data-cx-state
will be unset.
Change-Id: I131fafb1e0701bbf438d41fa5d0c3bd981780ec1
---
M modules/editor/ext.cx.editor.js
M modules/tools/ext.cx.tools.mt.js
M modules/tools/styles/ext.cx.tools.mt.less
M modules/translation/ext.cx.translation.js
M modules/translation/ext.cx.translation.progress.js
5 files changed, 59 insertions(+), 31 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/27/163827/1
diff --git a/modules/editor/ext.cx.editor.js b/modules/editor/ext.cx.editor.js
index 4d2f7f6..4966b04 100644
--- a/modules/editor/ext.cx.editor.js
+++ b/modules/editor/ext.cx.editor.js
@@ -39,12 +39,9 @@
* Section change handler
*/
CXSectionEditor.prototype.onChange = function () {
- // Remove the MT and source label from the section.
+ // Remove the MT/source/empty label from the section.
// Some manual change happened.
- this.$section.data( {
- 'cx-mt': false,
- 'cx-source': false
- } );
+ this.$section.data( 'cx-state', null );
mw.hook( 'mw.cx.translation.change' ).fire( this.$section );
};
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index f9b4be4..55c8458 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -165,8 +165,9 @@
.children()
.attr( {
id: 'cx' + sourceId,
- 'data-source': sourceId
+ 'data-source': sourceId,
} )
+ .data( 'cx-state', 'mt' )
);
// $section was replaced. Get the
updated instance.
$section = $( '#cx' + sourceId );
@@ -176,7 +177,6 @@
mw.hook( 'mw.cx.translation.add' ).fire(
sourceId, reason );
} )
.always( function () {
- $section.data( 'cx-mt', true );
mw.hook( 'mw.cx.translation.postMT' ).fire(
$section );
} );
@@ -188,6 +188,11 @@
this.$card = null;
this.$translations = null;
this.$providersMenu = null;
+ this.actions = {
+ $restore: null,
+ $clear: null,
+ $source: null
+ }
}
MTControlCard.prototype.getCard = function () {
@@ -209,25 +214,25 @@
this.$providerSelectorTrigger = $( 'div' )
.addClass( 'card__trigger' );
- this.$restore = $( 'div' )
+ this.actions.$restore = $( 'div' )
.addClass( 'card__control-button
cx-restore-translation' )
.text( mw.msg( 'cx-tools-mt-restore' ) );
- $useSource = $( 'div' )
+ this.actions.$source = $( 'div' )
.addClass( 'card__control-button cx-use-source' )
.text( mw.msg( 'cx-tools-mt-use-source' ) );
- $clearTranslation = $( 'div' )
+ this.actions.$clear = $( 'div' )
.addClass( 'card__control-button cx-clear-translation' )
.text( mw.msg( 'cx-tools-mt-clear-translation' ) );
$controlButtonsBlock = $( 'div' )
.addClass( 'card__button-block' )
- .append(
- this.$restore,
- $useSource,
- $clearTranslation
- );
+ .append( // Object.values would be nice here
+ this.actions.$restore,
+ this.actions.$source,
+ this.actions.$clear
+ );
$bottom = $( 'div' )
.addClass( 'card__bottom' );
@@ -272,9 +277,9 @@
* Clear the translation text.
*/
MTControlCard.prototype.clearTranslation = function () {
- this.$section.empty();
-
[MediaWiki-commits] [Gerrit] Fix repo/details check of E2E test - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163828
Change subject: Fix repo/details check of E2E test
..
Fix repo/details check of E2E test
Change-Id: I116080a4047799cc883faa2b3d91141bedeaff01
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/923
---
M tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
M tests/browser/features/support/pages/e2e_test_page.rb
2 files changed, 7 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/28/163828/1
diff --git
a/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
b/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
index d777c83..3911661 100644
--- a/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
+++ b/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
@@ -105,9 +105,9 @@
page.mmv_image_metadata_desc_element.when_present.text.should match /Sunrise
over fishing boats on the beach south of Kovalam/
# Image metadata links
page.mmv_image_metadata_links_wrapper_element.when_present.should be_visible
- # Repo link
- page.mmv_image_metadata_repo_link_element.when_present.text.should match
/More details about this file on Wikimedia Commons/
-
page.mmv_image_metadata_repo_link_element.when_present.attribute('href').should
match /boats_in_Kerala.jpg$/
+ # Details link
+ page.mmv_details_page_link_element.when_present.text.should match /More
details/
+ page.mmv_details_page_link_element.when_present.attribute('href').should
match /boats_in_Kerala.jpg$/
end
# Helper function that verifies the presence of various elements in viewer
@@ -143,7 +143,7 @@
page.mmv_image_metadata_desc_element.when_present.text.should match /Photo
from Wikimedia Foundation/
# Image metadata links
page.mmv_image_metadata_links_wrapper_element.when_present.should be_visible
- # Repo link
- page.mmv_image_metadata_repo_link_element.when_present.text.should match
/More details about this file on Wikimedia Commons/
-
page.mmv_image_metadata_repo_link_element.when_present.attribute('href').should
match /All_Hands_Offsite.*\.jpg$/
+ # Details link
+ page.mmv_details_page_link_element.when_present.text.should match /More
details/
+ page.mmv_details_page_link_element.when_present.attribute('href').should
match /All_Hands_Offsite.*\.jpg$/
end
diff --git a/tests/browser/features/support/pages/e2e_test_page.rb
b/tests/browser/features/support/pages/e2e_test_page.rb
index 433a57e..de89bfd 100644
--- a/tests/browser/features/support/pages/e2e_test_page.rb
+++ b/tests/browser/features/support/pages/e2e_test_page.rb
@@ -30,7 +30,7 @@
p(:mmv_image_metadata_desc, class: mw-mmv-image-desc)
ul(:mmv_image_metadata_links_wrapper, class: mw-mmv-image-links)
- a(:mmv_image_metadata_repo_link, class: mw-mmv-repo)
+ a(:mmv_details_page_link, class: mw-mmv-description-page-button)
# Controls
div(:mmv_next_button, class: mw-mmv-next-image)
--
To view, visit https://gerrit.wikimedia.org/r/163828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I116080a4047799cc883faa2b3d91141bedeaff01
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Lowercase tooltip wording - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/163829 Change subject: Lowercase tooltip wording .. Lowercase tooltip wording Change-Id: I4b74981190084c43c5d3b608cfcb3de1d358eae6 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/914 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/29/163829/1 diff --git a/i18n/en.json b/i18n/en.json index 35d4b2f..142d6ff 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -53,7 +53,7 @@ multimediaviewer-geoloc-coord: $1° $2′ $3″ $4, multimediaviewer-geoloc-coords: $1, $2, multimediaviewer-geolocation: Location: $1, -multimediaviewer-reuse-link: Share or Embed this file, +multimediaviewer-reuse-link: Share or embed this file, multimediaviewer-reuse-loading-placeholder: Loading…, multimediaviewer-share-tab: Share, multimediaviewer-embed-tab: Embed, -- To view, visit https://gerrit.wikimedia.org/r/163829 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b74981190084c43c5d3b608cfcb3de1d358eae6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Badge selector: Reposition menu when initializing - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Badge selector: Reposition menu when initializing
..
Badge selector: Reposition menu when initializing
Instead of at the end of the body, the menu is shown next to badge initially,
providing
user feedback about the menu actually loading.
Change-Id: I47e38eacdcad6851ef5355f288bbcd6095c29095
---
M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
index 1eab2a6..6ef165c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
@@ -239,6 +239,8 @@
deferred = $.Deferred(),
$menu = this._getMenu();
+ self.repositionMenu();
+
this._fillMenu()
.done( function() {
$menu.children( 'li' ).each( function() {
--
To view, visit https://gerrit.wikimedia.org/r/163805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47e38eacdcad6851ef5355f288bbcd6095c29095
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@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] badge selector: Adapt styles of existing selectors - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: badge selector: Adapt styles of existing selectors
..
badge selector: Adapt styles of existing selectors
Change-Id: Iad95dde0080afa2809337f98e48d5bff017527a8
---
M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
M lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
2 files changed, 3 insertions(+), 9 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
index 6ef165c..2654401 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
@@ -247,7 +247,9 @@
var $li = $( this ),
badgeId = $li.data( self.widgetName +
'-menuitem-badge' );
- $li.toggleClass( 'ui-state-active', $.inArray(
badgeId, self.value() ) !== -1 );
+ $li
+ .addClass( 'ui-menu-item' )
+ .toggleClass( 'ui-state-active', $.inArray(
badgeId, self.value() ) !== -1 );
} );
$menu.hide();
diff --git
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
index 086fe33..2a77766 100644
---
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
+++
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.badgeselector.css
@@ -14,14 +14,6 @@
z-index: 2; /* Monobook #content has 2 */
}
-.wikibase-badgeselector-menu.ui-widget-content li {
- border: none;
-}
-
-.wikibase-badgeselector-menu li.ui-state-active a:hover {
- text-decoration: underline;
-}
-
.wikibase-badgeselector-menu li a {
display: inline-block;
}
--
To view, visit https://gerrit.wikimedia.org/r/163806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad95dde0080afa2809337f98e48d5bff017527a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@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] badge selector: Display item id if no label exists - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: badge selector: Display item id if no label exists
..
badge selector: Display item id if no label exists
Change-Id: Ia1ff367daede7c18f309fea84972781a4d0cc777
---
M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
index 2654401..84b7eb7 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
@@ -288,9 +288,11 @@
} );
if( item ) {
- $item.text( item.getLabel(
self.options.languageCode ) );
+ $item.text( item.getLabel(
self.options.languageCode ) || item.getId() );
} else {
- $item.append(
wb.utilities.ui.buildMissingEntityInfo( itemId, wb.datamodel.Item.TYPE ) );
+ $item.append(
+
wb.utilities.ui.buildMissingEntityInfo( itemId, wb.datamodel.Item.TYPE )
+ );
}
$( 'li/' )
--
To view, visit https://gerrit.wikimedia.org/r/163807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1ff367daede7c18f309fea84972781a4d0cc777
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@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] Fixed SSL fallback logic for users in China - change (apps...wikipedia)
Zhaofeng Li has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163830
Change subject: Fixed SSL fallback logic for users in China
..
Fixed SSL fallback logic for users in China
This commit adds checks for Chinese MCC ID and SSL handshake
exception (i.e. Connection reset by peer), and enables SSL fallback
where appropriate.
Change-Id: Ia9812ab15ddfe589d6ef0ad013e2aa1972724e4b
---
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
2 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/30/163830/1
diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index b117dba..1398139 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -182,6 +182,14 @@
zeroHandler = new WikipediaZeroHandler(this);
+// Check if we are in China
+String mccMnc = Utils.getMccMnc(this);
+if (mccMnc != null) {
+if (mccMnc.startsWith(460)) {
+this.setSslFallback(true);
+}
+}
+
new PerformMigrationsTask().execute();
}
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index d431a65..c7d0be1 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -680,7 +680,7 @@
|| ((SectionsFetchException)
caught).getCode().equals(invalidtitle)) {
ViewAnimations.crossFade(loadProgress, pageDoesNotExistError);
}
-} else if (Utils.throwableContainsSpecificType(caught,
SSLException.class)) {
+} else if (Utils.throwableContainsSpecificType(caught,
SSLException.class) || Utils.throwableContainsSpecificType(caught,
javax.net.ssl.SSLHandshakeException.class)) {
if (WikipediaApp.getInstance().incSslFailCount() 2) {
WikipediaApp.getInstance().setSslFallback(true);
showNetworkError();
--
To view, visit https://gerrit.wikimedia.org/r/163830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9812ab15ddfe589d6ef0ad013e2aa1972724e4b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Zhaofeng Li he...@zhaofeng.li
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Lowercase tooltip wording - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Lowercase tooltip wording .. Lowercase tooltip wording Change-Id: I4b74981190084c43c5d3b608cfcb3de1d358eae6 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/914 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 35d4b2f..142d6ff 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -53,7 +53,7 @@ multimediaviewer-geoloc-coord: $1° $2′ $3″ $4, multimediaviewer-geoloc-coords: $1, $2, multimediaviewer-geolocation: Location: $1, -multimediaviewer-reuse-link: Share or Embed this file, +multimediaviewer-reuse-link: Share or embed this file, multimediaviewer-reuse-loading-placeholder: Loading…, multimediaviewer-share-tab: Share, multimediaviewer-embed-tab: Embed, -- To view, visit https://gerrit.wikimedia.org/r/163829 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b74981190084c43c5d3b608cfcb3de1d358eae6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Abstract common qunit install steps - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163831
Change subject: Abstract common qunit install steps
..
Abstract common qunit install steps
Both qunit job templates uses almost exactly the same sequence of
builder, so make it a new builder macro 'prepare-mediawiki-qunit'.
While at it, add in mw-install-sqlite to install MediaWiki before
loading the extensions.
Change-Id: I95901329c170b0d533e06c200381c3a8fad2633d
---
M mediawiki-extensions.yaml
1 file changed, 12 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/31/163831/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index aa3cf3b..b1764d3 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -110,6 +110,16 @@
projects:
$(cat deps.txt)
+- builder:
+name: prepare-mediawiki-qunit
+builders:
+ - zuul-cloner-extdeps:
+ ext-name: '{ext-name}'
+ dependencies: '{dependencies}'
+ - mw-install-sqlite
+ - shell: cp deps.txt src/extensions_load.txt
+ - mw-apply-settings
+ - mw-run-update-script
- job-template:
name: '{name}-{ext-name}-qunit'
@@ -118,12 +128,8 @@
concurrent: true
triggers:
- zuul
-
builders:
- - mw-setup-extension:
-mwbranch: 'master'
-dependencies: '{dependencies}'
- - mw-run-update-script
+ - prepare-mediawiki-qunit
- qunit
publishers:
- archive-log-dir
@@ -136,12 +142,8 @@
concurrent: true
triggers:
- zuul
-
builders:
- - mw-setup-extension:
-mwbranch: 'master'
-dependencies: '{dependencies}'
- - mw-run-update-script
+ - prepare-mediawiki-qunit
- qunit-mobile
publishers:
- archive-log-dir
--
To view, visit https://gerrit.wikimedia.org/r/163831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95901329c170b0d533e06c200381c3a8fad2633d
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make SidebarHookHandlersTest::testNewFromGlobalState more ro... - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163832
Change subject: Make SidebarHookHandlersTest::testNewFromGlobalState more robust
..
Make SidebarHookHandlersTest::testNewFromGlobalState more robust
Right now that test fails for me, if run individually.
Change-Id: Ic6bf76b716f533b867f9ed49748274301f9f28e2
---
M client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/32/163832/1
diff --git a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
index 4a7df35..71f38b9 100644
--- a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
+++ b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
@@ -15,6 +15,7 @@
use SiteStore;
use StripState;
use Title;
+use Wikibase\Client\WikibaseClient;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
use Wikibase\Client\Hooks\SidebarHookHandlers;
@@ -255,8 +256,15 @@
}
public function testNewFromGlobalState() {
+ $settings = WikibaseClient::getDefaultInstance()-getSettings();
+
+ $oldSiteGroupValue = $settings-getSetting( 'siteGroup' );
+ $settings-setSetting( 'siteGroup', 'NYAN' );
+
$handler = SidebarHookHandlers::newFromGlobalState();
$this-assertInstanceOf(
'Wikibase\Client\Hooks\SidebarHookHandlers', $handler );
+
+ $settings-setSetting( 'siteGroup', $oldSiteGroupValue );
}
public function parserAfterParseProvider() {
--
To view, visit https://gerrit.wikimedia.org/r/163832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6bf76b716f533b867f9ed49748274301f9f28e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix version comments in thumbnail prerendering code - change (mediawiki/core)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163833
Change subject: Fix version comments in thumbnail prerendering code
..
Fix version comments in thumbnail prerendering code
Change-Id: I74b52d2ecc382dfc0b55615ce512e8c64d02e9cb
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/301
---
M includes/DefaultSettings.php
M includes/upload/UploadBase.php
2 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/33/163833/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ea2242f..e9b5746 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1249,7 +1249,7 @@
*
* This obviously means that more disk space is needed per upload upfront.
*
- * @since 1.24
+ * @since 1.25
*/
$wgUploadThumbnailRenderMap = array();
@@ -1263,14 +1263,14 @@
* This method only works if thumbnails are configured to be rendered by a 404
handler. The latter
* option uses the job queue to render the thumbnail.
*
- * @since 1.24
+ * @since 1.25
*/
$wgUploadThumbnailRenderMethod = 'jobqueue';
/**
* When using the http wgUploadThumbnailRenderMethod, lets one specify a
custom Host HTTP header.
*
- * @since 1.24
+ * @since 1.25
*/
$wgUploadThumbnailRenderHttpCustomHost = false;
@@ -1278,7 +1278,7 @@
* When using the http wgUploadThumbnailRenderMethod, lets one specify a
custom domain to send the
* HTTP request to.
*
- * @since 1.24
+ * @since 1.25
*/
$wgUploadThumbnailRenderHttpCustomDomain = false;
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 7741c35..eb54e58 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -757,6 +757,8 @@
/**
* Perform extra steps after a successful upload.
+*
+* @since 1.25
*/
public function postProcessUpload() {
global $wgUploadThumbnailRenderMap;
--
To view, visit https://gerrit.wikimedia.org/r/163833
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74b52d2ecc382dfc0b55615ce512e8c64d02e9cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update failure messages: FAILED - FAILURE - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163834 Change subject: Update failure messages: FAILED - FAILURE .. Update failure messages: FAILED - FAILURE That will let Gerrit properly highlight the build results which are assuming to use Jenkins hardcoded states (ie: FAILURE). Change-Id: I7bb87872b9774a20e5cb092f11aa0b4628e0fb5c --- M layout.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/34/163834/1 diff --git a/layout.yaml b/layout.yaml index 68901d9..8e81d1e 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1510,11 +1510,11 @@ - name: integration-docroot-deploy branch: ^master$ success-message: 'Change has been deployed on the server and should be now live on https://integration.wikimedia.org/ or https://doc.wikimedia.org/. Build' -failure-message: 'FAILED to deploy change. Please contact a member of the continuous integration team to fixup the docroot on the destination server.' +failure-message: 'FAILURE while deploying. Please contact a member of the continuous integration team to fixup the docroot on the destination server.' - name: 'integration-jjb-config-diff' success-message: 'Please carefully review the XML difference before deploying/merging your change.' -failure-message: 'FAILED to compare your patchset with the current configuration version' +failure-message: 'FAILURE while comparing your patchset with the current configuration version' - name: 'integration-zuul-layoutdiff' voting: false -- To view, visit https://gerrit.wikimedia.org/r/163834 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bb87872b9774a20e5cb092f11aa0b4628e0fb5c Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update failure messages: FAILED - FAILURE - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Update failure messages: FAILED - FAILURE .. Update failure messages: FAILED - FAILURE That will let Gerrit properly highlight the build results which are assuming to use Jenkins hardcoded states (ie: FAILURE). Change-Id: I7bb87872b9774a20e5cb092f11aa0b4628e0fb5c --- M layout.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index b19ad6c..e00f081 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1510,11 +1510,11 @@ - name: integration-docroot-deploy branch: ^master$ success-message: 'Change has been deployed on the server and should be now live on https://integration.wikimedia.org/ or https://doc.wikimedia.org/. Build' -failure-message: 'FAILED to deploy change. Please contact a member of the continuous integration team to fixup the docroot on the destination server.' +failure-message: 'FAILURE while deploying. Please contact a member of the continuous integration team to fixup the docroot on the destination server.' - name: 'integration-jjb-config-diff' success-message: 'Please carefully review the XML difference before deploying/merging your change.' -failure-message: 'FAILED to compare your patchset with the current configuration version' +failure-message: 'FAILURE while comparing your patchset with the current configuration version' - name: 'integration-zuul-layoutdiff' voting: false -- To view, visit https://gerrit.wikimedia.org/r/163834 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7bb87872b9774a20e5cb092f11aa0b4628e0fb5c Gerrit-PatchSet: 2 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Abstract common qunit install steps - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Abstract common qunit install steps
..
Abstract common qunit install steps
Both qunit job templates uses almost exactly the same sequence of
builder, so make it a new builder macro 'prepare-mediawiki-qunit'.
Change-Id: I95901329c170b0d533e06c200381c3a8fad2633d
---
M mediawiki-extensions.yaml
1 file changed, 11 insertions(+), 10 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index aa3cf3b..badea28 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -110,6 +110,13 @@
projects:
$(cat deps.txt)
+- builder:
+name: prepare-mediawiki-qunit
+builders:
+ - mw-setup-extension:
+ mwbranch: 'master'
+ dependencies: '{dependencies}'
+ - mw-run-update-script
- job-template:
name: '{name}-{ext-name}-qunit'
@@ -118,12 +125,9 @@
concurrent: true
triggers:
- zuul
-
builders:
- - mw-setup-extension:
-mwbranch: 'master'
-dependencies: '{dependencies}'
- - mw-run-update-script
+ - prepare-mediawiki-qunit:
+ dependencies: '{dependencies}'
- qunit
publishers:
- archive-log-dir
@@ -136,12 +140,9 @@
concurrent: true
triggers:
- zuul
-
builders:
- - mw-setup-extension:
-mwbranch: 'master'
-dependencies: '{dependencies}'
- - mw-run-update-script
+ - prepare-mediawiki-qunit:
+ dependencies: '{dependencies}'
- qunit-mobile
publishers:
- archive-log-dir
--
To view, visit https://gerrit.wikimedia.org/r/163831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95901329c170b0d533e06c200381c3a8fad2633d
Gerrit-PatchSet: 4
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
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 languages with translation over 90% to VisualEditor scre... - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add languages with translation over 90% to VisualEditor screenshot job .. Add languages with translation over 90% to VisualEditor screenshot job Change-Id: I424be4885852847fec5951114e4eab12d12d387f --- M job-templates-browsertests.yaml 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/job-templates-browsertests.yaml b/job-templates-browsertests.yaml index 581b91f..a7e439a 100644 --- a/job-templates-browsertests.yaml +++ b/job-templates-browsertests.yaml @@ -61,11 +61,15 @@ type: user-defined name: LANGUAGE_SCREENSHOT_CODE values: + - ar - ast - cs - de + - el - en - es + - et + - fa - fi - fr - gl @@ -75,8 +79,12 @@ - it - ja - kn + - ko + - lb - mk + - ms - nb + - nl - pl - pt - ro -- To view, visit https://gerrit.wikimedia.org/r/163241 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I424be4885852847fec5951114e4eab12d12d387f Gerrit-PatchSet: 4 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Vikassy vikasyaligar...@gmail.com Gerrit-Reviewer: Zfilipin zfili...@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] common.less: Remove dead code - change (mediawiki...Vector)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163835
Change subject: common.less: Remove dead code
..
common.less: Remove dead code
This does nothing since 7dc4b5861589f2cef472195273c41a86083f69d4 in core.
Change-Id: I879d96fe8d4034b6365c6b6af3d9e3615dd1c506
---
M components/common.less
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector
refs/changes/35/163835/1
diff --git a/components/common.less b/components/common.less
index ac4b850..bf0f451 100644
--- a/components/common.less
+++ b/components/common.less
@@ -123,10 +123,6 @@
font-size: 140%;
}
-.redirectMsg img {
- vertical-align: text-bottom;
-}
-
.mw-body-content {
position: relative;
line-height: @content-line-height;
--
To view, visit https://gerrit.wikimedia.org/r/163835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I879d96fe8d4034b6365c6b6af3d9e3615dd1c506
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Thumbnail prerendering at upload time on beta - change (operations/mediawiki-config)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/163836 Change subject: Thumbnail prerendering at upload time on beta .. Thumbnail prerendering at upload time on beta The buckets match the current Media Viewer set for testing purposes. They aren't representative of the final bucket list. Change-Id: I97e794c396d000a3d658a37352ba0a22970b90bc Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/301 --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/36/163836/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index f8aaabc..139e5d5 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -440,6 +440,23 @@ 'default' = false, 'enwiki' = true, ), + + // Thumbnail prerendering at upload time + 'wgUploadThumbnailRenderMap' = array( + 'default' = array( 320, 640, 800, 1024, 1280, 1920, 2560, 2880 ), + ), + + 'wgUploadThumbnailRenderMethod' = array( + 'default' = 'http', + ), + + 'wgUploadThumbnailRenderHttpCustomHost' = array( + 'default' = 'upload.beta.wmflabs.org', + ), + + 'wgUploadThumbnailRenderHttpCustomDomain' = array( + 'default' = 'deployment-cache-upload02.eqiad.wmflabs', + ), ); } # wmflLabsSettings() -- To view, visit https://gerrit.wikimedia.org/r/163836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97e794c396d000a3d658a37352ba0a22970b90bc Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Dedicated VisualEditor qunit job - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163837
Change subject: Dedicated VisualEditor qunit job
..
Dedicated VisualEditor qunit job
blalal
mwext-VisualEditor-qunit
Change-Id: I6f2253abf081ec47864f4744ae3df7ac38966584
---
M mediawiki-extensions.yaml
1 file changed, 24 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/37/163837/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 716..ed74476 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -151,6 +151,29 @@
- archive-log-dir
- qunit-cleanup
+# VisualEditor MediaWiki extensions has the VisualEditor repository as a
+# submodule under lib/ve
+- job-template:
+name: 'VisualEditor-qunit'
+node: productionSlaves UbuntuPrecise # labs instances not ready yet
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - prepare-mediawiki-qunit:
+ ext-name: '{ext-name}'
+ dependencies: '{dependencies}'
+ - zuul-cloner:
+ projects: VisualEditor
+ - shell: |
+ rm -fR src/extensions/VisualEditor/lib/ve
+ ln -sf src/VisualEditor src/extensions/VisualEditor/lib/ve
+ - qunit
+publishers:
+ - archive-log-dir
+ - qunit-cleanup
+
+
# Run extension tests via Zuul cloner
- job-template:
name: '{name}-{ext-name}-testextension'
@@ -1304,6 +1327,7 @@
jobs:
- '{name}-ruby1.9.3lint'
- 'mwext-VisualEditor-sync-gerrit'
+ - 'VisualEditor-qunit'
- project:
name: 'mwext-WikiLove'
--
To view, visit https://gerrit.wikimedia.org/r/163837
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f2253abf081ec47864f4744ae3df7ac38966584
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid too much recursion in jquery.wikibase.sitelinklistview - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid too much recursion in jquery.wikibase.sitelinklistview
..
Avoid too much recursion in jquery.wikibase.sitelinklistview
Bug: 71453
Change-Id: I34553e7f5265c386071f40e9ebc05a66c6257739
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index ef80587..fce3526 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -362,7 +362,11 @@
self._saveSiteLink( emptySiteLink )
.done( function() {
self._afterRemove();
- next();
+
+ // Use setTimeout here to break
out of the current call stack.
+ // This is needed because the
stack can get very large (if the queue
+ // is very large), eventually
leading to failures.
+ setTimeout( next, 0 );
} )
.fail( function( error ) {
self.setError( error );
@@ -387,7 +391,10 @@
$queue.queue( 'stopediting', function( next ) {
sitelinkview.element
.one(
'sitelinkviewafterstopediting.sitelinklistview', function( event ) {
- next();
+ // Use setTimeout here to break out of
the current call stack.
+ // This is needed because the stack can
get very large (if the queue
+ // is very large), eventually leading
to failures.
+ setTimeout( next, 0 );
} );
sitelinkview.stopEditing( dropValue );
} );
--
To view, visit https://gerrit.wikimedia.org/r/163822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34553e7f5265c386071f40e9ebc05a66c6257739
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.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] Workaround for hhvm memcached issue in CachingEntityRevision... - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163838
Change subject: Workaround for hhvm memcached issue in
CachingEntityRevisionLookup
..
Workaround for hhvm memcached issue in CachingEntityRevisionLookup
see bug: 71461
Change-Id: I8b85cd087248d29b79dfd634b1cb99bbd84a560e
---
M lib/includes/store/CachingEntityRevisionLookup.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/38/163838/1
diff --git a/lib/includes/store/CachingEntityRevisionLookup.php
b/lib/includes/store/CachingEntityRevisionLookup.php
index c6073cd..63d59e9 100644
--- a/lib/includes/store/CachingEntityRevisionLookup.php
+++ b/lib/includes/store/CachingEntityRevisionLookup.php
@@ -104,7 +104,12 @@
wfProfileIn( __METHOD__ );
$key = $this-getCacheKey( $entityId );
- $entityRevision = $this-cache-get( $key );
+ try {
+ $entityRevision = $this-cache-get( $key );
+ } catch ( \UnexpectedValueException $ex ) {
+ // @fixme ugly hack to work around hhvm issue, see bug
71461
+ $entityRevision = false;
+ }
if ( $entityRevision !== false ) {
if ( $revisionId === 0 $this-shouldVerifyRevision
) {
--
To view, visit https://gerrit.wikimedia.org/r/163838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b85cd087248d29b79dfd634b1cb99bbd84a560e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 71109) Don't fail Special:EditWatchlist when there's an... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163839
Change subject: (bug 71109) Don't fail Special:EditWatchlist when there's an
invalid UUID in watchlist
..
(bug 71109) Don't fail Special:EditWatchlist when there's an invalid UUID in
watchlist
Bug: 71109
Change-Id: I3409bdc64fbb7120259d478fa47f5da6afbe2c09
---
M Hooks.php
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/39/163839/1
diff --git a/Hooks.php b/Hooks.php
index ddaaf46..8360cdd 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -954,8 +954,13 @@
// build array of queries to be executed all at once
$queries = array();
foreach( $ids as $id ) {
- $uuid = UUID::create( strtolower( $id ) );
- $queries[] = array( 'rev_type_id' = $uuid );
+ try {
+ $uuid = UUID::create( strtolower( $id ) );
+ $queries[] = array( 'rev_type_id' = $uuid );
+ } catch ( \Exception $e ) {
+ // invalid id
+ unset( $watchlistInfo[NS_TOPIC][$id] );
+ }
}
/*
--
To view, visit https://gerrit.wikimedia.org/r/163839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3409bdc64fbb7120259d478fa47f5da6afbe2c09
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add tracking categories for files with attribution problems - change (mediawiki...CommonsMetadata)
jenkins-bot has submitted this change and it was merged.
Change subject: Add tracking categories for files with attribution problems
..
Add tracking categories for files with attribution problems
Adds a tracking category to file pages for each of these problems:
* no description
* no author
* no source
* no license
Needs to be enabled with $wgCommonsMetadataSetTrackingCategories.
Depends on core changes I685b285fcc772382993116f7822a832eeecc0681
and I89d9ea1db3a4e6486e77eee940bd438f7753b776.
Change-Id: I43ed79b6a54cd31820ecae8139e29c5880f5dd1b
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/859
---
M CommonsMetadata.php
M DataCollector.php
M HookHandler.php
M i18n/en.json
M i18n/qqq.json
5 files changed, 117 insertions(+), 6 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CommonsMetadata.php b/CommonsMetadata.php
index 5ffa245..5db1c83 100755
--- a/CommonsMetadata.php
+++ b/CommonsMetadata.php
@@ -25,6 +25,12 @@
'descriptionmsg' = 'commonsmetadata-desc',
);
+/**
+ * Set tracking categories on file pages where description, author, source or
license cannot be parsed
+ * @var bool
+ */
+$wgCommonsMetadataSetTrackingCategories = false;
+
$wgAutoloadClasses['CommonsMetadata\HookHandler'] = __DIR__ .
'/HookHandler.php';
$wgAutoloadClasses['CommonsMetadata\DataCollector'] = __DIR__ .
'/DataCollector.php';
$wgAutoloadClasses['CommonsMetadata\DomNavigator'] = __DIR__ .
'/DomNavigator.php';
@@ -36,4 +42,11 @@
$wgHooks['GetExtendedMetadata'][] =
'CommonsMetadata\HookHandler::onGetExtendedMetadata';
$wgHooks['ValidateExtendedMetadataCache'][] =
'CommonsMetadata\HookHandler::onValidateExtendedMetadataCache';
+$wgHooks['ContentAlterParserOutput'][] =
'CommonsMetadata\HookHandler::onContentAlterParserOutput';
$wgHooks['UnitTestsList'][] = 'CommonsMetadata\HookHandler::onUnitTestsList';
+
+
+$wgTrackingCategories[] = 'commonsmetadata-trackingcategory-no-license';
+$wgTrackingCategories[] = 'commonsmetadata-trackingcategory-no-description';
+$wgTrackingCategories[] = 'commonsmetadata-trackingcategory-no-author';
+$wgTrackingCategories[] = 'commonsmetadata-trackingcategory-no-source';
diff --git a/DataCollector.php b/DataCollector.php
index 373d38d..b8d7e0d 100755
--- a/DataCollector.php
+++ b/DataCollector.php
@@ -99,6 +99,38 @@
}
/**
+* Checks for the presence of metadata needed for attributing the file
(author, source, license)
+* and returns a list of keys corresponding to problems.
+* @param string $descriptionText HTML code of the file description
+* @return array one or more of the following keys:
+* - no-license - failed to detect a license
+* - no-description - failed to detect any image description
+* - no-author - failed to detect author name or a custom attribution
text
+* - no-source - failed to detect the source of the image or a custom
attribution text
+*/
+ public function verifyAttributionMetadata( $descriptionText ) {
+ $problems = array();
+ $templateData = $this-templateParser-parsePage(
$descriptionText );
+ $licenseData = $this-selectLicense(
$templateData[TemplateParser::LICENSES_KEY] );
+ $informationData = $this-selectInformationTemplate(
$templateData[TemplateParser::INFORMATION_FIELDS_KEY] );
+
+ if ( !$licenseData || empty( $licenseData['LicenseShortName'] )
) {
+ $problems[] = 'no-license';
+ }
+ if ( !$informationData || empty(
$informationData['ImageDescription'] ) ) {
+ $problems[] = 'no-description';
+ }
+ if ( !$informationData || empty( $informationData['Artist'] )
empty( $informationData['Attribution'] ) ) {
+ $problems[] = 'no-author';
+ }
+ if ( !$informationData || empty( $informationData['Credit'] )
empty( $informationData['Attribution'] ) ) {
+ $problems[] = 'no-source';
+ }
+
+ return $problems;
+ }
+
+ /**
* @param array $categories
* @return array
*/
diff --git a/HookHandler.php b/HookHandler.php
index 75c323e..84f235a 100755
--- a/HookHandler.php
+++ b/HookHandler.php
@@ -84,6 +84,36 @@
}
/**
+* Check HTML output of a file page to see if it has all the basic
metadata, and add tracking categories
+* if it does not.
+* @param \Content $content
+* @param \Title $title
+* @param \ParserOutput $parserOutput
+* @return bool this hook handler always returns true.
+*/
+ public static function onContentAlterParserOutput( $content, $title,
$parserOutput ) {
+ global
[MediaWiki-commits] [Gerrit] Followup b149390: fix dm.Surface's concept of selectedNode... - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Followup b149390: fix dm.Surface's concept of selectedNode to
match SurfaceFragment's
..
Followup b149390: fix dm.Surface's concept of selectedNode to match
SurfaceFragment's
In SurfaceFragment, there is only a selectedNode if the selection
precisely contains a node. In Surface, however, the same name
was being used to refer to the node the selection is inside of,
even if the selection doesn't fully contain the node.
This led to problems when ui.DesktopContext assumed that
if an inspector is open and selectedNode is not null, we
must be inspecting a node. This is clearly not true,
because when the link inspector is open, the selection
is entirely within one TextNode. Worse, when the user
clicks out of the inspector but within the same TextNode,
the selectedNode doesn't change, and so the inspector
isn't closed.
Bug: 71373
Change-Id: Ib67fe72a029ef8c706495ab150e8316ae4038a18
---
M src/dm/ve.dm.Surface.js
1 file changed, 2 insertions(+), 11 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/dm/ve.dm.Surface.js b/src/dm/ve.dm.Surface.js
index 8673935..34db3e6 100644
--- a/src/dm/ve.dm.Surface.js
+++ b/src/dm/ve.dm.Surface.js
@@ -525,7 +525,7 @@
*/
ve.dm.Surface.prototype.setSelection = function ( selection ) {
var left, right, leftAnnotations, rightAnnotations,
insertionAnnotations,
- startNode, endNode, selectedNode,
+ startNode, selectedNode,
branchNodes = {},
oldSelection = this.selection,
contextChange = false,
@@ -550,16 +550,7 @@
// Update selected node
if ( !selection.isCollapsed() ) {
startNode =
this.documentModel.documentNode.getNodeFromOffset( selection.start + 1 );
- if ( startNode ) {
- endNode =
this.documentModel.documentNode.getNodeFromOffset( selection.end - 1 );
- if ( startNode === endNode ) {
- selectedNode = startNode;
- }
- }
- } else {
- // Check if the range is inside a focusable node with a
collapsed selection
- startNode =
this.documentModel.documentNode.getNodeFromOffset( selection.start );
- if ( startNode ) {
+ if ( startNode
startNode.getOuterRange().equalsSelection( selection ) ) {
selectedNode = startNode;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/163783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib67fe72a029ef8c706495ab150e8316ae4038a18
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Esanders esand...@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] Experimental VisualEditor-qunit job - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Experimental VisualEditor-qunit job .. Experimental VisualEditor-qunit job Made non voting as a safe guard, it is only in the 'experimental' pipeline for now and hence can be triggered by commenting 'recheck'. JJB configuration change is https://gerrit.wikimedia.org/r/#/c/163837/ Change-Id: I6f2253abf081ec47864f4744ae3df7ac38966584 --- M layout.yaml 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index e00f081..42442a0 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1532,6 +1532,12 @@ - name: 'mwext-VisualEditor-sync-gerrit' branch: ^master$ + # Experimental https://gerrit.wikimedia.org/r/163837 + # Once made voting remove it from experimental pipeline and uncomment it from + # the test and gate-and-submit pipelines. + - name: 'VisualEditor-qunit' +voting: false + # FIXME: work in progress - name: sartoris-sphinx-doc voting: false @@ -5467,12 +5473,16 @@ - mwext-VisualEditor-npm - mwext-VisualEditor-lint - mwext-VisualEditor-doc-test + #- VisualEditor-qunit gate-and-submit: - mediawiki-gate - mwext-VisualEditor-npm - mwext-VisualEditor-lint - mwext-VisualEditor-doc-test - experiment-gating-dependencies + #- VisualEditor-qunit +experimental: + - VisualEditor-qunit postmerge: - mwext-VisualEditor-doc-publish - mwext-VisualEditor-sync-gerrit @@ -5784,10 +5794,14 @@ - VisualEditor-npm - VisualEditor-ruby1.9.3lint - VisualEditor-jsduck + #- VisualEditor-qunit gate-and-submit: - VisualEditor-npm - VisualEditor-ruby1.9.3lint - VisualEditor-jsduck + #- VisualEditor-qunit +experimental: + - VisualEditor-qunit - name: wikimedia/bots/jouncebot check-voter: -- To view, visit https://gerrit.wikimedia.org/r/163840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f2253abf081ec47864f4744ae3df7ac38966584 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...VisualEditor)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163847 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/47/163847/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/163847 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DiscussionParser: More tests for custom and localised namesp... - change (mediawiki...Echo)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163844
Change subject: DiscussionParser: More tests for custom and localised namespaces
..
DiscussionParser: More tests for custom and localised namespaces
Change-Id: Iebd60aab83b0a5695b2a006f0e723e127302c35a
---
M tests/phpunit/includes/DiscussionParserTest.php
1 file changed, 42 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/44/163844/1
diff --git a/tests/phpunit/includes/DiscussionParserTest.php
b/tests/phpunit/includes/DiscussionParserTest.php
index d068519..50b4f0a 100644
--- a/tests/phpunit/includes/DiscussionParserTest.php
+++ b/tests/phpunit/includes/DiscussionParserTest.php
@@ -3,7 +3,7 @@
/**
* @group Echo
*/
-class EchoDiscussionParserTest extends MediaWikiTestCase {
+class EchoDiscussionParserTest extends MediaWikiLangTestCase {
// TODO test cases for:
// - generateEventsForRevision
// - stripHeader
@@ -60,6 +60,15 @@
* FIXME some of the app logic is in the test...
*/
public function testSigningDetection( $line, $expectedUser ) {
+ $this-setMwGlobals( array(
+ 'wgLanguageCode' = 'pl',
+ 'wgContLang' = Language::factory( 'pl' ),
+ 'wgNamespaceAliases' = array(
+ 'Person' = NS_USER,
+ 'Person_talk' = NS_USER_TALK,
+ ),
+ ) );
+
if ( !EchoDiscussionParser::isSignedComment( $line ) ) {
$this-assertEquals( $expectedUser, false );
return;
@@ -106,6 +115,30 @@
'Werdna'
),
),
+ // Translated namespace name (in Polish, see setUp())
+ array(
+ Zażółć gęślą jaźń. [[Użytkownik:Matma
Rex|Matma Rex]] ([[Dyskusja użytkownika:Matma Rex|Matma Rex]]) $ts,
+ array(
+ 55,
+ 'Matma Rex'
+ ),
+ ),
+ // Translated namespace name, gendered (female) alias
(in Polish, see setUp())
+ array(
+ Zażółć gęślą jaźń. [[Użytkowniczka:Matma
Rex|Matma Rex]] ([[Dyskusja użytkowniczki:Matma Rex|Matma Rex]]) $ts,
+ array(
+ 58,
+ 'Matma Rex'
+ ),
+ ),
+ // Custom aliased namespaces
+ array(
+ I like this. [[Person:Werdna]] ([[Person
talk:Werdna|talk]]) $ts,
+ array(
+ 32,
+ 'Werdna'
+ ),
+ ),
// Anonymous user
array(
I am anonymous because I like my IP address.
--[[Special:Contributions/127.0.0.1]] $ts,
@@ -114,6 +147,14 @@
'127.0.0.1'
),
),
+ // Anonymous user
+ array(
+ I am anonymous because I like my IP address.
--[[Specjalna:Wkład/127.0.0.1]] $ts,
+ array(
+ 47,
+ '127.0.0.1'
+ ),
+ ),
// No signature
array(
Well, \nI do think that [[User:Newyorkbrad]]
is pretty cool, but what do I know?,
--
To view, visit https://gerrit.wikimedia.org/r/163844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebd60aab83b0a5695b2a006f0e723e127302c35a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (VisualEditor/VisualEditor)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163846 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/46/163846/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/163846 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Workaround for hhvm memcached issue in CachingEntityRevision... - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163843
Change subject: Workaround for hhvm memcached issue in
CachingEntityRevisionLookup
..
Workaround for hhvm memcached issue in CachingEntityRevisionLookup
see bug: 71461
Change-Id: I8b85cd087248d29b79dfd634b1cb99bbd84a560e
---
M lib/includes/store/CachingEntityRevisionLookup.php
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/43/163843/1
diff --git a/lib/includes/store/CachingEntityRevisionLookup.php
b/lib/includes/store/CachingEntityRevisionLookup.php
index c6073cd..6cb39ed 100644
--- a/lib/includes/store/CachingEntityRevisionLookup.php
+++ b/lib/includes/store/CachingEntityRevisionLookup.php
@@ -104,7 +104,14 @@
wfProfileIn( __METHOD__ );
$key = $this-getCacheKey( $entityId );
- $entityRevision = $this-cache-get( $key );
+ try {
+ $entityRevision = $this-cache-get( $key );
+ } catch ( \UnexpectedValueException $ex ) {
+ // @fixme ugly hack to work around hhvm issue, see bug
71461, in addition
+ // to varying cache key based on if HHVM_VERSION is
defined.
+ wfLogWarning( 'Failed to deserialize ' .
$entityId-getSerialization() . ' from cache.' );
+ $entityRevision = false;
+ }
if ( $entityRevision !== false ) {
if ( $revisionId === 0 $this-shouldVerifyRevision
) {
--
To view, visit https://gerrit.wikimedia.org/r/163843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b85cd087248d29b79dfd634b1cb99bbd84a560e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split Wikibase's entity cache for HHVM/Zend - change (operations/mediawiki-config)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163842
Change subject: Split Wikibase's entity cache for HHVM/Zend
..
Split Wikibase's entity cache for HHVM/Zend
Bug: 71461
Change-Id: I197651871c3d68423980979603276b03f1dd64c0
---
M wmf-config/Wikibase.php
1 file changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/42/163842/1
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index a36a2b3..82fa59e 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -81,12 +81,11 @@
$wgWBRepoSettings['dataSquidMaxage'] = 1 * 60 * 60;
$wgWBRepoSettings['sharedCacheDuration'] = 60 * 60 * 24;
- if ( $wmfVersionNumber === '1.24wmf21' ) {
- // temp hack to refresh cache for any broken things on
test.wikidata / test2
- // due to broken code deployed to 1.24wmf21. set here and for
client.
- $wgWBRepoSettings['sharedCacheKeyPrefix'] =
$wmgWikibaseCachePrefix/WBL-1.24wmf21b;
- } else {
- $wgWBRepoSettings['sharedCacheKeyPrefix'] =
$wmgWikibaseCachePrefix/WBL-$wmfVersionNumber;
+ $wgWBRepoSettings['sharedCacheKeyPrefix'] =
$wmgWikibaseCachePrefix/WBL-$wmfVersionNumber;
+
+ if ( defined( 'HHVM_VERSION' ) ) {
+ // Split the cache up for hhvm. Bug 71461
+ $wgWBRepoSettings['sharedCacheKeyPrefix'] .= '-hhvm';
}
$wgPropertySuggesterMinProbability = 0.071;
--
To view, visit https://gerrit.wikimedia.org/r/163842
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I197651871c3d68423980979603276b03f1dd64c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce wb.getMwApiForRepo - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163845
Change subject: Introduce wb.getMwApiForRepo
..
Introduce wb.getMwApiForRepo
This is supposed to be a replacement for most usages of wb.RepoApi and
should help with handling recent and upcoming breaking changes to wb.RepoApi.
Change-Id: I24f69b7e5af50763826c3b3bc9c482fdfc714bf1
---
M client/resources/Resources.php
A client/resources/wikibase.client.getMwApiForRepo.js
M client/resources/wikibase.client.linkitem.init.js
3 files changed, 28 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/45/163845/1
diff --git a/client/resources/Resources.php b/client/resources/Resources.php
index ecdc010..ba5d402 100644
--- a/client/resources/Resources.php
+++ b/client/resources/Resources.php
@@ -8,6 +8,15 @@
);
return array(
+ 'wikibase.client.getMwRepoForApi' = $moduleTemplate + array(
+ 'scripts' = array(
+ 'wikibase.client.getMwRepoForApi.js'
+ ),
+ 'dependencies' = array(
+ 'mw.config.values.wbRepo',
+ 'wikibase.api.getLocationAgnosticMwApi',
+ )
+ ),
'wikibase.client.init' = $moduleTemplate + array(
'position' = 'top',
'skinStyles' = array(
diff --git a/client/resources/wikibase.client.getMwApiForRepo.js
b/client/resources/wikibase.client.getMwApiForRepo.js
new file mode 100644
index 000..80cb85f
--- /dev/null
+++ b/client/resources/wikibase.client.getMwApiForRepo.js
@@ -0,0 +1,16 @@
+/*
+ * @licence GNU GPL v2+
+ * @author: Adrian Lang adrian.l...@wikimedia.de
+ */
+( function( wb, $ ) {
+ 'use strict';
+
+ var MODULE = wb;
+
+ MODULE.getMwApiForRepo = function() {
+ var repoConfig = mw.config.get( 'wbRepo' ),
+ repoApiEndpoint = repoConfig.url +
repoConfig.scriptPath + '/api.php',
+ mwApiForRepo = wikibase.api.getLocationAgnosticMwApi(
repoApiEndpoint );
+ return mwApiForRepo;
+ };
+}( wikibase, jQuery ) );
diff --git a/client/resources/wikibase.client.linkitem.init.js
b/client/resources/wikibase.client.linkitem.init.js
index 6b5e66b..ad7fce9 100644
--- a/client/resources/wikibase.client.linkitem.init.js
+++ b/client/resources/wikibase.client.linkitem.init.js
@@ -21,19 +21,17 @@
'jquery.wikibase.linkitem',
'mediawiki.Title',
'mw.config.values.wbRepo',
- 'wikibase.api.getLocationAgnosticMwApi'
+ 'wikibase.client.getMwRepoForApi',
],
function() {
$spinner.remove();
- var repoConfig = mw.config.get( 'wbRepo' ),
- repoApiEndpoint = repoConfig.url +
repoConfig.scriptPath + '/api.php',
- mwApiForRepo =
wikibase.api.getLocationAgnosticMwApi( repoApiEndpoint );
+ var repoConfig = mw.config.get( 'wbRepo' );
$linkItemLink
.show()
.linkitem( {
- mwApiForRepo: mwApiForRepo,
+ mwApiForRepo:
wikibase.getMwApiForRepo(),
pageTitle: ( new mw.Title(
mw.config.get( 'wgTitle' ),
mw.config.get(
'wgNamespaceNumber' )
--
To view, visit https://gerrit.wikimedia.org/r/163845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24f69b7e5af50763826c3b3bc9c482fdfc714bf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Update config for Language pairs - change (operations/puppet)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163841
Change subject: WIP: Update config for Language pairs
..
WIP: Update config for Language pairs
So that it only shows Spanish and Catalan.
Change-Id: I87025fb418efdd0cee906ce3b743dd0ed4cc2bcf
---
M modules/cxserver/templates/config.erb
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/163841/1
diff --git a/modules/cxserver/templates/config.erb
b/modules/cxserver/templates/config.erb
index 2f91f67..d061352 100644
--- a/modules/cxserver/templates/config.erb
+++ b/modules/cxserver/templates/config.erb
@@ -8,4 +8,20 @@
port: %= @port %,
logDir: '%= @log_dir %',
'parsoid.api': '%= @parsoid %'
+ registry: {
+ es: {
+ ca: {
+ dictionary: {
+ providers: [
+ 'JsonDict'
+ ]
+ },
+ mt: {
+ providers: [
+ 'Apertium'
+ ]
+ }
+ }
+ }
+ }
};
--
To view, visit https://gerrit.wikimedia.org/r/163841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I87025fb418efdd0cee906ce3b743dd0ed4cc2bcf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Experimental VisualEditor-qunit job - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163840 Change subject: Experimental VisualEditor-qunit job .. Experimental VisualEditor-qunit job Made non voting as a safe guard, it is only in the 'experimental' pipeline for now and hence can be triggered by commenting 'recheck'. JJB configuration change is https://gerrit.wikimedia.org/r/#/c/163837/ Change-Id: I6f2253abf081ec47864f4744ae3df7ac38966584 --- M layout.yaml 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/40/163840/1 diff --git a/layout.yaml b/layout.yaml index e00f081..42442a0 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1532,6 +1532,12 @@ - name: 'mwext-VisualEditor-sync-gerrit' branch: ^master$ + # Experimental https://gerrit.wikimedia.org/r/163837 + # Once made voting remove it from experimental pipeline and uncomment it from + # the test and gate-and-submit pipelines. + - name: 'VisualEditor-qunit' +voting: false + # FIXME: work in progress - name: sartoris-sphinx-doc voting: false @@ -5467,12 +5473,16 @@ - mwext-VisualEditor-npm - mwext-VisualEditor-lint - mwext-VisualEditor-doc-test + #- VisualEditor-qunit gate-and-submit: - mediawiki-gate - mwext-VisualEditor-npm - mwext-VisualEditor-lint - mwext-VisualEditor-doc-test - experiment-gating-dependencies + #- VisualEditor-qunit +experimental: + - VisualEditor-qunit postmerge: - mwext-VisualEditor-doc-publish - mwext-VisualEditor-sync-gerrit @@ -5784,10 +5794,14 @@ - VisualEditor-npm - VisualEditor-ruby1.9.3lint - VisualEditor-jsduck + #- VisualEditor-qunit gate-and-submit: - VisualEditor-npm - VisualEditor-ruby1.9.3lint - VisualEditor-jsduck + #- VisualEditor-qunit +experimental: + - VisualEditor-qunit - name: wikimedia/bots/jouncebot check-voter: -- To view, visit https://gerrit.wikimedia.org/r/163840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f2253abf081ec47864f4744ae3df7ac38966584 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Kill jquery.json module dependency - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Kill jquery.json module dependency .. Kill jquery.json module dependency This module has been deprecated. Change-Id: I0f3823329af3fb0102850f941dcc178264a8d8a5 --- M Resources.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: SG: Looks good to me, but someone else must approve Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index e96994d..3d80aba 100644 --- a/Resources.php +++ b/Resources.php @@ -320,7 +320,6 @@ 'ext.flow.vendor.storer', 'ext.flow.vendor.jquery.ba-throttle-debounce', 'mediawiki.jqueryMsg', - 'jquery.json', 'ext.flow.jquery.conditionalScroll', 'ext.flow.jquery.findWithParent', 'mediawiki.api', -- To view, visit https://gerrit.wikimedia.org/r/163780 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0f3823329af3fb0102850f941dcc178264a8d8a5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: SG shah...@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] Hygiene: Share pipelist decoration between history and autho... - change (mediawiki...Flow)
Matthias Mullie has submitted this change and it was merged.
Change subject: Hygiene: Share pipelist decoration between history and author
links
..
Hygiene: Share pipelist decoration between history and author links
Change-Id: I505ff3f3038fc028bf580df5d45b2032b1fe5181
---
M handlebars/compiled/flow_block_board-history.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_block_board-history.handlebars
M handlebars/flow_block_topic_history.handlebars
M handlebars/flow_post_author.handlebars
M modules/new/styles/board/topic/post.less
M modules/new/styles/common.less
9 files changed, 75 insertions(+), 65 deletions(-)
Approvals:
SG: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_board-history.handlebars.php
b/handlebars/compiled/flow_block_board-history.handlebars.php
index 01fff40..9681811 100644
--- a/handlebars/compiled/flow_block_board-history.handlebars.php
+++ b/handlebars/compiled/flow_block_board-history.handlebars.php
@@ -24,14 +24,14 @@
ul
'.LCRun3::sec($cx, ((is_array($in) isset($in['revisions']))
? $in['revisions'] : null), $in, true, function($cx, $in) {return '
li
- ('.((LCRun3::ifvar($cx,
((is_array($in['links']) isset($in['links']['diff-cur'])) ?
$in['links']['diff-cur'] : null))) ? 'a
href='.htmlentities(((is_array($in['links']['diff-cur'])
isset($in['links']['diff-cur']['url'])) ? $in['links']['diff-cur']['url'] :
null), ENT_QUOTES, 'UTF-8').'
title='.htmlentities(((is_array($in['links']['diff-cur'])
isset($in['links']['diff-cur']['title'])) ? $in['links']['diff-cur']['title'] :
null), ENT_QUOTES,
'UTF-8').''.htmlentities(((is_array($in['links']['diff-cur'])
isset($in['links']['diff-cur']['title'])) ? $in['links']['diff-cur']['title'] :
null), ENT_QUOTES, 'UTF-8').'/a' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('cur'),Array()), 'encq').'
- ').'
- '.LCRun3::ch($cx, 'l10n',
Array(Array('pipe-separator'),Array()), 'encq').'
- '.((LCRun3::ifvar($cx,
((is_array($in['links']) isset($in['links']['diff-prev'])) ?
$in['links']['diff-prev'] : null))) ? '
- a
href='.htmlentities(((is_array($in['links']['diff-prev'])
isset($in['links']['diff-prev']['url'])) ? $in['links']['diff-prev']['url'] :
null), ENT_QUOTES, 'UTF-8').'
title='.htmlentities(((is_array($in['links']['diff-prev'])
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES,
'UTF-8').''.htmlentities(((is_array($in['links']['diff-prev'])
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES, 'UTF-8').'/a' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('last'),Array()), 'encq').'
- ').''.((LCRun3::ifvar($cx,
((is_array($in['links']) isset($in['links']['topic'])) ?
$in['links']['topic'] : null))) ? '
- '.LCRun3::ch($cx, 'l10n',
Array(Array('pipe-separator'),Array()), 'encq').'
- a
href='.htmlentities(((is_array($in['links']['topic'])
isset($in['links']['topic']['url'])) ? $in['links']['topic']['url'] : null),
ENT_QUOTES, 'UTF-8').' title='.htmlentities(((is_array($in['links']['topic'])
isset($in['links']['topic']['title'])) ? $in['links']['topic']['title'] :
null), ENT_QUOTES, 'UTF-8').''.htmlentities(((is_array($in['links']['topic'])
isset($in['links']['topic']['title'])) ? $in['links']['topic']['title'] :
null), ENT_QUOTES, 'UTF-8').'/a' : '').')
+ span
class=flow-pipelist'.htmlentities(((is_array($in) isset($in['noop'])) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'span'.((LCRun3::ifvar($cx,
((is_array($in['links']) isset($in['links']['diff-cur'])) ?
$in['links']['diff-cur'] : null))) ? 'a
href='.htmlentities(((is_array($in['links']['diff-cur'])
isset($in['links']['diff-cur']['url'])) ? $in['links']['diff-cur']['url'] :
null), ENT_QUOTES, 'UTF-8').'
title='.htmlentities(((is_array($in['links']['diff-cur'])
isset($in['links']['diff-cur']['title'])) ? $in['links']['diff-cur']['title'] :
null), ENT_QUOTES,
'UTF-8').''.htmlentities(((is_array($in['links']['diff-cur'])
isset($in['links']['diff-cur']['title'])) ? $in['links']['diff-cur']['title'] :
null), ENT_QUOTES, 'UTF-8').'/a' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('cur'),Array()), 'encq').'
+ ').'
+ /span
+ span
+
[MediaWiki-commits] [Gerrit] Move a lot of the miscellaneous wikis out of their own speci... - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Move a lot of the miscellaneous wikis out of their own specific
docroots
..
Move a lot of the miscellaneous wikis out of their own specific docroots
Change-Id: I278f470674aebc2186d52778cadf5f56c763da46
---
M modules/mediawiki/files/apache/sites/main.conf
M modules/mediawiki/files/apache/sites/remnant.conf
M modules/mediawiki/files/apache/sites/wikimedia.conf
3 files changed, 133 insertions(+), 134 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index e82f37c..ef3fef3 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -59,38 +59,38 @@
VirtualHost *:80
ServerName test.wikidata.org
-DocumentRoot /srv/mediawiki/docroot/testwikidata
+DocumentRoot /srv/mediawiki/docroot/wikidata
AllowEncodedSlashes On
RewriteEngine On
IfDefine HHVM
-ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/index.php
+ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php
ProxyPass /w/extensions!
-ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/$1
-RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/index.php[P]
-RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/robots.php [P]
-RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/testwikidata/w/favicon.php [P]
+ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
+RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php[P]
+RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/robots.php [P]
+RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/favicon.php [P]
/IfDefine
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
# Primary wiki redirector:
-Alias /wiki /srv/mediawiki/docroot/testwikidata/w/index.php
+Alias /wiki /srv/mediawiki/docroot/wikidata/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/w/$ /w/index.php
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-Directory /srv/mediawiki/docroot/testwikidata/w
+Directory /srv/mediawiki/docroot/wikidata/w
IfModule mod_php5.c
php_admin_flag engine on
/IfModule
/Directory
-Directory /srv/mediawiki/docroot/testwikidata/w/extensions
+Directory /srv/mediawiki/docroot/wikidata/w/extensions
IfModule mod_php5.c
php_admin_flag engine off
/IfModule
@@ -284,7 +284,7 @@
VirtualHost *:80
ServerName donate.wikimedia.org
ServerAlias donate.wikipedia.org
-DocumentRoot /srv/mediawiki/docroot/donate
+DocumentRoot /srv/mediawiki/docroot/wikimedia.org
AllowEncodedSlashes On
RewriteEngine On
@@ -293,7 +293,7 @@
RewriteRule . - [E=RW_PROTO:http]
# Primary wiki redirector:
-Alias /wiki /srv/mediawiki/docroot/donate/w/index.php
+Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
# Push to SSL
RewriteCond %{HTTP:X-Forwarded-Proto} !https
@@ -309,12 +309,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-Directory /srv/mediawiki/docroot/donate/w
+Directory /srv/mediawiki/docroot/wikimedia.org/w
IfModule mod_php5.c
php_admin_flag engine on
/IfModule
/Directory
-Directory /srv/mediawiki/docroot/donate/w/extensions
+Directory /srv/mediawiki/docroot/wikimedia.org/w/extensions
IfModule mod_php5.c
php_admin_flag engine off
/IfModule
@@ -324,12 +324,12 @@
VirtualHost *:80
ServerName vote.wikimedia.org
-DocumentRoot /srv/mediawiki/docroot/vote
+DocumentRoot /srv/mediawiki/docroot/wikimedia.org
AllowEncodedSlashes On
RewriteEngine On
# Primary wiki redirector:
-Alias /wiki /srv/mediawiki/docroot/vote/w/index.php
+Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/w/$ /w/index.php
@@ -337,12 +337,12 @@
RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule (.) https://vote.wikimedia.org%{REQUEST_URI} [R=301]
-Directory /srv/mediawiki/docroot/vote/w
+Directory /srv/mediawiki/docroot/wikimedia.org/w
[MediaWiki-commits] [Gerrit] (bug 71109) Don't fail Special:EditWatchlist when there's an... - change (mediawiki...Flow)
Matthias Mullie has submitted this change and it was merged.
Change subject: (bug 71109) Don't fail Special:EditWatchlist when there's an
invalid UUID in watchlist
..
(bug 71109) Don't fail Special:EditWatchlist when there's an invalid UUID in
watchlist
Bug: 71109
Change-Id: I3409bdc64fbb7120259d478fa47f5da6afbe2c09
---
M Hooks.php
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
SG: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index ddaaf46..8360cdd 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -954,8 +954,13 @@
// build array of queries to be executed all at once
$queries = array();
foreach( $ids as $id ) {
- $uuid = UUID::create( strtolower( $id ) );
- $queries[] = array( 'rev_type_id' = $uuid );
+ try {
+ $uuid = UUID::create( strtolower( $id ) );
+ $queries[] = array( 'rev_type_id' = $uuid );
+ } catch ( \Exception $e ) {
+ // invalid id
+ unset( $watchlistInfo[NS_TOPIC][$id] );
+ }
}
/*
--
To view, visit https://gerrit.wikimedia.org/r/163839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3409bdc64fbb7120259d478fa47f5da6afbe2c09
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@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] Workaround for hhvm memcached issue in CachingEntityRevision... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Workaround for hhvm memcached issue in
CachingEntityRevisionLookup
..
Workaround for hhvm memcached issue in CachingEntityRevisionLookup
see bug: 71461
Change-Id: I8b85cd087248d29b79dfd634b1cb99bbd84a560e
---
M lib/includes/store/CachingEntityRevisionLookup.php
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/store/CachingEntityRevisionLookup.php
b/lib/includes/store/CachingEntityRevisionLookup.php
index c6073cd..6cb39ed 100644
--- a/lib/includes/store/CachingEntityRevisionLookup.php
+++ b/lib/includes/store/CachingEntityRevisionLookup.php
@@ -104,7 +104,14 @@
wfProfileIn( __METHOD__ );
$key = $this-getCacheKey( $entityId );
- $entityRevision = $this-cache-get( $key );
+ try {
+ $entityRevision = $this-cache-get( $key );
+ } catch ( \UnexpectedValueException $ex ) {
+ // @fixme ugly hack to work around hhvm issue, see bug
71461, in addition
+ // to varying cache key based on if HHVM_VERSION is
defined.
+ wfLogWarning( 'Failed to deserialize ' .
$entityId-getSerialization() . ' from cache.' );
+ $entityRevision = false;
+ }
if ( $entityRevision !== false ) {
if ( $revisionId === 0 $this-shouldVerifyRevision
) {
--
To view, visit https://gerrit.wikimedia.org/r/163843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b85cd087248d29b79dfd634b1cb99bbd84a560e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.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] Hygiene: CatchableFatalErrorException should be in exception... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: CatchableFatalErrorException should be in exception namespace .. Hygiene: CatchableFatalErrorException should be in exception namespace Change-Id: Icdd3b25e614a3d28dcd021ffcc0a649aa2a69835 --- M autoload.php R includes/Exception/CatchableFatalErrorException.php M includes/RecoverableErrorHandler.php 3 files changed, 4 insertions(+), 2 deletions(-) Approvals: SG: Looks good to me, approved jenkins-bot: Verified diff --git a/autoload.php b/autoload.php index dd34304..fe9a699 100644 --- a/autoload.php +++ b/autoload.php @@ -53,7 +53,6 @@ $wgAutoloadClasses['Flow\\Block\\TopicBlock'] = __DIR__ . '/includes/Block/Topic.php'; $wgAutoloadClasses['Flow\\Block\\TopicListBlock'] = __DIR__ . '/includes/Block/TopicList.php'; $wgAutoloadClasses['Flow\\Block\\TopicSummaryBlock'] = __DIR__ . '/includes/Block/TopicSummary.php'; -$wgAutoloadClasses['Flow\\CatchableFatalErrorException'] = __DIR__ . '/includes/CatchableFatalErrorException.php'; $wgAutoloadClasses['Flow\\Collection\\AbstractCollection'] = __DIR__ . '/includes/Collection/AbstractCollection.php'; $wgAutoloadClasses['Flow\\Collection\\CollectionCache'] = __DIR__ . '/includes/Collection/CollectionCache.php'; $wgAutoloadClasses['Flow\\Collection\\HeaderCollection'] = __DIR__ . '/includes/Collection/HeaderCollection.php'; @@ -114,6 +113,7 @@ $wgAutoloadClasses['Flow\\Data\\Utils\\ResultDuplicator'] = __DIR__ . '/includes/Data/Utils/ResultDuplicator.php'; $wgAutoloadClasses['Flow\\Data\\Utils\\SortArrayByKeys'] = __DIR__ . '/includes/Data/Utils/SortArrayByKeys.php'; $wgAutoloadClasses['Flow\\DbFactory'] = __DIR__ . '/includes/DbFactory.php'; +$wgAutoloadClasses['Flow\\Exception\\CatchableFatalErrorException'] = __DIR__ . '/includes/Exception/CatchableFatalErrorException.php'; $wgAutoloadClasses['Flow\\Exception\\CrossWikiException'] = __DIR__ . '/includes/Exception/ExceptionHandling.php'; $wgAutoloadClasses['Flow\\Exception\\DataModelException'] = __DIR__ . '/includes/Exception/ExceptionHandling.php'; $wgAutoloadClasses['Flow\\Exception\\DataPersistenceException'] = __DIR__ . '/includes/Exception/ExceptionHandling.php'; diff --git a/includes/CatchableFatalErrorException.php b/includes/Exception/CatchableFatalErrorException.php similarity index 88% rename from includes/CatchableFatalErrorException.php rename to includes/Exception/CatchableFatalErrorException.php index 678ca0a..2594325 100644 --- a/includes/CatchableFatalErrorException.php +++ b/includes/Exception/CatchableFatalErrorException.php @@ -1,6 +1,6 @@ ?php -namespace Flow; +namespace Flow\Exception; use ErrorException; diff --git a/includes/RecoverableErrorHandler.php b/includes/RecoverableErrorHandler.php index 7a94d6d..15b371e 100644 --- a/includes/RecoverableErrorHandler.php +++ b/includes/RecoverableErrorHandler.php @@ -2,6 +2,8 @@ namespace Flow; +use Flow\Exception\CatchableFatalErrorException; + /** * Catches E_RECOVERABLE_ERROR and converts into exceptions * instead of fataling. -- To view, visit https://gerrit.wikimedia.org/r/162909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icdd3b25e614a3d28dcd021ffcc0a649aa2a69835 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: SG shah...@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] qunit-cleanup: rm -f when deleting file - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163848 Change subject: qunit-cleanup: rm -f when deleting file .. qunit-cleanup: rm -f when deleting file The builders might fail to create the symbolic link in the Apache workspace, in such a case the publisher should not complains. So pass -f to rm to skip the error. The job definitely fails already. Change-Id: I211d0da992060f4575cc843fc754ab16ff6eed62 --- M macro.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/48/163848/1 diff --git a/macro.yaml b/macro.yaml index 7920623..d9b23b4 100644 --- a/macro.yaml +++ b/macro.yaml @@ -315,7 +315,7 @@ - postbuildscript: builders: - shell: | - rm /srv/localhost/qunit/$BUILD_TAG + rm -f /srv/localhost/qunit/$BUILD_TAG # Options are confusing, setting them both to false ensures the # postbuildscript is ALWAYS run. onsuccess: False -- To view, visit https://gerrit.wikimedia.org/r/163848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I211d0da992060f4575cc843fc754ab16ff6eed62 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent ConfirmEdit captcha from attempting to leave the pag... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Prevent ConfirmEdit captcha from attempting to leave the page in FF .. Prevent ConfirmEdit captcha from attempting to leave the page in FF Change-Id: Iedd1c6f61c74a57d01d237892dcaedb406bf6a84 --- M includes/SpamFilter/ConfirmEdit.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: SG: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/SpamFilter/ConfirmEdit.php b/includes/SpamFilter/ConfirmEdit.php index 1be6bf6..5b5ba59 100644 --- a/includes/SpamFilter/ConfirmEdit.php +++ b/includes/SpamFilter/ConfirmEdit.php @@ -38,7 +38,7 @@ // let's extract those and respond them along with the form HTML global $wgOut; $html = $wgOut-buildCssLinks() . - $wgOut-getScriptsForBottomQueue( false ) . + $wgOut-getScriptsForBottomQueue( true ) . $html; $msg = wfMessage( 'flow-spam-confirmedit-form' )-rawParams( $html ); -- To view, visit https://gerrit.wikimedia.org/r/162232 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iedd1c6f61c74a57d01d237892dcaedb406bf6a84 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: SG shah...@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] Update HHVM settings - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/163854 Change subject: Update HHVM settings .. Update HHVM settings Somewhat mirroring what WMF is doing Change-Id: Iad9894f261fa0edd3a73edad0177d077d8b25dd4 --- M puppet/modules/hhvm/files/php.ini M puppet/modules/hhvm/files/upstart 2 files changed, 14 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/54/163854/1 diff --git a/puppet/modules/hhvm/files/php.ini b/puppet/modules/hhvm/files/php.ini index 2b57a9a..bd6378b 100644 --- a/puppet/modules/hhvm/files/php.ini +++ b/puppet/modules/hhvm/files/php.ini @@ -10,11 +10,14 @@ hhvm.server.file_socket = /run/hhvm/hhvm.sock hhvm.server.type = fastcgi hhvm.server.gzip_compression_level = 0 +hhvm.server.graceful_shutdown_wait = 5 -hhvm.dynamic_extension_path = /usr/lib/hphp/extensions/20140727 +hhvm.dynamic_extension_path = /usr/lib/x86_64-linux-gnu/hhvm/extensions/20140829 hhvm.jit = true -hhvm.jit_afrozen_size = 1 +hhvm.jit_a_size = 1 +hhvm.jit_a_frozen_size = 1 +hhvm.jit_a_cold_size = 3300 hhvm.log.level = Notice hhvm.log.always_log_unhandled_exceptions = true @@ -25,10 +28,12 @@ hhvm.log.access.file = /var/log/hhvm/access.log hhvm.log.access.format = %h %l %u % t \”%r\” %s %b hhvm.log.header = true +hhvm.log.native_stack_trace = true hhvm.repo.central.path = /run/hhvm/hhvm.hhbc hhvm.enable_zend_compat = true +hhvm.enable_obj_destruct_call = true hhvm.mysql.typed_results = false hhvm.mysql.slow_query_threshold = 5000 diff --git a/puppet/modules/hhvm/files/upstart b/puppet/modules/hhvm/files/upstart index f489a93..47f0697 100644 --- a/puppet/modules/hhvm/files/upstart +++ b/puppet/modules/hhvm/files/upstart @@ -12,9 +12,12 @@ end script exec /sbin/start-stop-daemon --quiet --start \ - --chuid www-data:www-data \ - --pidfile /var/run/hhvm/hhvm.pid \ - --startas /usr/bin/hhvm \ - -- --mode server + --chuid www-data:www-data \ + --pidfile /run/hhvm/hhvm.pid \ + --startas /usr/bin/hhvm \ + -- \ +--config /etc/hhvm/config.hdf \ +--config /etc/hhvm/php.ini \ +--mode server respawn -- To view, visit https://gerrit.wikimedia.org/r/163854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad9894f261fa0edd3a73edad0177d077d8b25dd4 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Handle triple click with surface fragments - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163849
Change subject: Handle triple click with surface fragments
..
Handle triple click with surface fragments
Also change the type argument of the currently-unused 'closest'
expandRange mode to be a instanceof check, instead of a
string type check.
Change-Id: I9282be1a01bd3559c3c565b3237d6ac7a274dada
---
M src/ce/ve.ce.Surface.js
M src/dm/ve.dm.SurfaceFragment.js
2 files changed, 4 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/49/163849/1
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 40becd1..462b59a 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -647,7 +647,7 @@
return;
}
- var selection, node, view = this;
+ var view = this;
// Remember the mouse is down
this.dragging = true;
@@ -668,13 +668,7 @@
// Browser default behaviour for triple click won't behave as
we want
e.preventDefault();
- selection = this.model.getSelection();
- node = this.documentView.getDocumentNode().getNodeFromOffset(
selection.start );
- // Find the nearest non-content node
- while ( node.parent !== null node.getModel().isContent() ) {
- node = node.parent;
- }
- this.model.setSelection( node.getModel().getRange() );
+ this.getModel().getFragment().expandRange( 'closest',
ve.dm.BranchNode ).adjustRange( 1, -1 ).select();
}
};
diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js
index 357c40b..4557606 100644
--- a/src/dm/ve.dm.SurfaceFragment.js
+++ b/src/dm/ve.dm.SurfaceFragment.js
@@ -351,7 +351,7 @@
* - `annotation`: Expands to cover a given annotation (argument) within the
current range
* - `root`: Expands to cover the entire document
* - `siblings`: Expands to cover all sibling nodes
- * - `closest`: Expands to cover the closest common ancestor node of a give
type (argument)
+ * - `closest`: Expands to cover the closest common ancestor node of a give
type (ve.dm.Node)
* - `parent`: Expands to cover the closest common parent node
* @param {Mixed} [type] Parameter to use with scope method if needed
* @returns {ve.dm.SurfaceFragment} Expanded fragment
@@ -409,7 +409,7 @@
// Grow range to cover closest common ancestor node of
given type
node = this.document.selectNodes( oldRange, 'siblings'
)[0].node;
parent = node.getParent();
- while ( parent parent.getType() !== type ) {
+ while ( parent !( parent instanceof type ) ) {
node = parent;
parent = parent.getParent();
}
--
To view, visit https://gerrit.wikimedia.org/r/163849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9282be1a01bd3559c3c565b3237d6ac7a274dada
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/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] Dont add permalink to topic in new-topic notification - change (mediawiki...Flow)
Matthias Mullie has submitted this change and it was merged.
Change subject: Dont add permalink to topic in new-topic notification
..
Dont add permalink to topic in new-topic notification
https://trello.com/c/CoHbElok/647-single-new-topic-notification-should-link-to-board-page-when-you-click-on-link
Essentially we have the primary link of this notification already
pointing to the board page, but there is a secondary link inside the
i18n which takes users to the wrong place.
This patch removes that link leaving only the notification primary link.
Change-Id: I69cea4bb1a11dfaa01abc25a06a65d876ab10413
---
M i18n/en.json
M i18n/qqq.json
M includes/Notifications/Notifications.php
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
SG: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 95aa1f9..6adab12 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -220,7 +220,7 @@
flow-notification-reply-bundle: span class=\plainlinks
mw-echo-title-heading\[$4 $2]/spanbr /$1 and $5
{{PLURAL:$6|other|others}} {{GENDER:$1|responded}} on '''$3'''.,
flow-notification-edit: $1 {{GENDER:$1|edited}} a span
class=\plainlinks\[$5 post]/span in \$2\ on [[$3|$4]].,
flow-notification-edit-bundle: $1 and $5 {{PLURAL:$6|other|others}}
{{GENDER:$1|edited}} a span class=\plainlinks\[$4 post]/span in \$2\ on
\$3\.,
-flow-notification-newtopic: span
class=\mw-echo-title-heading\$4/spanbr /$1 {{GENDER:$1|created}} a span
class=\plainlinks\[$5 new topic]/span on '''$3'''.,
+flow-notification-newtopic: span
class=\mw-echo-title-heading\$4/spanbr /$1 {{GENDER:$1|created}} a new
topic on '''$3'''.,
flow-notification-newtopic-bundle: {{PLURAL:$1|$1|250=250+}} new
{{PLURAL:$1|topic|topics}} on '''$2''',
flow-notification-rename: $1 {{GENDER:$1|changed}} the title of span
class=\plainlinks\[$2 $3]/span to \$4\ on [[$5|$6]].,
flow-notification-mention: $1 {{GENDER:$1|mentioned}} {{GENDER:$5|you}}
in {{GENDER:$1|his|her|their}} span class=\plainlinks\[$2 post]/span in
\$3\ on \$4\.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 074b955..6228bb1 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -224,7 +224,7 @@
flow-notification-reply-bundle: Notification text for when a user
receives replies from multiple users on the same topic.\n\nParameters:\n* $1 -
username of the person who replied\n* $2 - title of the topic\n* $3 - title for
the page that the Flow board is attached to\n* $4 - permantent URL for the
post\n* $5 - the count of other action performers, could be number or
{{msg-mw|Echo-notification-count}}. e.g. 7 others or 99+ others\n* $6 - a
number used for plural support\nSee also:\n*
{{msg-mw|Flow-notification-reply-email-batch-bundle-body}}\n{{Related|Flow-notification}},
flow-notification-edit: Notification text for when a user's post is
edited. Parameters:\n* $1 - username of the person who edited the post\n* $2 -
title of the topic\n* $3 - title for the Flow board\n* $4 - title for the page
that the Flow board is attached to\n* $5 - permanent URL for the
post\n{{Related|Flow-notification}},
flow-notification-edit-bundle: Notification text for when a user
receives post edits from multiple users on the same topic.\n\nParameters:\n* $1
- username of the person who edited post\n* $2 - title of the topic\n* $3 -
title for the page that the Flow board is attached to\n* $4 - permantent URL
for the topic\n* $5 - the count of other action performers, could be number or
{{msg-mw|Echo-notification-count}}. e.g. 7 others or 99+ others\n* $6 - a
number used for plural support\nSee also:\n*
{{msg-mw|Flow-notification-edit-email-batch-bundle-body}}\n{{Related|Flow-notification}},
- flow-notification-newtopic: Notification text for when a new topic
is created. Parameters:\n* $1 - username of the person who created the topic\n*
$2 - (Unused) title for the Flow board\n* $3 - title for the page that the Flow
board is attached to\n* $4 - title of the topic\n* $5 - permanent URL for the
topic\n{{Related|Flow-notification}},
+ flow-notification-newtopic: Notification text for when a new topic
is created. Parameters:\n* $1 - username of the person who created the topic\n*
$2 - (Unused) title for the Flow board\n* $3 - title for the page that the Flow
board is attached to\n* $4 - title of the topic\n{{Related|Flow-notification}},
flow-notification-newtopic-bundle: Notification text for when
multiple new topics are created on the same page. Parameters:\n* $1 - The
number of topics that were created. This value is capped to 250. When this
value is 250 it means 250 or more topics have been created.\n* $2 - The title
of the page the topics were created on\n{{Related|Flow-notification}},
flow-notification-rename: Notification text for when the subject of
a topic is changed. Parameters:\n* $1 - username of
[MediaWiki-commits] [Gerrit] Followup b149390: fix dm.Surface's concept of selectedNode... - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Followup b149390: fix dm.Surface's concept of selectedNode to
match SurfaceFragment's
..
Followup b149390: fix dm.Surface's concept of selectedNode to match
SurfaceFragment's
In SurfaceFragment, there is only a selectedNode if the selection
precisely contains a node. In Surface, however, the same name
was being used to refer to the node the selection is inside of,
even if the selection doesn't fully contain the node.
This led to problems when ui.DesktopContext assumed that
if an inspector is open and selectedNode is not null, we
must be inspecting a node. This is clearly not true,
because when the link inspector is open, the selection
is entirely within one TextNode. Worse, when the user
clicks out of the inspector but within the same TextNode,
the selectedNode doesn't change, and so the inspector
isn't closed.
Bug: 71373
Change-Id: Ib67fe72a029ef8c706495ab150e8316ae4038a18
(cherry picked from commit 0677c3bae718c191e1fbeb6487930b02f0374e53)
---
M src/dm/ve.dm.Surface.js
1 file changed, 2 insertions(+), 11 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/dm/ve.dm.Surface.js b/src/dm/ve.dm.Surface.js
index c45d1e9..e0b222b 100644
--- a/src/dm/ve.dm.Surface.js
+++ b/src/dm/ve.dm.Surface.js
@@ -525,7 +525,7 @@
*/
ve.dm.Surface.prototype.setSelection = function ( selection ) {
var left, right, leftAnnotations, rightAnnotations,
insertionAnnotations,
- startNode, endNode, selectedNode,
+ startNode, selectedNode,
branchNodes = {},
oldSelection = this.selection,
contextChange = false,
@@ -550,16 +550,7 @@
// Update selected node
if ( !selection.isCollapsed() ) {
startNode =
this.documentModel.documentNode.getNodeFromOffset( selection.start + 1 );
- if ( startNode ) {
- endNode =
this.documentModel.documentNode.getNodeFromOffset( selection.end - 1 );
- if ( startNode === endNode ) {
- selectedNode = startNode;
- }
- }
- } else {
- // Check if the range is inside a focusable node with a
collapsed selection
- startNode =
this.documentModel.documentNode.getNodeFromOffset( selection.start );
- if ( startNode ) {
+ if ( startNode
startNode.getOuterRange().equalsSelection( selection ) ) {
selectedNode = startNode;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/163852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib67fe72a029ef8c706495ab150e8316ae4038a18
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata, fix for jquery.wikibase.sitelinklistview.js... - change (mediawiki...Wikidata)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163851
Change subject: Update Wikidata, fix for jquery.wikibase.sitelinklistview.js
and hhvm
..
Update Wikidata, fix for jquery.wikibase.sitelinklistview.js and hhvm
Change-Id: I3e11fbdf509b78fdb022bfc1aad434f9a020624d
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M vendor/composer/autoload_files.php
M vendor/composer/installed.json
7 files changed, 108 insertions(+), 94 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/51/163851/1
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index b6c8abd..69b07cb 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1411740968;
\ No newline at end of file
+$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412085892;
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index bf53581..ccf9b36 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1411740968;
\ No newline at end of file
+$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412085892;
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 981ae25..2a03bec 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1191,12 +1191,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: f59b83fa72a654fba6dbd0c3f5db38b3479e05da
+reference: 210c5a0c936211fa8f3210c65bac38efa7958ea4
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f59b83fa72a654fba6dbd0c3f5db38b3479e05da;,
-reference: f59b83fa72a654fba6dbd0c3f5db38b3479e05da,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/210c5a0c936211fa8f3210c65bac38efa7958ea4;,
+reference: 210c5a0c936211fa8f3210c65bac38efa7958ea4,
shasum:
},
require: {
@@ -1265,7 +1265,7 @@
wikibaserepo,
wikidata
],
-time: 2014-09-26 14:12:51
+time: 2014-09-30 13:33:12
},
{
name: wikibase/wikimedia-badges,
diff --git
a/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
b/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
index c6073cd..6cb39ed 100644
--- a/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
+++ b/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
@@ -104,7 +104,14 @@
wfProfileIn( __METHOD__ );
$key = $this-getCacheKey( $entityId );
- $entityRevision = $this-cache-get( $key );
+ try {
+ $entityRevision = $this-cache-get( $key );
+ } catch ( \UnexpectedValueException $ex ) {
+ // @fixme ugly hack to work around hhvm issue, see bug
71461, in addition
+ // to varying cache key based on if HHVM_VERSION is
defined.
+ wfLogWarning( 'Failed to deserialize ' .
$entityId-getSerialization() . ' from cache.' );
+ $entityRevision = false;
+ }
if ( $entityRevision !== false ) {
if ( $revisionId === 0 $this-shouldVerifyRevision
) {
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index ef80587..fce3526 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -362,7 +362,11 @@
self._saveSiteLink( emptySiteLink )
.done( function() {
self._afterRemove();
- next();
+
+ // Use setTimeout here to break
out of the current call stack.
+ // This is needed because the
stack can get very large (if the queue
+ // is very large), eventually
leading to failures.
+
[MediaWiki-commits] [Gerrit] Followup b149390: fix dm.Surface's concept of selectedNode... - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163852
Change subject: Followup b149390: fix dm.Surface's concept of selectedNode to
match SurfaceFragment's
..
Followup b149390: fix dm.Surface's concept of selectedNode to match
SurfaceFragment's
In SurfaceFragment, there is only a selectedNode if the selection
precisely contains a node. In Surface, however, the same name
was being used to refer to the node the selection is inside of,
even if the selection doesn't fully contain the node.
This led to problems when ui.DesktopContext assumed that
if an inspector is open and selectedNode is not null, we
must be inspecting a node. This is clearly not true,
because when the link inspector is open, the selection
is entirely within one TextNode. Worse, when the user
clicks out of the inspector but within the same TextNode,
the selectedNode doesn't change, and so the inspector
isn't closed.
Bug: 71373
Change-Id: Ib67fe72a029ef8c706495ab150e8316ae4038a18
(cherry picked from commit 0677c3bae718c191e1fbeb6487930b02f0374e53)
---
M src/dm/ve.dm.Surface.js
1 file changed, 2 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/52/163852/1
diff --git a/src/dm/ve.dm.Surface.js b/src/dm/ve.dm.Surface.js
index c45d1e9..e0b222b 100644
--- a/src/dm/ve.dm.Surface.js
+++ b/src/dm/ve.dm.Surface.js
@@ -525,7 +525,7 @@
*/
ve.dm.Surface.prototype.setSelection = function ( selection ) {
var left, right, leftAnnotations, rightAnnotations,
insertionAnnotations,
- startNode, endNode, selectedNode,
+ startNode, selectedNode,
branchNodes = {},
oldSelection = this.selection,
contextChange = false,
@@ -550,16 +550,7 @@
// Update selected node
if ( !selection.isCollapsed() ) {
startNode =
this.documentModel.documentNode.getNodeFromOffset( selection.start + 1 );
- if ( startNode ) {
- endNode =
this.documentModel.documentNode.getNodeFromOffset( selection.end - 1 );
- if ( startNode === endNode ) {
- selectedNode = startNode;
- }
- }
- } else {
- // Check if the range is inside a focusable node with a
collapsed selection
- startNode =
this.documentModel.documentNode.getNodeFromOffset( selection.start );
- if ( startNode ) {
+ if ( startNode
startNode.getOuterRange().equalsSelection( selection ) ) {
selectedNode = startNode;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/163852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib67fe72a029ef8c706495ab150e8316ae4038a18
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] give *Coren* Icinga permissions - change (operations/puppet)
coren has uploaded a new change for review. https://gerrit.wikimedia.org/r/163853 Change subject: give *Coren* Icinga permissions .. give *Coren* Icinga permissions ... and not 'marc' since Icinga uses the account name and not the uid. :-) Change-Id: Id8867ed82fa4b06ac9b634dd910b2e63ee7a960e --- M modules/icinga/files/cgi.cfg 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/53/163853/1 diff --git a/modules/icinga/files/cgi.cfg b/modules/icinga/files/cgi.cfg index 2269f09..eaacb7c 100644 --- a/modules/icinga/files/cgi.cfg +++ b/modules/icinga/files/cgi.cfg @@ -131,7 +131,7 @@ # not use authorization. You may use an asterisk (*) to # authorize any user who has authenticated to the web server. -authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,marc +authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren # CONFIGURATION INFORMATION ACCESS @@ -142,7 +142,7 @@ # an asterisk (*) to authorize any user who has authenticated # to the web server. -authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,marc +authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren @@ -155,7 +155,7 @@ # You may use an asterisk (*) to authorize any user who has # authenticated to the web server. -authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,marc +authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren # GLOBAL HOST/SERVICE VIEW ACCESS @@ -181,8 +181,8 @@ # authorization). You may use an asterisk (*) to authorize any # user who has authenticated to the web server. -authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,marc -authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,marc +authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren +authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren -- To view, visit https://gerrit.wikimedia.org/r/163853 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8867ed82fa4b06ac9b634dd910b2e63ee7a960e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Logspam: Dont log requests for protected data - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Logspam: Dont log requests for protected data
..
Logspam: Dont log requests for protected data
Change-Id: I07359589ee11226ac2013baef57bca941f1ebc62
---
M includes/Exception/ExceptionHandling.php
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
SG: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Exception/ExceptionHandling.php
b/includes/Exception/ExceptionHandling.php
index 96a6843..0910479 100644
--- a/includes/Exception/ExceptionHandling.php
+++ b/includes/Exception/ExceptionHandling.php
@@ -220,6 +220,14 @@
protected function getErrorCodeList() {
return array ( 'insufficient-permission' );
}
+
+ /**
+* Do not log exception resulting from user requesting
+* disallowed content.
+*/
+ function isLoggable() {
+ return false;
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/162983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07359589ee11226ac2013baef57bca941f1ebc62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: SG shah...@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] Update HHVM settings - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Update HHVM settings .. Update HHVM settings Somewhat mirroring what WMF is doing Change-Id: Iad9894f261fa0edd3a73edad0177d077d8b25dd4 --- M puppet/modules/hhvm/files/php.ini M puppet/modules/hhvm/files/upstart 2 files changed, 14 insertions(+), 6 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/hhvm/files/php.ini b/puppet/modules/hhvm/files/php.ini index 2b57a9a..bd6378b 100644 --- a/puppet/modules/hhvm/files/php.ini +++ b/puppet/modules/hhvm/files/php.ini @@ -10,11 +10,14 @@ hhvm.server.file_socket = /run/hhvm/hhvm.sock hhvm.server.type = fastcgi hhvm.server.gzip_compression_level = 0 +hhvm.server.graceful_shutdown_wait = 5 -hhvm.dynamic_extension_path = /usr/lib/hphp/extensions/20140727 +hhvm.dynamic_extension_path = /usr/lib/x86_64-linux-gnu/hhvm/extensions/20140829 hhvm.jit = true -hhvm.jit_afrozen_size = 1 +hhvm.jit_a_size = 1 +hhvm.jit_a_frozen_size = 1 +hhvm.jit_a_cold_size = 3300 hhvm.log.level = Notice hhvm.log.always_log_unhandled_exceptions = true @@ -25,10 +28,12 @@ hhvm.log.access.file = /var/log/hhvm/access.log hhvm.log.access.format = %h %l %u % t \”%r\” %s %b hhvm.log.header = true +hhvm.log.native_stack_trace = true hhvm.repo.central.path = /run/hhvm/hhvm.hhbc hhvm.enable_zend_compat = true +hhvm.enable_obj_destruct_call = true hhvm.mysql.typed_results = false hhvm.mysql.slow_query_threshold = 5000 diff --git a/puppet/modules/hhvm/files/upstart b/puppet/modules/hhvm/files/upstart index f489a93..47f0697 100644 --- a/puppet/modules/hhvm/files/upstart +++ b/puppet/modules/hhvm/files/upstart @@ -12,9 +12,12 @@ end script exec /sbin/start-stop-daemon --quiet --start \ - --chuid www-data:www-data \ - --pidfile /var/run/hhvm/hhvm.pid \ - --startas /usr/bin/hhvm \ - -- --mode server + --chuid www-data:www-data \ + --pidfile /run/hhvm/hhvm.pid \ + --startas /usr/bin/hhvm \ + -- \ +--config /etc/hhvm/config.hdf \ +--config /etc/hhvm/php.ini \ +--mode server respawn -- To view, visit https://gerrit.wikimedia.org/r/163854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad9894f261fa0edd3a73edad0177d077d8b25dd4 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@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] Throttle / debounce resizes - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163855
Change subject: Throttle / debounce resizes
..
Throttle / debounce resizes
* throttle resize events to one per 100ms
* create a resize-end event which fires 100ms after resize ends
(or pauses)
* move slow rezise callback (fetching new thumbnail from the server)
to resize-end
Change-Id: I1c1217ea43ffade4cfaf0c03f24574d0ebfee080
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/898
---
M resources/mmv/mmv.js
M resources/mmv/ui/mmv.ui.canvas.js
2 files changed, 5 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/55/163855/1
diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index a77a4d1..963563d 100644
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -870,7 +870,7 @@
viewer.nextImage();
} ).on( 'mmv-prev.mmvp', function () {
viewer.prevImage();
- } ).on( 'mmv-resize.mmvp', function () {
+ } ).on( 'mmv-resize-end.mmvp', function () {
viewer.resize( viewer.ui );
} ).on( 'mmv-request-thumbnail.mmvp', function ( e, size ) {
if ( viewer.currentImageFileTitle ) {
diff --git a/resources/mmv/ui/mmv.ui.canvas.js
b/resources/mmv/ui/mmv.ui.canvas.js
index 2a31b7a..b0a1210 100644
--- a/resources/mmv/ui/mmv.ui.canvas.js
+++ b/resources/mmv/ui/mmv.ui.canvas.js
@@ -201,9 +201,11 @@
C.attach = function() {
var canvas = this;
- $( window ).on( 'resize.mmv-canvas', function () {
+ $( window ).on( 'resize.mmv-canvas', $.throttle( 100, function
() {
canvas.$mainWrapper.trigger( $.Event( 'mmv-resize' ) );
- } );
+ } ) ).on( 'resize.mmv-canvas', $.debounce( 100, function () {
+ canvas.$mainWrapper.trigger( $.Event( 'mmv-resize-end'
) );
+ } ) );
this.$imageDiv.on( 'click.mmv-canvas', 'img', function () {
canvas.$mainWrapper.trigger( $.Event( 'mmv-image-click'
) );
--
To view, visit https://gerrit.wikimedia.org/r/163855
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c1217ea43ffade4cfaf0c03f24574d0ebfee080
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix 'Edit' link for custom data tab - change (wikimedia...civicrm)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163856
Change subject: Fix 'Edit' link for custom data tab
..
Fix 'Edit' link for custom data tab
groupID-groupId (case changed)
Change-Id: I23fd94e0a29400ca611784b851eabdd668519481
---
M templates/CRM/Custom/Page/CustomDataView.tpl
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm
refs/changes/56/163856/1
diff --git a/templates/CRM/Custom/Page/CustomDataView.tpl
b/templates/CRM/Custom/Page/CustomDataView.tpl
index 1c8b94e..ad0d690 100644
--- a/templates/CRM/Custom/Page/CustomDataView.tpl
+++ b/templates/CRM/Custom/Page/CustomDataView.tpl
@@ -32,7 +32,7 @@
{if $editOwnCustomData or ($showEdit and $editCustomData and $groupId)}
tr
td
-a href={crmURL p=civicrm/contact/view/cd/edit
q=tableId=`$contactId`cid=`$contactId`groupID=`$groupId`action=updatereset=1}
class=button style=margin-left: 6px;spandiv class=icon
edit-icon/div{ts 1=$cd_edit.title}Edit %1{/ts}/span/abr/br/
+a href={crmURL p=civicrm/contact/view/cd/edit
q=tableId=`$contactId`cid=`$contactId`groupId=`$groupId`action=updatereset=1}
class=button style=margin-left: 6px;spandiv class=icon
edit-icon/div{ts 1=$cd_edit.title}Edit %1{/ts}/span/abr/br/
/td
/tr
{/if}
--
To view, visit https://gerrit.wikimedia.org/r/163856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23fd94e0a29400ca611784b851eabdd668519481
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to get entity null or undefined from store - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't try to get entity null or undefined from store
..
Don't try to get entity null or undefined from store
Change-Id: I1ae21cf5f6d33bf6a50737ff00931591812faa3f
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/snakview/snakview.js
M lib/resources/wikibase.store/store.CombiningEntityStore.js
3 files changed, 26 insertions(+), 26 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index f16f25d..bde5e84 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -194,21 +194,22 @@
: this.options.predefined.mainSnak.property;
var deferred = $.Deferred();
- var oldHelpMessage = this.options.helpMessage;
+ var helpMessage = this.options.helpMessage;
this.options.helpMessage = deferred.promise();
- this.options.entityStore.get( property ).done(
function( fetchedProperty ) {
- var helpMessage;
- if( fetchedProperty ) {
- helpMessage = mw.msg(
-
'wikibase-claimview-snak-tooltip',
-
wb.utilities.ui.buildPrettyEntityLabelText( fetchedProperty.getContent() )
- );
- } else {
- helpMessage = oldHelpMessage;
- }
+ if( property ) {
+ this.options.entityStore.get( property ).done(
function( fetchedProperty ) {
+ if( fetchedProperty ) {
+ helpMessage = mw.msg(
+
'wikibase-claimview-snak-tooltip',
+
wb.utilities.ui.buildPrettyEntityLabelText( fetchedProperty.getContent() )
+ );
+ }
+ deferred.resolve( helpMessage );
+ } );
+ } else {
deferred.resolve( helpMessage );
- } );
+ }
}
},
diff --git a/lib/resources/jquery.wikibase/snakview/snakview.js
b/lib/resources/jquery.wikibase/snakview/snakview.js
index 7fd6f33..3ebd418 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.js
@@ -725,12 +725,16 @@
// NOTE: Order of these shouldn't matter; If for any reasons
draw functions start changing
// the outcome of the variation (or Snak type), then something
must be incredibly wrong!
- this._entityStore.get( this._propertyId ).done( function(
fetchedProperty ) {
- self.drawProperty(
- fetchedProperty ? fetchedProperty.getContent()
: null,
- fetchedProperty ? fetchedProperty.getTitle() :
null
- );
- } );
+ if( this._propertyId ) {
+ this._entityStore.get( this._propertyId ).done(
function( fetchedProperty ) {
+ self.drawProperty(
+ fetchedProperty ?
fetchedProperty.getContent() : null,
+ fetchedProperty ?
fetchedProperty.getTitle() : null
+ );
+ } );
+ } else {
+ this.drawProperty( null, null );
+ }
this.drawSnakTypeSelector();
this.drawVariation();
},
diff --git a/lib/resources/wikibase.store/store.CombiningEntityStore.js
b/lib/resources/wikibase.store/store.CombiningEntityStore.js
index 2147b08..8cb8fa5 100644
--- a/lib/resources/wikibase.store/store.CombiningEntityStore.js
+++ b/lib/resources/wikibase.store/store.CombiningEntityStore.js
@@ -55,14 +55,9 @@
* @see wikibase.store.Entity.store.get
*/
get: function( entityId ) {
- if( !entityId ) {
- // FIXME: This should probably be fixed on the
caller's side
- return
[MediaWiki-commits] [Gerrit] Avoid flash of unstyled content on new topic form - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid flash of unstyled content on new topic form
..
Avoid flash of unstyled content on new topic form
Bug: 69220
Change-Id: I7339d974b6c5bdd459dd630c039b22658e3ced6d
---
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_block_topiclist.handlebars
M handlebars/flow_newtopic_form.handlebars
M modules/new/styles/mediawiki.ui/forms.less
4 files changed, 20 insertions(+), 5 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
EBernhardson: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 1dd696b..f7282de 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -86,7 +86,8 @@
'.'
div class=flow-newtopic-container
div class=flow-nojs
- a href='.htmlentities(((is_array($in['links'])
isset($in['links']['newtopic'])) ? $in['links']['newtopic'] : null),
ENT_QUOTES, 'UTF-8').''.LCRun3::ch($cx, 'l10n',
Array(Array('flow-newtopic-start-placeholder'),Array()), 'encq').'/a
+ a class=mw-ui-input mw-ui-input-large
flow-ui-input-replacement-anchor
+ href='.htmlentities(((is_array($in['links'])
isset($in['links']['newtopic'])) ? $in['links']['newtopic'] : null),
ENT_QUOTES, 'UTF-8').''.LCRun3::ch($cx, 'l10n',
Array(Array('flow-newtopic-start-placeholder'),Array()), 'encq').'/a
/div
div class=flow-js
@@ -131,9 +132,11 @@
textarea name=topiclist_content
data-flow-preview-template=flow_topic
class=mw-ui-input flow-form-collapsible
mw-ui-input-large
+ style=display:none;
placeholder='.LCRun3::ch($cx, 'l10n',
Array(Array('flow-newtopic-content-placeholder',((is_array($cx['scopes'][0])
isset($cx['scopes'][0]['title'])) ? $cx['scopes'][0]['title'] :
null)),Array()), 'encq').' data-role=content required/textarea
- div class=flow-form-actions flow-form-collapsible
+ div class=flow-form-actions flow-form-collapsible
+ style=display:none;
button data-role=submit
data-flow-api-handler=newTopic
data-flow-interactive-handler=apiRequest
class=mw-ui-button mw-ui-constructive
mw-ui-flush-right'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-newtopic-save'),Array()), 'encq').'/button
@@ -611,4 +614,4 @@
/div
';
}
-?
\ No newline at end of file
+?
diff --git a/handlebars/flow_block_topiclist.handlebars
b/handlebars/flow_block_topiclist.handlebars
index d5493c4..8876882 100644
--- a/handlebars/flow_block_topiclist.handlebars
+++ b/handlebars/flow_block_topiclist.handlebars
@@ -4,7 +4,8 @@
{{! new-topic form should only be displayed when run with JS, otherwise
link to designated page }}
div class=flow-newtopic-container
div class=flow-nojs
- a href={{links.newtopic}}{{l10n
flow-newtopic-start-placeholder}}/a
+ a class=mw-ui-input mw-ui-input-large
flow-ui-input-replacement-anchor
+ href={{links.newtopic}}{{l10n
flow-newtopic-start-placeholder}}/a
/div
div class=flow-js
diff --git a/handlebars/flow_newtopic_form.handlebars
b/handlebars/flow_newtopic_form.handlebars
index d8fd016..bc75ecb 100644
--- a/handlebars/flow_newtopic_form.handlebars
+++ b/handlebars/flow_newtopic_form.handlebars
@@ -14,9 +14,11 @@
textarea name=topiclist_content
data-flow-preview-template=flow_topic
class=mw-ui-input flow-form-collapsible
mw-ui-input-large
+ style=display:none;
placeholder={{l10n flow-newtopic-content-placeholder
@root.title}} data-role=content required/textarea
- div class=flow-form-actions flow-form-collapsible
+ div class=flow-form-actions flow-form-collapsible
+ style=display:none;
button data-role=submit
data-flow-api-handler=newTopic
data-flow-interactive-handler=apiRequest
class=mw-ui-button mw-ui-constructive
mw-ui-flush-right{{l10n flow-newtopic-save}}/button
diff --git a/modules/new/styles/mediawiki.ui/forms.less
b/modules/new/styles/mediawiki.ui/forms.less
index 982a8f0..181696f 100644
--- a/modules/new/styles/mediawiki.ui/forms.less
+++ b/modules/new/styles/mediawiki.ui/forms.less
@@ -10,6 +10,15 @@
[MediaWiki-commits] [Gerrit] Delete unused user_subs from container.php - change (mediawiki...Flow)
Matthias Mullie has submitted this change and it was merged.
Change subject: Delete unused user_subs from container.php
..
Delete unused user_subs from container.php
Change-Id: Ib898fe8215284d9d93f3681f8e9642087ddaf170
---
M container.php
1 file changed, 0 insertions(+), 34 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/container.php b/container.php
index d9f230d..9b7a83b 100644
--- a/container.php
+++ b/container.php
@@ -162,7 +162,6 @@
new Flow\Data\Listener\WorkflowTopicListListener(
$c['storage.topic_list'], $c['topic_list.last_updated.index'] ),
$c['listener.occupation'],
$c['listener.url_generator']
- // $c['storage.user_subs.user_index']
);
return new ObjectManager( $mapper, $storage, $indexes, $lifecycle );
@@ -527,39 +526,6 @@
} );
-// Storage implementation for user subscriptions, separate from
storage.user_subs so it
-// can be used in storage.user_subs.user_index as well.
-$c['storage.user_subs.backing'] = $c-share( function( $c ) {
- return new BasicDbStorage(
- // factory and table
- $c['db.factory'], 'flow_user_sub',
- // pk
- array( 'subscrip_user_id', 'subscrip_workflow_id' )
- );
-} );
-// Needs to be separate from storage.user_subs so it can be attached to
Workflow updates
-// Limits users to 2000 subscriptions
-// TODO: Can't use TopKIndex, needs to be custom. so it stores the right data
-// TODO: Storage wont work either, it
-$c['storage.user_subs.user_index'] = $c-share( function( $c ) {
- $cache = $c['memcache.buffered'];
- $storage = $c['storage.user_subs.backing'];
- return new TopKIndex(
- $cache, $storage, 'flow_user_sub:user', array(
'subscrip_user_id' ),
- array( 'limit' = 2000, 'sort' = 'subscrip_last_updated' )
- );
-} );
-// User subscriptions are triggered by updates on workflow objects.
-$c['storage.user_subs'] = $c-share( function( $c ) {
- $mapper = BasicObjectMapper::model( 'Flow\\Model\\UserSubscription' );
- $storage = $c['storage.user_subs.backing'];
- $indexes = array(
- // no reason to index workflow_id, it subscription updates need
to happen
- // in a background job anyways.
- $c['storage.user_subs.user_index']
- );
- return new ObjectLocator( $mapper, $storage, $indexes );
-} );
$c['storage'] = $c-share( function( $c ) {
return new \Flow\Data\ManagerGroup(
$c,
--
To view, visit https://gerrit.wikimedia.org/r/161593
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib898fe8215284d9d93f3681f8e9642087ddaf170
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@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] Update Wikidata, fix for jquery.wikibase.sitelinklistview.js... - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikidata, fix for jquery.wikibase.sitelinklistview.js
and hhvm
..
Update Wikidata, fix for jquery.wikibase.sitelinklistview.js and hhvm
Change-Id: I3e11fbdf509b78fdb022bfc1aad434f9a020624d
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M vendor/composer/autoload_files.php
M vendor/composer/installed.json
7 files changed, 108 insertions(+), 94 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index b6c8abd..69b07cb 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1411740968;
\ No newline at end of file
+$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412085892;
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index bf53581..ccf9b36 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1411740968;
\ No newline at end of file
+$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412085892;
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 981ae25..2a03bec 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1191,12 +1191,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: f59b83fa72a654fba6dbd0c3f5db38b3479e05da
+reference: 210c5a0c936211fa8f3210c65bac38efa7958ea4
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f59b83fa72a654fba6dbd0c3f5db38b3479e05da;,
-reference: f59b83fa72a654fba6dbd0c3f5db38b3479e05da,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/210c5a0c936211fa8f3210c65bac38efa7958ea4;,
+reference: 210c5a0c936211fa8f3210c65bac38efa7958ea4,
shasum:
},
require: {
@@ -1265,7 +1265,7 @@
wikibaserepo,
wikidata
],
-time: 2014-09-26 14:12:51
+time: 2014-09-30 13:33:12
},
{
name: wikibase/wikimedia-badges,
diff --git
a/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
b/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
index c6073cd..6cb39ed 100644
--- a/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
+++ b/extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php
@@ -104,7 +104,14 @@
wfProfileIn( __METHOD__ );
$key = $this-getCacheKey( $entityId );
- $entityRevision = $this-cache-get( $key );
+ try {
+ $entityRevision = $this-cache-get( $key );
+ } catch ( \UnexpectedValueException $ex ) {
+ // @fixme ugly hack to work around hhvm issue, see bug
71461, in addition
+ // to varying cache key based on if HHVM_VERSION is
defined.
+ wfLogWarning( 'Failed to deserialize ' .
$entityId-getSerialization() . ' from cache.' );
+ $entityRevision = false;
+ }
if ( $entityRevision !== false ) {
if ( $revisionId === 0 $this-shouldVerifyRevision
) {
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index ef80587..fce3526 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -362,7 +362,11 @@
self._saveSiteLink( emptySiteLink )
.done( function() {
self._afterRemove();
- next();
+
+ // Use setTimeout here to break
out of the current call stack.
+ // This is needed because the
stack can get very large (if the queue
+ // is very large), eventually
leading to failures.
+ setTimeout(
[MediaWiki-commits] [Gerrit] browsertests: enable Performance publisher - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163857 Change subject: browsertests: enable Performance publisher .. browsertests: enable Performance publisher Enable the Jenkins Performance reporting plugin: https://wiki.jenkins-ci.org/display/JENKINS/Performance+Plugin Wikidata is using it to build dashboards of test execution time and latency. The plugins simply parse the Junit result. Tobi Gritschacher introduced it on the QA mailling list: https://lists.wikimedia.org/pipermail/qa/2014-September/001972.html Change-Id: I716f4e087ea4b7e2c60852419219cd37cc9f6be9 --- M job-templates-browsertests.yaml 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/57/163857/1 diff --git a/job-templates-browsertests.yaml b/job-templates-browsertests.yaml index a7e439a..97ca39d 100644 --- a/job-templates-browsertests.yaml +++ b/job-templates-browsertests.yaml @@ -145,6 +145,12 @@ - claim-build + - performance: + failed-threshold: -1 + unstable-threshold: -1 + report: + - junit: log/junit/*.xml + - archive: artifacts: 'log/*.log, log/junit/*.xml, log/report.html, log/*.png' -- To view, visit https://gerrit.wikimedia.org/r/163857 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I716f4e087ea4b7e2c60852419219cd37cc9f6be9 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata, fix for jquery.wikibase.sitelinklistview.js... - change (mediawiki/core)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/163858 Change subject: Update Wikidata, fix for jquery.wikibase.sitelinklistview.js and hhvm .. Update Wikidata, fix for jquery.wikibase.sitelinklistview.js and hhvm See I3e11fbd for extension changes Change-Id: I9679f8572865f42fd7ab786b76de6c48fa80b3c5 --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/58/163858/1 diff --git a/extensions/Wikidata b/extensions/Wikidata index f2a1f8d..b3d8000 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit f2a1f8dfca0339646db29ec59918b5664f646758 +Subproject commit b3d8000b8def49ee03ddc3824dfc5a3786113464 -- To view, visit https://gerrit.wikimedia.org/r/163858 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9679f8572865f42fd7ab786b76de6c48fa80b3c5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf1 Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add memcached role - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Add memcached role
..
Add memcached role
Installs and enables memcached caching on the wikis, as
is done in production.
Although we have redis, sometimes it is necessary for debugging
and other purposes to have memcached.
Change-Id: Ie3ab00c7d5fbfef5c0cd57feaadd6533a2773642
---
A puppet/modules/role/manifests/memcached.pp
A puppet/modules/role/templates/memcached.php.erb
2 files changed, 25 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/role/manifests/memcached.pp
b/puppet/modules/role/manifests/memcached.pp
new file mode 100644
index 000..1cf4008
--- /dev/null
+++ b/puppet/modules/role/manifests/memcached.pp
@@ -0,0 +1,12 @@
+# == Class: role::memcached
+# This role installs and enables memcached, as configured by wmf in production.
+#
+class role::memcached {
+include ::memcached
+include ::memcached::php
+
+mediawiki::settings { 'Memcached':
+values = template('role/memcached.php.erb'),
+}
+
+}
diff --git a/puppet/modules/role/templates/memcached.php.erb
b/puppet/modules/role/templates/memcached.php.erb
new file mode 100644
index 000..1ad58c3
--- /dev/null
+++ b/puppet/modules/role/templates/memcached.php.erb
@@ -0,0 +1,13 @@
+$wgMainCacheType = 'memcached-pecl';
+
+$wgMemCachedPersistent = false;
+$wgMemCachedTimeout = 0.25 * 1e6; // 250kμs (a quarter of a second).
+
+$wgObjectCaches['memcached-pecl'] = array(
+ 'class' = 'MemcachedPeclBagOStuff',
+ 'serializer' = 'php',
+ 'persistent' = false,
+ 'servers' = array( '127.0.0.1:%= scope['::memcached::port'] %' ),
+ 'server_failure_limit' = 1e9,
+ 'retry_timeout' = -1
+);
--
To view, visit https://gerrit.wikimedia.org/r/162285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3ab00c7d5fbfef5c0cd57feaadd6533a2773642
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core sub-module to wmf/1.25wmf1 for cherry-pick (5... - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/163859 Change subject: Update VE core sub-module to wmf/1.25wmf1 for cherry-pick (560f89e) .. Update VE core sub-module to wmf/1.25wmf1 for cherry-pick (560f89e) New changes: 560f89e Followup b149390: fix dm.Surface's concept of selectedNode to match SurfaceFragment's Change-Id: I77a6d8cd8429b588a92d1895121deec7e8fe4f39 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/59/163859/1 diff --git a/lib/ve b/lib/ve index 4f0aca0..560f89e 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 4f0aca0d56f313261dd9fd1e2fba206098d91157 +Subproject commit 560f89efdb5b450ef8967acdff3e1f3aae7b7244 -- To view, visit https://gerrit.wikimedia.org/r/163859 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77a6d8cd8429b588a92d1895121deec7e8fe4f39 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.25wmf1 Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix selection error that prevents selecting source text - change (mediawiki...ContentTranslation)
Jsahleen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163860
Change subject: Fix selection error that prevents selecting source text
..
Fix selection error that prevents selecting source text
One-line fix.
BugID: 71467
Change-Id: I74197e245d1b86023e3e89f1628d96cf80a8831b
---
M modules/translation/ext.cx.translation.js
1 file changed, 0 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/60/163860/1
diff --git a/modules/translation/ext.cx.translation.js
b/modules/translation/ext.cx.translation.js
index 5717b06..05ca8c1 100644
--- a/modules/translation/ext.cx.translation.js
+++ b/modules/translation/ext.cx.translation.js
@@ -162,7 +162,6 @@
// And now onwards clicking on source section has same effect
of clicking
// on target section.
$sourceSection.on( 'click', function () {
- mw.cx.selection.restore( 'translation' );
mw.hook( 'mw.cx.translation.focus' ).fire( $section );
} );
// If the section is editable, initiate an editor.
--
To view, visit https://gerrit.wikimedia.org/r/163860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74197e245d1b86023e3e89f1628d96cf80a8831b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Jsahleen jsahl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (0677c3b) - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/163861 Change subject: Update VE core submodule to master (0677c3b) .. Update VE core submodule to master (0677c3b) New changes: 28ebb29 ve.ui.CommentInspector.css: Fix documentation b3b3b11 Followup a618491: fix JS errors when slugging near annotated inline nodes b987d63 Record and show observation times in ve.Filibuster 60ac437 ve.ui.FragmentInspector: Remove #setDimensions 9f4a067 ve.ui.CommentInspector.js: Fix documentation 0677c3b Followup b149390: fix dm.Surface's concept of selectedNode to match SurfaceFragment's Change-Id: I1f3c9d3e81eea9d380b2e2aa5deb9fdbf0ca9c93 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/61/163861/1 diff --git a/lib/ve b/lib/ve index 3aafc81..0677c3b 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 3aafc81e1e6289df76760ead51e01426889aaa51 +Subproject commit 0677c3bae718c191e1fbeb6487930b02f0374e53 -- To view, visit https://gerrit.wikimedia.org/r/163861 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f3c9d3e81eea9d380b2e2aa5deb9fdbf0ca9c93 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
