[MediaWiki-commits] [Gerrit] puppetmaster::logstash. Fix out of module dependencies - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: puppetmaster::logstash. Fix out of module dependencies
..
puppetmaster::logstash. Fix out of module dependencies
Instead of notifying specific out of module resources, use
base::puppet::config to populate the config stanza and allow it to
notify the compilation process
Change-Id: I4e8ab6864654f457d94cff7ed6c25173a01dffc3
---
M modules/puppetmaster/manifests/logstash.pp
1 file changed, 4 insertions(+), 7 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/logstash.pp
b/modules/puppetmaster/manifests/logstash.pp
index a11598f..f1eb9cb 100644
--- a/modules/puppetmaster/manifests/logstash.pp
+++ b/modules/puppetmaster/manifests/logstash.pp
@@ -15,6 +15,8 @@
$logstash_port,
$timeout = 5,
) {
+include base::puppet
+
file { '/etc/puppet/logstash.yaml':
ensure = present,
owner = 'puppet',
@@ -23,13 +25,8 @@
content = template('puppetmaster/logstash.yaml.erb'),
}
-file { '/etc/puppet/puppet.conf.d/30-logstash.conf':
-ensure = present,
-owner = 'root',
-group = 'root',
-mode= '0444',
+base::puppet::config { 'logstash':
+prio= 30,
content = template('puppetmaster/30-logstash.conf.erb'),
-notify = Exec['compile puppet.conf'],
-require = File['/etc/puppet/puppet.conf.d'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/209270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e8ab6864654f457d94cff7ed6c25173a01dffc3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update for DataValuesJavaScript 0.7.0 - change (mediawiki...WikibaseJavaScriptApi)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212516
Change subject: Update for DataValuesJavaScript 0.7.0
..
Update for DataValuesJavaScript 0.7.0
do not merge!!!
Change-Id: If3c880427c21e613c9b035d830a75a38f29b7af8
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseJavaScriptApi
refs/changes/16/212516/1
diff --git a/composer.json b/composer.json
index a01d814..bd79d48 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
name: wikibase/javascript-api,
description: Wikibase API client in JavaScript,
require: {
- data-values/javascript: ~0.6.0
+ data-values/javascript: dev-undeserializable
},
license: GPL-2.0+,
authors: [
--
To view, visit https://gerrit.wikimedia.org/r/212516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3c880427c21e613c9b035d830a75a38f29b7af8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseJavaScriptApi
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] change job so it should work - change (mediawiki...WikidataQualityExternalValidation)
Dominic.sauer has submitted this change and it was merged.
Change subject: change job so it should work
..
change job so it should work
did hopefully the same as in the Constraints extension, but don't have
data to check if it really works. But the tests are running.
Change-Id: Id819d9f3949f2c60f3b46e1895b71f94ca586ee6
---
M WikibaseQualityExternalValidation.php
M includes/EvaluateCrossCheckJob.php
M includes/EvaluateCrossCheckJobService.php
M specials/SpecialCrossCheck.php
M tests/phpunit/EvaluateCrossCheckJobServiceTest.php
5 files changed, 45 insertions(+), 34 deletions(-)
Approvals:
Dominic.sauer: Verified; Looks good to me, approved
diff --git a/WikibaseQualityExternalValidation.php
b/WikibaseQualityExternalValidation.php
index 3cc2925..d1637eb 100755
--- a/WikibaseQualityExternalValidation.php
+++ b/WikibaseQualityExternalValidation.php
@@ -44,5 +44,6 @@
define( 'DUMP_IDENTIFIER_PROPERTIES_TABLE',
'wbqev_identifier_properties' );
// Jobs
- $GLOBALS['wgJobClasses']['checkForCrossCheckViolations'] =
'WikibaseQuality\ExternalValidation\CheckForCrossCheckViolationsJob';
+ $GLOBALS['wgDebugLogGroups']['wbq_evaluation'] =
'/var/log/mediawiki/wbq_evaluation.log';
+ $GLOBALS['wgJobClasses']['evaluateCrossCheckJob'] =
'WikibaseQuality\ExternalValidation\EvaluateCrossCheckJob';
} );
\ No newline at end of file
diff --git a/includes/EvaluateCrossCheckJob.php
b/includes/EvaluateCrossCheckJob.php
index 8a59cd4..01470e8 100755
--- a/includes/EvaluateCrossCheckJob.php
+++ b/includes/EvaluateCrossCheckJob.php
@@ -18,66 +18,63 @@
private $service;
/**
-* @param EvaluateCrossCheckJobService $service
-* @param EntityId $entity
-* @param $checkTimestamp
-* @param $results
+* @param string $entityId
+* @param int $checkTimestamp
+* @param string $results
*
* @return EvaluateCrossCheckJob
* @throws \MWException
*/
- public static function newInsertNow( EvaluateCrossCheckJobService
$service, EntityId $entity, $checkTimestamp, $results ) {
+ public static function newInsertNow( $entityId, $checkTimestamp,
$results ) {
// The Job class wants a Title object for some reason. Supply a
dummy.
$dummyTitle = Title::newFromText( EvaluateCrossCheckJob,
NS_SPECIAL );
$params = array ();
- $params['entityId'] = $entity;
+ $params['entityId'] = $entityId;
$params['results'] = $results;
$params['checkTimestamp'] = $checkTimestamp;
$params['referenceTimestamp'] = null;
- return new EvaluateCrossCheckJob( $service, $dummyTitle,
$params );
+ return new EvaluateCrossCheckJob( $dummyTitle, $params );
}
/**
-* @param EvaluateCrossCheckJobService $service
-* @param EntityId $entityId
-* @param null $referenceTimestamp
+* @param string $entityId
+* @param int|null $referenceTimestamp
* @param int $releaseTimestamp
*
* @return EvaluateCrossCheckJob
* @throws \MWException
*/
- public static function newInsertDeferred( EvaluateCrossCheckJobService
$service, EntityId $entity, $referenceTimestamp = null, $releaseTimestamp = 0 )
{
+ public static function newInsertDeferred( $entityId,
$referenceTimestamp = null, $releaseTimestamp = 0 ) {
// The Job class wants a Title object for some reason. Supply a
dummy.
$dummyTitle = Title::newFromText( EvaluateCrossCheckJob,
NS_SPECIAL );
$params = array ();
- $params['entityId'] = $entity;
+ $params['entityId'] = $entityId;
$params['results'] = null;
$params['referenceTimestamp'] = $referenceTimestamp;
$params['releaseTimestamp'] = wfTimestamp( TS_MW ) +
$releaseTimestamp;
- return new EvaluateCrossCheckJob( $service, $dummyTitle,
$params );
+ return new EvaluateCrossCheckJob( $dummyTitle, $params );
}
/**
-* @param EvaluateCrossCheckJobService $service
* @param Title $title
* @param array|bool $params
*/
- public function __construct( EvaluateCrossCheckJobService $service,
Title $title, $params ) {
- parent::__construct( 'checkForCrossCheckViolations', $title,
$params );
- $this-service = $service;
+ public function __construct( Title $title, $params ) {
+ parent::__construct( 'evaluateCrossCheckJob', $title, $params );
+ $this-service = new EvaluateCrossCheckJobService();
}
public function run() {
$checkTimestamp = array_key_exists( 'checkTimestamp',
$this-params ) ?
[MediaWiki-commits] [Gerrit] puppetmaster: Move backups to the role class - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: puppetmaster: Move backups to the role class
..
puppetmaster: Move backups to the role class
Move it from the module class to the role class. This is cleaner and
also avoids backing up slave puppetmasters who do not anyway have
anything worthy backing up
Change-Id: I2720cf760c00a778ff99616e97f023f8347575c9
---
M manifests/role/puppetmaster.pp
M modules/puppetmaster/manifests/init.pp
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/puppetmaster.pp b/manifests/role/puppetmaster.pp
index 010e150..86da6a4 100644
--- a/manifests/role/puppetmaster.pp
+++ b/manifests/role/puppetmaster.pp
@@ -14,6 +14,10 @@
include role::puppetmaster::config
include passwords::puppet::database
+include role::backup::host
+backup::set { 'var-lib-puppet-ssl': }
+backup::set { 'var-lib-puppet-volatile': }
+
system::role { 'puppetmaster':
description = 'Puppetmaster backend'
}
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index 7d8418e..6f4b166 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -56,10 +56,6 @@
include ::apache::mod::proxy_balancer
}
-include role::backup::host
-backup::set { 'var-lib-puppet-ssl': }
-backup::set { 'var-lib-puppet-volatile': }
-
class { 'puppetmaster::passenger':
bind_address= $bind_address,
verify_client = $verify_client,
--
To view, visit https://gerrit.wikimedia.org/r/209271
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2720cf760c00a778ff99616e97f023f8347575c9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WikidataPageBanner client-side image loading - change (mediawiki...WikidataPageBanner)
Sumit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212512
Change subject: WikidataPageBanner client-side image loading
..
WikidataPageBanner client-side image loading
In order to load banner image of appropriate browser size, a js module added
which reads data-src attribute on .ext-wpb-pagebanner element and retrieves
an image of appropriate size via api request.
Change-Id: I3b3564d5bf96528108ce7eb0b41937356f766722
---
M includes/WikidataPageBanner.hooks.php
M resources/Resources.php
A resources/ext.WikidataPageBanner.loadImage/ext.WikidataPageBanner.loadImage.js
3 files changed, 37 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner
refs/changes/12/212512/1
diff --git a/includes/WikidataPageBanner.hooks.php
b/includes/WikidataPageBanner.hooks.php
index 3b67b7e..eb9f3ea 100644
--- a/includes/WikidataPageBanner.hooks.php
+++ b/includes/WikidataPageBanner.hooks.php
@@ -27,7 +27,7 @@
// if no image exists with given bannerurl, no banner
will be added
if ( in_array( $ns, $wgBannerNamespaces )
!$title-isMainPage()
$bannerurl !== null ) {
- $banner = self::getBannerHtml( $bannerurl,
$title );
+ $banner = self::getBannerHtml( $bannerurl,
$title, $wgPBImage );
$out-addHtml( $banner );
$out-setProperty( 'articlebanner', $banner );
}
@@ -51,6 +51,7 @@
if ( $out-getProperty( 'articlebanner' ) != null ) {
// if articlebanner property is set, we need to add
banner styles
$out-addModuleStyles( 'ext.WikidataPageBanner' );
+ $out-addModuleScripts(
'ext.WikidataPageBanner.loadImage' );
}
}
@@ -73,7 +74,7 @@
$title = $parser-getTitle();
$ns = $title-getNamespace();
if ( in_array( $ns, $wgBannerNamespaces )
!$title-isMainPage() ) {
- $banner = self::getBannerHtml( $fileurl, $title );
+ $banner = self::getBannerHtml( $fileurl, $title,
$bannername );
// Set 'articlebanner' property for future reference
$parser-getOutput()-setProperty( 'articlebanner',
$banner );
}
@@ -120,10 +121,11 @@
* @return string Html code of the banner
* TODO:Move this banner html code to a template.
*/
- public static function getBannerHtml( $bannerurl, $title ) {
+ public static function getBannerHtml( $bannerurl, $title, $file ) {
$banner = Html::openElement( 'div', array( 'class' = 'noprint'
) ) .
Html::openElement( 'div', array( 'class' =
'ext-wpb-pagebanner',
- 'style'
= background-image:url($bannerurl);
+ 'style'
= background-image:url($bannerurl);,
+
'data-src' = $file
)
) .
Html::openElement( 'div', array( 'class' = 'topbanner'
) ) .
diff --git a/resources/Resources.php b/resources/Resources.php
index 018323d..94e80fb 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -32,3 +32,14 @@
'remoteExtPath' = 'WikidataPageBanner/resources',
'targets' = array( 'desktop', 'mobile' ),
);
+$wgResourceModules['ext.WikidataPageBanner.loadImage'] = array(
+ 'scripts' = array(
+
'ext.WikidataPageBanner.loadImage/ext.WikidataPageBanner.loadImage.js',
+ ),
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = 'WikidataPageBanner/resources',
+ 'dependencies' = array(
+ 'mediawiki.api'
+ ),
+ 'targets' = array( 'desktop', 'mobile' ),
+);
diff --git
a/resources/ext.WikidataPageBanner.loadImage/ext.WikidataPageBanner.loadImage.js
b/resources/ext.WikidataPageBanner.loadImage/ext.WikidataPageBanner.loadImage.js
new file mode 100644
index 000..99f7ded
--- /dev/null
+++
b/resources/ext.WikidataPageBanner.loadImage/ext.WikidataPageBanner.loadImage.js
@@ -0,0 +1,20 @@
+/*
+ * Javascript for loading banner dynamically depending upon browser size
+ */
+( function ( mw, $ ) {
+ var src = $( '.ext-wpb-pagebanner' ).data( 'src' );
+ src = 'File:abcd.jpg';
+ //alert( src );
+ //console.log(mw.Api);
+ var api = new mw.Api();
+ api.get({
+ 'action': 'query',
+ 'prop': 'imageinfo',
+
[MediaWiki-commits] [Gerrit] BSBlog: Cache invalidation - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged.
Change subject: BSBlog: Cache invalidation
..
BSBlog: Cache invalidation
* Also added cache invalidation on article delete in blog namespace
* Removed caching when blog type is not default
= Use cache only in NS_BLOG - there is curently no functionality to figure out
in what type of blog tag a entry is showen and why (coditions). Possible blog
by categories or subpages...
Needs rework.
Change-Id: I76dd5ecdc2b5f936d225e2087241667b92bdb232
---
M Blog/Blog.class.php
1 file changed, 68 insertions(+), 28 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index d2c4975..6413026 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -75,6 +75,7 @@
$this-setHook( 'BeforePageDisplay' );
$this-setHook( 'BSTopMenuBarCustomizerRegisterNavigationSites'
);
$this-setHook( 'PageContentSaveComplete' );
+ $this-setHook( 'ArticleDeleteComplete' );
// Trackback is not fully functional in MW and thus disabled.
BsConfig::registerVar( 'MW::Blog::ShowTrackback', false,
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL );
@@ -222,6 +223,36 @@
// Invalidate blog tag cache
BsCacheHelper::invalidateCache( $sTagsKey );
+ return true;
+ }
+
+ /**
+* Invalidate blog cache
+* @param WikiPage $article
+* @param User $user
+* @param String $reason
+* @param Integer $id
+* @param Content $content
+* @param type $logEntry
+* @return boolean
+*/
+ public function onArticleDeleteComplete( $article, User $user,
$reason, $id, $content, $logEntry ) {
+ # TODO: Cache must also be invalidated on other occasions like
blog tags
+ # for subpages or categories.
+ if ( !in_array($article-getTitle()-getNamespace(), array(
+ NS_BLOG,
+ NS_BLOG_TALK
+ )) ){
+ return true;
+ }
+
+ $sTagsKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Blog',
'Tags' );
+ $aTagsData = BsCacheHelper::get( $sTagsKey );
+
+ // Invalidate all blog tag caches
+ BsCacheHelper::invalidateCache( $aTagsData );
+ // Invalidate blog tag cache
+ BsCacheHelper::invalidateCache( $sTagsKey );
return true;
}
@@ -400,7 +431,6 @@
return $aData;
}
// initialize local variables
- $sOut = '';
$oErrorListView = new ViewTagErrorList( $this );
BsExtensionManager::setContext( 'MW::Blog::ShowBlog' );
@@ -588,11 +618,11 @@
$iLoop = 0;
foreach( $res as $row ) {
// prepare data for view class
- $oTitle = Title::newFromID( $row-entry_page_id );
- if ( !$oTitle-userCan( 'read' ) ) {
$iNumberOfEntries--; continue; }
+ $oEntryTitle = Title::newFromID( $row-entry_page_id );
+ if ( !$oEntryTitle-userCan( 'read' ) ) {
$iNumberOfEntries--; continue; }
$bMore = false;
- $aContent = preg_split( '#(bs:blog:)?more */#',
BsPageContentProvider::getInstance()-getContentFromTitle( $oTitle ) );
+ $aContent = preg_split( '#(bs:blog:)?more */#',
BsPageContentProvider::getInstance()-getContentFromTitle( $oEntryTitle ) );
if ( sizeof( $aContent ) 1 ) $bMore = true;
$aContent = trim( $aContent[0] );
// Prevent recursive rendering of blog tag
@@ -627,7 +657,7 @@
$resComment = $dbr-selectRow(
'revision',
'COUNT( rev_id ) AS cnt',
- array( 'rev_page' =
$oTitle-getTalkPage()-getArticleID() )
+ array( 'rev_page' =
$oEntryTitle-getTalkPage()-getArticleID() )
);
$iCount = $resComment-cnt;
@@ -647,26 +677,26 @@
//TODO: magic_call?
if ( $argsModeNamespace === 'ns' ) {
- $sTitle = substr( $oTitle-getText(), 5 );
+ $sTitle = substr( $oEntryTitle-getText(), 5 );
} else {
- $sTitle = $oTitle-getText();
+ $sTitle = $oEntryTitle-getText();
}
$aTalkParams = array();
- if (
[MediaWiki-commits] [Gerrit] BSBlog: Cache invalidation - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged.
Change subject: BSBlog: Cache invalidation
..
BSBlog: Cache invalidation
* Also added cache invalidation on article delete in blog namespace
* Removed caching when blog type is not default
= Use cache only in NS_BLOG - there is curently no functionality to figure out
in what type of blog tag a entry is showen and why (coditions). Possible blog
by categories or subpages...
Needs rework.
Change-Id: I76dd5ecdc2b5f936d225e2087241667b92bdb232
---
M Blog/Blog.class.php
1 file changed, 68 insertions(+), 28 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index d2c4975..6413026 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -75,6 +75,7 @@
$this-setHook( 'BeforePageDisplay' );
$this-setHook( 'BSTopMenuBarCustomizerRegisterNavigationSites'
);
$this-setHook( 'PageContentSaveComplete' );
+ $this-setHook( 'ArticleDeleteComplete' );
// Trackback is not fully functional in MW and thus disabled.
BsConfig::registerVar( 'MW::Blog::ShowTrackback', false,
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL );
@@ -222,6 +223,36 @@
// Invalidate blog tag cache
BsCacheHelper::invalidateCache( $sTagsKey );
+ return true;
+ }
+
+ /**
+* Invalidate blog cache
+* @param WikiPage $article
+* @param User $user
+* @param String $reason
+* @param Integer $id
+* @param Content $content
+* @param type $logEntry
+* @return boolean
+*/
+ public function onArticleDeleteComplete( $article, User $user,
$reason, $id, $content, $logEntry ) {
+ # TODO: Cache must also be invalidated on other occasions like
blog tags
+ # for subpages or categories.
+ if ( !in_array($article-getTitle()-getNamespace(), array(
+ NS_BLOG,
+ NS_BLOG_TALK
+ )) ){
+ return true;
+ }
+
+ $sTagsKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Blog',
'Tags' );
+ $aTagsData = BsCacheHelper::get( $sTagsKey );
+
+ // Invalidate all blog tag caches
+ BsCacheHelper::invalidateCache( $aTagsData );
+ // Invalidate blog tag cache
+ BsCacheHelper::invalidateCache( $sTagsKey );
return true;
}
@@ -400,7 +431,6 @@
return $aData;
}
// initialize local variables
- $sOut = '';
$oErrorListView = new ViewTagErrorList( $this );
BsExtensionManager::setContext( 'MW::Blog::ShowBlog' );
@@ -588,11 +618,11 @@
$iLoop = 0;
foreach( $res as $row ) {
// prepare data for view class
- $oTitle = Title::newFromID( $row-entry_page_id );
- if ( !$oTitle-userCan( 'read' ) ) {
$iNumberOfEntries--; continue; }
+ $oEntryTitle = Title::newFromID( $row-entry_page_id );
+ if ( !$oEntryTitle-userCan( 'read' ) ) {
$iNumberOfEntries--; continue; }
$bMore = false;
- $aContent = preg_split( '#(bs:blog:)?more */#',
BsPageContentProvider::getInstance()-getContentFromTitle( $oTitle ) );
+ $aContent = preg_split( '#(bs:blog:)?more */#',
BsPageContentProvider::getInstance()-getContentFromTitle( $oEntryTitle ) );
if ( sizeof( $aContent ) 1 ) $bMore = true;
$aContent = trim( $aContent[0] );
// Prevent recursive rendering of blog tag
@@ -627,7 +657,7 @@
$resComment = $dbr-selectRow(
'revision',
'COUNT( rev_id ) AS cnt',
- array( 'rev_page' =
$oTitle-getTalkPage()-getArticleID() )
+ array( 'rev_page' =
$oEntryTitle-getTalkPage()-getArticleID() )
);
$iCount = $resComment-cnt;
@@ -647,26 +677,26 @@
//TODO: magic_call?
if ( $argsModeNamespace === 'ns' ) {
- $sTitle = substr( $oTitle-getText(), 5 );
+ $sTitle = substr( $oEntryTitle-getText(), 5 );
} else {
- $sTitle = $oTitle-getText();
+ $sTitle = $oEntryTitle-getText();
}
$aTalkParams = array();
- if (
[MediaWiki-commits] [Gerrit] BSBlog: Cache invalidation - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212513
Change subject: BSBlog: Cache invalidation
..
BSBlog: Cache invalidation
* Also added cache invalidation on article delete in blog namespace
* Removed caching when blog type is not default
= Use cache only in NS_BLOG - there is curently no functionality to figure out
in what type of blog tag a entry is showen and why (coditions). Possible blog
by categories or subpages...
Needs rework.
Change-Id: I76dd5ecdc2b5f936d225e2087241667b92bdb232
---
M Blog/Blog.class.php
1 file changed, 68 insertions(+), 28 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/13/212513/1
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index d2c4975..6413026 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -75,6 +75,7 @@
$this-setHook( 'BeforePageDisplay' );
$this-setHook( 'BSTopMenuBarCustomizerRegisterNavigationSites'
);
$this-setHook( 'PageContentSaveComplete' );
+ $this-setHook( 'ArticleDeleteComplete' );
// Trackback is not fully functional in MW and thus disabled.
BsConfig::registerVar( 'MW::Blog::ShowTrackback', false,
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL );
@@ -222,6 +223,36 @@
// Invalidate blog tag cache
BsCacheHelper::invalidateCache( $sTagsKey );
+ return true;
+ }
+
+ /**
+* Invalidate blog cache
+* @param WikiPage $article
+* @param User $user
+* @param String $reason
+* @param Integer $id
+* @param Content $content
+* @param type $logEntry
+* @return boolean
+*/
+ public function onArticleDeleteComplete( $article, User $user,
$reason, $id, $content, $logEntry ) {
+ # TODO: Cache must also be invalidated on other occasions like
blog tags
+ # for subpages or categories.
+ if ( !in_array($article-getTitle()-getNamespace(), array(
+ NS_BLOG,
+ NS_BLOG_TALK
+ )) ){
+ return true;
+ }
+
+ $sTagsKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Blog',
'Tags' );
+ $aTagsData = BsCacheHelper::get( $sTagsKey );
+
+ // Invalidate all blog tag caches
+ BsCacheHelper::invalidateCache( $aTagsData );
+ // Invalidate blog tag cache
+ BsCacheHelper::invalidateCache( $sTagsKey );
return true;
}
@@ -400,7 +431,6 @@
return $aData;
}
// initialize local variables
- $sOut = '';
$oErrorListView = new ViewTagErrorList( $this );
BsExtensionManager::setContext( 'MW::Blog::ShowBlog' );
@@ -588,11 +618,11 @@
$iLoop = 0;
foreach( $res as $row ) {
// prepare data for view class
- $oTitle = Title::newFromID( $row-entry_page_id );
- if ( !$oTitle-userCan( 'read' ) ) {
$iNumberOfEntries--; continue; }
+ $oEntryTitle = Title::newFromID( $row-entry_page_id );
+ if ( !$oEntryTitle-userCan( 'read' ) ) {
$iNumberOfEntries--; continue; }
$bMore = false;
- $aContent = preg_split( '#(bs:blog:)?more */#',
BsPageContentProvider::getInstance()-getContentFromTitle( $oTitle ) );
+ $aContent = preg_split( '#(bs:blog:)?more */#',
BsPageContentProvider::getInstance()-getContentFromTitle( $oEntryTitle ) );
if ( sizeof( $aContent ) 1 ) $bMore = true;
$aContent = trim( $aContent[0] );
// Prevent recursive rendering of blog tag
@@ -627,7 +657,7 @@
$resComment = $dbr-selectRow(
'revision',
'COUNT( rev_id ) AS cnt',
- array( 'rev_page' =
$oTitle-getTalkPage()-getArticleID() )
+ array( 'rev_page' =
$oEntryTitle-getTalkPage()-getArticleID() )
);
$iCount = $resComment-cnt;
@@ -647,26 +677,26 @@
//TODO: magic_call?
if ( $argsModeNamespace === 'ns' ) {
- $sTitle = substr( $oTitle-getText(), 5 );
+ $sTitle = substr( $oEntryTitle-getText(), 5 );
} else {
- $sTitle = $oTitle-getText();
+ $sTitle = $oEntryTitle-getText();
}
[MediaWiki-commits] [Gerrit] Added '@group WikibaseQuality' to tests - change (mediawiki...WikidataQuality)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/212517 Change subject: Added '@group WikibaseQuality' to tests .. Added '@group WikibaseQuality' to tests Change-Id: I2ec86200aa2de752450a8d64dc59823b6d52c170 --- M tests/phpunit/Html/HtmlTableCellTest.php M tests/phpunit/Html/HtmlTableHeaderTest.php M tests/phpunit/Html/HtmlTableTest.php 3 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/17/212517/1 diff --git a/tests/phpunit/Html/HtmlTableCellTest.php b/tests/phpunit/Html/HtmlTableCellTest.php index 340612f..707ee23 100755 --- a/tests/phpunit/Html/HtmlTableCellTest.php +++ b/tests/phpunit/Html/HtmlTableCellTest.php @@ -9,6 +9,8 @@ /** * @covers WikibaseQuality\Html\HtmlTableCell * + * @group WikibaseQuality + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/Html/HtmlTableHeaderTest.php b/tests/phpunit/Html/HtmlTableHeaderTest.php index 3f0bb6f..30a9b6c 100755 --- a/tests/phpunit/Html/HtmlTableHeaderTest.php +++ b/tests/phpunit/Html/HtmlTableHeaderTest.php @@ -9,6 +9,8 @@ /** * @covers WikibaseQuality\Html\HtmlTableHeader * + * @group WikibaseQuality + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/Html/HtmlTableTest.php b/tests/phpunit/Html/HtmlTableTest.php index cf52e05..2e0071b 100755 --- a/tests/phpunit/Html/HtmlTableTest.php +++ b/tests/phpunit/Html/HtmlTableTest.php @@ -10,6 +10,8 @@ /** * @covers WikibaseQuality\Html\HtmlTable * + * @group WikibaseQuality + * * @uses WikibaseQuality\Html\HtmlTableHeader * @uses WikibaseQuality\Html\HtmlTableCell * -- To view, visit https://gerrit.wikimedia.org/r/212517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ec86200aa2de752450a8d64dc59823b6d52c170 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppetmaster: DRY on inclusion of hiera configuration - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: puppetmaster: DRY on inclusion of hiera configuration
..
puppetmaster: DRY on inclusion of hiera configuration
Instead of conditionally defining twice the hiera class, rely on
conditionally setting a variable and using to specify the correct class
incantation
Change-Id: I41afdf9fa7b79374f085578c75159d8c7d840a08
---
M modules/puppetmaster/manifests/init.pp
1 file changed, 5 insertions(+), 6 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index 6f4b166..e125f07 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -78,12 +78,11 @@
include puppetmaster::labs
require_package('ruby-httpclient')
-class { '::puppetmaster::hiera':
-source = puppet:///modules/puppetmaster/labs.hiera.yaml,
-}
+$hiera_config = 'labs'
} else {
-class { '::puppetmaster::hiera':
-source = puppet:///modules/puppetmaster/${::realm}.hiera.yaml,
-}
+$hiera_config = $::realm
+}
+class { '::puppetmaster::hiera':
+source = puppet:///modules/puppetmaster/${hiera_config}.hiera.yaml,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/209272
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I41afdf9fa7b79374f085578c75159d8c7d840a08
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] config: Don't use MW domain names - change (mediawiki...cxserver)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212511
Change subject: config: Don't use MW domain names
..
config: Don't use MW domain names
* als - gsw
* bat-smg - sgs
* be-x-old - be-tarask
* crh - crh-latn
* fiu-vro - vro
* roa-rup - rup
* zh-classical - lzh
* zh-min-nan - nan
* zh-yue - yue
Change-Id: Icea4e74f50a97be090d5eafb7c25e0d0fdcd2bec
---
M config.defaults.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver
refs/changes/11/212511/1
diff --git a/config.defaults.js b/config.defaults.js
index 3700355..b15cc2c 100644
--- a/config.defaults.js
+++ b/config.defaults.js
@@ -23,8 +23,8 @@
cert: null,
// Service registry
registry: {
- source: [ 'aa', 'ab', 'ace', 'af', 'ak', 'als', 'am', 'ang',
'an', 'arc', 'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar', 'bat-smg',
'ba', 'bcl', 'be-x-old', 'be', 'bg', 'bho', 'bi', 'bjn', 'bm', 'bn', 'bo',
'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ceb', 'ce', 'cho',
'chr', 'ch', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cs', 'cu', 'cv', 'cy',
'da', 'de', 'diq', 'dsb', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es',
'et', 'eu', 'ext', 'fa', 'ff', 'fiu-vro', 'fi', 'fj', 'fo', 'frp', 'frr', 'fr',
'fur', 'fy', 'gag', 'gan', 'ga', 'gd', 'glk', 'gl', 'gn', 'got', 'gu', 'gv',
'hak', 'ha', 'haw', 'he', 'hif', 'hi', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hy',
'hz', 'ia', 'id', 'ie', 'ig', 'ii', 'ik', 'ilo', 'io', 'is', 'it', 'iu', 'ja',
'jbo', 'jv', 'kaa', 'kab', 'ka', 'kbd', 'kg', 'ki', 'kj', 'kk', 'kl', 'km',
'kn', 'koi', 'ko', 'krc', 'kr', 'ksh', 'ks', 'ku', 'kv', 'kw', 'ky', 'lad',
'la', 'lbe', 'lb', 'lez', 'lg', 'lij', 'li', 'lmo', 'ln', 'lo', 'ltg', 'lt',
'lv', 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mh', 'min', 'mi', 'mk', 'ml',
'mn', 'mo', 'mrj', 'mr', 'ms', 'mt', 'mus', 'mwl', 'myv', 'my', 'mzn', 'nah',
'nap', 'na', 'nds-nl', 'nds', 'ne', 'new', 'ng', 'nl', 'nn', 'nov', 'no',
'nrm', 'nso', 'nv', 'ny', 'oc', 'om', 'or', 'os', 'pag', 'pam', 'pap', 'pa',
'pcd', 'pdc', 'pfl', 'pih', 'pi', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'qu',
'rm', 'rmy', 'rn', 'roa-rup', 'roa-tara', 'ro', 'rue', 'ru', 'rw', 'sah', 'sa',
'scn', 'sco', 'sc', 'sd', 'se', 'sg', 'sh', 'simple', 'si', 'sk', 'sl', 'sm',
'sn', 'so', 'sq', 'srn', 'sr', 'ss', 'stq', 'st', 'su', 'sv', 'sw', 'szl',
'ta', 'tet', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to', 'tpi', 'tr', 'ts',
'tt', 'tum', 'tw', 'tyv', 'ty', 'udm', 'ug', 'uk', 'ur', 'uz', 'vec', 'vep',
've', 'vi', 'vls', 'vo', 'war', 'wa', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi',
'yo', 'za', 'zea', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zh', 'zu' ],
- target: [ 'aa', 'ab', 'ace', 'af', 'ak', 'als', 'am', 'ang',
'an', 'arc', 'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar', 'bat-smg',
'ba', 'bcl', 'be-x-old', 'be', 'bg', 'bho', 'bi', 'bjn', 'bm', 'bn', 'bo',
'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ceb', 'ce', 'cho',
'chr', 'ch', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cs', 'cu', 'cv', 'cy',
'da', 'de', 'diq', 'dsb', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es',
'et', 'eu', 'ext', 'fa', 'ff', 'fiu-vro', 'fi', 'fj', 'fo', 'frp', 'frr', 'fr',
'fur', 'fy', 'gag', 'gan', 'ga', 'gd', 'glk', 'gl', 'gn', 'got', 'gu', 'gv',
'hak', 'ha', 'haw', 'he', 'hif', 'hi', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hy',
'hz', 'ia', 'id', 'ie', 'ig', 'ii', 'ik', 'ilo', 'io', 'is', 'it', 'iu', 'ja',
'jbo', 'jv', 'kaa', 'kab', 'ka', 'kbd', 'kg', 'ki', 'kj', 'kk', 'kl', 'km',
'kn', 'koi', 'ko', 'krc', 'kr', 'ksh', 'ks', 'ku', 'kv', 'kw', 'ky', 'lad',
'la', 'lbe', 'lb', 'lez', 'lg', 'lij', 'li', 'lmo', 'ln', 'lo', 'ltg', 'lt',
'lv', 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mh', 'min', 'mi', 'mk', 'ml',
'mn', 'mo', 'mrj', 'mr', 'ms', 'mt', 'mus', 'mwl', 'myv', 'my', 'mzn', 'nah',
'nap', 'na', 'nds-nl', 'nds', 'ne', 'new', 'ng', 'nl', 'nn', 'nov', 'no',
'nrm', 'nso', 'nv', 'ny', 'oc', 'om', 'or', 'os', 'pag', 'pam', 'pap', 'pa',
'pcd', 'pdc', 'pfl', 'pih', 'pi', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'qu',
'rm', 'rmy', 'rn', 'roa-rup', 'roa-tara', 'ro', 'rue', 'ru', 'rw', 'sah', 'sa',
'scn', 'sco', 'sc', 'sd', 'se', 'sg', 'sh', 'simple', 'si', 'sk', 'sl', 'sm',
'sn', 'so', 'sq', 'srn', 'sr', 'ss', 'stq', 'st', 'su', 'sv', 'sw', 'szl',
'ta', 'tet', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to', 'tpi', 'tr', 'ts',
'tt', 'tum', 'tw', 'tyv', 'ty', 'udm', 'ug', 'uk', 'ur', 'uz', 'vec', 'vep',
've', 'vi', 'vls', 'vo', 'war', 'wa', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi',
'yo', 'za', 'zea', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zh', 'zu' ],
+ source: [ 'aa', 'ab', 'ace', 'af', 'ak', 'am', 'ang', 'an',
'arc', 'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar', 'ba', 'bcl',
'be-tarask', 'be', 'bg', 'bho', 'bi', 'bjn', 'bm', 'bn', 'bo', 'bpy', 'br',
'bs', 'bug', 'bxr', 'ca',
[MediaWiki-commits] [Gerrit] Remove the unneeded priorites in filenames - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Remove the unneeded priorites in filenames
..
Remove the unneeded priorites in filenames
Now that we use base::puppet::config, priorities in filenames are not
needed
Change-Id: I8305150f8edc1bfb619f1793f7af667152e3b93f
---
M modules/puppetmaster/manifests/config.pp
M modules/puppetmaster/manifests/logstash.pp
R modules/puppetmaster/templates/logstash.conf.erb
R modules/puppetmaster/templates/master.conf.erb
4 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/config.pp
b/modules/puppetmaster/manifests/config.pp
index 33d7d0e..001988e 100644
--- a/modules/puppetmaster/manifests/config.pp
+++ b/modules/puppetmaster/manifests/config.pp
@@ -5,7 +5,7 @@
class puppetmaster::config {
base::puppet::config { 'master':
prio= 20,
-content = template('puppetmaster/20-master.conf.erb'),
+content = template('puppetmaster/master.conf.erb'),
}
# See https://tickets.puppetlabs.com/browse/PUP-1237
diff --git a/modules/puppetmaster/manifests/logstash.pp
b/modules/puppetmaster/manifests/logstash.pp
index f1eb9cb..62e7988 100644
--- a/modules/puppetmaster/manifests/logstash.pp
+++ b/modules/puppetmaster/manifests/logstash.pp
@@ -27,6 +27,6 @@
base::puppet::config { 'logstash':
prio= 30,
-content = template('puppetmaster/30-logstash.conf.erb'),
+content = template('puppetmaster/logstash.conf.erb'),
}
}
diff --git a/modules/puppetmaster/templates/30-logstash.conf.erb
b/modules/puppetmaster/templates/logstash.conf.erb
similarity index 100%
rename from modules/puppetmaster/templates/30-logstash.conf.erb
rename to modules/puppetmaster/templates/logstash.conf.erb
diff --git a/modules/puppetmaster/templates/20-master.conf.erb
b/modules/puppetmaster/templates/master.conf.erb
similarity index 100%
rename from modules/puppetmaster/templates/20-master.conf.erb
rename to modules/puppetmaster/templates/master.conf.erb
--
To view, visit https://gerrit.wikimedia.org/r/212305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8305150f8edc1bfb619f1793f7af667152e3b93f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Corrected language code based on wgLanguageCode setting - change (operations/puppet)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/212514 Change subject: CX: Corrected language code based on wgLanguageCode setting .. CX: Corrected language code based on wgLanguageCode setting Change-Id: I0d3a7734d458a9f0028e505d2f4659fb3f15f153 --- M hieradata/common/cxserver.yaml M hieradata/labs/deployment-prep/common.yaml 2 files changed, 27 insertions(+), 27 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/14/212514/1 diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index 4e1640f..975628f 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -5,7 +5,6 @@ - 'ace' - 'af' - 'ak' -- 'als' - 'am' - 'ang' - 'an' @@ -18,11 +17,10 @@ - 'ay' - 'az' - 'bar' -- 'bat-smg' - 'ba' - 'bcl' -- 'be-x-old' - 'be' +- 'be-tarask' - 'bg' - 'bho' - 'bi' @@ -70,7 +68,6 @@ - 'ext' - 'fa' - 'ff' -- 'fiu-vro' - 'fi' - 'fj' - 'fo' @@ -87,6 +84,7 @@ - 'gl' - 'gn' - 'got' +- 'gsw' - 'gu' - 'gv' - 'hak' @@ -151,6 +149,7 @@ - 'ltg' - 'lt' - 'lv' +- 'lzh' - 'mai' - 'map-bms' - 'mdf' @@ -173,6 +172,7 @@ - 'my' - 'mzn' - 'nah' +- 'nan' - 'nap' - 'na' - 'nds-nl' @@ -211,10 +211,10 @@ - 'rm' - 'rmy' - 'rn' -- 'roa-rup' - 'roa-tara' - 'ro' - 'rue' +- 'rup' - 'ru' - 'rw' - 'sah' @@ -225,6 +225,7 @@ - 'sd' - 'se' - 'sg' +- 'sgs' - 'sh' - 'simple' - 'si' @@ -272,6 +273,7 @@ - 'vi' - 'vls' - 'vo' +- 'vro' - 'war' - 'wa' - 'wo' @@ -281,11 +283,9 @@ - 'xmf' - 'yi' - 'yo' +- 'yue' - 'za' - 'zea' -- 'zh-classical' -- 'zh-min-nan' -- 'zh-yue' - 'zh' - 'zu' target: @@ -297,14 +297,14 @@ - 'av' - 'az' - 'ba' -- 'be-x-old' - 'be' +- 'be-tarask' - 'bcl' - 'bg' - 'bho' - 'bm' - 'ca' -- 'cbk-za' +- 'cbk-zam' - 'ceb' - 'crh-latn' - 'cs' @@ -359,7 +359,7 @@ - 'pt' - 'rmy' - 'rn' -- 'roa-rup' +- 'rup' - 'rue' - 'sah' - 'sg' diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 79a1db2..7d30b06 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -61,7 +61,6 @@ - 'ace' - 'af' - 'ak' -- 'als' - 'am' - 'ang' - 'an' @@ -74,11 +73,10 @@ - 'ay' - 'az' - 'bar' -- 'bat-smg' - 'ba' - 'bcl' -- 'be-x-old' - 'be' +- 'be-tarask' - 'bg' - 'bho' - 'bi' @@ -126,7 +124,6 @@ - 'ext' - 'fa' - 'ff' -- 'fiu-vro' - 'fi' - 'fj' - 'fo' @@ -143,6 +140,7 @@ - 'gl' - 'gn' - 'got' +- 'gsw' - 'gu' - 'gv' - 'hak' @@ -207,6 +205,7 @@ - 'ltg' - 'lt' - 'lv' +- 'lzh' - 'mai' - 'map-bms' - 'mdf' @@ -229,6 +228,7 @@ - 'my' - 'mzn' - 'nah' +- 'nan' - 'nap' - 'na' - 'nds-nl' @@ -267,10 +267,10 @@ - 'rm' - 'rmy' - 'rn' -- 'roa-rup' - 'roa-tara' - 'ro' - 'rue' +- 'rup' - 'ru' - 'rw' - 'sah' @@ -281,6 +281,7 @@ - 'sd' - 'se' - 'sg' +- 'sgs' - 'sh' - 'simple' - 'si' @@ -328,6 +329,7 @@ - 'vi' - 'vls' - 'vo' +- 'vro' - 'war' - 'wa' - 'wo' @@ -337,11 +339,9 @@ - 'xmf' - 'yi' - 'yo' +- 'yue' - 'za' - 'zea' -- 'zh-classical' -- 'zh-min-nan' -- 'zh-yue' - 'zh' - 'zu' target: @@ -350,7 +350,6 @@ - 'ace' - 'af' - 'ak' -- 'als' - 'am' - 'ang' - 'an' @@ -363,11 +362,10 @@ - 'ay' - 'az' - 'bar' -- 'bat-smg' - 'ba' - 'bcl' -- 'be-x-old' - 'be' +- 'be-tarask' - 'bg' - 'bho' - 'bi' @@ -415,7 +413,6 @@ - 'ext' - 'fa' - 'ff' -- 'fiu-vro' - 'fi' - 'fj' - 'fo' @@ -432,6 +429,7 @@ - 'gl' - 'gn' - 'got' +- 'gsw' - 'gu' - 'gv' - 'hak' @@ -496,6 +494,7 @@ - 'ltg' - 'lt' - 'lv' +- 'lzh' - 'mai' - 'map-bms' - 'mdf' @@ -518,6 +517,7 @@ - 'my' - 'mzn' - 'nah' +- 'nan' - 'nap' - 'na' - 'nds-nl' @@ -556,10 +556,10 @@ - 'rm' - 'rmy' - 'rn' -- 'roa-rup' - 'roa-tara' - 'ro' - 'rue' +- 'rup' - 'ru' - 'rw' - 'sah' @@ -570,6 +570,7 @@ - 'sd' - 'se' - 'sg' +- 'sgs' - 'sh' - 'simple' - 'si' @@ -617,6 +618,7
[MediaWiki-commits] [Gerrit] Update Wikibase to use DataValues JavaScript 0.7.0 - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/212515 Change subject: Update Wikibase to use DataValues JavaScript 0.7.0 .. Update Wikibase to use DataValues JavaScript 0.7.0 (right now it's a branch...) do not merge! Change-Id: If2b167681fee5923822c8646d37f34740fb78070 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/15/212515/1 diff --git a/composer.json b/composer.json index 8ff8471..193afa8 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ data-values/validators: ~0.1.0, data-values/data-types: ~0.4.0, data-values/serialization: ~1.0, - data-values/javascript: ~0.6.0, + data-values/javascript: dev-undeserializable, data-values/value-view: ~0.14.0, wikibase/data-model: ~2.6, -- To view, visit https://gerrit.wikimedia.org/r/212515 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2b167681fee5923822c8646d37f34740fb78070 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] remove CheckResult Interface and change namespace to Wikibas... - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged.
Change subject: remove CheckResult Interface and change namespace to
WikibaseQuality
..
remove CheckResult Interface and change namespace to WikibaseQuality
Change-Id: I52356dd117cc10ab57daaf765c22dd7996808ecc
---
M WikibaseQuality.php
M api/GetViolations.php
M api/ModifyViolation.php
M composer.json
M includes/Html/HtmlTable.php
M includes/Html/HtmlTableCell.php
M includes/Html/HtmlTableHeader.php
M includes/Serializer/ViolationSerializer.php
M includes/Violations/Violation.php
M includes/Violations/ViolationLookup.php
M includes/Violations/ViolationQuery.php
M includes/Violations/ViolationStore.php
D specials/SpecialCheckResultPage.php
D specials/SpecialWikidataQualityPage.php
M tests/phpunit/Api/GetViolationsTest.php
M tests/phpunit/Api/ModifyViolationTest.php
M tests/phpunit/Helper/JsonFileEntityLookup.php
M tests/phpunit/Html/HtmlTableCellTest.php
M tests/phpunit/Html/HtmlTableHeaderTest.php
M tests/phpunit/Html/HtmlTableTest.php
M tests/phpunit/Serializer/ViolationSerializerTest.php
M tests/phpunit/Violations/ViolationLookupTest.php
M tests/phpunit/Violations/ViolationQueryTest.php
M tests/phpunit/Violations/ViolationStoreTest.php
M tests/phpunit/Violations/ViolationTest.php
25 files changed, 85 insertions(+), 585 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/WikibaseQuality.php b/WikibaseQuality.php
index 7c53924..4adfc9b 100755
--- a/WikibaseQuality.php
+++ b/WikibaseQuality.php
@@ -32,8 +32,8 @@
);
// Define API modules
-$GLOBALS['wgAPIModules']['wbqgetviolations'] =
'WikidataQuality\Api\GetViolations';
-$GLOBALS['wgAPIModules']['wbqmodifyviolation'] =
'WikidataQuality\Api\ModifyViolation';
+$GLOBALS['wgAPIModules']['wbqgetviolations'] =
'WikibaseQuality\Api\GetViolations';
+$GLOBALS['wgAPIModules']['wbqmodifyviolation'] =
'WikibaseQuality\Api\ModifyViolation';
// Define database table names
define( 'VIOLATION_TABLE', 'wbq_violations' );
diff --git a/api/GetViolations.php b/api/GetViolations.php
old mode 100644
new mode 100755
index bea556c..6f3a4ef
--- a/api/GetViolations.php
+++ b/api/GetViolations.php
@@ -1,16 +1,13 @@
?php
-namespace WikidataQuality\Api;
+namespace WikibaseQuality\Api;
use ApiMain;
use DataValues\Serializers;
-use DataValues\Serializers\DataValueSerializer;
use Wikibase\Api\ApiWikibase;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Statement\StatementList;
-use WikidataQuality\Violations\ViolationLookup;
-use WikidataQuality\Violations\ViolationQuery;
-use WikidataQuality\Serializer\ViolationSerializer;
+use WikibaseQuality\Violations\ViolationLookup;
+use WikibaseQuality\Violations\ViolationQuery;
+use WikibaseQuality\Serializer\ViolationSerializer;
/**
@@ -18,7 +15,7 @@
*
* API module to access found violations
*
- * @package WikidataQuality\Api
+ * @package WikibaseQuality\Api
* @author BP2014N1
* @license GNU GPL v2+
*/
diff --git a/api/ModifyViolation.php b/api/ModifyViolation.php
old mode 100644
new mode 100755
index 203332c..3e7fd88
--- a/api/ModifyViolation.php
+++ b/api/ModifyViolation.php
@@ -1,18 +1,15 @@
?php
-namespace WikidataQuality\Api;
+namespace WikibaseQuality\Api;
use ApiMain;
use DataValues\Serializers;
-use DataValues\Serializers\DataValueSerializer;
use Wikibase\Api\ApiWikibase;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Statement\StatementList;
use Wikibase\Repo\WikibaseRepo;
-use WikidataQuality\Violations\ViolationLookup;
-use WikidataQuality\Violations\ViolationQuery;
-use WikidataQuality\Serializer\ViolationSerializer;
-use WikidataQuality\Violations\ViolationStore;
+use WikibaseQuality\Violations\ViolationLookup;
+use WikibaseQuality\Violations\ViolationQuery;
+use WikibaseQuality\Serializer\ViolationSerializer;
+use WikibaseQuality\Violations\ViolationStore;
/**
@@ -20,7 +17,7 @@
*
* API module to access found violations
*
- * @package WikidataQuality\Api
+ * @package WikibaseQuality\Api
* @author BP2014N1
* @license GNU GPL v2+
*/
diff --git a/composer.json b/composer.json
old mode 100644
new mode 100755
index 48379b4..a604326
--- a/composer.json
+++ b/composer.json
@@ -26,10 +26,10 @@
},
autoload: {
psr-4: {
- WikidataQuality\\: includes/,
- WikidataQuality\\Api\\: api/,
- WikidataQuality\\Specials\\: specials/,
- WikidataQuality\\Tests\\: tests/phpunit/
+ WikibaseQuality\\: includes/,
+ WikibaseQuality\\Api\\: api/,
+ WikibaseQuality\\Specials\\: specials/,
+ WikibaseQuality\\Tests\\: tests/phpunit/
},
classmap: [
WikibaseQualityHooks.php
diff --git
[MediaWiki-commits] [Gerrit] Make sure $dbw is an object in DeferredUpdates::addUpdate() - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212505
Change subject: Make sure $dbw is an object in DeferredUpdates::addUpdate()
..
Make sure $dbw is an object in DeferredUpdates::addUpdate()
Change-Id: Ib52574bc7f2e13bf06f595e349a7b3ccea425056
---
M includes/deferred/DeferredUpdates.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/05/212505/1
diff --git a/includes/deferred/DeferredUpdates.php
b/includes/deferred/DeferredUpdates.php
index 29bb8d7..082d435 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -65,7 +65,7 @@
$lb = wfGetLB();
$dbw = $lb-getAnyOpenConnection( $lb-getWriterIndex()
);
// Do the update as soon as there is no transaction
- if ( $dbw-trxLevel() ) {
+ if ( $dbw $dbw-trxLevel() ) {
$waitingOnTrx = true;
$dbw-onTransactionIdle( function() use (
$waitingOnTrx ) {
DeferredUpdates::doUpdates();
--
To view, visit https://gerrit.wikimedia.org/r/212505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib52574bc7f2e13bf06f595e349a7b3ccea425056
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump version - change (mediawiki...luasandbox)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Bump version .. Bump version Bumping to 2.0.9 to reflect the various changes Bug: T88798 Change-Id: Ic12fef05a3cd4561e97d89677f51521f1e14e031 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 69d5bb5..0b50825 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +php-luasandbox (2.0.9) trusty-wikimedia; urgency=low + + * Rebuilt with HHVM autodetection. Will now build correctly both on HHVM +enabled distros and not HHVM enabled ones. + + -- Alexandros Kosiaris a...@wikimedia.org Thu, 21 May 2015 09:52:56 +0300 + php-luasandbox (2.0.8) trusty-wikimedia; urgency=medium * Debian native package versioning -- To view, visit https://gerrit.wikimedia.org/r/212510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic12fef05a3cd4561e97d89677f51521f1e14e031 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/php/luasandbox Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Jackmcbarn jackmcb...@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] Avoid pointless getNativeData() call in isCountable() - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212507
Change subject: Avoid pointless getNativeData() call in isCountable()
..
Avoid pointless getNativeData() call in isCountable()
Change-Id: I40ed1972a8815de645d11217b35c1060d5007e5a
---
M includes/content/WikitextContent.php
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/212507/1
diff --git a/includes/content/WikitextContent.php
b/includes/content/WikitextContent.php
index dbe09f9..3b449b6 100644
--- a/includes/content/WikitextContent.php
+++ b/includes/content/WikitextContent.php
@@ -273,12 +273,11 @@
return false;
}
- $text = $this-getNativeData();
-
switch ( $wgArticleCountMethod ) {
case 'any':
return true;
case 'comma':
+ $text = $this-getNativeData();
return strpos( $text, ',' ) !== false;
case 'link':
if ( $hasLinks === null ) { # not known, find
out
--
To view, visit https://gerrit.wikimedia.org/r/212507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40ed1972a8815de645d11217b35c1060d5007e5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump version - change (mediawiki...luasandbox)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/212510 Change subject: Bump version .. Bump version Bumping to 2.0.9 to reflect the various changes Bug: T88798 Change-Id: Ic12fef05a3cd4561e97d89677f51521f1e14e031 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox refs/changes/10/212510/1 diff --git a/debian/changelog b/debian/changelog index 69d5bb5..0b50825 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +php-luasandbox (2.0.9) trusty-wikimedia; urgency=low + + * Rebuilt with HHVM autodetection. Will now build correctly both on HHVM +enabled distros and not HHVM enabled ones. + + -- Alexandros Kosiaris a...@wikimedia.org Thu, 21 May 2015 09:52:56 +0300 + php-luasandbox (2.0.8) trusty-wikimedia; urgency=medium * Debian native package versioning -- To view, visit https://gerrit.wikimedia.org/r/212510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic12fef05a3cd4561e97d89677f51521f1e14e031 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/php/luasandbox Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Made RecentChange defer the save() method via DeferredUpdates - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212509
Change subject: Made RecentChange defer the save() method via DeferredUpdates
..
Made RecentChange defer the save() method via DeferredUpdates
* Also made it handle calling PatrolLog::record() itself
Change-Id: I58ef060e02b89a5f9dadc0dbc4edba667932beda
---
M includes/changes/RecentChange.php
M includes/page/WikiPage.php
2 files changed, 29 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/09/212509/1
diff --git a/includes/changes/RecentChange.php
b/includes/changes/RecentChange.php
index b430bab..d7ecf03 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -512,8 +512,10 @@
* @param int $patrol
* @return RecentChange
*/
- public static function notifyEdit( $timestamp, $title, $minor, $user,
$comment, $oldId,
- $lastTimestamp, $bot, $ip = '', $oldSize = 0, $newSize = 0,
$newId = 0, $patrol = 0 ) {
+ public static function notifyEdit(
+ $timestamp, $title, $minor, $user, $comment, $oldId,
$lastTimestamp,
+ $bot, $ip = '', $oldSize = 0, $newSize = 0, $newId = 0, $patrol
= 0
+ ) {
$rc = new RecentChange;
$rc-mTitle = $title;
$rc-mPerformer = $user;
@@ -550,7 +552,13 @@
'newSize' = $newSize,
'pageStatus' = 'changed'
);
- $rc-save();
+
+ DeferredUpdates::addCallableUpdate( function() use ( $rc ) {
+ $rc-save();
+ if ( $rc-mAttribs['rc_patrolled'] ) {
+ PatrolLog::record( $rc, true,
$rc-getPerformer() );
+ }
+ } );
return $rc;
}
@@ -571,8 +579,10 @@
* @param int $patrol
* @return RecentChange
*/
- public static function notifyNew( $timestamp, $title, $minor, $user,
$comment, $bot,
- $ip = '', $size = 0, $newId = 0, $patrol = 0 ) {
+ public static function notifyNew(
+ $timestamp, $title, $minor, $user, $comment, $bot,
+ $ip = '', $size = 0, $newId = 0, $patrol = 0
+ ) {
$rc = new RecentChange;
$rc-mTitle = $title;
$rc-mPerformer = $user;
@@ -609,7 +619,13 @@
'newSize' = $size,
'pageStatus' = 'created'
);
- $rc-save();
+
+ DeferredUpdates::addCallableUpdate( function() use ( $rc ) {
+ $rc-save();
+ if ( $rc-mAttribs['rc_patrolled'] ) {
+ PatrolLog::record( $rc, true,
$rc-getPerformer() );
+ }
+ } );
return $rc;
}
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 64dd99d..140550e 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1835,17 +1835,13 @@
if ( !( $flags EDIT_SUPPRESS_RC ) ) {
// Mark as patrolled if the user can do
so
$patrolled = $wgUseRCPatrol !count(
-
$this-mTitle-getUserPermissionsErrors( 'autopatrol', $user ) );
+
$this-mTitle-getUserPermissionsErrors( 'autopatrol', $user ) );
// Add RC row to the DB
- $rc = RecentChange::notifyEdit( $now,
$this-mTitle, $isminor, $user, $summary,
+ RecentChange::notifyEdit(
+ $now, $this-mTitle, $isminor,
$user, $summary,
$oldid, $this-getTimestamp(),
$bot, '', $oldsize, $newsize,
$revisionId, $patrolled
);
-
- // Log auto-patrolled edits
- if ( $patrolled ) {
- PatrolLog::record( $rc, true,
$user );
- }
}
$user-incEditCount();
@@ -1936,13 +1932,10 @@
$patrolled = ( $wgUseRCPatrol || $wgUseNPPatrol
) !count(
$this-mTitle-getUserPermissionsErrors( 'autopatrol', $user ) );
// Add RC row to the DB
- $rc = RecentChange::notifyNew( $now,
$this-mTitle, $isminor, $user, $summary, $bot,
-
[MediaWiki-commits] [Gerrit] Make sure $dbw is an object in DeferredUpdates::addUpdate() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Make sure $dbw is an object in DeferredUpdates::addUpdate()
..
Make sure $dbw is an object in DeferredUpdates::addUpdate()
Change-Id: Ib52574bc7f2e13bf06f595e349a7b3ccea425056
---
M includes/deferred/DeferredUpdates.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/deferred/DeferredUpdates.php
b/includes/deferred/DeferredUpdates.php
index 29bb8d7..082d435 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -65,7 +65,7 @@
$lb = wfGetLB();
$dbw = $lb-getAnyOpenConnection( $lb-getWriterIndex()
);
// Do the update as soon as there is no transaction
- if ( $dbw-trxLevel() ) {
+ if ( $dbw $dbw-trxLevel() ) {
$waitingOnTrx = true;
$dbw-onTransactionIdle( function() use (
$waitingOnTrx ) {
DeferredUpdates::doUpdates();
--
To view, visit https://gerrit.wikimedia.org/r/212505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib52574bc7f2e13bf06f595e349a7b3ccea425056
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@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] should still be short URL in repo I think - change (wikidata...rdf)
Smalyshev has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212506
Change subject: should still be short URL in repo I think
..
should still be short URL in repo I think
Change-Id: Ie9f990aeb586af44d3966a6964223d04ad6e6f77
---
M gui/gui.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/06/212506/1
diff --git a/gui/gui.js b/gui/gui.js
index 485f8f4..ee609b8 100644
--- a/gui/gui.js
+++ b/gui/gui.js
@@ -2,7 +2,7 @@
window.EDITOR = {};
(function($, mw) {
- var SERVICE =
'http://wdqs-beta.wmflabs.org/bigdata/namespace/wdq/sparql',
+ var SERVICE = '/bigdata/namespace/wdq/sparql',
SHORTURL = 'http://tinyurl.com/create.php?url=',
NAMESPACE_SHORTCUTS = {
'Wikidata' : {
--
To view, visit https://gerrit.wikimedia.org/r/212506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9f990aeb586af44d3966a6964223d04ad6e6f77
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev smalys...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved addAutopromoteOnceGroups() call to a deferred update - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212508
Change subject: Moved addAutopromoteOnceGroups() call to a deferred update
..
Moved addAutopromoteOnceGroups() call to a deferred update
Change-Id: If7941465889c1848ccf1be4ff5505c5eb53a14f1
---
M includes/page/WikiPage.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/08/212508/1
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 64dd99d..fe6f416 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1835,7 +1835,7 @@
if ( !( $flags EDIT_SUPPRESS_RC ) ) {
// Mark as patrolled if the user can do
so
$patrolled = $wgUseRCPatrol !count(
-
$this-mTitle-getUserPermissionsErrors( 'autopatrol', $user ) );
+
$this-mTitle-getUserPermissionsErrors( 'autopatrol', $user ) );
// Add RC row to the DB
$rc = RecentChange::notifyEdit( $now,
$this-mTitle, $isminor, $user, $summary,
$oldid, $this-getTimestamp(),
$bot, '', $oldsize, $newsize,
@@ -1968,13 +1968,13 @@
$status-value['revision'] = $revision;
$hook_args = array( $this, $user, $content, $summary,
- $flags EDIT_MINOR,
null, null, $flags, $revision, $status, $baseRevId );
+ $flags EDIT_MINOR, null, null, $flags, $revision,
$status, $baseRevId );
ContentHandler::runLegacyHooks( 'ArticleSaveComplete',
$hook_args );
Hooks::run( 'PageContentSaveComplete', $hook_args );
// Promote user to any groups they meet the criteria for
- $dbw-onTransactionIdle( function () use ( $user ) {
+ DeferredUpdates::addCallableUpdate( function () use ( $user ) {
$user-addAutopromoteOnceGroups( 'onEdit' );
$user-addAutopromoteOnceGroups( 'onView' ); // b/c
} );
--
To view, visit https://gerrit.wikimedia.org/r/212508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7941465889c1848ccf1be4ff5505c5eb53a14f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Fix language codes - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: CX: Fix language codes .. CX: Fix language codes Language selector shouldn't use MW domain code. Also added missing Lithuanian (lt) Change-Id: Ie2f1ea1f5ead4b98db940fe6ffb26f6628b2046c --- M hieradata/common/cxserver.yaml M hieradata/labs/deployment-prep/common.yaml 2 files changed, 10 insertions(+), 8 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index 460b149..4e1640f 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -24,7 +24,7 @@ - 'be-x-old' - 'be' - 'bg' -- 'bh' +- 'bho' - 'bi' - 'bjn' - 'bm' @@ -46,7 +46,7 @@ - 'chy' - 'ckb' - 'co' -- 'crh' +- 'crh-latn' - 'cr' - 'csb' - 'cs' @@ -301,14 +301,15 @@ - 'be' - 'bcl' - 'bg' -- 'bh' +- 'bho' - 'bm' - 'ca' - 'cbk-za' - 'ceb' -- 'cv' +- 'crh-latn' - 'cs' - 'csb' +- 'cv' - 'da' - 'ee' - 'el' @@ -338,6 +339,7 @@ - 'lez' - 'li' - 'lg' +- 'lt' - 'ltg' - 'lv' - 'min' diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 90fac3e..79a1db2 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -80,7 +80,7 @@ - 'be-x-old' - 'be' - 'bg' -- 'bh' +- 'bho' - 'bi' - 'bjn' - 'bm' @@ -102,7 +102,7 @@ - 'chy' - 'ckb' - 'co' -- 'crh' +- 'crh-latn' - 'cr' - 'csb' - 'cs' @@ -369,7 +369,7 @@ - 'be-x-old' - 'be' - 'bg' -- 'bh' +- 'bho' - 'bi' - 'bjn' - 'bm' @@ -391,7 +391,7 @@ - 'chy' - 'ckb' - 'co' -- 'crh' +- 'crh-latn' - 'cr' - 'csb' - 'cs' -- To view, visit https://gerrit.wikimedia.org/r/212504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2f1ea1f5ead4b98db940fe6ffb26f6628b2046c Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org 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] Invert placeholder text on create collection input - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged. Change subject: Invert placeholder text on create collection input .. Invert placeholder text on create collection input Bug: T96837 Change-Id: I7df0fc4f119f648b98e69b944dc11cbc3c5be26e --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, but someone else must approve Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 82e966a..57ffbce 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -61,7 +61,7 @@ gather-anon-cta: Add this page to a collection that you can share with the world., gather-create-new-button-label: Create, gather-create-collection-button-label: Create a collection, - gather-add-new-placeholder: Enter a new collection name, + gather-add-new-placeholder: Name of the collection, gather-add-to-new: Add to new public collection, gather-add-to-existing: Add to existing collection, gather-add-toast: The page has been added to your \$1\ collection., -- To view, visit https://gerrit.wikimedia.org/r/211920 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7df0fc4f119f648b98e69b944dc11cbc3c5be26e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jhernandez jhernan...@wikimedia.org Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change search input placeholder on editing collection - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged. Change subject: Change search input placeholder on editing collection .. Change search input placeholder on editing collection Bug: T98541 Change-Id: I4da8d13a5653dc24519909df831383b836928100 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 82e966a..3203cf0 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -107,7 +107,7 @@ gather-delete-button: Delete, gather-overlay-edit-button: Edit title and description, gather-overlay-continue: Next, - gather-overlay-search-empty: Search for a page to add to this collection, + gather-overlay-search-empty: Search to add pages, gather-overlay-search-new: Start a new search..., gather-overlay-search-results-empty: Sorry, we couldn't find any pages for \$1\, right-gather-hidelist: Force a public user list to become hidden, -- To view, visit https://gerrit.wikimedia.org/r/212020 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4da8d13a5653dc24519909df831383b836928100 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jhernandez jhernan...@wikimedia.org Gerrit-Reviewer: Jdlrobson jrob...@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] Merge branch 'v1' - change (mediawiki...WikidataQualityConstraints)
Jonaskeutel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212518
Change subject: Merge branch 'v1'
..
Merge branch 'v1'
Conflicts:
WikibaseQualityConstraints.php
i18n/en.json
i18n/qqq.json
includes/ConstraintCheck/Result/CheckResult.php
tests/phpunit/DelegatingConstraintCheckerTest.php
tests/phpunit/EvaluateConstraintReportJobServiceTest.php
Change-Id: Ia53dc39221d2517d3dfd65bbb353b8ad169e08eb
---
M WikibaseQualityConstraints.php
M composer.json
M i18n/en.json
M i18n/qqq.json
M includes/ConstraintCheck/Result/CheckResult.php
M tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
M tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
M tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php
M tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
M tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php
M tests/phpunit/DelegatingConstraintCheckerTest.php
M tests/phpunit/EvaluateConstraintReportJobServiceTest.php
M tests/phpunit/Helper/ConstraintReportHelperTest.php
M tests/phpunit/Result/CheckResultTest.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
16 files changed, 41 insertions(+), 459 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/18/212518/1
diff --git a/WikibaseQualityConstraints.php b/WikibaseQualityConstraints.php
index 7e1f1f9..600fff3 100755
--- a/WikibaseQualityConstraints.php
+++ b/WikibaseQualityConstraints.php
@@ -30,11 +30,7 @@
// Define modules
$GLOBALS['wgResourceModules']['SpecialConstraintReportPage'] = array (
- HEAD (e109a4 Localisation updates from https://translatewiki.net.)
- 'styles' = '/modules/SpecialConstraintReportPage.css',
-===
'styles' = '/modules/SpecialConstraintReportPage.css',
- BRANCH (5f5351 Fix for coveralls.)
'scripts' = '/modules/SpecialConstraintReportPage.js',
'localBasePath' = __DIR__,
'remoteExtPath' = 'WikibaseQualityConstraints'
@@ -46,4 +42,4 @@
// Jobs
$GLOBALS['wgJobClasses']['evaluateConstraintReportJob'] =
'WikidataQuality\ConstraintReport\EvaluateConstraintReportJob';
$GLOBALS['wgDebugLogGroups']['wbq_evaluation'] =
'/var/log/mediawiki/wbq_evaluation.log';
-} );
+} );
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c87fb2e..ed6efc8 100644
--- a/composer.json
+++ b/composer.json
@@ -44,4 +44,4 @@
WikibaseQualityConstraints.php
]
}
-}
+}
\ No newline at end of file
diff --git a/i18n/en.json b/i18n/en.json
index a50eb40..d7b27e3 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,10 +11,7 @@
wbqc-constraintreport-empty-result: There are no constraint defined on
this entity.,
wbqc-constraintreport-status-violation: Violation,
wbqc-constraintreport-status-compliance: Compliance,
- HEAD (e109a4 Localisation updates from https://translatewiki.net.)
-===
wbqc-constraintreport-status-exception: Exception,
- BRANCH (5f5351 Fix for coveralls.)
wbqc-constraintreport-status-todo: Todo,
wbqc-constraintreport-result-table-header-claim: Claim,
wbqc-constraintreport-result-table-header-constraint: Constraint,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a9c291f..1f9f2b3 100755
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -12,18 +12,11 @@
wbqc-constraintreport-explanation-part-two: Explanation (part two),
what this special page does and how it gets its data.,
wbqc-constraintreport-form-submit-label: Label of the button, that
starts the check.\n{{Identical|Check}},
wbqc-constraintreport-form-entityid-placeholder: Entity id
placeholder for the input field.,
- HEAD (e109a4 Localisation updates from https://translatewiki.net.)
- wbqc-constraintreport-result-headline: Result headline,
- wbqc-constraintreport-empty-result: Message that appears, when there
are no constraints defined for the given entity.,
- wbqc-constraintreport-status-violation: Status for claims that are
violated against a constraint.,
- wbqc-constraintreport-status-compliance: Status for claims that
comply with a constraint,
-===
wbqc-constraintreport-result-headline: Result headline,
wbqc-constraintreport-empty-result: Message that appears, when there
are no constraints defined for the given entity.,
wbqc-constraintreport-status-violation: Status for claims that are
violated against a constraint.,
wbqc-constraintreport-status-compliance: Status for claims that
comply with a constraint,
wbqc-constraintreport-status-exception: Status for claims that were
marked as a exception,
- BRANCH (5f5351 Fix for coveralls.)
wbqc-constraintreport-status-todo: Status for constraints
[MediaWiki-commits] [Gerrit] Added '@group WikibaseQualityExternalValidation' to tests - change (mediawiki...WikidataQualityExternalValidation)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/212520 Change subject: Added '@group WikibaseQualityExternalValidation' to tests .. Added '@group WikibaseQualityExternalValidation' to tests Change-Id: I3b04242aaf81abe435826845516e0d2eb8d2d738 --- M tests/phpunit/Api/CrossCheckTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php M tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php M tests/phpunit/CrossCheck/CrossCheckerTest.php M tests/phpunit/CrossCheck/ReferenceHandlerTest.php M tests/phpunit/CrossCheck/Result/CompareResultTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php M tests/phpunit/CrossCheck/Result/ReferenceResultTest.php M tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php M tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php M tests/phpunit/EvaluateCrossCheckJobServiceTest.php M tests/phpunit/ExternalDataRepoTest.php M tests/phpunit/ExternalValidationFactoryTest.php M tests/phpunit/Serializer/CompareResultSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php M tests/phpunit/Serializer/IndexedTagsSerializerTest.php M tests/phpunit/Serializer/ReferenceResultSerializerTest.php M tests/phpunit/Serializer/SerializerBaseTest.php M tests/phpunit/Serializer/SerializerFactoryTest.php M tests/phpunit/Specials/SpecialCrossCheckTest.php M tests/phpunit/Specials/SpecialExternalDbsTest.php M tests/phpunit/UpdateTable/ImportContextTest.php M tests/phpunit/UpdateTable/UpdateTableTest.php 35 files changed, 70 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation refs/changes/20/212520/1 diff --git a/tests/phpunit/Api/CrossCheckTest.php b/tests/phpunit/Api/CrossCheckTest.php index 6ccf718..a75368d 100755 --- a/tests/phpunit/Api/CrossCheckTest.php +++ b/tests/phpunit/Api/CrossCheckTest.php @@ -14,6 +14,7 @@ /** * @covers WikibaseQuality\ExternalValidation\Api\CrossCheck * + * @group WikibaseQualityExternalValidation * @group Database * @group API * @group medium diff --git a/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php b/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php index a5aead3..fcba1e6 100755 --- a/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php +++ b/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php @@ -6,6 +6,8 @@ use WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer; /** + * @group WikibaseQualityExternalValidation + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php b/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php index f8a10ff..ca38d51 100755 --- a/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php +++ b/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php @@ -21,6 +21,8 @@ /** * @covers WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparerFactory * + * @group WikibaseQualityExternalValidation + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php index 58152c4..7805cf0 100755 --- a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php @@ -19,6 +19,8 @@ * @covers WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparerBase * @covers WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DispatchingDataValueComparer * + * @group WikibaseQualityExternalValidation + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php index 86f264b..eb538e0 100755 --- a/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php +++
[MediaWiki-commits] [Gerrit] Merge branch 'v1' - change (mediawiki...WikidataQualityConstraints)
Dominic.sauer has submitted this change and it was merged.
Change subject: Merge branch 'v1'
..
Merge branch 'v1'
Conflicts:
WikibaseQualityConstraints.php
i18n/en.json
i18n/qqq.json
includes/ConstraintCheck/Result/CheckResult.php
tests/phpunit/DelegatingConstraintCheckerTest.php
tests/phpunit/EvaluateConstraintReportJobServiceTest.php
Change-Id: Ia53dc39221d2517d3dfd65bbb353b8ad169e08eb
---
M WikibaseQualityConstraints.php
M composer.json
M i18n/en.json
M i18n/qqq.json
M includes/ConstraintCheck/Result/CheckResult.php
M includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
M tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
M tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
M tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php
M tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
M tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php
M tests/phpunit/DelegatingConstraintCheckerTest.php
M tests/phpunit/EvaluateConstraintReportJobServiceTest.php
M tests/phpunit/Helper/ConstraintReportHelperTest.php
M tests/phpunit/Result/CheckResultTest.php
M tests/phpunit/Result/CheckResultToViolationTranslatorTest.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
18 files changed, 48 insertions(+), 469 deletions(-)
Approvals:
Dominic.sauer: Verified; Looks good to me, approved
diff --git a/WikibaseQualityConstraints.php b/WikibaseQualityConstraints.php
index 7e1f1f9..600fff3 100755
--- a/WikibaseQualityConstraints.php
+++ b/WikibaseQualityConstraints.php
@@ -30,11 +30,7 @@
// Define modules
$GLOBALS['wgResourceModules']['SpecialConstraintReportPage'] = array (
- HEAD (e109a4 Localisation updates from https://translatewiki.net.)
- 'styles' = '/modules/SpecialConstraintReportPage.css',
-===
'styles' = '/modules/SpecialConstraintReportPage.css',
- BRANCH (5f5351 Fix for coveralls.)
'scripts' = '/modules/SpecialConstraintReportPage.js',
'localBasePath' = __DIR__,
'remoteExtPath' = 'WikibaseQualityConstraints'
@@ -46,4 +42,4 @@
// Jobs
$GLOBALS['wgJobClasses']['evaluateConstraintReportJob'] =
'WikidataQuality\ConstraintReport\EvaluateConstraintReportJob';
$GLOBALS['wgDebugLogGroups']['wbq_evaluation'] =
'/var/log/mediawiki/wbq_evaluation.log';
-} );
+} );
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c87fb2e..ed6efc8 100644
--- a/composer.json
+++ b/composer.json
@@ -44,4 +44,4 @@
WikibaseQualityConstraints.php
]
}
-}
+}
\ No newline at end of file
diff --git a/i18n/en.json b/i18n/en.json
index a50eb40..d7b27e3 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,10 +11,7 @@
wbqc-constraintreport-empty-result: There are no constraint defined on
this entity.,
wbqc-constraintreport-status-violation: Violation,
wbqc-constraintreport-status-compliance: Compliance,
- HEAD (e109a4 Localisation updates from https://translatewiki.net.)
-===
wbqc-constraintreport-status-exception: Exception,
- BRANCH (5f5351 Fix for coveralls.)
wbqc-constraintreport-status-todo: Todo,
wbqc-constraintreport-result-table-header-claim: Claim,
wbqc-constraintreport-result-table-header-constraint: Constraint,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a9c291f..1f9f2b3 100755
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -12,18 +12,11 @@
wbqc-constraintreport-explanation-part-two: Explanation (part two),
what this special page does and how it gets its data.,
wbqc-constraintreport-form-submit-label: Label of the button, that
starts the check.\n{{Identical|Check}},
wbqc-constraintreport-form-entityid-placeholder: Entity id
placeholder for the input field.,
- HEAD (e109a4 Localisation updates from https://translatewiki.net.)
- wbqc-constraintreport-result-headline: Result headline,
- wbqc-constraintreport-empty-result: Message that appears, when there
are no constraints defined for the given entity.,
- wbqc-constraintreport-status-violation: Status for claims that are
violated against a constraint.,
- wbqc-constraintreport-status-compliance: Status for claims that
comply with a constraint,
-===
wbqc-constraintreport-result-headline: Result headline,
wbqc-constraintreport-empty-result: Message that appears, when there
are no constraints defined for the given entity.,
wbqc-constraintreport-status-violation: Status for claims that are
violated against a constraint.,
wbqc-constraintreport-status-compliance: Status for claims that
comply with a constraint,
wbqc-constraintreport-status-exception: Status for claims that were
marked as a exception,
- BRANCH (5f5351 Fix for coveralls.)
[MediaWiki-commits] [Gerrit] puppet/self: try to fix kafkian puppet syntax - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212523
Change subject: puppet/self: try to fix kafkian puppet syntax
..
puppet/self: try to fix kafkian puppet syntax
Change-Id: Icf7613d3e7569f787f5881b358304bd401d3965e
---
M modules/puppet/manifests/self/config.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/212523/1
diff --git a/modules/puppet/manifests/self/config.pp
b/modules/puppet/manifests/self/config.pp
index ba420e2..056395c 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -75,7 +75,7 @@
}
}
-File['/etc/puppet/puppet.conf.d/10-main.conf'] {
+File | title == '/etc/puppet/puppet.conf.d/10-main.conf' | {
ensure = absent,
}
--
To view, visit https://gerrit.wikimedia.org/r/212523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf7613d3e7569f787f5881b358304bd401d3965e
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] Added '@group WikibaseQualityConstraints' to tests - change (mediawiki...WikidataQualityConstraints)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/212519 Change subject: Added '@group WikibaseQualityConstraints' to tests .. Added '@group WikibaseQualityConstraints' to tests Change-Id: Ie1386c2353ceb47b556446f4b3528af529304b58 --- M tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php M tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php M tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php M tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php M tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php M tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php M tests/phpunit/Checker/QualifierChecker/QualifiersCheckerTest.php M tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php M tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php M tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php M tests/phpunit/Checker/TypeChecker/TypeCheckerHelperTest.php M tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php M tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/ValueCountCheckerHelperTest.php M tests/phpunit/ConstraintReportFactoryTest.php M tests/phpunit/ConstraintRepositoryTest.php M tests/phpunit/ConstraintTest.php M tests/phpunit/DelegatingConstraintCheckerTest.php M tests/phpunit/EvaluateConstraintReportJobServiceTest.php M tests/phpunit/Helper/ConstraintReportHelperTest.php M tests/phpunit/Maintenance/UpdateTableTest.php M tests/phpunit/Result/CheckResultTest.php M tests/phpunit/Specials/SpecialConstraintReportTest.php 31 files changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints refs/changes/19/212519/1 diff --git a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php index 05ed5b1..2a60d8c 100755 --- a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php +++ b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php @@ -17,6 +17,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\CommonsLinkChecker * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintReportHelper * diff --git a/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php b/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php index 696fcf0..546eb8b 100755 --- a/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php @@ -17,6 +17,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\ConflictsWithChecker * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintReportHelper * diff --git a/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php b/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php index 11f02d7..7d93eb0 100755 --- a/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php @@ -16,6 +16,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConnectionCheckerHelper * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintReportHelper * diff --git a/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php b/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php index 14a153f..ba1a699 100755 --- a/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php @@ -19,6 +19,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\InverseChecker * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult * @uses
[MediaWiki-commits] [Gerrit] Added '@group WikibaseQualityConstraints' to tests - change (mediawiki...WikidataQualityConstraints)
Dominic.sauer has submitted this change and it was merged. Change subject: Added '@group WikibaseQualityConstraints' to tests .. Added '@group WikibaseQualityConstraints' to tests Change-Id: Ie1386c2353ceb47b556446f4b3528af529304b58 --- M tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php M tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php M tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php M tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php M tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php M tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php M tests/phpunit/Checker/QualifierChecker/QualifiersCheckerTest.php M tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php M tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php M tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php M tests/phpunit/Checker/TypeChecker/TypeCheckerHelperTest.php M tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php M tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/ValueCountCheckerHelperTest.php M tests/phpunit/ConstraintReportFactoryTest.php M tests/phpunit/ConstraintRepositoryTest.php M tests/phpunit/ConstraintTest.php M tests/phpunit/DelegatingConstraintCheckerTest.php M tests/phpunit/EvaluateConstraintReportJobServiceTest.php M tests/phpunit/Helper/ConstraintReportHelperTest.php M tests/phpunit/Maintenance/UpdateTableTest.php M tests/phpunit/Result/CheckResultTest.php M tests/phpunit/Specials/SpecialConstraintReportTest.php 31 files changed, 56 insertions(+), 0 deletions(-) Approvals: Dominic.sauer: Verified; Looks good to me, approved diff --git a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php index 05ed5b1..2a60d8c 100755 --- a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php +++ b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php @@ -17,6 +17,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\CommonsLinkChecker * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintReportHelper * diff --git a/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php b/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php index 696fcf0..546eb8b 100755 --- a/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php @@ -17,6 +17,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\ConflictsWithChecker * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintReportHelper * diff --git a/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php b/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php index 11f02d7..7d93eb0 100755 --- a/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php @@ -16,6 +16,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConnectionCheckerHelper * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintReportHelper * diff --git a/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php b/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php index 14a153f..ba1a699 100755 --- a/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php @@ -19,6 +19,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\InverseChecker * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintReportHelper * diff
[MediaWiki-commits] [Gerrit] QA: Fixes to browser tests - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: QA: Fixes to browser tests
..
QA: Fixes to browser tests
For unknown reasons an empty element is not being located via
Selenium Chrome drive.
To work around this:
* Do not show description element when it is empty
* Increase timeout
* Update tests to deal with empty element
Change-Id: Ib0cb29bf87bfd5aeb25379460caa2e3c0686e675
---
M includes/views/Collection.php
M tests/browser/features/edit_collection.feature
M tests/browser/features/step_definitions/edit_collection_steps.rb
M tests/browser/features/support/pages/gather_page.rb
4 files changed, 14 insertions(+), 7 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/views/Collection.php b/includes/views/Collection.php
index 1a4931a..2070e43 100644
--- a/includes/views/Collection.php
+++ b/includes/views/Collection.php
@@ -61,9 +61,12 @@
}
$html .= Html::closeElement( 'div' ) .
$this-getOwnerHtml( $owner ) .
- Html::element( 'h1', array( 'id' = 'section_0' ),
$collection-getTitle() ) .
- Html::element( 'div', array( 'class' =
'collection-description' ), $description ) .
- $this-getActionButtonsHtml() .
+ Html::element( 'h1', array( 'id' = 'section_0' ),
$collection-getTitle() );
+ if ( $description ) {
+ $html .= Html::element( 'div', array( 'class' =
'collection-description' ), $description );
+ }
+
+ $html .= $this-getActionButtonsHtml() .
Html::closeElement( 'div' );
return $html;
diff --git a/tests/browser/features/edit_collection.feature
b/tests/browser/features/edit_collection.feature
index b9f47c9..1c96acf 100644
--- a/tests/browser/features/edit_collection.feature
+++ b/tests/browser/features/edit_collection.feature
@@ -32,4 +32,4 @@
And I click to save description
And I click done
And the page has reloaded
-Then the description of my collection is
+Then the description of my collection is empty
diff --git a/tests/browser/features/step_definitions/edit_collection_steps.rb
b/tests/browser/features/step_definitions/edit_collection_steps.rb
index de502a6..27aae7e 100644
--- a/tests/browser/features/step_definitions/edit_collection_steps.rb
+++ b/tests/browser/features/step_definitions/edit_collection_steps.rb
@@ -24,11 +24,15 @@
end
Then(/^the page has reloaded$/) do
- sleep 2
+ sleep 5
end
Then(/^the description of my collection is (.*?)$/) do |text|
- expect(on(GatherPage).collection_description_element.when_present.text).to
match text
+ expect(on(GatherPage).collection_description_element.when_present.text).to
eq text
+end
+
+Then(/^the description of my collection is empty$/) do
+ expect(on(GatherPage).collection_description_element.when_not_present).to
be_nil
end
When(/^I click to edit name and description$/) do
diff --git a/tests/browser/features/support/pages/gather_page.rb
b/tests/browser/features/support/pages/gather_page.rb
index 317d5b4..77afdf2 100644
--- a/tests/browser/features/support/pages/gather_page.rb
+++ b/tests/browser/features/support/pages/gather_page.rb
@@ -6,7 +6,7 @@
a(:my_first_public_collection, css: '.collection-card-title a', index:1)
a(:edit, css: '.edit-collection')
div(:edit_overlay, css: '.collection-editor-overlay')
- text_field(:edit_overlay_description, css: '.collection-editor-overlay
.description')
+ textarea(:edit_overlay_description, css: '.collection-editor-overlay
.description')
button(:edit_overlay_save_desc,
css: '.collection-editor-overlay .save-description')
button(:edit_overlay_done,
--
To view, visit https://gerrit.wikimedia.org/r/211967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0cb29bf87bfd5aeb25379460caa2e3c0686e675
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@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] Save results in violations table adter crosscheck - change (mediawiki...WikidataQualityExternalValidation)
Dominic.sauer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212521
Change subject: Save results in violations table adter crosscheck
..
Save results in violations table adter crosscheck
Change-Id: Ie8350d56775f7cb9654f698f6ba9a491d9972f14
---
M specials/SpecialCrossCheck.php
1 file changed, 15 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/21/212521/1
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index 2e0db24..db56070 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -31,6 +31,8 @@
use WikibaseQuality\ExternalValidation\ExternalValidationFactory;
use WikibaseQuality\Html\HtmlTable;
use WikibaseQuality\Html\HtmlTableHeader;
+use
WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultToViolationTranslator;
+use WikibaseQuality\Violations\ViolationStore;
class SpecialCrossCheck extends SpecialPage {
@@ -175,6 +177,7 @@
}
$results = $this-crossCheckInteractor-crossCheckEntity( $entity );
+$this-saveResultsInViolationsTable( $entity, $results );
$this-doEvaluation( $entity, $results );
@@ -435,6 +438,18 @@
return $table-toHtml();
}
+
+/**
+* @param Entity $entity
+* @param array $results
+*/
+protected function saveResultsInViolationsTable( $entity, $results ) {
+$translator = new CrossCheckResultToViolationTranslator(
WikibaseRepo::getDefaultInstance()-getEntityRevisionLookup() );
+$violations = $translator-translateToViolation( $entity, $results );
+$violationStore = new ViolationStore();
+$violationStore-insertViolations( $violations );
+}
+
private function doEvaluation( $entity, $results ) {
$service = new EvaluateCrossCheckJobService();
$checkTimeStamp = wfTimestamp( TS_MW );
--
To view, visit https://gerrit.wikimedia.org/r/212521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8350d56775f7cb9654f698f6ba9a491d9972f14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Dominic.sauer dominic.sa...@yahoo.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added '@group WikibaseQualityExternalValidation' to tests - change (mediawiki...WikidataQualityExternalValidation)
Dominic.sauer has submitted this change and it was merged. Change subject: Added '@group WikibaseQualityExternalValidation' to tests .. Added '@group WikibaseQualityExternalValidation' to tests Change-Id: I3b04242aaf81abe435826845516e0d2eb8d2d738 --- M tests/phpunit/Api/CrossCheckTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php M tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php M tests/phpunit/CrossCheck/CrossCheckerTest.php M tests/phpunit/CrossCheck/ReferenceHandlerTest.php M tests/phpunit/CrossCheck/Result/CompareResultTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php M tests/phpunit/CrossCheck/Result/ReferenceResultTest.php M tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php M tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php M tests/phpunit/EvaluateCrossCheckJobServiceTest.php M tests/phpunit/ExternalDataRepoTest.php M tests/phpunit/ExternalValidationFactoryTest.php M tests/phpunit/Serializer/CompareResultSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php M tests/phpunit/Serializer/IndexedTagsSerializerTest.php M tests/phpunit/Serializer/ReferenceResultSerializerTest.php M tests/phpunit/Serializer/SerializerBaseTest.php M tests/phpunit/Serializer/SerializerFactoryTest.php M tests/phpunit/Specials/SpecialCrossCheckTest.php M tests/phpunit/Specials/SpecialExternalDbsTest.php M tests/phpunit/UpdateTable/ImportContextTest.php M tests/phpunit/UpdateTable/UpdateTableTest.php 35 files changed, 70 insertions(+), 5 deletions(-) Approvals: Dominic.sauer: Verified; Looks good to me, approved diff --git a/tests/phpunit/Api/CrossCheckTest.php b/tests/phpunit/Api/CrossCheckTest.php index 6ccf718..a75368d 100755 --- a/tests/phpunit/Api/CrossCheckTest.php +++ b/tests/phpunit/Api/CrossCheckTest.php @@ -14,6 +14,7 @@ /** * @covers WikibaseQuality\ExternalValidation\Api\CrossCheck * + * @group WikibaseQualityExternalValidation * @group Database * @group API * @group medium diff --git a/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php b/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php index a5aead3..fcba1e6 100755 --- a/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php +++ b/tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php @@ -6,6 +6,8 @@ use WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer; /** + * @group WikibaseQualityExternalValidation + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php b/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php index f8a10ff..ca38d51 100755 --- a/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php +++ b/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php @@ -21,6 +21,8 @@ /** * @covers WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparerFactory * + * @group WikibaseQualityExternalValidation + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php index 58152c4..7805cf0 100755 --- a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php @@ -19,6 +19,8 @@ * @covers WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparerBase * @covers WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DispatchingDataValueComparer * + * @group WikibaseQualityExternalValidation + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php index 86f264b..eb538e0 100755 --- a/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php @@ -17,6 +17,8 @@ * @covers
[MediaWiki-commits] [Gerrit] [WIP] Add development support for PureScript - change (mediawiki...MobileFrontend)
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212522
Change subject: [WIP] Add development support for PureScript
..
[WIP] Add development support for PureScript
YOLO
Change-Id: Id8c6628e23bb82befa496acada1bdce6c0c5d79f
---
M Gruntfile.js
A bower.json
M package.json
3 files changed, 29 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/22/212522/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 08838f2..f86584e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,6 +17,7 @@
grunt.loadNpmTasks( 'grunt-jsduck' );
grunt.loadNpmTasks( 'grunt-contrib-clean' );
grunt.loadNpmTasks( 'grunt-mkdir' );
+ grunt.loadNpmTasks( 'grunt-purescript' );
grunt.initConfig( {
URL: process.env.MEDIAWIKI_URL ||
'http://127.0.0.1:8080/w/index.php/',
@@ -30,7 +31,11 @@
],
jsTests: 'tests/qunit/**/*.js',
jsExternals: 'javascripts/externals/**/*.js',
- resourceJsExternals: 'resources/*/externals/**/*.js'
+ resourceJsExternals: 'resources/*/externals/**/*.js',
+ pureScript: [
+ 'resources/**/*.purs',
+ 'bower_components/**/src/**/*.purs'
+ ]
},
jshint: {
options: {
@@ -142,6 +147,9 @@
'warnings': [ '-nodoc(class,public)',
'-dup_member', '-link_ambiguous' ]
}
}
+ },
+ pscMake: {
+ src: [ '%=files.pureScript%' ]
}
} );
diff --git a/bower.json b/bower.json
new file mode 100644
index 000..2a07d8d
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,11 @@
+{
+ name: MobileFrontend-dependencies,
+ version: 0.0.1,
+ ignore: [
+ **/.*,
+ node_modules,
+ bower_components,
+ test,
+ tests
+ ]
+}
diff --git a/package.json b/package.json
index 8f9862e..386888e 100644
--- a/package.json
+++ b/package.json
@@ -20,16 +20,17 @@
},
devDependencies: {
grunt-contrib-clean: ^0.6.0,
- grunt-mkdir: ^0.1.2,
- grunt-svg2png: 0.2.5,
grunt-contrib-jshint: 0.10.0,
- grunt-jscs: 1.8.0,
- jscs-jsdoc:
git+https://github.com/jdlrobson/jscs-jsdoc.git#checkParamExistence;,
- grunt-jsduck: ^1.0.1,
- js-beautify: ^1.5.4,
- grunt-notify: ^0.3.1,
grunt-contrib-watch: 0.6.1,
+ grunt-jscs: 1.8.0,
+ grunt-jsduck: ^1.0.1,
grunt-lib-phantomjs-istanbul: 0.6.0,
- grunt-qunit-istanbul:
git+https://github.com/joakin/grunt-qunit-istanbul.git#prefix-url;
+ grunt-mkdir: ^0.1.2,
+ grunt-notify: ^0.3.1,
+ grunt-purescript: ^0.6.0,
+ grunt-qunit-istanbul:
git+https://github.com/joakin/grunt-qunit-istanbul.git#prefix-url;,
+ grunt-svg2png: 0.2.5,
+ js-beautify: ^1.5.4,
+ jscs-jsdoc:
git+https://github.com/jdlrobson/jscs-jsdoc.git#checkParamExistence;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/212522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8c6628e23bb82befa496acada1bdce6c0c5d79f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added '@group WikibaseQuality' to tests - change (mediawiki...WikidataQuality)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/212524 Change subject: Added '@group WikibaseQuality' to tests .. Added '@group WikibaseQuality' to tests Cherry-picked from v1 Change-Id: I2ec86200aa2de752450a8d64dc59823b6d52c170 --- M tests/phpunit/Html/HtmlTableCellTest.php M tests/phpunit/Html/HtmlTableHeaderTest.php M tests/phpunit/Html/HtmlTableTest.php 3 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/24/212524/1 diff --git a/tests/phpunit/Html/HtmlTableCellTest.php b/tests/phpunit/Html/HtmlTableCellTest.php index dbe4363..707ee23 100755 --- a/tests/phpunit/Html/HtmlTableCellTest.php +++ b/tests/phpunit/Html/HtmlTableCellTest.php @@ -9,8 +9,8 @@ /** * @covers WikibaseQuality\Html\HtmlTableCell * - * @group WikidataQuality - * + * @group WikibaseQuality + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/Html/HtmlTableHeaderTest.php b/tests/phpunit/Html/HtmlTableHeaderTest.php index dcfdaec..30a9b6c 100755 --- a/tests/phpunit/Html/HtmlTableHeaderTest.php +++ b/tests/phpunit/Html/HtmlTableHeaderTest.php @@ -9,7 +9,7 @@ /** * @covers WikibaseQuality\Html\HtmlTableHeader * - * @group WikidataQuality + * @group WikibaseQuality * * @author BP2014N1 * @license GNU GPL v2+ diff --git a/tests/phpunit/Html/HtmlTableTest.php b/tests/phpunit/Html/HtmlTableTest.php index da81f68..ecaa4e6 100755 --- a/tests/phpunit/Html/HtmlTableTest.php +++ b/tests/phpunit/Html/HtmlTableTest.php @@ -10,6 +10,8 @@ /** * @covers WikibaseQuality\Html\HtmlTable * + * @group WikibaseQuality + * * @uses WikibaseQuality\Html\HtmlTableHeader * @uses WikibaseQuality\Html\HtmlTableCell * -- To view, visit https://gerrit.wikimedia.org/r/212524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ec86200aa2de752450a8d64dc59823b6d52c170 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: master Gerrit-Owner: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WikiGrok] Undeployed from WMF cluster - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/212525 Change subject: [WikiGrok] Undeployed from WMF cluster .. [WikiGrok] Undeployed from WMF cluster https://git.wikimedia.org/commitdiff/operations%2Fmediawiki-config/4179abaa55938bb5b570feb22bcc62ac023f2392 Change-Id: I1c255f9eccfab63577ec99be8fe9360e92c9d1d8 --- M groups/MediaWiki/WikimediaAgg.yaml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/25/212525/1 diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index 3ac75ed..b11b026 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -110,7 +110,6 @@ - ext-vectorbeta # change-id: 5ab746e86cddaa09fec195f9670a5767025106c7 - ext-vipsscaler - ext-wikibasedatamodel - - ext-wikigrok # 2014-10-24, change id: I49a08c9f025a6258bd3a6d8f531d9b2a9c48968a - ext-wikilove - ext-wikihiero - ext-wikimediacontactpagemessages -- To view, visit https://gerrit.wikimedia.org/r/212525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c255f9eccfab63577ec99be8fe9360e92c9d1d8 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] [WikiGrok] Undeployed from WMF cluster - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [WikiGrok] Undeployed from WMF cluster .. [WikiGrok] Undeployed from WMF cluster https://git.wikimedia.org/commitdiff/operations%2Fmediawiki-config/4179abaa55938bb5b570feb22bcc62ac023f2392 Change-Id: I1c255f9eccfab63577ec99be8fe9360e92c9d1d8 --- M groups/MediaWiki/WikimediaAgg.yaml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index 3ac75ed..b11b026 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -110,7 +110,6 @@ - ext-vectorbeta # change-id: 5ab746e86cddaa09fec195f9670a5767025106c7 - ext-vipsscaler - ext-wikibasedatamodel - - ext-wikigrok # 2014-10-24, change id: I49a08c9f025a6258bd3a6d8f531d9b2a9c48968a - ext-wikilove - ext-wikihiero - ext-wikimediacontactpagemessages -- To view, visit https://gerrit.wikimedia.org/r/212525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c255f9eccfab63577ec99be8fe9360e92c9d1d8 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] Refactor request default options into a common helper function. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212577
Change subject: Refactor request default options into a common helper function.
..
Refactor request default options into a common helper function.
Change-Id: Ia86b601fa433e6507b6330e740a6296c4424894d
---
M lib/mediawiki.ApiRequest.js
1 file changed, 32 insertions(+), 100 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/77/212577/1
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index c353b6c..7298a22 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -48,6 +48,25 @@
}
};
+var applyDefaultOptions = function(env, options) {
+ var proxy = env.conf.wiki.apiProxy;
+ options.headers = options.headers || {};
+ options.headers['User-Agent'] = USER_AGENT;
+ options.headers.Connection = 'close';
+ options.strictSSL = env.conf.parsoid.strictSSL;
+ if (proxy) {
+ options.proxy = proxy.uri;
+ options.proxy_strip_https = proxy.strip_https;
+ if (proxy.headers) {
+ Object.assign(options.headers, proxy.headers);
+ }
+ }
+ if ( env.cookie ) {
+ // Forward the cookie if set
+ this.requestOptions.headers.Cookie = env.cookie;
+ }
+};
+
// Helper to return a promise returning function for the result of an
// (Ctor-type) ApiRequest.
var promiseFor = function(Ctor) {
@@ -295,31 +314,15 @@
}
var uri = env.conf.wiki.apiURI;
- var proxy = env.conf.wiki.apiProxy;
- this.requestOptions = {
+ this.requestOptions = applyDefaultOptions(env, {
method: 'GET',
followRedirect: true,
uri: uri,
qs: apiargs,
timeout: MW_API_SRC_FETCH_TIMEOUT,
- proxy: proxy proxy.uri,
- proxy_strip_https: proxy proxy.strip_https,
- strictSSL: env.conf.parsoid.strictSSL,
- headers: {
- 'User-Agent': USER_AGENT,
- 'Connection': 'close'
- }
- };
+ });
- if ( proxy proxy.headers ) {
- Object.assign( this.requestOptions.headers, proxy.headers );
- }
-
- if ( env.cookie ) {
- // Forward the cookie if set
- this.requestOptions.headers.Cookie = env.cookie;
- }
// Start the request
this.request( this.requestOptions, this._requestCB.bind(this) );
@@ -456,9 +459,8 @@
}
var uri = env.conf.wiki.apiURI;
- var proxy = env.conf.wiki.apiProxy;
- this.requestOptions = {
+ this.requestOptions = applyDefaultOptions(env, {
// Use POST since we are passing a bit of source, and GET has a
very
// limited length. You'll be greeted by HTTP Error 414 Request
URI
// too long otherwise ;)
@@ -467,23 +469,7 @@
followRedirect: true,
uri: uri,
timeout: MW_API_PREPROCESSOR_TIMEOUT,
- proxy: proxy proxy.uri,
- proxy_strip_https: proxy proxy.strip_https,
- strictSSL: env.conf.parsoid.strictSSL,
- headers: {
- 'User-Agent': USER_AGENT,
- 'Connection': 'close'
- }
- };
-
- if ( proxy proxy.headers ) {
- Object.assign( this.requestOptions.headers, proxy.headers );
- }
-
- if ( env.cookie ) {
- // Forward the cookie if set
- this.requestOptions.headers.Cookie = env.cookie;
- }
+ });
// Start the request
this.request( this.requestOptions, this._requestCB.bind(this) );
@@ -582,7 +568,7 @@
apiargs.title = title;
}
- this.requestOptions = {
+ this.requestOptions = applyDefaultOptions(env, {
// Use POST since we are passing a bit of source, and GET has a
very
// limited length. You'll be greeted by HTTP Error 414 Request
URI
// too long otherwise ;)
@@ -591,23 +577,7 @@
followRedirect: true,
uri: uri,
timeout: MW_API_EXTPARSE_TIMEOUT,
- proxy: proxy proxy.uri,
- proxy_strip_https: proxy proxy.strip_https,
- strictSSL: env.conf.parsoid.strictSSL,
- headers: {
- 'User-Agent': USER_AGENT,
- 'Connection': 'close'
- }
- };
-
- if ( proxy proxy.headers ) {
- Object.assign( this.requestOptions.headers, proxy.headers );
- }
-
- if ( env.cookie ) {
- // Forward the cookie if set
-
[MediaWiki-commits] [Gerrit] Avoid calling load() in LocalFile::invalidateCache; not needed - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212579
Change subject: Avoid calling load() in LocalFile::invalidateCache; not needed
..
Avoid calling load() in LocalFile::invalidateCache; not needed
Change-Id: I1e2d61722a18e4046bdf7c375ea9c1dbbea4a157
---
M includes/filerepo/file/File.php
M includes/filerepo/file/LocalFile.php
2 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/212579/1
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 6edd6fc..eb50a12 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -163,7 +163,8 @@
* @param FileRepo|bool $repo
*/
function __construct( $title, $repo ) {
- if ( $title !== false ) { // subclasses may not use MW titles
+ // Some subclasses do not use $title, but set name/title some
other way
+ if ( $title !== false ) {
$title = self::normalizeTitle( $title, 'exception' );
}
$this-title = $title;
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index fe42c2d..b763c8d 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -316,15 +316,12 @@
* Purge the file object/metadata cache
*/
function invalidateCache() {
- $this-load();
-
$key = $this-getCacheKey();
if ( !$key ) {
return;
}
- $cache = ObjectCache::getMainWANInstance();
- $cache-delete( $key );
+ ObjectCache::getMainWANInstance()-delete( $key );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/212579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e2d61722a18e4046bdf7c375ea9c1dbbea4a157
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid calling load() in LocalFile::invalidateCache; not needed - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid calling load() in LocalFile::invalidateCache; not needed
..
Avoid calling load() in LocalFile::invalidateCache; not needed
Change-Id: I1e2d61722a18e4046bdf7c375ea9c1dbbea4a157
---
M includes/filerepo/file/File.php
M includes/filerepo/file/LocalFile.php
2 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 6edd6fc..eb50a12 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -163,7 +163,8 @@
* @param FileRepo|bool $repo
*/
function __construct( $title, $repo ) {
- if ( $title !== false ) { // subclasses may not use MW titles
+ // Some subclasses do not use $title, but set name/title some
other way
+ if ( $title !== false ) {
$title = self::normalizeTitle( $title, 'exception' );
}
$this-title = $title;
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index fe42c2d..b763c8d 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -316,15 +316,12 @@
* Purge the file object/metadata cache
*/
function invalidateCache() {
- $this-load();
-
$key = $this-getCacheKey();
if ( !$key ) {
return;
}
- $cache = ObjectCache::getMainWANInstance();
- $cache-delete( $key );
+ ObjectCache::getMainWANInstance()-delete( $key );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/212579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e2d61722a18e4046bdf7c375ea9c1dbbea4a157
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@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] registration: Don't ignore empty array config settings when ... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: registration: Don't ignore empty array config settings when
converting
..
registration: Don't ignore empty array config settings when converting
Remember which settings we set to an empty array and then only skip
those settings.
The weird variable name $__settings is used to avoid any conflicts
similar to what eval.php does.
Bug: T98739
Change-Id: Iefbf8a98fd433cfbe0087aca6821d90c2786b0cb
(cherry picked from commit e66864878a19c007ecc8be2bb3089da870f2933f)
---
M maintenance/convertExtensionToRegistration.php
1 file changed, 10 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/convertExtensionToRegistration.php
b/maintenance/convertExtensionToRegistration.php
index c6ba7cf..acb8d3a 100644
--- a/maintenance/convertExtensionToRegistration.php
+++ b/maintenance/convertExtensionToRegistration.php
@@ -70,7 +70,10 @@
public function execute() {
// Extensions will do stuff like $wgResourceModules +=
array(...) which is a
// fatal unless an array is already set. So set an empty value.
- foreach ( array_merge( $this-getAllGlobals(), array_keys(
$this-custom ) ) as $var ) {
+ // And use the weird $__settings name to avoid any conflicts
+ // with real poorly named settings.
+ $__settings = array_merge( $this-getAllGlobals(), array_keys(
$this-custom ) );
+ foreach ( $__settings as $var ) {
$var = 'wg' . $var;
$$var = array();
}
@@ -79,15 +82,18 @@
// Try not to create any local variables before this line
$vars = get_defined_vars();
unset( $vars['this'] );
+ unset( $vars['__settings'] );
$this-dir = dirname( realpath( $this-getArg( 0 ) ) );
$this-json = array();
$globalSettings = $this-getAllGlobals();
foreach ( $vars as $name = $value ) {
- // If an empty array, assume it's the default we set,
so skip it
- if ( is_array( $value ) count( $value ) === 0 ) {
+ $realName = substr( $name, 2 ); // Strip 'wg'
+
+ // If it's an empty array that we likely set, skip it
+ if ( is_array( $value ) count( $value ) === 0
in_array( $realName, $__settings ) ) {
continue;
}
- $realName = substr( $name, 2 ); // Strip 'wg'
+
if ( isset( $this-custom[$realName] ) ) {
call_user_func_array( array( $this,
$this-custom[$realName] ), array( $realName, $value ) );
} elseif ( in_array( $realName, $globalSettings ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/212575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iefbf8a98fd433cfbe0087aca6821d90c2786b0cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Parent5446 tylerro...@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] Make the banner image clickable - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the banner image clickable
..
Make the banner image clickable
Bug: T96404
Change-Id: Ia599e2ae6763a9b59943f5d432bc981b4ba64bd8
---
M includes/Resources.php
M resources/mobile.bannerImage/BannerImage.js
M resources/mobile.bannerImage/Image.js
M resources/mobile.bannerImage/MobileViewBannerImageRepository.js
M resources/mobile.bannerImage/bannerImage.less
M tests/qunit/mobile.bannerImage/test_MobileViewBannerImageRepository.js
6 files changed, 38 insertions(+), 8 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index e866466..cfe047b 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1324,6 +1324,8 @@
'mobile.bannerImage' = $wgMFResourceFileModuleBoilerplate + array(
'dependencies' = array(
+ 'mediawiki.Title',
+ 'mobile.startup',
'mobile.ajax',
),
'scripts' = array(
diff --git a/resources/mobile.bannerImage/BannerImage.js
b/resources/mobile.bannerImage/BannerImage.js
index 0476611..568d793 100644
--- a/resources/mobile.bannerImage/BannerImage.js
+++ b/resources/mobile.bannerImage/BannerImage.js
@@ -1,5 +1,6 @@
( function ( M, $ ) {
var BannerImage,
+ router = M.require( 'router' ),
View = M.require( 'View' ),
browser = M.require( 'browser' );
@@ -87,7 +88,14 @@
.css( {
'background-image': 'url(' + image.src
+ ')'
} )
- .show();
+ .show()
+ /**
+* Show the image in mediaViewer
+*/
+ .on( 'click', function () {
+ var title = new mw.Title( 'File:' +
image.fileName );
+ router.navigate( '#/media/' +
title.toString() );
+ } );
self.resizeContainer();
diff --git a/resources/mobile.bannerImage/Image.js
b/resources/mobile.bannerImage/Image.js
index 164a5c9..ae49063 100644
--- a/resources/mobile.bannerImage/Image.js
+++ b/resources/mobile.bannerImage/Image.js
@@ -6,11 +6,16 @@
* An image that can be loaded.
*
* @class Image
+* @param {String} src
+* @param {Number} width
+* @param {String} height
+* @param {String} fileName The name of the file from which the
thumbnail was created
*/
- function Image( src, width, height ) {
+ function Image( src, width, height, fileName ) {
this.src = src;
this.width = width;
this.height = height;
+ this.fileName = fileName;
}
/**
diff --git a/resources/mobile.bannerImage/MobileViewBannerImageRepository.js
b/resources/mobile.bannerImage/MobileViewBannerImageRepository.js
index 60b00dd..1f95e76 100644
--- a/resources/mobile.bannerImage/MobileViewBannerImageRepository.js
+++ b/resources/mobile.bannerImage/MobileViewBannerImageRepository.js
@@ -42,7 +42,7 @@
self.api.get( {
action: 'mobileview',
- prop: 'thumb',
+ prop: 'thumb|image',
page: self.title,
thumbwidth: targetWidth
} )
@@ -57,8 +57,11 @@
return;
}
- // Page exists but doesn't have thumbnail.
- if ( !data.mobileview.hasOwnProperty( 'thumb' )
) {
+ // Page exists but doesn't have thumbnail or
the main image.
+ if (
+ !data.mobileview.hasOwnProperty(
'thumb' ) ||
+ !data.mobileview.hasOwnProperty(
'image' )
+ ) {
// TODO: Should this reject with an
error?
deferred.reject();
@@ -69,7 +72,8 @@
image = new Image(
thumb.url,
thumb.width,
- thumb.height
+ thumb.height,
+ data.mobileview.image.file
);
self.cache[targetWidth] = image;
diff --git
[MediaWiki-commits] [Gerrit] Enable experiments for anons - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Enable experiments for anons .. Enable experiments for anons Needed by Gather. Change-Id: I8e59c542f9397bcbaadea9c2c7917e5dec60860e --- M includes/MobileFrontend.hooks.php M includes/skins/SkinMinerva.php 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, but someone else must approve Jdlrobson: Looks good to me, approved Phuedx: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/MobileFrontend.hooks.php b/includes/MobileFrontend.hooks.php index c186f7a..c8696f1 100644 --- a/includes/MobileFrontend.hooks.php +++ b/includes/MobileFrontend.hooks.php @@ -350,7 +350,7 @@ /** * ResourceLoaderGetConfigVars hook handler * This should be used for variables which vary with the html -* and for variables this should work cross skin +* and for variables this should work cross skin including anonymous users * @see https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderGetConfigVars * * @param array $vars @@ -363,6 +363,7 @@ // Get the licensing agreement that is displayed in the uploading interface. $wgMFUploadLicense = SkinMinerva::getLicense( 'upload' ); $vars += array( + 'wgMFExperiments' = $config-get( 'MFExperiments' ), 'wgMFNearbyEndpoint' = $config-get( 'MFNearbyEndpoint' ), 'wgMFThumbnailSizes' = array( 'tiny' = MobilePage::TINY_IMAGE_WIDTH, diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index 8a16858..fa36f2c 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -918,7 +918,6 @@ ); } $vars['wgMFUserBlockInfo'] = $blockInfo; - $vars['wgMFExperiments'] = $config-get( 'MFExperiments' ); } $vars['wgMFShowRedLinks'] = $user-isLoggedIn() -- To view, visit https://gerrit.wikimedia.org/r/210876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e59c542f9397bcbaadea9c2c7917e5dec60860e Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Phuedx g...@samsmith.io Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve ProfilerXhprof's blacklist/whitelist capabilities - change (mediawiki/core)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212582
Change subject: Improve ProfilerXhprof's blacklist/whitelist capabilities
..
Improve ProfilerXhprof's blacklist/whitelist capabilities
* Apply the blacklist / whitelist to profiled sections, not just function names.
* Allow shell-style wildcard patterns in blacklist / whitelist.
* Prefix all profiled section names with 'section.', to distinguish them from
functions.
This has the side-effect of working around
https://github.com/facebook/hhvm/issues/4385
Task: T99829
Change-Id: I8354ed922fa7b42857eda03be8f62b89ac78d0d6
---
M includes/profiler/ProfilerXhprof.php
1 file changed, 36 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/212582/1
diff --git a/includes/profiler/ProfilerXhprof.php
b/includes/profiler/ProfilerXhprof.php
index f36cdc1..0ad5b84 100644
--- a/includes/profiler/ProfilerXhprof.php
+++ b/includes/profiler/ProfilerXhprof.php
@@ -40,12 +40,8 @@
*
* To restrict the functions for which profiling data is collected, you can
* use either a whitelist ($wgProfiler['include']) or a blacklist
- * ($wgProfiler['exclude']) containing an array of function names. The
- * blacklist functionality is built into HHVM and will completely exclude the
- * named functions from profiling collection. The whitelist is implemented by
- * Xhprof class which will filter the data collected by XHProf before
reporting.
- * See documentation for the Xhprof class and the XHProf extension for
- * additional information.
+ * ($wgProfiler['exclude']) containing an array of function names.
+ * Shell-style patterns are also accepted.
*
* @author Bryan Davis bd...@wikimedia.org
* @copyright © 2014 Bryan Davis and Wikimedia Foundation.
@@ -77,7 +73,8 @@
}
public function scopedProfileIn( $section ) {
- return $this-sprofiler-scopedProfileIn( $section );
+ $key = 'section.' . ltrim( $section, '.' );
+ return $this-sprofiler-scopedProfileIn( $key );
}
/**
@@ -86,12 +83,43 @@
public function close() {
}
+ /**
+* Check if a function or section should be included in the output.
+*
+* @param string $name Function or section name.
+* @return bool
+*/
+ private function shouldInclude( $name ) {
+ if ( $name === '-total' ) {
+ return false;
+ }
+ if ( !empty( $this-params['include'] ) ) {
+ foreach ( $this-params['include'] as $pattern ) {
+ if ( fnmatch( $pattern, $name, FNM_NOESCAPE ) )
{
+ return true;
+ }
+ }
+ return false;
+ }
+ if ( !empty( $this-params['exclude'] ) ) {
+ foreach ( $this-params['exclude'] as $pattern ) {
+ if ( fnmatch( $pattern, $name, FNM_NOESCAPE ) )
{
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
public function getFunctionStats() {
$metrics = $this-xhprof-getCompleteMetrics();
$profile = array();
$main = null; // units in ms
foreach ( $metrics as $fname = $stats ) {
+ if ( !$this-shouldInclude( $fname ) ) {
+ continue;
+ }
// Convert elapsed times from μs to ms to match
interface
$entry = array(
'name' = $fname,
@@ -113,8 +141,7 @@
// Merge in all of the custom profile sections
foreach ( $this-sprofiler-getFunctionStats() as $stats ) {
- if ( $stats['name'] === '-total' ) {
- // Discard section profiler running totals
+ if ( !$this-shouldInclude( $fname ) ) {
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/212582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8354ed922fa7b42857eda03be8f62b89ac78d0d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Hygiene: quick lookup - resources - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: quick lookup - resources .. Hygiene: quick lookup - resources Change-Id: I6c80f63c0212d5d5a647675d91f811da6af21e29 --- M includes/Resources.php R resources/mobile.quickLookup/Drawer.hogan R resources/mobile.quickLookup/QuickLookupDrawer.js R resources/mobile.quickLookup/init.js R resources/mobile.quickLookup/quickLookup.less 5 files changed, 4 insertions(+), 4 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index e866466..cf61665 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -1084,14 +1084,14 @@ 'mobile.swipe', ), 'scripts' = array( - 'javascripts/modules/quickLookup/QuickLookupDrawer.js', - 'javascripts/modules/quickLookup/init.js', + 'resources/mobile.quickLookup/QuickLookupDrawer.js', + 'resources/mobile.quickLookup/init.js', ), 'templates' = array( - 'Drawer.hogan' = 'templates/modules/quickLookup/Drawer.hogan', + 'Drawer.hogan' = 'resources/mobile.quickLookup/Drawer.hogan', ), 'styles' = array( - 'less/modules/quickLookup.less', + 'resources/mobile.quickLookup/quickLookup.less', ), 'messages' = array( mobile-frontend-quick-lookup-looking, diff --git a/templates/modules/quickLookup/Drawer.hogan b/resources/mobile.quickLookup/Drawer.hogan similarity index 100% rename from templates/modules/quickLookup/Drawer.hogan rename to resources/mobile.quickLookup/Drawer.hogan diff --git a/javascripts/modules/quickLookup/QuickLookupDrawer.js b/resources/mobile.quickLookup/QuickLookupDrawer.js similarity index 100% rename from javascripts/modules/quickLookup/QuickLookupDrawer.js rename to resources/mobile.quickLookup/QuickLookupDrawer.js diff --git a/javascripts/modules/quickLookup/init.js b/resources/mobile.quickLookup/init.js similarity index 100% rename from javascripts/modules/quickLookup/init.js rename to resources/mobile.quickLookup/init.js diff --git a/less/modules/quickLookup.less b/resources/mobile.quickLookup/quickLookup.less similarity index 100% rename from less/modules/quickLookup.less rename to resources/mobile.quickLookup/quickLookup.less -- To view, visit https://gerrit.wikimedia.org/r/212564 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c80f63c0212d5d5a647675d91f811da6af21e29 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: Jhernandez jhernan...@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] Move queries from SqlUsageTracker into EntityUsageTable. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212581
Change subject: Move queries from SqlUsageTracker into EntityUsageTable.
..
Move queries from SqlUsageTracker into EntityUsageTable.
This removes all knowledge about the schema of wbc_entity_usage
from SqlUsageTracker.
Change-Id: I65c998511cb2019c0533a3f8436f480b5822d91f
---
M client/includes/Usage/Sql/EntityUsageTable.php
M client/includes/Usage/Sql/SqlUsageTracker.php
M client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
3 files changed, 280 insertions(+), 146 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/81/212581/1
diff --git a/client/includes/Usage/Sql/EntityUsageTable.php
b/client/includes/Usage/Sql/EntityUsageTable.php
index 0e24e59..f29c49a 100644
--- a/client/includes/Usage/Sql/EntityUsageTable.php
+++ b/client/includes/Usage/Sql/EntityUsageTable.php
@@ -2,10 +2,13 @@
namespace Wikibase\Client\Usage\Sql;
+use ArrayIterator;
use DatabaseBase;
use InvalidArgumentException;
use Iterator;
use Wikibase\Client\Usage\EntityUsage;
+use Wikibase\Client\Usage\PageEntityUsages;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParser;
/**
@@ -196,6 +199,17 @@
}
/**
+* @param EntityId[] $entityIds
+*
+* @return string[]
+*/
+ private function getEntityIdStrings( array $entityIds ) {
+ return array_map( function( EntityId $entityId ) {
+ return $entityId-getSerialization();
+ }, $entityIds );
+ }
+
+ /**
* @param array|Iterator $rows
*
* @return EntityUsage[]
@@ -252,12 +266,14 @@
*
* @see UsageTracker::removeEntities
*
-* @param string[] $idStrings
+* @param EntityId[] $entityIds
*/
- public function removeEntities( array $idStrings ) {
- if ( empty( $idStrings ) ) {
+ public function removeEntities( array $entityIds ) {
+ if ( empty( $entityIds ) ) {
return;
}
+
+ $idStrings = $this-getEntityIdStrings( $entityIds );
$batches = array_chunk( $idStrings, $this-batchSize );
@@ -272,4 +288,126 @@
}
}
+ /**
+* @see UsageLookup::getPagesUsing
+*
+* @param EntityId[] $entityIds
+* @param string[] $aspects
+*
+* @return IteratorPageEntityUsages An iterator over entity usages
grouped by page
+*/
+ public function getPagesUsing( array $entityIds, array $aspects =
array() ) {
+ if ( empty( $entityIds ) ) {
+ return new ArrayIterator();
+ }
+
+ $idStrings = $this-getEntityIdStrings( $entityIds );
+ $where = array( 'eu_entity_id' = $idStrings );
+
+ if ( !empty( $aspects ) ) {
+ $where['eu_aspect'] = $aspects;
+ }
+
+ $res = $this-connection-select(
+ 'wbc_entity_usage',
+ array( 'eu_page_id', 'eu_entity_id', 'eu_aspect' ),
+ $where,
+ __METHOD__
+ );
+
+ $pages = $this-foldRowsIntoPageEntityUsages( $res );
+
+ //TODO: use paging for large page sets!
+ return new ArrayIterator( $pages );
+ }
+
+ /**
+* @param array|Iterator $rows
+*
+* @return PageEntityUsages[]
+*/
+ private function foldRowsIntoPageEntityUsages( $rows ) {
+ $usagesPerPage = array();
+
+ foreach ( $rows as $row ) {
+ $pageId = (int)$row-eu_page_id;
+
+ if ( isset( $usagesPerPage[$pageId] ) ) {
+ $pageEntityUsages = $usagesPerPage[$pageId];
+ } else {
+ $pageEntityUsages = new PageEntityUsages(
$pageId );
+ }
+
+ $entityId = $this-idParser-parse( $row-eu_entity_id
);
+ $usage = new EntityUsage( $entityId, $row-eu_aspect );
+ $pageEntityUsages-addUsages( array( $usage ) );
+
+ $usagesPerPage[$pageId] = $pageEntityUsages;
+ }
+
+ return $usagesPerPage;
+ }
+
+ /**
+* @see UsageLookup::getUnusedEntities
+*
+* @param EntityId[] $entityIds
+*
+* @return EntityId[]
+*/
+ public function getUnusedEntities( array $entityIds ) {
+ if ( empty( $entityIds ) ) {
+ return array();
+ }
+
+ $entityIdMap = array();
+
+ foreach (
[MediaWiki-commits] [Gerrit] Hygiene: error report modules - resources - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: error report modules - resources .. Hygiene: error report modules - resources Change-Id: I08f04191e888efb035f297a1211b7ac689a32145 --- M includes/Resources.php R resources/mobile.errorReport.overlay/ErrorReportOverlay.hogan R resources/mobile.errorReport.overlay/ErrorReportOverlay.js R resources/mobile.errorReport.overlay/errorReportOverlay.less R resources/mobile.errorReport/init.js 5 files changed, 4 insertions(+), 4 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 0de5dce1d..33fcc5d 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -1042,7 +1042,7 @@ 'mobile.buttonWithSpinner', ), 'scripts' = array( - 'javascripts/modules/errorReport/init.js', + 'resources/mobile.errorReport/init.js', ), 'messages' = array( 'mobile-frontend-errorreport-button-label', @@ -1055,10 +1055,10 @@ 'mobile.toast', ), 'scripts' = array( - 'javascripts/modules/errorReport/ErrorReportOverlay.js', + 'resources/mobile.errorReport.overlay/ErrorReportOverlay.js', ), 'styles' = array( - 'less/modules/errorReport/errorReportOverlay.less', + 'resources/mobile.errorReport.overlay/errorReportOverlay.less', ), 'messages' = array( 'mobile-frontend-editor-licensing', @@ -1072,7 +1072,7 @@ 'mobile-frontend-errorreport-summary', ), 'templates' = array( - 'ErrorReportOverlay.hogan' = 'templates/modules/errorReport/ErrorReportOverlay.hogan', + 'ErrorReportOverlay.hogan' = 'resources/mobile.errorReport.overlay/ErrorReportOverlay.hogan', ), ), diff --git a/templates/modules/errorReport/ErrorReportOverlay.hogan b/resources/mobile.errorReport.overlay/ErrorReportOverlay.hogan similarity index 100% rename from templates/modules/errorReport/ErrorReportOverlay.hogan rename to resources/mobile.errorReport.overlay/ErrorReportOverlay.hogan diff --git a/javascripts/modules/errorReport/ErrorReportOverlay.js b/resources/mobile.errorReport.overlay/ErrorReportOverlay.js similarity index 100% rename from javascripts/modules/errorReport/ErrorReportOverlay.js rename to resources/mobile.errorReport.overlay/ErrorReportOverlay.js diff --git a/less/modules/errorReport/errorReportOverlay.less b/resources/mobile.errorReport.overlay/errorReportOverlay.less similarity index 100% rename from less/modules/errorReport/errorReportOverlay.less rename to resources/mobile.errorReport.overlay/errorReportOverlay.less diff --git a/javascripts/modules/errorReport/init.js b/resources/mobile.errorReport/init.js similarity index 100% rename from javascripts/modules/errorReport/init.js rename to resources/mobile.errorReport/init.js -- To view, visit https://gerrit.wikimedia.org/r/212563 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I08f04191e888efb035f297a1211b7ac689a32145 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: Jhernandez jhernan...@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] Support ORs of incategory - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Support ORs of incategory
..
Support ORs of incategory
This supports incategory as names of the category or as the page id of the
category's wikipage. The latter is to support integration with CatGraph.
This patch has a non-strict dependency (nothing will break without it) on
I7b7be24f in core. Until that patch is merged users searching for a
non-existent category by id will be offered to create the page matching the
search query when they should not.
Bug: T89823
Change-Id: Iad60c33d6a582a1ad005bd45165ffa198637add0
---
M CirrusSearch.php
M includes/Searcher.php
M tests/browser/features/incategory_api.feature
M tests/browser/features/step_definitions/search_steps.rb
M tests/browser/features/support/cirrus_search_api_helper.rb
M tests/browser/features/support/hooks.rb
6 files changed, 89 insertions(+), 5 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
Daniel Kinzler: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 3f9a99b..cffc871 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -529,6 +529,8 @@
*/
$wgCirrusSearchEnableSearchLogging = false;
+// The maximum number of incategory:a|b|c items to OR together.
+$wgCirrusSearchMaxIncategoryOptions = 100;
$includes = __DIR__ . /includes/;
$apiDir = $includes . 'Api/';
diff --git a/includes/Searcher.php b/includes/Searcher.php
index b077bfc..f067b9d 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -2,6 +2,7 @@
namespace CirrusSearch;
use Elastica;
+use \Category;
use \CirrusSearch;
use \CirrusSearch\Extra\Filter\SourceRegex;
use \CirrusSearch\Search\Escaper;
@@ -497,10 +498,12 @@
// The {7,15} keeps this from having horrible performance on
big strings
$escaper = $this-escaper;
$fuzzyQuery = $this-fuzzyQuery;
+ $isEmptyQuery = false;
$this-extractSpecialSyntaxFromTerm(
'/(?key[a-z\\-]{7,15}):\s*(?value(?:[^]|(?:(?=\\\)))+|[^ ]+) ?/',
function ( $matches ) use ( $searcher, $escaper,
$filters, $notFilters, $boostTemplates,
- $searchContainedSyntax, $fuzzyQuery,
$highlightSource ) {
+ $searchContainedSyntax, $fuzzyQuery,
$highlightSource, $isEmptyQuery ) {
+ global $wgCirrusSearchMaxIncategoryOptions;
$key = $matches['key'];
$value = $matches['value']; // Note that if
the user supplied quotes they are not removed
$value = str_replace( '\', '', $value );
@@ -543,7 +546,13 @@
$searchContainedSyntax = true;
return '';
case 'incategory':
- $filterDestination[] =
$searcher-matchPage( 'category.lowercase_keyword', $value );
+ $categories = array_slice(
explode( '|', $value ), 0, $wgCirrusSearchMaxIncategoryOptions );
+ $categoryFilters =
$searcher-matchPageCategories( $categories );
+ if ( $categoryFilters === null
) {
+ $isEmptyQuery = true;
+ } else {
+ $filterDestination[] =
$categoryFilters;
+ }
$searchContainedSyntax = true;
return '';
case 'insource':
@@ -559,6 +568,9 @@
}
}
);
+ if ( $isEmptyQuery ) {
+ return Status::newGood( new SearchResultSet( true ) );
+ }
$this-filters = $filters;
$this-notFilters = $notFilters;
$this-boostTemplates = $boostTemplates;
@@ -754,6 +766,38 @@
}
/**
+* Builds an or between many categories that the page could be in.
+* @param string[] $categories categories to match
+* @return \Elastica\Filter\Bool|null A null return value means all
values are filtered
+* and an empty result set should be returned.
+*/
+ public function matchPageCategories( $categories ) {
+ $filter = new \Elastica\Filter\Bool();
+ $ids = array();
+ $names = array();
+ foreach ( $categories as $category ) {
+
[MediaWiki-commits] [Gerrit] ProfilerOutputStats: allow a key prefix to be specified - change (mediawiki/core)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212578
Change subject: ProfilerOutputStats: allow a key prefix to be specified
..
ProfilerOutputStats: allow a key prefix to be specified
If one wants to nest all metrics emitted by the profiler under a metric
namespace, one can now set the 'prefix' param.
Task: T66301
Change-Id: I6c52f20e39017f4c818ca6623bb7f48683fc8abc
---
M includes/profiler/output/ProfilerOutputStats.php
1 file changed, 20 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/78/212578/1
diff --git a/includes/profiler/output/ProfilerOutputStats.php
b/includes/profiler/output/ProfilerOutputStats.php
index a635793..2e7ff49 100644
--- a/includes/profiler/output/ProfilerOutputStats.php
+++ b/includes/profiler/output/ProfilerOutputStats.php
@@ -32,19 +32,34 @@
class ProfilerOutputStats extends ProfilerOutput {
/**
+* Make a metric key safe for Graphite
+*
+* @param string $key
+*/
+ private static function sanitizeMetricKey( $key ) {
+ $key = str_replace( '::', '.', $key );
+ $key = preg_replace( '/[^a-z.]+/i', '_', $key );
+ $key = trim( $key, '_.' );
+ $key = str_replace( array( '._', '_.' ), '.', $key );
+ return $key;
+ }
+
+ /**
* Flush profiling data to the current profiling context's stats buffer.
*
* @param array $stats
*/
public function log( array $stats ) {
+ if ( isset( $this-params['prefix'] ) ) {
+ $prefix = self::sanitizeMetricKey(
$this-params['prefix'] );
+ } else {
+ $prefix = '';
+ }
+
$contextStats = $this-collector-getContext()-getStats();
foreach ( $stats as $stat ) {
- // Sanitize the key
- $key = str_replace( '::', '.', $stat['name'] );
- $key = preg_replace( '/[^a-z.]+/i', '_', $key );
- $key = trim( $key, '_.' );
- $key = str_replace( array( '._', '_.' ), '.', $key );
+ $key = self::sanitizeMetricKey(
{$prefix}.{$stat['name']} );
// Convert fractional seconds to whole milliseconds
$cpu = round( $stat['cpu'] * 1000 );
--
To view, visit https://gerrit.wikimedia.org/r/212578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c52f20e39017f4c818ca6623bb7f48683fc8abc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] ProfilerOutputStats: allow a key prefix to be specified - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: ProfilerOutputStats: allow a key prefix to be specified
..
ProfilerOutputStats: allow a key prefix to be specified
If one wants to nest all metrics emitted by the profiler under a metric
namespace, one can now set the 'prefix' param.
Task: T66301
Change-Id: I6c52f20e39017f4c818ca6623bb7f48683fc8abc
---
M includes/profiler/output/ProfilerOutputStats.php
1 file changed, 24 insertions(+), 5 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/profiler/output/ProfilerOutputStats.php
b/includes/profiler/output/ProfilerOutputStats.php
index a635793..0d75191 100644
--- a/includes/profiler/output/ProfilerOutputStats.php
+++ b/includes/profiler/output/ProfilerOutputStats.php
@@ -32,19 +32,38 @@
class ProfilerOutputStats extends ProfilerOutput {
/**
+* Normalize a metric key for StatsD
+*
+* Replace occurences of '::' with dots and any other non-alphabetic
+* characters with underscores. Combine runs of dots or underscores.
+* Then trim leading or trailing dots or underscores.
+*
+* @param string $key
+* @since 1.26
+*/
+ private static function normalizeMetricKey( $key ) {
+ $key = str_replace( '::', '.', $key );
+ $key = preg_replace( '/[^a-z.]+/i', '_', $key );
+ $key = trim( $key, '_.' );
+ return str_replace( array( '._', '_.' ), '.', $key );
+ }
+
+ /**
* Flush profiling data to the current profiling context's stats buffer.
*
* @param array $stats
*/
public function log( array $stats ) {
+ if ( isset( $this-params['prefix'] ) ) {
+ $prefix = self::normalizeMetricKey(
$this-params['prefix'] );
+ } else {
+ $prefix = '';
+ }
+
$contextStats = $this-collector-getContext()-getStats();
foreach ( $stats as $stat ) {
- // Sanitize the key
- $key = str_replace( '::', '.', $stat['name'] );
- $key = preg_replace( '/[^a-z.]+/i', '_', $key );
- $key = trim( $key, '_.' );
- $key = str_replace( array( '._', '_.' ), '.', $key );
+ $key = self::normalizeMetricKey(
{$prefix}.{$stat['name']} );
// Convert fractional seconds to whole milliseconds
$cpu = round( $stat['cpu'] * 1000 );
--
To view, visit https://gerrit.wikimedia.org/r/212578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c52f20e39017f4c818ca6623bb7f48683fc8abc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ConfirmEdit messages dirs paths for Ia3b84d3cb718 - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Update ConfirmEdit messages dirs paths for Ia3b84d3cb718 .. Update ConfirmEdit messages dirs paths for Ia3b84d3cb718 Change-Id: Ia3b84d3cb71832749ae73774dadb292dc4b9157b --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 6ec7a4c..7dbf418 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -638,22 +638,22 @@ id = ext-confirmaccount-usercredentials Confirm Edit -file = ConfirmEdit/i18n/core/%CODE%.json +file = ConfirmEdit/i18n/%CODE%.json aliasfile = ConfirmEdit/ConfirmEdit.alias.php descmsg = captcha-desc ConfirmEdit Fancy Captcha -file = ConfirmEdit/i18n/fancy/%CODE%.json +file = ConfirmEdit/FancyCaptcha/i18n/%CODE%.json descmsg = fancycaptcha-desc optional = fancycaptcha-desc ConfirmEdit Questy Captcha -file = ConfirmEdit/i18n/questy/%CODE%.json +file = ConfirmEdit/QuestyCaptcha/i18n/%CODE%.json descmsg = questycaptcha-desc optional = questycaptcha-desc ConfirmEdit ReCaptcha -file = ConfirmEdit/i18n/re/%CODE%.json +file = ConfirmEdit/ReCaptcha/%CODE%.json descmsg = recaptcha-desc optional = recaptcha-desc -- To view, visit https://gerrit.wikimedia.org/r/212562 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia3b84d3cb71832749ae73774dadb292dc4b9157b Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de 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] Search: Allow searchContainedSyntax to be defined by constru... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Search: Allow searchContainedSyntax to be defined by constructor
..
Search: Allow searchContainedSyntax to be defined by constructor
The SearchResultSet is returned where no query is performed because it
is known ahead of time that no result exists. In cases where that is
known due to the syntax of the query (e.g. the syntax requires
searching a category that does not exist) this searchContainedSyntax
method returns the wrong value. This patch makes it possible for the
instantiating code to properly set the return value of this method.
Change-Id: I7b7be24f5630a48d2a561e4fda9cec696a8cacf9
---
M includes/search/SearchResultSet.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/search/SearchResultSet.php
b/includes/search/SearchResultSet.php
index 406d322..0a05eef 100644
--- a/includes/search/SearchResultSet.php
+++ b/includes/search/SearchResultSet.php
@@ -25,6 +25,12 @@
* @ingroup Search
*/
class SearchResultSet {
+ protected $containedSyntax = false;
+
+ public function __construct( $containedSyntax = false ) {
+ $this-containedSyntax = $containedSyntax;
+ }
+
/**
* Fetch an array of regular expression fragments for matching
* the search terms as parsed by this engine in a text extract.
@@ -120,7 +126,7 @@
* @return bool
*/
public function searchContainedSyntax() {
- return false;
+ return $this-containedSyntax;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/211917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b7be24f5630a48d2a561e4fda9cec696a8cacf9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@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] Rename UsageTableUpdater to EntityUsageTable - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212580
Change subject: Rename UsageTableUpdater to EntityUsageTable
..
Rename UsageTableUpdater to EntityUsageTable
Change-Id: Ie3d8cf74106d158a9c5d5d41a25bf5fa4d0a8570
---
R client/includes/Usage/Sql/EntityUsageTable.php
M client/includes/Usage/Sql/SqlUsageTracker.php
R client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
M client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php
4 files changed, 21 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/80/212580/1
diff --git a/client/includes/Usage/Sql/UsageTableUpdater.php
b/client/includes/Usage/Sql/EntityUsageTable.php
similarity index 98%
rename from client/includes/Usage/Sql/UsageTableUpdater.php
rename to client/includes/Usage/Sql/EntityUsageTable.php
index de93841..0e24e59 100644
--- a/client/includes/Usage/Sql/UsageTableUpdater.php
+++ b/client/includes/Usage/Sql/EntityUsageTable.php
@@ -14,8 +14,9 @@
*
* @license GPL 2+
* @author Daniel Kinzler
+ * @internal
*/
-class UsageTableUpdater {
+class EntityUsageTable {
/**
* @var DatabaseBase
diff --git a/client/includes/Usage/Sql/SqlUsageTracker.php
b/client/includes/Usage/Sql/SqlUsageTracker.php
index 82633db..5ee973c 100644
--- a/client/includes/Usage/Sql/SqlUsageTracker.php
+++ b/client/includes/Usage/Sql/SqlUsageTracker.php
@@ -52,10 +52,10 @@
/**
* @param DatabaseBase $db
*
-* @return UsageTableUpdater
+* @return EntityUsageTable
*/
private function newTableUpdater( DatabaseBase $db ) {
- return new UsageTableUpdater( $db, 'wbc_entity_usage',
$this-batchSize, $this-idParser );
+ return new EntityUsageTable( $db, 'wbc_entity_usage',
$this-batchSize, $this-idParser );
}
/**
diff --git a/client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php
b/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
similarity index 93%
rename from client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php
rename to client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
index c58ffaf..e43e1e4 100644
--- a/client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php
+++ b/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
@@ -4,14 +4,14 @@
use DatabaseBase;
use Wikibase\Client\Usage\EntityUsage;
-use Wikibase\Client\Usage\Sql\UsageTableUpdater;
+use Wikibase\Client\Usage\Sql\EntityUsageTable;
use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
/**
- * @covers Wikibase\Client\Usage\Sql\UsageTableUpdater
+ * @covers Wikibase\Client\Usage\Sql\EntityUsageTable
*
* @group Wikibase
* @group WikibaseClient
@@ -21,13 +21,13 @@
* @license GPL 2+
* @author Daniel Kinzler
*/
-class UsageTableUpdaterTest extends \MediaWikiTestCase {
+class EntityUsageTableTest extends \MediaWikiTestCase {
protected function setUp() {
parent::setUp();
if (
WikibaseClient::getDefaultInstance()-getSettings()-getSetting(
'useLegacyUsageIndex' ) ) {
- $this-markTestSkipped( 'Skipping test for
UsageTableUpdater, because the useLegacyUsageIndex option is set.' );
+ $this-markTestSkipped( 'Skipping test for
EntityUsageTable, because the useLegacyUsageIndex option is set.' );
}
$this-tablesUsed[] = 'wbc_entity_usage';
@@ -120,8 +120,8 @@
return $rows;
}
- private function getUsageTableUpdater( $batchSize = 1000 ) {
- return new UsageTableUpdater(
+ private function getEntityUsageTable( $batchSize = 1000 ) {
+ return new EntityUsageTable(
wfGetDB( DB_MASTER ),
'wbc_entity_usage',
$batchSize,
@@ -149,7 +149,7 @@
new EntityUsage( $q5, EntityUsage::ALL_USAGE ),
);
- $tableUpdater = $this-getUsageTableUpdater();
+ $tableUpdater = $this-getEntityUsageTable();
// adding usages should put them into the database
$tableUpdater-addUsages( 23, $usagesT1, $t1 );
@@ -191,7 +191,7 @@
new EntityUsage( $q5, EntityUsage::ALL_USAGE ),
);
- $tableUpdater = $this-getUsageTableUpdater();
+ $tableUpdater = $this-getEntityUsageTable();
$tableUpdater-addUsages( 23, $usagesT1, $t1 );
// touch usage entries (some non-existing)
@@ -288,7 +288,7 @@
new EntityUsage( $q5, EntityUsage::ALL_USAGE ),
);
-
[MediaWiki-commits] [Gerrit] Fix undo API - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix undo API
..
Fix undo API
This wasn't noticed before because we were only using it via the form
path, which doesn't use the API classes. Alexander Jones caught it
when looking for the auto-formatted documentation.
Issues:
* Action was exposed as both POST and GET. It only needs to be GET,
because it doesn't actually change the content, it just reverses
a diff and presents an edit box.
* Was triggering inapplicable validation as a result of above..
* Unneeded postId still required in UndoEditPost.
* Weren't exposed as submodules.
* Header undo was broken on submit even for server path.
* Was showing undo link for editing posts even to users who couldn't
save the edit.
Bug: T99645
Bug: T99902
Change-Id: I16f4c7b7789c74217406c9642a5c8528bfec4e96
---
M FlowActions.php
M handlebars/compiled/flow_block_header_undo_edit.handlebars.php
M handlebars/flow_block_header_undo_edit.handlebars
M includes/Api/ApiFlow.php
M includes/Api/ApiFlowUndoEditHeader.php
M includes/Api/ApiFlowUndoEditPost.php
M includes/Api/ApiFlowUndoEditTopicSummary.php
M includes/Block/Header.php
8 files changed, 13 insertions(+), 9 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FlowActions.php b/FlowActions.php
index 9bae7bc..b9ee955 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -296,7 +296,10 @@
'log_type' = false, // maybe?
'rc_insert' = true,
'permissions' = array(
- PostRevision::MODERATED_NONE = '',
+ // no permissions needed for own posts
+ PostRevision::MODERATED_NONE = function( PostRevision
$post, RevisionActionPermissions $permissions ) {
+ return $post-isCreator(
$permissions-getUser() ) ? '' : 'flow-edit-post';
+ }
),
'root-permissions' = array(
PostRevision::MODERATED_NONE = '',
diff --git a/handlebars/compiled/flow_block_header_undo_edit.handlebars.php
b/handlebars/compiled/flow_block_header_undo_edit.handlebars.php
index 97596a9..c1aba2b 100644
--- a/handlebars/compiled/flow_block_header_undo_edit.handlebars.php
+++ b/handlebars/compiled/flow_block_header_undo_edit.handlebars.php
@@ -50,7 +50,7 @@
input type=hidden name=header_prev_revision
value='.htmlentities((string)((isset($in['current']['revisionId'])
is_array($in['current'])) ? $in['current']['revisionId'] : null), ENT_QUOTES,
'UTF-8').' /
div class=flow-editor
- textarea name=topic_content class=mw-ui-input
data-role=content'.((LCRun3::ifvar($cx, ((isset($in['submitted']['content'])
is_array($in['submitted'])) ? $in['submitted']['content'] : null))) ?
''.htmlentities((string)((isset($in['submitted']['content'])
is_array($in['submitted'])) ? $in['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'' : ''.((LCRun3::ifvar($cx, ((isset($in['undo']['possible'])
is_array($in['undo'])) ? $in['undo']['possible'] : null))) ?
''.htmlentities((string)((isset($in['undo']['content'])
is_array($in['undo'])) ? $in['undo']['content'] : null), ENT_QUOTES,
'UTF-8').'' :
''.htmlentities((string)((isset($in['current']['content']['content'])
is_array($in['current']['content'])) ? $in['current']['content']['content'] :
null), ENT_QUOTES, 'UTF-8').'').'').'/textarea
+ textarea name=header_content class=mw-ui-input
data-role=content'.((LCRun3::ifvar($cx, ((isset($in['submitted']['content'])
is_array($in['submitted'])) ? $in['submitted']['content'] : null))) ?
''.htmlentities((string)((isset($in['submitted']['content'])
is_array($in['submitted'])) ? $in['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'' : ''.((LCRun3::ifvar($cx, ((isset($in['undo']['possible'])
is_array($in['undo'])) ? $in['undo']['possible'] : null))) ?
''.htmlentities((string)((isset($in['undo']['content'])
is_array($in['undo'])) ? $in['undo']['content'] : null), ENT_QUOTES,
'UTF-8').'' :
''.htmlentities((string)((isset($in['current']['content']['content'])
is_array($in['current']['content'])) ? $in['current']['content']['content'] :
null), ENT_QUOTES, 'UTF-8').'').'').'/textarea
/div
div class=flow-form-actions flow-form-collapsible
diff --git a/handlebars/flow_block_header_undo_edit.handlebars
b/handlebars/flow_block_header_undo_edit.handlebars
index 5826844..8d133c0 100644
--- a/handlebars/flow_block_header_undo_edit.handlebars
+++ b/handlebars/flow_block_header_undo_edit.handlebars
@@ -16,7 +16,7 @@
input type=hidden name=header_prev_revision
value={{current.revisionId}} /
div class=flow-editor
- textarea name=topic_content class=mw-ui-input
[MediaWiki-commits] [Gerrit] save parameters in violation - change (mediawiki...WikidataQualityConstraints)
Jonaskeutel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212537
Change subject: save parameters in violation
..
save parameters in violation
enabling us to display nice messages and distinguish bad bad and very bad
violations for the UI
Change-Id: Ib07d4f38acdc92c68671c746a28eb71810f22f64
---
M includes/ConstraintCheck/Checker/CommonsLinkChecker.php
M includes/ConstraintCheck/Checker/ConflictsWithChecker.php
M includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M includes/ConstraintCheck/Checker/FormatChecker.php
M includes/ConstraintCheck/Checker/InverseChecker.php
M includes/ConstraintCheck/Checker/ItemChecker.php
M includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
M includes/ConstraintCheck/Checker/MultiValueChecker.php
M includes/ConstraintCheck/Checker/OneOfChecker.php
M includes/ConstraintCheck/Checker/QualifierChecker.php
M includes/ConstraintCheck/Checker/QualifiersChecker.php
M includes/ConstraintCheck/Checker/RangeChecker.php
M includes/ConstraintCheck/Checker/SingleValueChecker.php
M includes/ConstraintCheck/Checker/SymmetricChecker.php
M includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php
M includes/ConstraintCheck/Checker/TypeChecker.php
M includes/ConstraintCheck/Checker/UniqueValueChecker.php
M includes/ConstraintCheck/Checker/ValueTypeChecker.php
M includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
M tests/phpunit/Result/CheckResultToViolationTranslatorTest.php
20 files changed, 103 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/37/212537/1
diff --git a/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
b/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
index 33a57fb..3ca6d8e 100755
--- a/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
+++ b/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
@@ -47,7 +47,13 @@
public function checkConstraint( Statement $statement, Constraint
$constraint, Entity $entity = null ) {
$parameters = array ();
$constraintParameters = $constraint-getConstraintParameters();
- $parameters[ 'namespace' ] =
$this-helper-parseSingleParameter( $constraintParameters['namespace'], true );
+ if ( array_key_exists( 'namespace', $constraintParameters ) ) {
+ $parameters[ 'namespace' ] =
$this-helper-parseSingleParameter( $constraintParameters['namespace'], true );
+ }
+
+ if ( array_key_exists( 'constraint_status',
$constraintParameters ) ) {
+ $parameters[ 'constraint_status' ] =
$this-helper-parseSingleParameter(
$constraintParameters['constraint_status'], true );
+ }
$mainSnak = $statement-getClaim()-getMainSnak();
diff --git a/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
b/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
index a39027d..883a2cc 100755
--- a/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
+++ b/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
@@ -77,6 +77,10 @@
$parameters[ 'item' ] =
$this-constraintReportHelper-parseParameterArray( explode( ',',
$constraintParameters[ 'item' ] ) );
};
+ if ( array_key_exists( 'constraint_status',
$constraintParameters ) ) {
+ $parameters[ 'constraint_status' ] =
$this-helper-parseSingleParameter(
$constraintParameters['constraint_status'], true );
+ }
+
/*
* 'Conflicts with' can be defined with
* a) a property only
diff --git a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
index 50c8083..23417a7 100755
--- a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
+++ b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
@@ -59,6 +59,10 @@
$parameters['property'] =
$this-constraintReportHelper-parseSingleParameter(
$constraintParameters['property'], 'PropertyId' );
}
+ if ( array_key_exists( 'constraint_status',
$constraintParameters ) ) {
+ $parameters[ 'constraint_status' ] =
$this-helper-parseSingleParameter(
$constraintParameters['constraint_status'], true );
+ }
+
$mainSnak = $statement-getClaim()-getMainSnak();
/*
diff --git a/includes/ConstraintCheck/Checker/FormatChecker.php
b/includes/ConstraintCheck/Checker/FormatChecker.php
index 279cb6d..78e3d40 100755
--- a/includes/ConstraintCheck/Checker/FormatChecker.php
+++ b/includes/ConstraintCheck/Checker/FormatChecker.php
@@ -55,6 +55,10 @@
return new CheckResult( $statement,
[MediaWiki-commits] [Gerrit] Update cxserver to 42366db - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged. Change subject: Update cxserver to 42366db .. Update cxserver to 42366db Changes: * 42366db Don't use MW domain names * 4d1392f cxserver should use valid language codes Change-Id: Ib44689db685053e4776567576b218774eddaec67 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/src b/src index 737f574..42366db 16 --- a/src +++ b/src -Subproject commit 737f574678c666ac18b39227615240fa6474be27 +Subproject commit 42366db2008c25b80089a56a34639ebe018f2486 -- To view, visit https://gerrit.wikimedia.org/r/212533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib44689db685053e4776567576b218774eddaec67 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver/deploy Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@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] Added '@group WikibaseQualityExternalValidation' to tests - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged. Change subject: Added '@group WikibaseQualityExternalValidation' to tests .. Added '@group WikibaseQualityExternalValidation' to tests Cherry-picked from v1 Change-Id: I3b04242aaf81abe435826845516e0d2eb8d2d738 --- M tests/phpunit/Api/CrossCheckTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php M tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php M tests/phpunit/CrossCheck/CrossCheckerTest.php M tests/phpunit/CrossCheck/ReferenceHandlerTest.php M tests/phpunit/CrossCheck/Result/CompareResultTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php M tests/phpunit/CrossCheck/Result/ReferenceResultTest.php M tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php M tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php M tests/phpunit/EvaluateCrossCheckJobServiceTest.php M tests/phpunit/ExternalDataRepoTest.php M tests/phpunit/ExternalValidationFactoryTest.php M tests/phpunit/Serializer/CompareResultSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php M tests/phpunit/Serializer/IndexedTagsSerializerTest.php M tests/phpunit/Serializer/ReferenceResultSerializerTest.php M tests/phpunit/Serializer/SerializerBaseTest.php M tests/phpunit/Serializer/SerializerFactoryTest.php M tests/phpunit/Specials/SpecialCrossCheckTest.php M tests/phpunit/Specials/SpecialExternalDbsTest.php M tests/phpunit/UpdateTable/ImportContextTest.php M tests/phpunit/UpdateTable/UpdateTableTest.php 35 files changed, 199 insertions(+), 197 deletions(-) Approvals: Soeren.oldag: Verified; Looks good to me, approved diff --git a/tests/phpunit/Api/CrossCheckTest.php b/tests/phpunit/Api/CrossCheckTest.php index 074431c..a75368d 100755 --- a/tests/phpunit/Api/CrossCheckTest.php +++ b/tests/phpunit/Api/CrossCheckTest.php @@ -12,31 +12,31 @@ use Wikibase\Test\Api\WikibaseApiTestCase; /** - * @group WikidataQualityExternalValidation - * @group API - * @group Database - * @group medium + * @covers WikibaseQuality\ExternalValidation\Api\CrossCheck * - * @covers WikibaseQuality\ExternalValidation\Api\CrossCheck + * @group WikibaseQualityExternalValidation + * @group Database + * @group API + * @group medium * - * @uses WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation - * @usesWikibaseQuality\ExternalValidation\CrossCheck\CrossChecker - * @usesWikibaseQuality\ExternalValidation\CrossCheck\ReferenceHandler - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringValueComparer - * @usesWikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Result\ReferenceResult - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultList - * @usesWikibaseQuality\ExternalValidation\Serializer\IndexedTagsSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\CompareResultSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\ReferenceResultSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\CrossCheckResultSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\CrossCheckResultListSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\DumpMetaInformationSerializer - * @usesWikibaseQuality\ExternalValidation\Serializer\SerializerFactory + * @uses WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation + * @uses WikibaseQuality\ExternalValidation\CrossCheck\CrossChecker + * @uses WikibaseQuality\ExternalValidation\CrossCheck\ReferenceHandler + * @uses WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer + * @uses WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringValueComparer + * @uses WikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult + * @uses
[MediaWiki-commits] [Gerrit] Work arround broken isset in php 5.3 - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Work arround broken isset in php 5.3
..
Work arround broken isset in php 5.3
Bug: T99871
Change-Id: I8e9040c6aef2a7607bbd9cec7b03960b2eadb3d6
---
M includes/ElasticsearchIntermediary.php
1 file changed, 31 insertions(+), 1 deletion(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ElasticsearchIntermediary.php
b/includes/ElasticsearchIntermediary.php
index cf66328..352b092 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -185,7 +185,7 @@
$offset = isset( $queryData['from'] ) ?
$queryData['from'] : 0;
$logMessage .= and returned $num of them
starting at $offset;
}
- if ( isset(
$queryData['query']['filtered']['filter']['terms']['namespace'] ) ) {
+ if ( $this-_isset( $queryData, array( 'query',
'filtered', 'filter', 'terms', 'namespace' ) ) ) {
$namespaces =
$queryData['query']['filtered']['filter']['terms']['namespace'];
$logMessage .= ' within these namespaces: ' .
implode( ', ', $namespaces );
}
@@ -274,4 +274,34 @@
}
return array( Status::newFatal( 'cirrussearch-backend-error' ),
$message );
}
+
+ /**
+* Like isset, but wont fatal when one of the expected array keys in a
+* multi-dimensional array is a string.
+*
+* Temporary hack required only for php 5.3. Can be removed when 5.4 is
no
+* longer a requirement. See T99871 for more details.
+*
+* @param array $array
+* @param array $path
+* @return bool
+*/
+ private function _isset( $array, $path ) {
+ while( true ) {
+ $step = array_shift( $path );
+ if ( !isset( $array[$step] ) ) {
+ // next step of the path is non-existent
+ return false;
+ } elseif( !$path ) {
+ // reached the end of our path
+ return true;
+ } elseif ( !is_array( $array[$step] ) ) {
+ // more steps exist in the path, but we don't
have an array
+ return false;
+ } else {
+ // keep looking
+ $array = $array[$step];
+ }
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/212500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e9040c6aef2a7607bbd9cec7b03960b2eadb3d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@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] Small layout tweaks for Flow right-rail - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Small layout tweaks for Flow right-rail
..
Small layout tweaks for Flow right-rail
Small styling adjustments to:
- Make the flow margin to look well balanced at both sides of the flow content.
- Adjust the position of the toggle icon so that it does not overlap with the
scrollbar and looks centered when the rail is collapsed.
Change-Id: Ia978f745bcd3529d7a86082af5940b0d3c225714
---
M modules/styles/board/header.less
M modules/styles/common.less
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/styles/board/header.less b/modules/styles/board/header.less
index 75d3549..1293bd7 100644
--- a/modules/styles/board/header.less
+++ b/modules/styles/board/header.less
@@ -54,8 +54,8 @@
.side-rail-toggle-button {
visibility: hidden;
position: absolute;
- top: 8px;
- right: 2px;
+ top: 9px;
+ right: 5px;
font-size: 1.3em;
.mw-ui-button {
diff --git a/modules/styles/common.less b/modules/styles/common.less
index 71bdd5c..3e75fb9 100644
--- a/modules/styles/common.less
+++ b/modules/styles/common.less
@@ -150,7 +150,7 @@
width: 66%;
box-sizing: border-box;
max-width: 1200px;
- padding-right: 20px;
+ padding-right: 26px;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/212540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia978f745bcd3529d7a86082af5940b0d3c225714
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Sbisson sbis...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added '@group WikibaseQuality' to tests - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged. Change subject: Added '@group WikibaseQuality' to tests .. Added '@group WikibaseQuality' to tests Cherry-picked from v1 Change-Id: I2ec86200aa2de752450a8d64dc59823b6d52c170 --- M tests/phpunit/Html/HtmlTableCellTest.php M tests/phpunit/Html/HtmlTableHeaderTest.php M tests/phpunit/Html/HtmlTableTest.php 3 files changed, 5 insertions(+), 3 deletions(-) Approvals: Soeren.oldag: Verified; Looks good to me, approved Dominic.sauer: Verified; Looks good to me, approved diff --git a/tests/phpunit/Html/HtmlTableCellTest.php b/tests/phpunit/Html/HtmlTableCellTest.php index dbe4363..707ee23 100755 --- a/tests/phpunit/Html/HtmlTableCellTest.php +++ b/tests/phpunit/Html/HtmlTableCellTest.php @@ -9,8 +9,8 @@ /** * @covers WikibaseQuality\Html\HtmlTableCell * - * @group WikidataQuality - * + * @group WikibaseQuality + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/Html/HtmlTableHeaderTest.php b/tests/phpunit/Html/HtmlTableHeaderTest.php index dcfdaec..30a9b6c 100755 --- a/tests/phpunit/Html/HtmlTableHeaderTest.php +++ b/tests/phpunit/Html/HtmlTableHeaderTest.php @@ -9,7 +9,7 @@ /** * @covers WikibaseQuality\Html\HtmlTableHeader * - * @group WikidataQuality + * @group WikibaseQuality * * @author BP2014N1 * @license GNU GPL v2+ diff --git a/tests/phpunit/Html/HtmlTableTest.php b/tests/phpunit/Html/HtmlTableTest.php index da81f68..ecaa4e6 100755 --- a/tests/phpunit/Html/HtmlTableTest.php +++ b/tests/phpunit/Html/HtmlTableTest.php @@ -10,6 +10,8 @@ /** * @covers WikibaseQuality\Html\HtmlTable * + * @group WikibaseQuality + * * @uses WikibaseQuality\Html\HtmlTableHeader * @uses WikibaseQuality\Html\HtmlTableCell * -- To view, visit https://gerrit.wikimedia.org/r/212524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ec86200aa2de752450a8d64dc59823b6d52c170 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: master Gerrit-Owner: Tamslo tamaraslosa...@gmail.com Gerrit-Reviewer: Dominic.sauer dominic.sa...@yahoo.de Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.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] 1.26wmf7 symlinks - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: 1.26wmf7 symlinks .. 1.26wmf7 symlinks Bug: T99886 Change-Id: I27429b203b5b39dc8aa0072a6886b670de2dffbc --- A docroot/bits/static/1.26wmf7/extensions A docroot/bits/static/1.26wmf7/resources A docroot/bits/static/1.26wmf7/skins M php A w/static/1.26wmf7/extensions A w/static/1.26wmf7/resources A w/static/1.26wmf7/skins M w/static/current/extensions M w/static/current/resources M w/static/current/skins 10 files changed, 10 insertions(+), 4 deletions(-) Approvals: 20after4: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/bits/static/1.26wmf7/extensions b/docroot/bits/static/1.26wmf7/extensions new file mode 12 index 000..57c148d --- /dev/null +++ b/docroot/bits/static/1.26wmf7/extensions @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/extensions \ No newline at end of file diff --git a/docroot/bits/static/1.26wmf7/resources b/docroot/bits/static/1.26wmf7/resources new file mode 12 index 000..4d1994b --- /dev/null +++ b/docroot/bits/static/1.26wmf7/resources @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/resources \ No newline at end of file diff --git a/docroot/bits/static/1.26wmf7/skins b/docroot/bits/static/1.26wmf7/skins new file mode 12 index 000..a43d5ea --- /dev/null +++ b/docroot/bits/static/1.26wmf7/skins @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/skins/ \ No newline at end of file diff --git a/php b/php index 6c65059..d12d518 12 --- a/php +++ b/php @@ -1 +1 @@ -php-1.26wmf6 \ No newline at end of file +php-1.26wmf7 \ No newline at end of file diff --git a/w/static/1.26wmf7/extensions b/w/static/1.26wmf7/extensions new file mode 12 index 000..57c148d --- /dev/null +++ b/w/static/1.26wmf7/extensions @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/extensions \ No newline at end of file diff --git a/w/static/1.26wmf7/resources b/w/static/1.26wmf7/resources new file mode 12 index 000..4d1994b --- /dev/null +++ b/w/static/1.26wmf7/resources @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/resources \ No newline at end of file diff --git a/w/static/1.26wmf7/skins b/w/static/1.26wmf7/skins new file mode 12 index 000..313a65c --- /dev/null +++ b/w/static/1.26wmf7/skins @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/skins \ No newline at end of file diff --git a/w/static/current/extensions b/w/static/current/extensions index 75d6fd1..57c148d 12 --- a/w/static/current/extensions +++ b/w/static/current/extensions @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf6/extensions \ No newline at end of file +/srv/mediawiki/php-1.26wmf7/extensions \ No newline at end of file diff --git a/w/static/current/resources b/w/static/current/resources index 237dbad..4d1994b 12 --- a/w/static/current/resources +++ b/w/static/current/resources @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf6/resources \ No newline at end of file +/srv/mediawiki/php-1.26wmf7/resources \ No newline at end of file diff --git a/w/static/current/skins b/w/static/current/skins index 2577508..313a65c 12 --- a/w/static/current/skins +++ b/w/static/current/skins @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf6/skins \ No newline at end of file +/srv/mediawiki/php-1.26wmf7/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/212535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27429b203b5b39dc8aa0072a6886b670de2dffbc Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: 20after4 mmod...@wikimedia.org Gerrit-Reviewer: 20after4 mmod...@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] [SmiteSpam] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [SmiteSpam] Register extension .. [SmiteSpam] Register extension Change-Id: Ibe5a80a1dfa226c77a8c640bf74ef75d8d8a63b4 --- 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 486bdba..6ec7a4c 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2028,6 +2028,9 @@ Slimbox Thumbs +Smite Spam +aliasfile = SmiteSpam/SmiteSpam.alias.php + Smooth Gallery magicfile = SmoothGallery/SmoothGallery.i18n.magic.php ignored = smoothgallery-pagetext -- To view, visit https://gerrit.wikimedia.org/r/212536 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe5a80a1dfa226c77a8c640bf74ef75d8d8a63b4 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] [SmiteSpam] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/212536 Change subject: [SmiteSpam] Register extension .. [SmiteSpam] Register extension Change-Id: Ibe5a80a1dfa226c77a8c640bf74ef75d8d8a63b4 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/36/212536/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 486bdba..6ec7a4c 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2028,6 +2028,9 @@ Slimbox Thumbs +Smite Spam +aliasfile = SmiteSpam/SmiteSpam.alias.php + Smooth Gallery magicfile = SmoothGallery/SmoothGallery.i18n.magic.php ignored = smoothgallery-pagetext -- To view, visit https://gerrit.wikimedia.org/r/212536 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe5a80a1dfa226c77a8c640bf74ef75d8d8a63b4 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] Add pageview aggregation and parquet merger. - change (analytics...source)
Joal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212541
Change subject: Add pageview aggregation and parquet merger.
..
Add pageview aggregation and parquet merger.
Pageview aggregation is done hourly on dimensions project, access_method,
agent_type and country.
Parquet merger is a utility tool to merge parquet folders having the same
schema.
Change-Id: I03ea5a5d663e0605225d5d4754beb316f0466104
---
M pom.xml
M refinery-job/pom.xml
A
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/PageviewAggregator.scala
A
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/ParquetMerger.scala
A
refinery-job/src/test/resources/webrequest_test_data/webrequest_source=mobile/year=2015/month=5/day=18/hour=5/_common_metadata
A
refinery-job/src/test/resources/webrequest_test_data/webrequest_source=mobile/year=2015/month=5/day=18/hour=5/_metadata
A
refinery-job/src/test/resources/webrequest_test_data/webrequest_source=mobile/year=2015/month=5/day=18/hour=5/part-r-1.parquet
A
refinery-job/src/test/resources/webrequest_test_data/webrequest_source=text/year=2015/month=5/day=18/hour=5/_common_metadata
A
refinery-job/src/test/resources/webrequest_test_data/webrequest_source=text/year=2015/month=5/day=18/hour=5/_metadata
A
refinery-job/src/test/resources/webrequest_test_data/webrequest_source=text/year=2015/month=5/day=18/hour=5/part-r-1.parquet
A
refinery-job/src/test/scala/org/wikimedia/analytics/refinery/job/SparkJobSpec.scala
A
refinery-job/src/test/scala/org/wikimedia/analytics/refinery/job/TestPageviewAggregator.scala
12 files changed, 360 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source
refs/changes/41/212541/1
diff --git a/pom.xml b/pom.xml
index cb169e9..fbbb0a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,13 @@
version2.5.2/version
/dependency
+ dependency
+groupIdorg.scalatest/groupId
+artifactIdscalatest_2.10/artifactId
+version2.2.4/version
+scopetest/scope
+ /dependency
+
/dependencies
/dependencyManagement
diff --git a/refinery-job/pom.xml b/refinery-job/pom.xml
index 61808ff..e37726c 100644
--- a/refinery-job/pom.xml
+++ b/refinery-job/pom.xml
@@ -21,13 +21,6 @@
/dependency
dependency
-groupIdorg.scala-lang/groupId
-artifactIdscala-library/artifactId
-version${scala.version}/version
-scopeprovided/scope
-/dependency
-
-dependency
groupIdorg.apache.spark/groupId
artifactIdspark-core_2.10/artifactId
version${spark.version}/version
@@ -48,10 +41,48 @@
scopeprovided/scope
/dependency
+dependency
+groupIdorg.scalatest/groupId
+artifactIdscalatest_2.10/artifactId
+scopetest/scope
+/dependency
+
+dependency
+groupIdcom.github.scopt/groupId
+artifactIdscopt_2.10/artifactId
+version3.3.0/version
+/dependency
+
+dependency
+groupIdjunit/groupId
+artifactIdjunit/artifactId
+scopetest/scope
+/dependency
+
/dependencies
build
plugins
+
+plugin
+groupIdorg.scalatest/groupId
+artifactIdscalatest-maven-plugin/artifactId
+version1.0/version
+configuration
+
reportsDirectory${project.build.directory}/surefire-reports/reportsDirectory
+junitxml./junitxml
+filereportsWDF TestSuite.txt/filereports
+/configuration
+executions
+execution
+idtest/id
+goals
+goaltest/goal
+/goals
+/execution
+/executions
+/plugin
+
plugin
groupIdorg.scala-tools/groupId
artifactIdmaven-scala-plugin/artifactId
diff --git
a/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/PageviewAggregator.scala
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/PageviewAggregator.scala
new file mode 100644
index 000..b1a9387
--- /dev/null
+++
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/PageviewAggregator.scala
@@ -0,0 +1,142 @@
+package org.wikimedia.analytics.refinery.job
+
+
+import org.apache.spark.sql.{DataFrame, SQLContext}
+import org.apache.spark.{SparkConf, SparkContext}
+import org.wikimedia.analytics.refinery.core.PageviewDefinition
+
+/**
+ * Pageview hourly aggregation job.
+ * Using text and mobile webrequests, filters pageviews
+ * and count by project, access_method, agent_type,
+ * country and country_code.
+ */
+object
[MediaWiki-commits] [Gerrit] save parameters in violation - change (mediawiki...WikidataQualityConstraints)
Andreasburmeister has submitted this change and it was merged.
Change subject: save parameters in violation
..
save parameters in violation
enabling us to display nice messages and distinguish bad bad and very bad
violations for the UI
Change-Id: Ib07d4f38acdc92c68671c746a28eb71810f22f64
---
M includes/ConstraintCheck/Checker/CommonsLinkChecker.php
M includes/ConstraintCheck/Checker/ConflictsWithChecker.php
M includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M includes/ConstraintCheck/Checker/FormatChecker.php
M includes/ConstraintCheck/Checker/InverseChecker.php
M includes/ConstraintCheck/Checker/ItemChecker.php
M includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
M includes/ConstraintCheck/Checker/MultiValueChecker.php
M includes/ConstraintCheck/Checker/OneOfChecker.php
M includes/ConstraintCheck/Checker/QualifierChecker.php
M includes/ConstraintCheck/Checker/QualifiersChecker.php
M includes/ConstraintCheck/Checker/RangeChecker.php
M includes/ConstraintCheck/Checker/SingleValueChecker.php
M includes/ConstraintCheck/Checker/SymmetricChecker.php
M includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php
M includes/ConstraintCheck/Checker/TypeChecker.php
M includes/ConstraintCheck/Checker/UniqueValueChecker.php
M includes/ConstraintCheck/Checker/ValueTypeChecker.php
M includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
M tests/phpunit/Result/CheckResultToViolationTranslatorTest.php
20 files changed, 103 insertions(+), 7 deletions(-)
Approvals:
Andreasburmeister: Verified; Looks good to me, approved
diff --git a/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
b/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
index 33a57fb..3ca6d8e 100755
--- a/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
+++ b/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
@@ -47,7 +47,13 @@
public function checkConstraint( Statement $statement, Constraint
$constraint, Entity $entity = null ) {
$parameters = array ();
$constraintParameters = $constraint-getConstraintParameters();
- $parameters[ 'namespace' ] =
$this-helper-parseSingleParameter( $constraintParameters['namespace'], true );
+ if ( array_key_exists( 'namespace', $constraintParameters ) ) {
+ $parameters[ 'namespace' ] =
$this-helper-parseSingleParameter( $constraintParameters['namespace'], true );
+ }
+
+ if ( array_key_exists( 'constraint_status',
$constraintParameters ) ) {
+ $parameters[ 'constraint_status' ] =
$this-helper-parseSingleParameter(
$constraintParameters['constraint_status'], true );
+ }
$mainSnak = $statement-getClaim()-getMainSnak();
diff --git a/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
b/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
index a39027d..883a2cc 100755
--- a/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
+++ b/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
@@ -77,6 +77,10 @@
$parameters[ 'item' ] =
$this-constraintReportHelper-parseParameterArray( explode( ',',
$constraintParameters[ 'item' ] ) );
};
+ if ( array_key_exists( 'constraint_status',
$constraintParameters ) ) {
+ $parameters[ 'constraint_status' ] =
$this-helper-parseSingleParameter(
$constraintParameters['constraint_status'], true );
+ }
+
/*
* 'Conflicts with' can be defined with
* a) a property only
diff --git a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
index 50c8083..23417a7 100755
--- a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
+++ b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
@@ -59,6 +59,10 @@
$parameters['property'] =
$this-constraintReportHelper-parseSingleParameter(
$constraintParameters['property'], 'PropertyId' );
}
+ if ( array_key_exists( 'constraint_status',
$constraintParameters ) ) {
+ $parameters[ 'constraint_status' ] =
$this-helper-parseSingleParameter(
$constraintParameters['constraint_status'], true );
+ }
+
$mainSnak = $statement-getClaim()-getMainSnak();
/*
diff --git a/includes/ConstraintCheck/Checker/FormatChecker.php
b/includes/ConstraintCheck/Checker/FormatChecker.php
index 279cb6d..78e3d40 100755
--- a/includes/ConstraintCheck/Checker/FormatChecker.php
+++ b/includes/ConstraintCheck/Checker/FormatChecker.php
@@ -55,6 +55,10 @@
return new CheckResult( $statement,
$constraint-getConstraintTypeQid(), $parameters,
CheckResult::STATUS_VIOLATION, $message );
[MediaWiki-commits] [Gerrit] CX: Corrected language code based on wgLanguageCode setting - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: CX: Corrected language code based on wgLanguageCode setting .. CX: Corrected language code based on wgLanguageCode setting Change-Id: I0d3a7734d458a9f0028e505d2f4659fb3f15f153 --- M hieradata/common/cxserver.yaml M hieradata/labs/deployment-prep/common.yaml 2 files changed, 27 insertions(+), 27 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index 4e1640f..975628f 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -5,7 +5,6 @@ - 'ace' - 'af' - 'ak' -- 'als' - 'am' - 'ang' - 'an' @@ -18,11 +17,10 @@ - 'ay' - 'az' - 'bar' -- 'bat-smg' - 'ba' - 'bcl' -- 'be-x-old' - 'be' +- 'be-tarask' - 'bg' - 'bho' - 'bi' @@ -70,7 +68,6 @@ - 'ext' - 'fa' - 'ff' -- 'fiu-vro' - 'fi' - 'fj' - 'fo' @@ -87,6 +84,7 @@ - 'gl' - 'gn' - 'got' +- 'gsw' - 'gu' - 'gv' - 'hak' @@ -151,6 +149,7 @@ - 'ltg' - 'lt' - 'lv' +- 'lzh' - 'mai' - 'map-bms' - 'mdf' @@ -173,6 +172,7 @@ - 'my' - 'mzn' - 'nah' +- 'nan' - 'nap' - 'na' - 'nds-nl' @@ -211,10 +211,10 @@ - 'rm' - 'rmy' - 'rn' -- 'roa-rup' - 'roa-tara' - 'ro' - 'rue' +- 'rup' - 'ru' - 'rw' - 'sah' @@ -225,6 +225,7 @@ - 'sd' - 'se' - 'sg' +- 'sgs' - 'sh' - 'simple' - 'si' @@ -272,6 +273,7 @@ - 'vi' - 'vls' - 'vo' +- 'vro' - 'war' - 'wa' - 'wo' @@ -281,11 +283,9 @@ - 'xmf' - 'yi' - 'yo' +- 'yue' - 'za' - 'zea' -- 'zh-classical' -- 'zh-min-nan' -- 'zh-yue' - 'zh' - 'zu' target: @@ -297,14 +297,14 @@ - 'av' - 'az' - 'ba' -- 'be-x-old' - 'be' +- 'be-tarask' - 'bcl' - 'bg' - 'bho' - 'bm' - 'ca' -- 'cbk-za' +- 'cbk-zam' - 'ceb' - 'crh-latn' - 'cs' @@ -359,7 +359,7 @@ - 'pt' - 'rmy' - 'rn' -- 'roa-rup' +- 'rup' - 'rue' - 'sah' - 'sg' diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 79a1db2..7d30b06 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -61,7 +61,6 @@ - 'ace' - 'af' - 'ak' -- 'als' - 'am' - 'ang' - 'an' @@ -74,11 +73,10 @@ - 'ay' - 'az' - 'bar' -- 'bat-smg' - 'ba' - 'bcl' -- 'be-x-old' - 'be' +- 'be-tarask' - 'bg' - 'bho' - 'bi' @@ -126,7 +124,6 @@ - 'ext' - 'fa' - 'ff' -- 'fiu-vro' - 'fi' - 'fj' - 'fo' @@ -143,6 +140,7 @@ - 'gl' - 'gn' - 'got' +- 'gsw' - 'gu' - 'gv' - 'hak' @@ -207,6 +205,7 @@ - 'ltg' - 'lt' - 'lv' +- 'lzh' - 'mai' - 'map-bms' - 'mdf' @@ -229,6 +228,7 @@ - 'my' - 'mzn' - 'nah' +- 'nan' - 'nap' - 'na' - 'nds-nl' @@ -267,10 +267,10 @@ - 'rm' - 'rmy' - 'rn' -- 'roa-rup' - 'roa-tara' - 'ro' - 'rue' +- 'rup' - 'ru' - 'rw' - 'sah' @@ -281,6 +281,7 @@ - 'sd' - 'se' - 'sg' +- 'sgs' - 'sh' - 'simple' - 'si' @@ -328,6 +329,7 @@ - 'vi' - 'vls' - 'vo' +- 'vro' - 'war' - 'wa' - 'wo' @@ -337,11 +339,9 @@ - 'xmf' - 'yi' - 'yo' +- 'yue' - 'za' - 'zea' -- 'zh-classical' -- 'zh-min-nan' -- 'zh-yue' - 'zh' - 'zu' target: @@ -350,7 +350,6 @@ - 'ace' - 'af' - 'ak' -- 'als' - 'am' - 'ang' - 'an' @@ -363,11 +362,10 @@ - 'ay' - 'az' - 'bar' -- 'bat-smg' - 'ba' - 'bcl' -- 'be-x-old' - 'be' +- 'be-tarask' - 'bg' - 'bho' - 'bi' @@ -415,7 +413,6 @@ - 'ext' - 'fa' - 'ff' -- 'fiu-vro' - 'fi' - 'fj' - 'fo' @@ -432,6 +429,7 @@ - 'gl' - 'gn' - 'got' +- 'gsw' - 'gu' - 'gv' - 'hak' @@ -496,6 +494,7 @@ - 'ltg' - 'lt' - 'lv' +- 'lzh' - 'mai' - 'map-bms' - 'mdf' @@ -518,6 +517,7 @@ - 'my' - 'mzn' - 'nah' +- 'nan' - 'nap' - 'na' - 'nds-nl' @@ -556,10 +556,10 @@ - 'rm' - 'rmy' - 'rn' -- 'roa-rup' - 'roa-tara' - 'ro' - 'rue' +- 'rup' - 'ru' - 'rw' - 'sah' @@ -570,6 +570,7 @@ - 'sd' - 'se' - 'sg' +- 'sgs' - 'sh' - 'simple' - 'si' @@ -617,6 +618,7 @@ - 'vi' - 'vls' - 'vo' +-
[MediaWiki-commits] [Gerrit] 1.26wmf7 symlinks - change (operations/mediawiki-config)
20after4 has uploaded a new change for review. https://gerrit.wikimedia.org/r/212535 Change subject: 1.26wmf7 symlinks .. 1.26wmf7 symlinks Change-Id: I27429b203b5b39dc8aa0072a6886b670de2dffbc --- A docroot/bits/static/1.26wmf7/extensions A docroot/bits/static/1.26wmf7/resources A docroot/bits/static/1.26wmf7/skins M php A w/static/1.26wmf7/extensions A w/static/1.26wmf7/resources A w/static/1.26wmf7/skins M w/static/current/extensions M w/static/current/resources M w/static/current/skins 10 files changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/35/212535/1 diff --git a/docroot/bits/static/1.26wmf7/extensions b/docroot/bits/static/1.26wmf7/extensions new file mode 12 index 000..57c148d --- /dev/null +++ b/docroot/bits/static/1.26wmf7/extensions @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/extensions \ No newline at end of file diff --git a/docroot/bits/static/1.26wmf7/resources b/docroot/bits/static/1.26wmf7/resources new file mode 12 index 000..4d1994b --- /dev/null +++ b/docroot/bits/static/1.26wmf7/resources @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/resources \ No newline at end of file diff --git a/docroot/bits/static/1.26wmf7/skins b/docroot/bits/static/1.26wmf7/skins new file mode 12 index 000..a43d5ea --- /dev/null +++ b/docroot/bits/static/1.26wmf7/skins @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/skins/ \ No newline at end of file diff --git a/php b/php index 6c65059..d12d518 12 --- a/php +++ b/php @@ -1 +1 @@ -php-1.26wmf6 \ No newline at end of file +php-1.26wmf7 \ No newline at end of file diff --git a/w/static/1.26wmf7/extensions b/w/static/1.26wmf7/extensions new file mode 12 index 000..57c148d --- /dev/null +++ b/w/static/1.26wmf7/extensions @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/extensions \ No newline at end of file diff --git a/w/static/1.26wmf7/resources b/w/static/1.26wmf7/resources new file mode 12 index 000..4d1994b --- /dev/null +++ b/w/static/1.26wmf7/resources @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/resources \ No newline at end of file diff --git a/w/static/1.26wmf7/skins b/w/static/1.26wmf7/skins new file mode 12 index 000..313a65c --- /dev/null +++ b/w/static/1.26wmf7/skins @@ -0,0 +1 @@ +/srv/mediawiki/php-1.26wmf7/skins \ No newline at end of file diff --git a/w/static/current/extensions b/w/static/current/extensions index 75d6fd1..57c148d 12 --- a/w/static/current/extensions +++ b/w/static/current/extensions @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf6/extensions \ No newline at end of file +/srv/mediawiki/php-1.26wmf7/extensions \ No newline at end of file diff --git a/w/static/current/resources b/w/static/current/resources index 237dbad..4d1994b 12 --- a/w/static/current/resources +++ b/w/static/current/resources @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf6/resources \ No newline at end of file +/srv/mediawiki/php-1.26wmf7/resources \ No newline at end of file diff --git a/w/static/current/skins b/w/static/current/skins index 2577508..313a65c 12 --- a/w/static/current/skins +++ b/w/static/current/skins @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf6/skins \ No newline at end of file +/srv/mediawiki/php-1.26wmf7/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/212535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27429b203b5b39dc8aa0072a6886b670de2dffbc Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: 20after4 mmod...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added '@group WikibaseQuality' to tests - change (mediawiki...WikidataQuality)
Tamslo has submitted this change and it was merged. Change subject: Added '@group WikibaseQuality' to tests .. Added '@group WikibaseQuality' to tests Change-Id: I2ec86200aa2de752450a8d64dc59823b6d52c170 --- M tests/phpunit/Html/HtmlTableCellTest.php M tests/phpunit/Html/HtmlTableHeaderTest.php M tests/phpunit/Html/HtmlTableTest.php 3 files changed, 6 insertions(+), 0 deletions(-) Approvals: Dominic.sauer: Verified; Looks good to me, approved diff --git a/tests/phpunit/Html/HtmlTableCellTest.php b/tests/phpunit/Html/HtmlTableCellTest.php index 340612f..707ee23 100755 --- a/tests/phpunit/Html/HtmlTableCellTest.php +++ b/tests/phpunit/Html/HtmlTableCellTest.php @@ -9,6 +9,8 @@ /** * @covers WikibaseQuality\Html\HtmlTableCell * + * @group WikibaseQuality + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/Html/HtmlTableHeaderTest.php b/tests/phpunit/Html/HtmlTableHeaderTest.php index 3f0bb6f..30a9b6c 100755 --- a/tests/phpunit/Html/HtmlTableHeaderTest.php +++ b/tests/phpunit/Html/HtmlTableHeaderTest.php @@ -9,6 +9,8 @@ /** * @covers WikibaseQuality\Html\HtmlTableHeader * + * @group WikibaseQuality + * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/Html/HtmlTableTest.php b/tests/phpunit/Html/HtmlTableTest.php index cf52e05..2e0071b 100755 --- a/tests/phpunit/Html/HtmlTableTest.php +++ b/tests/phpunit/Html/HtmlTableTest.php @@ -10,6 +10,8 @@ /** * @covers WikibaseQuality\Html\HtmlTable * + * @group WikibaseQuality + * * @uses WikibaseQuality\Html\HtmlTableHeader * @uses WikibaseQuality\Html\HtmlTableCell * -- To view, visit https://gerrit.wikimedia.org/r/212517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ec86200aa2de752450a8d64dc59823b6d52c170 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Tamslo tamaraslosa...@gmail.com Gerrit-Reviewer: Dominic.sauer dominic.sa...@yahoo.de Gerrit-Reviewer: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed merge flaw - change (mediawiki...WikidataQualityExternalValidation)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/212538 Change subject: Fixed merge flaw .. Fixed merge flaw Change-Id: Ifbddcb1fbb8a390fb6612eb807e556497776bfd6 --- M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultToViolationTranslatorTest.php M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php 3 files changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation refs/changes/38/212538/1 diff --git a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php index c44f6b1..63edf12 100755 --- a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php +++ b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php @@ -12,11 +12,11 @@ /** - * @group WikibaseQualityExternalValidation - * * @covers WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparerBase * @covers WikibaseQuality\ExternalValidation\CrossCheck\Comparer\TimeValueComparer * + * @group WikibaseQualityExternalValidation + * * @usesWikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult * * @author BP2014N1 diff --git a/tests/phpunit/CrossCheck/Result/CrossCheckResultToViolationTranslatorTest.php b/tests/phpunit/CrossCheck/Result/CrossCheckResultToViolationTranslatorTest.php index 3e73af9..584a6e7 100755 --- a/tests/phpunit/CrossCheck/Result/CrossCheckResultToViolationTranslatorTest.php +++ b/tests/phpunit/CrossCheck/Result/CrossCheckResultToViolationTranslatorTest.php @@ -19,11 +19,11 @@ /** + * @covers WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultToViolationTranslator + * * @group WikibaseQualityExternalValidation * @group Database * @group medium - * - * @covers WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultToViolationTranslator * * @uses WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation * @usesWikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult diff --git a/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php b/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php index 2400d1a..5531223 100755 --- a/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php +++ b/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php @@ -8,8 +8,6 @@ use WikibaseQuality\ExternalValidation\Serializer\DumpMetaInformationSerializer; /** - * @group WikibaseQualityExternalValidation - * * @covers WikibaseQuality\ExternalValidation\Serializer\DumpMetaInformationSerializer * * @group WikibaseQualityExternalValidation -- To view, visit https://gerrit.wikimedia.org/r/212538 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifbddcb1fbb8a390fb6612eb807e556497776bfd6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation Gerrit-Branch: master Gerrit-Owner: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update testgroups second run - change (mediawiki...WikidataQuality)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/212539 Change subject: Update testgroups second run .. Update testgroups second run Change-Id: Ic151c13e96315cf2805ff438a1f0803ab714181d --- M tests/phpunit/Api/GetViolationsTest.php M tests/phpunit/Api/ModifyViolationTest.php M tests/phpunit/Serializer/ViolationSerializerTest.php M tests/phpunit/Violations/ViolationLookupTest.php M tests/phpunit/Violations/ViolationQueryTest.php M tests/phpunit/Violations/ViolationStoreTest.php M tests/phpunit/Violations/ViolationTest.php 7 files changed, 12 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/39/212539/1 diff --git a/tests/phpunit/Api/GetViolationsTest.php b/tests/phpunit/Api/GetViolationsTest.php index c9c78a2..fd03f25 100755 --- a/tests/phpunit/Api/GetViolationsTest.php +++ b/tests/phpunit/Api/GetViolationsTest.php @@ -8,6 +8,7 @@ /** * @covers WikibaseQuality\Api\GetViolations * + * @group WikibaseQuality * @group Database * @group API * @group medium diff --git a/tests/phpunit/Api/ModifyViolationTest.php b/tests/phpunit/Api/ModifyViolationTest.php index fc13568..8859202 100755 --- a/tests/phpunit/Api/ModifyViolationTest.php +++ b/tests/phpunit/Api/ModifyViolationTest.php @@ -7,6 +7,7 @@ /** * @covers WikibaseQuality\Api\ModifyViolation * + * @group WikibaseQuality * @group Database * @group API * @group medium diff --git a/tests/phpunit/Serializer/ViolationSerializerTest.php b/tests/phpunit/Serializer/ViolationSerializerTest.php index f382e3f..153dadb 100755 --- a/tests/phpunit/Serializer/ViolationSerializerTest.php +++ b/tests/phpunit/Serializer/ViolationSerializerTest.php @@ -9,10 +9,10 @@ /** - * @group WikibaseQuality - * * @covers WikibaseQuality\Serializer\ViolationSerializer * + * @group WikibaseQuality + * * @uses WikibaseQuality\Violations\Violation * * @author BP2014N1 diff --git a/tests/phpunit/Violations/ViolationLookupTest.php b/tests/phpunit/Violations/ViolationLookupTest.php index c61c89b..2da9fbc 100755 --- a/tests/phpunit/Violations/ViolationLookupTest.php +++ b/tests/phpunit/Violations/ViolationLookupTest.php @@ -7,11 +7,11 @@ /** + * @covers WikibaseQuality\Violations\ViolationLookup + * * @group WikibaseQuality * @group database * @group medium - * - * @covers WikibaseQuality\Violations\ViolationLookup * * @uses WikibaseQuality\Violations\Violation * @uses WikibaseQuality\Violations\ViolationQuery diff --git a/tests/phpunit/Violations/ViolationQueryTest.php b/tests/phpunit/Violations/ViolationQueryTest.php index 9c9f90b..a8546eb 100755 --- a/tests/phpunit/Violations/ViolationQueryTest.php +++ b/tests/phpunit/Violations/ViolationQueryTest.php @@ -7,10 +7,10 @@ /** + * @covers WikibaseQuality\Violations\ViolationQuery + * * @group WikibaseQuality * - * @covers WikibaseQuality\Violations\ViolationQuery - * * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/tests/phpunit/Violations/ViolationStoreTest.php b/tests/phpunit/Violations/ViolationStoreTest.php index 033eb0c..7e5931e 100755 --- a/tests/phpunit/Violations/ViolationStoreTest.php +++ b/tests/phpunit/Violations/ViolationStoreTest.php @@ -9,11 +9,11 @@ /** + * @covers WikibaseQuality\Violations\ViolationStore + * * @group WikibaseQuality * @group database * @group medium - * - * @covers WikibaseQuality\Violations\ViolationStore * * @uses WikibaseQuality\Violations\Violation * diff --git a/tests/phpunit/Violations/ViolationTest.php b/tests/phpunit/Violations/ViolationTest.php index c93b6bb..e7bee14 100755 --- a/tests/phpunit/Violations/ViolationTest.php +++ b/tests/phpunit/Violations/ViolationTest.php @@ -8,10 +8,10 @@ /** - * @group WikibaseQuality - * * @covers WikibaseQuality\Violations\Violation * + * @group WikibaseQuality + * * @author BP2014N1 * @license GNU GPL v2+ */ -- To view, visit https://gerrit.wikimedia.org/r/212539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic151c13e96315cf2805ff438a1f0803ab714181d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: master Gerrit-Owner: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Small layout tweaks for Flow right-rail - change (mediawiki...Flow)
Pginer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212540
Change subject: Small layout tweaks for Flow right-rail
..
Small layout tweaks for Flow right-rail
Small styling adjustments to:
- Make the flow margin to look well balanced at both sides of the flow content.
- Adjust the position of the toggle icon so that it does not overlap with the
scrollbar and looks centered when the rail is collapsed.
Change-Id: Ia978f745bcd3529d7a86082af5940b0d3c225714
---
M modules/styles/board/header.less
M modules/styles/common.less
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/40/212540/1
diff --git a/modules/styles/board/header.less b/modules/styles/board/header.less
index 75d3549..1293bd7 100644
--- a/modules/styles/board/header.less
+++ b/modules/styles/board/header.less
@@ -54,8 +54,8 @@
.side-rail-toggle-button {
visibility: hidden;
position: absolute;
- top: 8px;
- right: 2px;
+ top: 9px;
+ right: 5px;
font-size: 1.3em;
.mw-ui-button {
diff --git a/modules/styles/common.less b/modules/styles/common.less
index 71bdd5c..3e75fb9 100644
--- a/modules/styles/common.less
+++ b/modules/styles/common.less
@@ -150,7 +150,7 @@
width: 66%;
box-sizing: border-box;
max-width: 1200px;
- padding-right: 20px;
+ padding-right: 26px;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/212540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia978f745bcd3529d7a86082af5940b0d3c225714
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct new role name - change (wikimedia...crm)
jenkins-bot has submitted this change and it was merged.
Change subject: Correct new role name
..
Correct new role name
Change-Id: Ib3494aafda46fc4982d6a0173776b68bb4cf927a
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index bff6772..54c79cd 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -1161,12 +1161,13 @@
/**
* Add Engage contribution type
*
- * Note that we create the Engage role programatically, but it won't have
usable permissions.
+ * Note that we create the Engage Direct Mail role programatically, but it
+ * won't have usable permissions.
*/
function wmf_civicrm_update_7028() {
-if ( false === user_role_load_by_name( 'Engage' ) ) {
+if ( false === user_role_load_by_name( 'Engage Direct Mail' ) ) {
$role = new stdClass();
-$role-name = 'Engage';
+$role-name = 'Engage Direct Mail';
user_role_save( $role );
}
--
To view, visit https://gerrit.wikimedia.org/r/208712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3494aafda46fc4982d6a0173776b68bb4cf927a
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added getCheckKeyTimeMulti() method to WANObjectCache - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212606
Change subject: Added getCheckKeyTimeMulti() method to WANObjectCache
..
Added getCheckKeyTimeMulti() method to WANObjectCache
Change-Id: I6e4e2086c4efdc63c50a4097a1ee612518a4fe4f
---
M includes/libs/objectcache/WANObjectCache.php
M tests/phpunit/includes/objectcache/WANObjectCacheTest.php
2 files changed, 54 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/06/212606/1
diff --git a/includes/libs/objectcache/WANObjectCache.php
b/includes/libs/objectcache/WANObjectCache.php
index 5d9557a..58d68d2 100755
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -285,7 +285,40 @@
* @return float|bool TS_UNIX timestamp of the key; false if not present
*/
final public function getCheckKeyTime( $key ) {
- return self::parsePurgeValue( $this-cache-get(
self::TIME_KEY_PREFIX . $key ) );
+ $times = $this-getCheckKeyTimeMulti( array( $key ) );
+
+ return isset( $times[$key] ) ? $times[$key] : false;
+ }
+
+ /**
+* Fetch the value of multiple timestamp check keys
+*
+* Note that check keys won't collide with other regular keys
+*
+* @param array $keys
+* @return array Map of (key = float|bool TS_UNIX timestamp) for
present keys
+*/
+ final public function getCheckKeyTimeMulti( array $keys ) {
+ $cKeys = array();
+ foreach ( $keys as $key ) {
+ $cKeys[] = self::TIME_KEY_PREFIX . $key;
+ }
+
+ $values = $this-cache-getMulti( $cKeys );
+
+ $times = array();
+ foreach ( $keys as $key ) {
+ $cKey = self::TIME_KEY_PREFIX . $key;
+ $time = isset( $values[$cKey] )
+ ? self::parsePurgeValue( $values[$cKey] )
+ : false;
+
+ if ( is_float( $time ) ) {
+ $times[$key] = $time;
+ }
+ }
+
+ return $times;
}
/**
diff --git a/tests/phpunit/includes/objectcache/WANObjectCacheTest.php
b/tests/phpunit/includes/objectcache/WANObjectCacheTest.php
index 3e284c8..f286205 100644
--- a/tests/phpunit/includes/objectcache/WANObjectCacheTest.php
+++ b/tests/phpunit/includes/objectcache/WANObjectCacheTest.php
@@ -225,12 +225,18 @@
/**
* @covers WANObjectCache::touchCheckKey()
* @covers WANObjectCache::getCheckKeyTime()
+* @covers WANObjectCache::getCheckKeyTimeMulti()
*/
public function testTouchKeys() {
$key = wfRandomString();
+ $multiKeys = array();
$t0 = $this-cache-getCheckKeyTime( $key );
$this-assertFalse( $t0, 'Check key time is false' );
+
+ $newKey = wfRandomString();
+ $this-cache-touchCheckKey( $newKey );
+ $multiKeys[] = $newKey;
$priorTime = microtime( true );
usleep( 1 );
@@ -241,6 +247,10 @@
$t2 = $this-cache-getCheckKeyTime( $key );
$this-assertEquals( $t1, $t2, 'Check key time did not change'
);
+ $newKey = wfRandomString();
+ $this-cache-touchCheckKey( $newKey );
+ $multiKeys[] = $newKey;
+
usleep( 1 );
$this-cache-touchCheckKey( $key );
$t3 = $this-cache-getCheckKeyTime( $key );
@@ -248,5 +258,15 @@
$t4 = $this-cache-getCheckKeyTime( $key );
$this-assertEquals( $t3, $t4, 'Check key time did not change'
);
+
+ $newKey = wfRandomString();
+ $this-cache-touchCheckKey( $newKey );
+ $multiKeys[] = $newKey;
+
+ // Keys were made between usleep(), they should differ
+ $times = $this-cache-getCheckKeyTimeMulti( $multiKeys );
+ $this-assertEquals( 3, count( $times ),
getCheckKeyTimeMulti() returned 3 keys );
+ $this-assertEquals( 3, count( array_unique( $times ) ),
+ getCheckKeyTimeMulti() returned 3 different keys );
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/212606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e4e2086c4efdc63c50a4097a1ee612518a4fe4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] bump version to 0.5.6-1), build for trusty - change (operations...trebuchet-trigger)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/212707 Change subject: bump version to 0.5.6-1), build for trusty .. bump version to 0.5.6-1), build for trusty Bug:T99919 Change-Id: I116df7f4711fa8aef2ee441477cab163afbfe76a --- A changelog 1 file changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/deployment/trebuchet-trigger refs/changes/07/212707/1 diff --git a/changelog b/changelog new file mode 100644 index 000..585ad6e --- /dev/null +++ b/changelog @@ -0,0 +1,73 @@ +trebuchet-trigger (0.5.6-1) trusty; urgency=low + + * Rebuild for trusty (T95436) + + -- Daniel Zahn dz...@wikimedia.org Thu, 21 May 2015 20:53:10 + + +trebuchet-trigger (0.5.5-1) precise; urgency=low + + * Update for yaml format args to publish.runner + + -- Ariel T. Glenn ar...@wikimedia.org Sat, 09 May 2015 08:32:56 + + +trebuchet-trigger (0.5.4-1) precise; urgency=low + + * Catch exception for config when not in repo + + -- Ryan Lane r...@ryandlane.com Wed, 05 Mar 2014 04:06:11 + + +trebuchet-trigger (0.5.3-1) precise; urgency=low + + * Refactor config to fulle use hashes and explicit keys + * Ignore configuration errors when using help action + * Add option to enforce umask + + -- Ryan Lane r...@ryandlane.com Wed, 26 Feb 2014 06:38:36 + + +trebuchet-trigger (0.5.2-1) precise; urgency=low + + * Fix a drivers reference error + + -- Ryan Lane r...@ryandlane.com Wed, 12 Feb 2014 08:42:58 + + +trebuchet-trigger (0.5.1-1) precise; urgency=low + + * Add a reporting driver with a default trebuchet.local driver + + -- Ryan Lane r...@ryandlane.com Sun, 09 Feb 2014 05:41:42 + + +trebuchet-trigger (0.4.3-1) precise; urgency=low + + * Fix more importing issues + + -- Ryan Lane r...@ryandlane.com Sun, 09 Feb 2014 05:15:00 + + +trebuchet-trigger (0.4.2-1) precise; urgency=low + + * Fix various importing issues + + -- Ryan Lane r...@ryandlane.com Sun, 09 Feb 2014 05:00:43 + + +trebuchet-trigger (0.4.1-1) precise; urgency=low + + * Add a utility to update server info in submodules for trebuchet.local +sync driver + + -- Ryan Lane r...@ryandlane.com Thu, 30 Jan 2014 22:15:04 + + +trebuchet-trigger (0.4-1) precise; urgency=low + + * Add support for a .trigger configuration file + * Messaging changes + * Store information in lock file + * Configuration load order changes + * Added service driver + * Fixed a number of errors during workflow + + -- Ryan Lane r...@ryandlane.com Thu, 30 Jan 2014 21:15:45 + + +trebuchet-trigger (0.3-1) precise; urgency=low + + * source package automatically created by stdeb 0.6.0 + + -- Ryan Lane r...@ryandlane.com Thu, 09 Jan 2014 03:21:18 + -- To view, visit https://gerrit.wikimedia.org/r/212707 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I116df7f4711fa8aef2ee441477cab163afbfe76a Gerrit-PatchSet: 1 Gerrit-Project: operations/software/deployment/trebuchet-trigger Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Updated numUsersWatchingPage to handle how User::touch... - change (mediawiki...FlaggedRevs)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212713
Change subject: [WIP] Updated numUsersWatchingPage to handle how User::touch()
works
..
[WIP] Updated numUsersWatchingPage to handle how User::touch() works
* That method no longer updates the DB, so this needs to check cache
Change-Id: I4669911c8c69a2e1a17854d45dcfd4d63d128ae3
---
M backend/FRUserActivity.php
M frontend/specialpages/reports/PendingChanges_body.php
2 files changed, 35 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs
refs/changes/13/212713/1
diff --git a/backend/FRUserActivity.php b/backend/FRUserActivity.php
old mode 100644
new mode 100755
index 5034633..474baf2
--- a/backend/FRUserActivity.php
+++ b/backend/FRUserActivity.php
@@ -12,31 +12,47 @@
* @return int
*/
public static function numUsersWatchingPage( Title $title ) {
- global $wgMemc, $wgCookieExpiration;
+ global $wgMemc, $wgActiveUserDays;
+
# Check the cache...
- $key = wfMemcKey( 'flaggedrevs', 'usersWatching',
$title-getArticleID() );
+ $key = wfMemcKey( 'flaggedrevs', 'users-watching',
$title-getArticleID() );
$val = $wgMemc-get( $key );
if ( is_int( $val ) ) {
return $val; // cache hit
}
- # Get number of active editors watching this page...
- $dbr = wfGetDB( DB_SLAVE );
- $cutoff = $dbr-timestamp( wfTimestamp( TS_UNIX ) - 2 *
$wgCookieExpiration );
- $count = (int)$dbr-selectField(
- array( 'watchlist', 'user' ),
- 'COUNT(*)',
- array(
- 'wl_namespace'= $title-getNamespace(),
- 'wl_title'= $title-getDBkey(),
- 'wl_user = user_id',
- 'user_touched ' . $dbr-addQuotes( $cutoff )
// logged in or out
- ),
- __METHOD__
+
+ # Get the last-login timestamp (includes some other updates)
for users
+ # watching this page. Avoids User object overhead by just
checking keys.
+ # @TODO: avoid having to know the name of User keys
+ $timestamps =
ObjectCache::getMainWANInstance()-getCheckKeyTimeMulti(
+ array_map(
+ function ( $userId ) {
+ return wfMemcKey( 'user-quicktouched',
'id', $userId );
+ },
+ wfGetDB( DB_SLAVE )-selectFieldValues(
+ array( 'watchlist' ),
+ 'wl_user',
+ array(
+ 'wl_namespace' =
$title-getNamespace(),
+ 'wl_title' =
$title-getDBkey()
+ ),
+ __METHOD__,
+ array( 'LIMIT' = 100 ) // sanity
+ )
+ )
);
- if ( $count 10 ) {
- # Save new value to cache (more aggresive for larger
counts)
- $wgMemc-set( $key, $count, ( $count 200 ) ? 30*60 :
5*60 );
- }
+
+ $cutoffUnix = time() - 86400 * $wgActiveUserDays;
+ # Get the number of those that are recent enough
+ $count = count( array_filter(
+ $timestamps,
+ function ( $timestamp ) use ( $cutoffUnix ) {
+ return $timestamp $cutoffUnix;
+ }
+ ) );
+
+ # Save new value to cache (more aggresive for larger counts)
+ $wgMemc-set( $key, $count, ( $count 100 ) ? 30*60 : 5*60 );
return $count;
}
diff --git a/frontend/specialpages/reports/PendingChanges_body.php
b/frontend/specialpages/reports/PendingChanges_body.php
old mode 100644
new mode 100755
--
To view, visit https://gerrit.wikimedia.org/r/212713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4669911c8c69a2e1a17854d45dcfd4d63d128ae3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Implement flagging backend - change (mediawiki...Gather)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212593
Change subject: [WIP] Implement flagging backend
..
[WIP] Implement flagging backend
* add a new table (gather_list_flag) which tracks which user
flagged which list
* add a new list permission (APPROVED) for lists which cannot be
autohidden
* add flag/approve modes to the editlist API
* when label or description is edited, permission is reset: hidden
becomes private, approved becomes public
* gather_list_flag needed a hook for user renames so added handling
for gather_list as well
To do:
* filter=notablyflagged (on top of 210885)
* Special:Gather/all/flagged
* add tests
* test UserMerge hook
Questions that should be addessed:
* move flagging to separate API? very different in terms of permissions
* state machine for permission states? (E.g. can I approve a hidden
list? Can I hide an approved list? What happens when showlist is
called on an approved list?)
* review permission reset logic
* should approve use the same user right as hide/show?
* do we need an Echo notification for approving?
Bug: T97704
Change-Id: Iae85317f9560d80475b53a66691b474981c13668
---
M i18n/en.json
M i18n/qqq.json
M includes/Gather.hooks.php
M includes/api/ApiEditList.php
M includes/api/ApiQueryLists.php
M schema/Updater.hooks.php
M schema/gather_list.sql
A schema/gather_list_flag.sql
8 files changed, 131 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/93/212593/1
diff --git a/i18n/en.json b/i18n/en.json
index 82e966a..a49f928 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -97,6 +97,9 @@
gather-moderation-unhidden: [[$1|Your collection]] was unhidden.
This means that it can be viewed publicly again. ,
gather-moderation-unhidden-email-subject: Your collection $1 was
unhidden.,
gather-moderation-unhidden-email-body: Your collection $1 was
unhidden. This means that it can be viewed publicly again.,
+ gather-moderation-approved: [[$1|Your collection]] was approved.
This means that it won't be automatically hidden again.,
+ gather-moderation-approved-email-subject: Your collection $1 was
approved.,
+ gather-moderation-approved-email-body: Your collection $1 was
approved. This means that it won't be automatically hidden again.,
echo-category-title-gather: Gather,
gather-echo-pref-tooltip: Notify me about changes to my
collections.,
gather-article-count: $1 {{PLURAL:$1|page|pages}},
@@ -111,6 +114,8 @@
gather-overlay-search-new: Start a new search...,
gather-overlay-search-results-empty: Sorry, we couldn't find any
pages for \$1\,
right-gather-hidelist: Force a public user list to become hidden,
+ apihelp-query+listpages-param-filter: Filter results by some
criteria (ignored for watchlists),
+ apihelp-query+listpages-paramvalue-filter-notablyflagged: Only show
results exceeding a threshold of flags,
apihelp-gather-description: List and edit Gather collections.,
apihelp-gather-param-gather: Action to perform on collections.,
apihelp-gather-param-owner: Owner of the collections to search for.
If omitted, defaults to current user.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 15e69fe..499ba8c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -101,6 +101,9 @@
gather-moderation-unhidden: Label for echo notification explaining
that your collection was unhidden and that it can be viewed again as normal.
Parameters:\n* $1 - Url of collection.,
gather-moderation-unhidden-email-subject: Label for echo
notification email subject explaining that your collection was unhidden.
Parameters:\n* $1 - Url of collection.,
gather-moderation-unhidden-email-body: Label for echo notification
email body explaining that your collection was unhidden. Parameters:\n* $1 -
Url of collection.,
+ gather-moderation-approved: Label for echo notification explaining
that your collection was approved (ie. it won't be automatically hidden when a
lot of users flag it). Parameters:\n* $1 - Url of collection.,
+ gather-moderation-approved-email-subject: Label for echo
notification email subject explaining that your collection was approved.
Parameters:\n* $1 - Url of collection.,
+ gather-moderation-approved-email-body: Label for echo notification
email body explaining that your collection was approved. Parameters:\n* $1 -
Url of collection.,
echo-category-title-gather: A label for the Gather checkboxes in the
Echo notifications preferences.,
gather-echo-pref-tooltip: This is a short description of the gather
notification category in the Echo notifications
preferences.\n{{Related|Echo-pref-tooltip}},
gather-article-count: Expression of the number of pages in a
collection. Parameter:\n* $1 - number of pages in the
[MediaWiki-commits] [Gerrit] Alpha, Beta: Center-align the last-modified bar on tablets - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Alpha, Beta: Center-align the last-modified bar on tablets
..
Alpha, Beta: Center-align the last-modified bar on tablets
Also:
* generate the last modified bar using a template.
* make sure the background stretches to the full page width
Bug: T98925
Change-Id: I38cefa7dd5c81b4ba900ca34c29c7ef6412db9de
---
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
M less/tablet/common.beta.less
M less/ui.less
M resources/mobile.head/init.js
A templates/history.mustache
6 files changed, 54 insertions(+), 19 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index f6b65cc..c751562 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -190,11 +190,20 @@
* @param array $data Data used to build the page
*/
protected function renderHistoryLink( $data ) {
- if ( isset( $data['historyLink'] ) ) {
+ $action = Action::getActionName( RequestContext::getMain() );
+ if ( isset( $data['historyLink'] ) $action === 'view' ) {
$historyLink = $data['historyLink'];
- $historyLabel = $historyLink['text'];
- unset( $historyLink['text'] );
- echo Html::element( 'a', $historyLink, $historyLabel );
+ $args = array(
+ 'isMainPage' =
$this-getSkin()-getTitle()-isMainPage(),
+ 'link' = $historyLink['href'],
+ 'text' = $historyLink['text'],
+ 'username' = $historyLink['data-user-name'],
+ 'userGender' =
$historyLink['data-user-gender'],
+ 'timestamp' = $historyLink['data-timestamp']
+ );
+ $templateParser = new TemplateParser(
+ __DIR__ . '/../../templates/' );
+ echo $templateParser-processTemplate( 'history', $args
);
}
}
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 8a16858..c040e1f 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -634,7 +634,6 @@
$unixTimestamp = wfTimestamp( TS_UNIX, $timestamp );
$historyUrl = $this-mobileContext-getMobileUrl(
$title-getFullURL( 'action=history' ) );
$link = array(
- 'id' = 'mw-mf-last-modified',
'data-timestamp' = $isMainPage ? '' : $unixTimestamp,
'href' = $historyUrl,
'text' = $lastModified,
@@ -652,9 +651,6 @@
} else {
$link['data-user-gender'] = 'unknown';
}
- }
- if ( !$title-isMainPage() ) {
- $link['class'] = 'last-modified-bar truncated-text';
}
$link['href'] = SpecialPage::getTitleFor( 'History', $title
)-getLocalURL();
return $link;
diff --git a/less/tablet/common.beta.less b/less/tablet/common.beta.less
index 5ade7ba..5537749 100644
--- a/less/tablet/common.beta.less
+++ b/less/tablet/common.beta.less
@@ -20,6 +20,13 @@
// so that the icon image is aligned with the content
right: -@iconGutterWidth;
}
+
+ #mw-mf-last-modified {
+ max-width: @contentMaxWidthTablet;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 5px @contentPaddingTablet;
+ }
}
.beta {
diff --git a/less/ui.less b/less/ui.less
index f378805..cfda712 100644
--- a/less/ui.less
+++ b/less/ui.less
@@ -15,7 +15,7 @@
.last-modified-bar {
background-color: @colorGray14;
- padding: 5px @contentMargin;
+ padding: 0 @contentMargin;
display: block;
color: @colorGray6;
a {
diff --git a/resources/mobile.head/init.js b/resources/mobile.head/init.js
index bbc21d6..e263da5 100644
--- a/resources/mobile.head/init.js
+++ b/resources/mobile.head/init.js
@@ -13,10 +13,11 @@
*/
function initHistoryLink() {
var $lastModified = $( '#mw-mf-last-modified' ),
- historyUrl = $lastModified.attr( 'href' ),
- ts = $lastModified.data( 'timestamp' ),
- username = $lastModified.data( 'user-name' ) || false,
- gender = $lastModified.data( 'user-gender' ),
+
[MediaWiki-commits] [Gerrit] Namespace configuration for office. - change (operations/mediawiki-config)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/212685 Change subject: Namespace configuration for office. .. Namespace configuration for office. Template namespace could now have subpages. Subpages are still disabled for the following namespaces: * 0: NS_MAIN * 6: NS_FILE * 8: NS_MEDIAWIKI * 113: Archive Bug: T99860 Change-Id: I3acee38638549dc8f469eb0b7eacacb6f1e2208b --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/85/212685/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3bfdae7..c94cab3 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -3796,7 +3796,7 @@ '+nlwikimedia' = array( 0 = 1 ), '+nostalgiawiki' = array( 0 = 1, 6 = 0, 8 = 0, 10 = 0 ), '+nowikimedia' = array( 0 = 1 ), - '+officewiki' = array( 0 = 1, 6 = 0, 8 = 0, 10 = 0, 113 = 1 ), + '+officewiki' = array( 0 = 1, 6 = 0, 8 = 0, 113 = 1 ), // T99860 et al. '+ombudsmenwiki' = array( 0 = 1 ), '+otrs_wikiwiki' = array( 0 = 1 ), '+outreachwiki' = array( 0 = 1 ), -- To view, visit https://gerrit.wikimedia.org/r/212685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3acee38638549dc8f469eb0b7eacacb6f1e2208b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson dereck...@espace-win.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Strip UTF8 BOM so that JSON.parse() doesn't throw - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212714
Change subject: Strip UTF8 BOM so that JSON.parse() doesn't throw
..
Strip UTF8 BOM so that JSON.parse() doesn't throw
* request does this if the `json` option is set but we handle our own
JSON parsing.
Change-Id: I8037248bcabee5dd8f905b8a1a1f59e9ab07ff25
---
M lib/mediawiki.ApiRequest.js
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/14/212714/1
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 7b1bc73..bc13bfc 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -224,7 +224,13 @@
}
var data;
try {
- data = JSON.parse( body );
+ // Strip the UTF8 BOM since it knowingly breaks parsing.
+ if (body[0] === '\uFEFF') {
+ this.env.log('warning', 'Stripping a UTF8 BOM. Your
webserver is' +
+ ' likely broken.');
+ body = body.slice(1);
+ }
+ data = JSON.parse(body);
} catch (e) {
error = new ParserError( 'Failed to parse the JSON response for
' +
this.reqType );
--
To view, visit https://gerrit.wikimedia.org/r/212714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8037248bcabee5dd8f905b8a1a1f59e9ab07ff25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Strip UTF8 BOM so that JSON.parse() doesn't throw - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Strip UTF8 BOM so that JSON.parse() doesn't throw
..
Strip UTF8 BOM so that JSON.parse() doesn't throw
* request does this if the `json` option is set but we handle our own
JSON parsing.
Change-Id: I8037248bcabee5dd8f905b8a1a1f59e9ab07ff25
---
M lib/mediawiki.ApiRequest.js
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 7b1bc73..bc13bfc 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -224,7 +224,13 @@
}
var data;
try {
- data = JSON.parse( body );
+ // Strip the UTF8 BOM since it knowingly breaks parsing.
+ if (body[0] === '\uFEFF') {
+ this.env.log('warning', 'Stripping a UTF8 BOM. Your
webserver is' +
+ ' likely broken.');
+ body = body.slice(1);
+ }
+ data = JSON.parse(body);
} catch (e) {
error = new ParserError( 'Failed to parse the JSON response for
' +
this.reqType );
--
To view, visit https://gerrit.wikimedia.org/r/212714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8037248bcabee5dd8f905b8a1a1f59e9ab07ff25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make `proxy_strip_https` into a general proxy configuration ... - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Make `proxy_strip_https` into a general proxy configuration
option.
..
Make `proxy_strip_https` into a general proxy configuration option.
This is used for some production WMF servers, but it might be more
generally useful as well. Move it out of initMwApiMap() for
clarity.
Change-Id: I8b14096fab1f516a95f121cb4a6774bc292a7818
---
M lib/mediawiki.ApiRequest.js
M lib/mediawiki.ParsoidConfig.js
2 files changed, 21 insertions(+), 10 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 7b1bc73..c0ec5c2 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -120,6 +120,19 @@
// Forward the request id
if (!options.headers) { options.headers = {}; }
options.headers['X-Request-ID'] = this.env.reqId;
+ // When proxying, strip TLS and lie to the appserver to indicate
+ // unwrapping has just occurred. The appserver isn't listening on
+ // port 443 but a site setting may require a secure connection,
+ // which the header identifies. (This is primarily for proxies
+ // used in WMF production, for which initMwApiMap sets the
+ // proxy_strip_https flag.)
+ if (options.proxy options.proxy_strip_https
/^https[:]/.test(options.uri)) {
+ options.uri = options.uri.replace(/^https/, 'http');
+ options.headers['X-Forwarded-Proto'] = 'https';
+ // request will actually ignore any unused options, but play it
+ // safe by removing our custom 'proxy_strip_https' option.
+ delete options.proxy_strip_https;
+ }
return request( options, callback );
};
@@ -274,6 +287,7 @@
qs: apiargs,
timeout: env.conf.parsoid.timeouts.mwApi.srcFetch,
proxy: proxy proxy.uri,
+ proxy_strip_https: proxy proxy.strip_https,
strictSSL: env.conf.parsoid.strictSSL,
headers: {
'User-Agent': env.conf.parsoid.userAgent,
@@ -437,6 +451,7 @@
uri: uri,
timeout: env.conf.parsoid.timeouts.mwApi.preprocessor,
proxy: proxy proxy.uri,
+ proxy_strip_https: proxy proxy.strip_https,
strictSSL: env.conf.parsoid.strictSSL,
headers: {
'User-Agent': env.conf.parsoid.userAgent,
@@ -560,6 +575,7 @@
uri: uri,
timeout: env.conf.parsoid.timeouts.mwApi.extParse,
proxy: proxy proxy.uri,
+ proxy_strip_https: proxy proxy.strip_https,
strictSSL: env.conf.parsoid.strictSSL,
headers: {
'User-Agent': env.conf.parsoid.userAgent,
@@ -785,6 +801,7 @@
qs: apiargs,
timeout: env.conf.parsoid.timeouts.mwApi.configInfo,
proxy: proxy proxy.uri,
+ proxy_strip_https: proxy proxy.strip_https,
strictSSL: env.conf.parsoid.strictSSL,
headers: {
'User-Agent': env.conf.parsoid.userAgent,
@@ -893,6 +910,7 @@
qs: apiArgs,
timeout: env.conf.parsoid.timeouts.mwApi.imgInfo,
proxy: proxy proxy.uri,
+ proxy_strip_https: proxy proxy.strip_https,
headers: {
'User-Agent': env.conf.parsoid.userAgent,
'Connection': 'close'
diff --git a/lib/mediawiki.ParsoidConfig.js b/lib/mediawiki.ParsoidConfig.js
index bbf8022..f13031a 100644
--- a/lib/mediawiki.ParsoidConfig.js
+++ b/lib/mediawiki.ParsoidConfig.js
@@ -315,20 +315,13 @@
// Avoid overwriting those already set in localsettings setup.
if (!this.mwApiMap.has(site.dbname)) {
var url = site.url;
- var proxyHeaders;
- // When proxying, strip TLS and lie to the appserver to
indicate
- // unwrapping has just occurred. The appserver isn't
listening on
- // port 443 but a site setting may require a secure
connection,
- // which the header identifies.
- if (proxyURI === undefined /https/.test(site.url)) {
- url = url.replace(https, http);
- proxyHeaders = { X-Forwarded-Proto: https };
- }
var apiConf = {
uri: url + /w/api.php,
proxy: {
uri: proxyURI,
- headers: proxyHeaders,
+
[MediaWiki-commits] [Gerrit] Conversion to using getMainStashInstance() - change (mediawiki...FlaggedRevs)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212715
Change subject: Conversion to using getMainStashInstance()
..
Conversion to using getMainStashInstance()
Bug: T97620
Change-Id: Ie9c261fce945922faaf1b43f1cb9261ac764c7f6
---
M backend/FRUserActivity.php
1 file changed, 72 insertions(+), 51 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs
refs/changes/15/212715/1
diff --git a/backend/FRUserActivity.php b/backend/FRUserActivity.php
old mode 100644
new mode 100755
index 5034633..fa8672d
--- a/backend/FRUserActivity.php
+++ b/backend/FRUserActivity.php
@@ -41,21 +41,21 @@
return $count;
}
- /*
+ /**
* Get who is currently reviewing a page
* @param int $pageId
* @return array (username or null, MW timestamp or null)
*/
public static function getUserReviewingPage( $pageId ) {
- global $wgMemc;
$key = wfMemcKey( 'flaggedrevs', 'userReviewingPage', $pageId );
- $val = $wgMemc-get( $key );
+ $val = ObjectCache::getMainStashInstance()-get( $key );
+
return ( count( $val ) == 3 )
? array( $val[0], $val[1] )
: array( null, null );
}
- /*
+ /**
* Check if someone is currently reviewing a page
* @param int $pageId
* @return bool
@@ -65,11 +65,11 @@
return ( $m[0] !== null );
}
- /*
+ /**
* Set the flag for who is reviewing a page if not already set by
someone.
* If already set, then increment the instance counter (multiple
windows)
* and add on time to the expiry.
- *
+*
* @param User $user
* @param int $pageId
* @return bool flag set
@@ -79,7 +79,7 @@
return self::incUserReviewingItem( $key, $user,
self::PAGE_REVIEW_SEC );
}
- /*
+ /**
* Clear an instance of a user reviewing a page by decrementing the
counter.
* If it reaches 0 instances, then clear the flag for who is reviewing
the page.
* @param User $user
@@ -91,33 +91,32 @@
return self::decUserReviewingItem( $key, $user,
self::PAGE_REVIEW_SEC );
}
- /*
+ /**
* Totally clear the flag for who is reviewing a page.
* @param int $pageId
* @return void
*/
public static function clearAllReviewingPage( $pageId ) {
- global $wgMemc;
$key = wfMemcKey( 'flaggedrevs', 'userReviewingPage', $pageId );
- $wgMemc-delete( $key );
+ ObjectCache::getMainStashInstance()-delete( $key );
}
- /*
+ /**
* Get who is currently reviewing a diff
* @param int $oldId
* @param int $newId
* @return array (username or null, MW timestamp or null)
*/
public static function getUserReviewingDiff( $oldId, $newId ) {
- global $wgMemc;
$key = wfMemcKey( 'flaggedrevs', 'userReviewingDiff', $oldId,
$newId );
- $val = $wgMemc-get( $key );
+ $val = ObjectCache::getMainStashInstance()-get( $key );
+
return ( count( $val ) == 3 )
? array( $val[0], $val[1] )
: array( null, null );
}
- /*
+ /**
* Check if someone is currently reviewing a diff
* @param int $oldId
* @param int $newId
@@ -125,23 +124,26 @@
*/
public static function diffIsUnderReview( $oldId, $newId ) {
$m = self::getUserReviewingDiff( $oldId, $newId );
+
return ( $m[0] !== null );
}
- /*
+ /**
* Set the flag for who is reviewing a diff if not already set by
someone.
* If already set, then increment the instance counter (multiple
windows)
* and add on time to the expiry.
* @param User $user
-* @param int $pageId
+* @param int $oldId
+* @param int $newId
* @return bool flag set
*/
public static function setUserReviewingDiff( User $user, $oldId, $newId
) {
$key = wfMemcKey( 'flaggedrevs', 'userReviewingDiff', $oldId,
$newId );
+
return self::incUserReviewingItem( $key, $user,
self::CHANGE_REVIEW_SEC );
}
- /*
+ /**
* Clear an instance of a user reviewing a diff by decrementing the
counter.
* If it reaches 0 instances, then clear the flag for who is reviewing
the diff.
* @param User $user
@@ -151,63 +153,82 @@
*/
public static function clearUserReviewingDiff( User $user, $oldId,
$newId ) {
$key = wfMemcKey( 'flaggedrevs',
[MediaWiki-commits] [Gerrit] Embellish; mention the wiki import source file - change (mediawiki/vagrant)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212716
Change subject: Embellish; mention the wiki import source file
..
Embellish; mention the wiki import source file
Change-Id: I2980f0395ce7ae3798467eb6b2f61a1bd2a0e920
---
M puppet/modules/payments/files/Main_Page.wiki
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/16/212716/1
diff --git a/puppet/modules/payments/files/Main_Page.wiki
b/puppet/modules/payments/files/Main_Page.wiki
index a213f3d..2da505e 100644
--- a/puppet/modules/payments/files/Main_Page.wiki
+++ b/puppet/modules/payments/files/Main_Page.wiki
@@ -1,3 +1,5 @@
+This help page was generated from
[http://git.wikimedia.org/blob/mediawiki%2Fvagrant.git/HEAD/puppet%2Fmodules%2Fpayments%2Ffiles%2FMain_Page.wiki
a file], please submit improvements back to that code repo.
+
__NOTOC__
Beware that you are using a '''beta''' version of the WMF Fundraising
Paymentswiki development puppet module, and there are many rough edges.
@@ -6,7 +8,7 @@
== Configuration ==
-Some minimum configuration is non-free, meaning you will have to be oathed
to WMF NDA in order to receive credentials. Alternatively, you may arrange for
your own development account with the payment processor. We are committed to
eliminating this barrier by providing mock API responses, but in the meantime,
here's an overview of what the missing settings look like,
+Some minimum configuration is non-free, meaning you will have to be oathed
to WMF NDA in order to use our credentials. Alternatively, you may make your
own arrangements for a development account with the payment processor. We are
committed to eliminating this barrier by
[https://phabricator.wikimedia.org/T89188 providing mock API responses], but in
the meantime, here's an overview of what the missing settings look like,
?php
# settings.d/wikis/paymentswiki/settings.d/01-DI-real.php
@@ -23,7 +25,7 @@
),
);
-= Example URLs =
+= Some donation forms =
*
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuoteffname=cc-vmadrecurring=uselang=enlanguage=encurrency=EURcountry=USamount=2.01}}
GlobalCollect in the US, English, EUR]
*
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuoteffname=cc-vmadrecurring=1uselang=enlanguage=encurrency=EURcountry=USamount=2.01}}
GlobalCollect recurring in the US, English, EUR]
@@ -32,6 +34,8 @@
*
[{{fullurl:Special:GatewayFormChooser|uselang=enlanguage=encurrency_code=EURcountry=NLpaymentmethod=ccamount=3amountGiven=country=UScurrency_code=USDfrequency=onetimelanguage=enpayment_method=ccutm_campaign=noneutm_key=27utm_medium=sitenoticeutm_source=B14_120723_5C_tp_tw1.no-LP.cc}}
Form chooser, credit card in NL]
+See also [https://phabricator.wikimedia.org/T86247 T86247], this would be a
good use of a Special page, to build a payments query out of adjustable
parameters.
+
== Errors ==
*
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuoteffname=cc-vmadrecurring=uselang=enlanguage=encurrency=USDcountry=USamount=.01}}
Donation amount too low (GlobalCollect)]
*
[{{fullurl:Special:PayPalGateway|appeal=JimmyQuoteffname=paypalrecurring=uselang=enlanguage=encurrency=INRcountry=USamount=200.01}}
Correcting currency (PayPal)]
--
To view, visit https://gerrit.wikimedia.org/r/212716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2980f0395ce7ae3798467eb6b2f61a1bd2a0e920
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Conversion to using getMainStashInstance() - change (mediawiki...AbuseFilter)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212717
Change subject: [WIP] Conversion to using getMainStashInstance()
..
[WIP] Conversion to using getMainStashInstance()
Bug: T97620
Change-Id: I7fc2c0a42bf295d71b9e0721ab4261290334cdec
---
M AbuseFilter.class.php
M AbuseFilter.hooks.php
M Views/AbuseFilterViewRevert.php
M api/ApiAbuseFilterUnblockAutopromote.php
4 files changed, 11 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/17/212717/1
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index fff2ddb..87f2010 100755
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -1300,10 +1300,12 @@
break;
case 'blockautopromote':
- global $wgUser, $wgMemc;
+ global $wgUser;
if ( !$wgUser-isAnon() ) {
$blockPeriod = (int)mt_rand( 3 * 86400,
7 * 86400 ); // Block for 3-7 days.
- $wgMemc-set(
self::autoPromoteBlockKey( $wgUser ), true, $blockPeriod );
+
ObjectCache::getMainStashInstance()-set(
+ self::autoPromoteBlockKey(
$wgUser ), true, $blockPeriod
+ );
$message = array(
'abusefilter-autopromote-blocked',
diff --git a/AbuseFilter.hooks.php b/AbuseFilter.hooks.php
old mode 100644
new mode 100755
index 892d901..faaafb3
--- a/AbuseFilter.hooks.php
+++ b/AbuseFilter.hooks.php
@@ -277,11 +277,8 @@
* @return bool
*/
public static function onGetAutoPromoteGroups( $user, $promote ) {
- global $wgMemc;
-
$key = AbuseFilter::autoPromoteBlockKey( $user );
-
- if ( $wgMemc-get( $key ) ) {
+ if ( ObjectCache::getMainStashInstance()-get( $key ) ) {
$promote = array();
}
diff --git a/Views/AbuseFilterViewRevert.php b/Views/AbuseFilterViewRevert.php
old mode 100644
new mode 100755
index 941fa66..c1a7738
--- a/Views/AbuseFilterViewRevert.php
+++ b/Views/AbuseFilterViewRevert.php
@@ -209,9 +209,9 @@
);
return true;
case 'blockautopromote':
- global $wgMemc;
- $wgMemc-delete(
AbuseFilter::autopromoteBlockKey(
- User::newFromId( $result['userid'] ) )
);
+ ObjectCache::getMainStashInstance()-delete(
+ AbuseFilter::autopromoteBlockKey(
User::newFromId( $result['userid'] ) )
+ );
return true;
case 'degroup':
// Pull the user's groups from the vars.
diff --git a/api/ApiAbuseFilterUnblockAutopromote.php
b/api/ApiAbuseFilterUnblockAutopromote.php
old mode 100644
new mode 100755
index 73d1558..6b3cb17
--- a/api/ApiAbuseFilterUnblockAutopromote.php
+++ b/api/ApiAbuseFilterUnblockAutopromote.php
@@ -15,16 +15,15 @@
$this-dieUsage( $msg, 'notsuspended' );
}
- global $wgMemc;
$key = AbuseFilter::autoPromoteBlockKey( $user );
-
- if ( !$wgMemc-get( $key ) ) {
+ $stash = ObjectCache::getMainStashInstance();
+ if ( !$stash-get( $key ) ) {
// Same as above :(
$msg = wfMessage( 'abusefilter-reautoconfirm-none',
$params['user'] )-text();
$this-dieUsage( $msg, 'notsuspended' );
}
- $wgMemc-delete( $key );
+ $stash-delete( $key );
$res = array( 'user' = $params['user'] );
$this-getResult()-addValue( null, $this-getModuleName(),
$res );
--
To view, visit https://gerrit.wikimedia.org/r/212717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fc2c0a42bf295d71b9e0721ab4261290334cdec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0ee7352..e85e395 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 0ee7352..e85e395 .. Syncronize VisualEditor: 0ee7352..e85e395 Change-Id: I1b759e756f2eee47c792ca709bb68261501485ac --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 0ee7352..e85e395 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0ee7352dc79708c603c5767f4cd62318fdb0466d +Subproject commit e85e395844d826952c9fa9a4f13bc3b49e07e2b6 -- To view, visit https://gerrit.wikimedia.org/r/212712 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1b759e756f2eee47c792ca709bb68261501485ac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0ee7352..e85e395 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/212712 Change subject: Syncronize VisualEditor: 0ee7352..e85e395 .. Syncronize VisualEditor: 0ee7352..e85e395 Change-Id: I1b759e756f2eee47c792ca709bb68261501485ac --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/12/212712/1 diff --git a/VisualEditor b/VisualEditor index 0ee7352..e85e395 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0ee7352dc79708c603c5767f4cd62318fdb0466d +Subproject commit e85e395844d826952c9fa9a4f13bc3b49e07e2b6 -- To view, visit https://gerrit.wikimedia.org/r/212712 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b759e756f2eee47c792ca709bb68261501485ac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Blank parameters should be preserved - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Blank parameters should be preserved
..
Blank parameters should be preserved
* The comment seems to think otherwise but that can't be true.
* Maybe that was the case in 2012 when it was added in
2195c31abff9319b951e149f048dcb0b27fcee9b but it certainly isn't
anymore.
Change-Id: Iba52b5a942e3c2d0b5573cf1620f2a035b3fa5a4
---
M lib/pegTokenizer.pegjs.txt
M tests/parserTests.txt
2 files changed, 20 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/pegTokenizer.pegjs.txt b/lib/pegTokenizer.pegjs.txt
index 47bcbdd..884ea52 100644
--- a/lib/pegTokenizer.pegjs.txt
+++ b/lib/pegTokenizer.pegjs.txt
@@ -728,8 +728,6 @@
template_param
= name:template_param_name
-// MW accepts |foo | = bar | as a single param..
-(p:'|' sp:space_or_newline* '=' { return [p, sp]; })?
val:(
kEndPos:({return peg$currPos;})
optionalSpaceToken
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index f89cd61..483461f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -119,6 +119,13 @@
!! endarticle
!! article
+Template:blank_param
+!! text
+{{{1}}}
+{{{}}}
+!! endarticle
+
+!! article
Template:table_attribs
!! text
noinclude
@@ -2738,6 +2745,19 @@
p about=#mwt1 typeof=mw:Transclusion
data-mw='{parts:[{template:{target:{wt:echo,href:./Template:Echo},params:{:{wt:foo}},i:0}}]}'{{{1}}}/p
!! end
+!! test
+Templates: Preserve blank parameter names in other positions
+!! wikitext
+{{blank_param|bar|=foo}}
+!! html/php
+pbar
+foo
+/p
+!! html/parsoid
+p about=#mwt1 typeof=mw:Transclusion
data-parsoid='{pi:[[{k:1,spc:[,,,]},{k:,named:true,spc:[,,,]}]]}'
data-mw='{parts:[{template:{target:{wt:blank_param,href:./Template:Blank_param},params:{1:{wt:bar},:{wt:foo}},i:0}}]}'bar
+foo/p
+!! end
+
###
### Parsoid-centric tests for testing RT edge cases for pre
###
--
To view, visit https://gerrit.wikimedia.org/r/212494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iba52b5a942e3c2d0b5573cf1620f2a035b3fa5a4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added '@group WikibaseQualityConstraints' to tests - change (mediawiki...WikidataQualityConstraints)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/212526 Change subject: Added '@group WikibaseQualityConstraints' to tests .. Added '@group WikibaseQualityConstraints' to tests Cherry-picked from v1 Change-Id: Ie1386c2353ceb47b556446f4b3528af529304b58 --- M tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php M tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php M tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php M tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php M tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php M tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php M tests/phpunit/Checker/QualifierChecker/QualifiersCheckerTest.php M tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php M tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php M tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php M tests/phpunit/Checker/TypeChecker/TypeCheckerHelperTest.php M tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php M tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/ValueCountCheckerHelperTest.php M tests/phpunit/ConstraintReportFactoryTest.php M tests/phpunit/ConstraintRepositoryTest.php M tests/phpunit/ConstraintTest.php M tests/phpunit/DelegatingConstraintCheckerTest.php M tests/phpunit/EvaluateConstraintReportJobServiceTest.php M tests/phpunit/Helper/ConstraintReportHelperTest.php M tests/phpunit/Maintenance/UpdateTableTest.php M tests/phpunit/Result/CheckResultTest.php M tests/phpunit/Specials/SpecialConstraintReportTest.php 31 files changed, 55 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints refs/changes/26/212526/1 diff --git a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php index b01000b..b433ea0 100755 --- a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php +++ b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php @@ -17,6 +17,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\CommonsLinkChecker * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintReportHelper * diff --git a/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php b/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php index 696fcf0..546eb8b 100755 --- a/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php @@ -17,6 +17,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\ConflictsWithChecker * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintReportHelper * diff --git a/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php b/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php index 11f02d7..7d93eb0 100755 --- a/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php @@ -16,6 +16,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConnectionCheckerHelper * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintReportHelper * diff --git a/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php b/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php index 14a153f..ba1a699 100755 --- a/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php @@ -19,6 +19,8 @@ /** * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\InverseChecker * + * @group WikibaseQualityConstraints + * * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult
[MediaWiki-commits] [Gerrit] config: Don't use MW domain names - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: config: Don't use MW domain names
..
config: Don't use MW domain names
* als - gsw
* bat-smg - sgs
* be-x-old - be-tarask
* crh - crh-latn
* fiu-vro - vro
* roa-rup - rup
* zh-classical - lzh
* zh-min-nan - nan
* zh-yue - yue
Change-Id: Icea4e74f50a97be090d5eafb7c25e0d0fdcd2bec
---
M config.defaults.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config.defaults.js b/config.defaults.js
index 3700355..78f574f 100644
--- a/config.defaults.js
+++ b/config.defaults.js
@@ -23,8 +23,8 @@
cert: null,
// Service registry
registry: {
- source: [ 'aa', 'ab', 'ace', 'af', 'ak', 'als', 'am', 'ang',
'an', 'arc', 'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar', 'bat-smg',
'ba', 'bcl', 'be-x-old', 'be', 'bg', 'bho', 'bi', 'bjn', 'bm', 'bn', 'bo',
'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ceb', 'ce', 'cho',
'chr', 'ch', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cs', 'cu', 'cv', 'cy',
'da', 'de', 'diq', 'dsb', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es',
'et', 'eu', 'ext', 'fa', 'ff', 'fiu-vro', 'fi', 'fj', 'fo', 'frp', 'frr', 'fr',
'fur', 'fy', 'gag', 'gan', 'ga', 'gd', 'glk', 'gl', 'gn', 'got', 'gu', 'gv',
'hak', 'ha', 'haw', 'he', 'hif', 'hi', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hy',
'hz', 'ia', 'id', 'ie', 'ig', 'ii', 'ik', 'ilo', 'io', 'is', 'it', 'iu', 'ja',
'jbo', 'jv', 'kaa', 'kab', 'ka', 'kbd', 'kg', 'ki', 'kj', 'kk', 'kl', 'km',
'kn', 'koi', 'ko', 'krc', 'kr', 'ksh', 'ks', 'ku', 'kv', 'kw', 'ky', 'lad',
'la', 'lbe', 'lb', 'lez', 'lg', 'lij', 'li', 'lmo', 'ln', 'lo', 'ltg', 'lt',
'lv', 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mh', 'min', 'mi', 'mk', 'ml',
'mn', 'mo', 'mrj', 'mr', 'ms', 'mt', 'mus', 'mwl', 'myv', 'my', 'mzn', 'nah',
'nap', 'na', 'nds-nl', 'nds', 'ne', 'new', 'ng', 'nl', 'nn', 'nov', 'no',
'nrm', 'nso', 'nv', 'ny', 'oc', 'om', 'or', 'os', 'pag', 'pam', 'pap', 'pa',
'pcd', 'pdc', 'pfl', 'pih', 'pi', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'qu',
'rm', 'rmy', 'rn', 'roa-rup', 'roa-tara', 'ro', 'rue', 'ru', 'rw', 'sah', 'sa',
'scn', 'sco', 'sc', 'sd', 'se', 'sg', 'sh', 'simple', 'si', 'sk', 'sl', 'sm',
'sn', 'so', 'sq', 'srn', 'sr', 'ss', 'stq', 'st', 'su', 'sv', 'sw', 'szl',
'ta', 'tet', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to', 'tpi', 'tr', 'ts',
'tt', 'tum', 'tw', 'tyv', 'ty', 'udm', 'ug', 'uk', 'ur', 'uz', 'vec', 'vep',
've', 'vi', 'vls', 'vo', 'war', 'wa', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi',
'yo', 'za', 'zea', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zh', 'zu' ],
- target: [ 'aa', 'ab', 'ace', 'af', 'ak', 'als', 'am', 'ang',
'an', 'arc', 'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar', 'bat-smg',
'ba', 'bcl', 'be-x-old', 'be', 'bg', 'bho', 'bi', 'bjn', 'bm', 'bn', 'bo',
'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ceb', 'ce', 'cho',
'chr', 'ch', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cs', 'cu', 'cv', 'cy',
'da', 'de', 'diq', 'dsb', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es',
'et', 'eu', 'ext', 'fa', 'ff', 'fiu-vro', 'fi', 'fj', 'fo', 'frp', 'frr', 'fr',
'fur', 'fy', 'gag', 'gan', 'ga', 'gd', 'glk', 'gl', 'gn', 'got', 'gu', 'gv',
'hak', 'ha', 'haw', 'he', 'hif', 'hi', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hy',
'hz', 'ia', 'id', 'ie', 'ig', 'ii', 'ik', 'ilo', 'io', 'is', 'it', 'iu', 'ja',
'jbo', 'jv', 'kaa', 'kab', 'ka', 'kbd', 'kg', 'ki', 'kj', 'kk', 'kl', 'km',
'kn', 'koi', 'ko', 'krc', 'kr', 'ksh', 'ks', 'ku', 'kv', 'kw', 'ky', 'lad',
'la', 'lbe', 'lb', 'lez', 'lg', 'lij', 'li', 'lmo', 'ln', 'lo', 'ltg', 'lt',
'lv', 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mh', 'min', 'mi', 'mk', 'ml',
'mn', 'mo', 'mrj', 'mr', 'ms', 'mt', 'mus', 'mwl', 'myv', 'my', 'mzn', 'nah',
'nap', 'na', 'nds-nl', 'nds', 'ne', 'new', 'ng', 'nl', 'nn', 'nov', 'no',
'nrm', 'nso', 'nv', 'ny', 'oc', 'om', 'or', 'os', 'pag', 'pam', 'pap', 'pa',
'pcd', 'pdc', 'pfl', 'pih', 'pi', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'qu',
'rm', 'rmy', 'rn', 'roa-rup', 'roa-tara', 'ro', 'rue', 'ru', 'rw', 'sah', 'sa',
'scn', 'sco', 'sc', 'sd', 'se', 'sg', 'sh', 'simple', 'si', 'sk', 'sl', 'sm',
'sn', 'so', 'sq', 'srn', 'sr', 'ss', 'stq', 'st', 'su', 'sv', 'sw', 'szl',
'ta', 'tet', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to', 'tpi', 'tr', 'ts',
'tt', 'tum', 'tw', 'tyv', 'ty', 'udm', 'ug', 'uk', 'ur', 'uz', 'vec', 'vep',
've', 'vi', 'vls', 'vo', 'war', 'wa', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi',
'yo', 'za', 'zea', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zh', 'zu' ],
+ source: [ 'aa', 'ab', 'ace', 'af', 'ak', 'am', 'ang', 'an',
'arc', 'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar', 'ba', 'bcl',
'be-tarask', 'be', 'bg', 'bho', 'bi', 'bjn', 'bm', 'bn', 'bo', 'bpy', 'br',
'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ceb', 'ce', 'cho', 'chr', 'ch',
'chy',
[MediaWiki-commits] [Gerrit] Update cxserver to 42366db - change (mediawiki...deploy)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/212533 Change subject: Update cxserver to 42366db .. Update cxserver to 42366db Changes: * 42366db Don't use MW domain names * 4d1392f cxserver should use valid language codes Change-Id: Ib44689db685053e4776567576b218774eddaec67 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy refs/changes/33/212533/1 diff --git a/src b/src index 737f574..42366db 16 --- a/src +++ b/src -Subproject commit 737f574678c666ac18b39227615240fa6474be27 +Subproject commit 42366db2008c25b80089a56a34639ebe018f2486 -- To view, visit https://gerrit.wikimedia.org/r/212533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib44689db685053e4776567576b218774eddaec67 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver/deploy Gerrit-Branch: master 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] Added '@group WikibaseQualityExternalValidation' to tests - change (mediawiki...WikidataQualityExternalValidation)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/212530 Change subject: Added '@group WikibaseQualityExternalValidation' to tests .. Added '@group WikibaseQualityExternalValidation' to tests Cherry-picked from v1 Change-Id: I3b04242aaf81abe435826845516e0d2eb8d2d738 --- M tests/phpunit/Api/CrossCheckTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerBaseTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php M tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php M tests/phpunit/CrossCheck/CrossCheckerTest.php M tests/phpunit/CrossCheck/ReferenceHandlerTest.php M tests/phpunit/CrossCheck/Result/CompareResultTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php M tests/phpunit/CrossCheck/Result/ReferenceResultTest.php M tests/phpunit/DumpMetaInformation/DumpMetaInformationRepoTest.php M tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php M tests/phpunit/EvaluateCrossCheckJobServiceTest.php M tests/phpunit/ExternalDataRepoTest.php M tests/phpunit/ExternalValidationFactoryTest.php M tests/phpunit/Serializer/CompareResultSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php M tests/phpunit/Serializer/IndexedTagsSerializerTest.php M tests/phpunit/Serializer/ReferenceResultSerializerTest.php M tests/phpunit/Serializer/SerializerBaseTest.php M tests/phpunit/Serializer/SerializerFactoryTest.php M tests/phpunit/Specials/SpecialCrossCheckTest.php M tests/phpunit/Specials/SpecialExternalDbsTest.php M tests/phpunit/UpdateTable/ImportContextTest.php M tests/phpunit/UpdateTable/UpdateTableTest.php 35 files changed, 199 insertions(+), 197 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation refs/changes/30/212530/1 diff --git a/tests/phpunit/Api/CrossCheckTest.php b/tests/phpunit/Api/CrossCheckTest.php index 074431c..a75368d 100755 --- a/tests/phpunit/Api/CrossCheckTest.php +++ b/tests/phpunit/Api/CrossCheckTest.php @@ -12,31 +12,31 @@ use Wikibase\Test\Api\WikibaseApiTestCase; /** - * @group WikidataQualityExternalValidation - * @group API - * @group Database - * @group medium + * @covers WikibaseQuality\ExternalValidation\Api\CrossCheck * - * @covers WikibaseQuality\ExternalValidation\Api\CrossCheck + * @group WikibaseQualityExternalValidation + * @group Database + * @group API + * @group medium * - * @uses WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation - * @usesWikibaseQuality\ExternalValidation\CrossCheck\CrossChecker - * @usesWikibaseQuality\ExternalValidation\CrossCheck\ReferenceHandler - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringValueComparer - * @usesWikibaseQuality\ExternalValidation\CrossCheck\Result\CompareResult - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Result\ReferenceResult - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultList - * @usesWikibaseQuality\ExternalValidation\Serializer\IndexedTagsSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\CompareResultSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\ReferenceResultSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\CrossCheckResultSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\CrossCheckResultListSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\DumpMetaInformationSerializer - * @usesWikibaseQuality\ExternalValidation\Serializer\SerializerFactory + * @uses WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation + * @uses WikibaseQuality\ExternalValidation\CrossCheck\CrossChecker + * @uses WikibaseQuality\ExternalValidation\CrossCheck\ReferenceHandler + * @uses WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer + * @uses WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringValueComparer + * @uses
[MediaWiki-commits] [Gerrit] [FEAT] tests: Automatic site attributes - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212534
Change subject: [FEAT] tests: Automatic site attributes
..
[FEAT] tests: Automatic site attributes
The SiteAttributeTestCase class automatically sets the attributes of
each site instance according to the sites defined (similar to how TestCase
itself set 'cls.site' if only one site is defined).
Change-Id: Ib680dd7cb0ccfd6b9a8b05991e64294da22d0e83
---
M tests/aspects.py
M tests/dry_api_tests.py
M tests/page_tests.py
3 files changed, 21 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/34/212534/1
diff --git a/tests/aspects.py b/tests/aspects.py
index c0a241c..ae29255 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -931,6 +931,19 @@
TestCase = six.add_metaclass(MetaTestCaseClass)(TestCase)
+class SiteAttributeTestCase(TestCase):
+
+Add the sites as attributes to the instances.
+
+@classmethod
+def setUpClass(cls):
+Add each initialized site as an attribute to cls.
+super(SiteAttributeTestCase, cls).setUpClass()
+for site in cls.sites:
+if 'site' in cls.sites[site]:
+setattr(cls, site, cls.sites[site]['site'])
+
+
class DefaultSiteTestCase(TestCase):
Run tests against the config specified site.
diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py
index ab80178..8d8701f 100644
--- a/tests/dry_api_tests.py
+++ b/tests/dry_api_tests.py
@@ -24,10 +24,12 @@
from tests import _images_dir
from tests.utils import DummySiteinfo
-from tests.aspects import unittest, TestCase, DefaultDrySiteTestCase
+from tests.aspects import (
+unittest, TestCase, DefaultDrySiteTestCase, SiteAttributeTestCase,
+)
-class DryCachedRequestTests(TestCase):
+class DryCachedRequestTests(SiteAttributeTestCase):
Test CachedRequest using real site objects.
@@ -46,8 +48,6 @@
def setUp(self):
super(DryCachedRequestTests, self).setUp()
-self.basesite = self.get_site('basesite')
-self.altsite = self.get_site('altsite')
self.parms = {'site': self.basesite,
'action': 'query',
'meta': 'userinfo'}
diff --git a/tests/page_tests.py b/tests/page_tests.py
index 202189f..c031da4 100644
--- a/tests/page_tests.py
+++ b/tests/page_tests.py
@@ -15,7 +15,9 @@
from pywikibot import InvalidTitle
import pywikibot.page
-from tests.aspects import unittest, TestCase, DefaultSiteTestCase
+from tests.aspects import (
+unittest, TestCase, DefaultSiteTestCase, SiteAttributeTestCase,
+)
from tests.utils import expected_failure_if
if sys.version_info[0] 2:
@@ -23,7 +25,7 @@
unicode = str
-class TestLinkObject(TestCase):
+class TestLinkObject(SiteAttributeTestCase):
Test cases for Link objects.
@@ -51,15 +53,6 @@
}
cached = True
-
-@classmethod
-def setUpClass(cls):
-super(TestLinkObject, cls).setUpClass()
-cls.enwiki = cls.get_site('enwiki')
-cls.frwiki = cls.get_site('frwiki')
-cls.itwikt = cls.get_site('itwikt')
-cls.enws = cls.get_site('enws')
-cls.itws = cls.get_site('itws')
namespaces = {0: [u],# en.wikipedia.org namespaces for testing
1: [uTalk:], # canonical form first, then others
--
To view, visit https://gerrit.wikimedia.org/r/212534
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib680dd7cb0ccfd6b9a8b05991e64294da22d0e83
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Browse: output articles in designated order - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Browse: output articles in designated order
..
Browse: output articles in designated order
Bug: T99104
Change-Id: Iaab75bb939c7889e456d8a9f9244472595261f03
---
M includes/specials/browse/SpecialTopicTag.php
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/browse/SpecialTopicTag.php
b/includes/specials/browse/SpecialTopicTag.php
index 1bb2909..82ee71d 100644
--- a/includes/specials/browse/SpecialTopicTag.php
+++ b/includes/specials/browse/SpecialTopicTag.php
@@ -82,12 +82,19 @@
$extract = $page['extract']['*'];
}
$item = new models\CollectionItem( $title,
$image, $extract );
- array_push( $collectionItems, $item );
+ $collectionItems[$page['pageid']] = $item;
+ }
+ }
+
+ $orderedCollectionItems = array();
+ foreach ( $pageIds as $id ) {
+ if ( isset( $collectionItems[$id] ) ) {
+ array_push( $orderedCollectionItems,
$collectionItems[$id] );
}
}
$collection = new models\Collection( null, $this-getUser() );
- $collection-batch( $collectionItems );
+ $collection-batch( $orderedCollectionItems );
$this-render( new views\Collection( $this-getUser(),
$collection ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/211038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaab75bb939c7889e456d8a9f9244472595261f03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
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 pointless getNativeData() call in isCountable() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid pointless getNativeData() call in isCountable()
..
Avoid pointless getNativeData() call in isCountable()
Change-Id: I40ed1972a8815de645d11217b35c1060d5007e5a
---
M includes/content/WikitextContent.php
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/content/WikitextContent.php
b/includes/content/WikitextContent.php
index dbe09f9..3b449b6 100644
--- a/includes/content/WikitextContent.php
+++ b/includes/content/WikitextContent.php
@@ -273,12 +273,11 @@
return false;
}
- $text = $this-getNativeData();
-
switch ( $wgArticleCountMethod ) {
case 'any':
return true;
case 'comma':
+ $text = $this-getNativeData();
return strpos( $text, ',' ) !== false;
case 'link':
if ( $hasLinks === null ) { # not known, find
out
--
To view, visit https://gerrit.wikimedia.org/r/212507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40ed1972a8815de645d11217b35c1060d5007e5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jackmcbarn jackmcb...@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] Alpha, Beta: Make banners center-aligned - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Alpha, Beta: Make banners center-aligned
..
Alpha, Beta: Make banners center-aligned
Bug: T98385
Change-Id: Ifd2ac8c036ef6e5099085be4e1a18e7405a2a60e
---
M includes/Resources.php
A less/tablet/hacks.beta.less
2 files changed, 18 insertions(+), 1 deletion(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 99335f8..530ef82 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -74,7 +74,8 @@
'skins.minerva.tablet.beta.styles' =
$wgMFResourceFileModuleBoilerplate + array(
'position' = 'top',
'styles' = array(
- 'less/tablet/common.beta.less'
+ 'less/tablet/common.beta.less',
+ 'less/tablet/hacks.beta.less',
),
),
'skins.minerva.tablet.alpha.styles' =
$wgMFResourceFileModuleBoilerplate + array(
diff --git a/less/tablet/hacks.beta.less b/less/tablet/hacks.beta.less
new file mode 100644
index 000..cf17f34
--- /dev/null
+++ b/less/tablet/hacks.beta.less
@@ -0,0 +1,16 @@
+@import minerva.variables;
+@import minerva.mixins;
+
+@media all and (min-width: @wgMFDeviceWidthTablet) {
+ .alpha,
+ .beta {
+ // banners inserted by other extensions, i.e. Zero
+ #mw-mf-page-center .mw-mf-banner {
+ max-width: @contentMaxWidthTablet;
+ margin: 0 auto;
+ padding: 0 @contentPaddingTablet;
+ // !important because Zero has an inline style
+ background-clip: content-box !important;
+ }
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/210616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd2ac8c036ef6e5099085be4e1a18e7405a2a60e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Alpha, Beta: Make overlays center-aligned - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Alpha, Beta: Make overlays center-aligned
..
Alpha, Beta: Make overlays center-aligned
Bug: T96327
Change-Id: Iab701bacec374e1deb0db1838e51b6f3fc713dc6
---
M resources/mobile.overlays/Overlay.less
1 file changed, 29 insertions(+), 0 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.overlays/Overlay.less
b/resources/mobile.overlays/Overlay.less
index c93d46f..d701a8e 100644
--- a/resources/mobile.overlays/Overlay.less
+++ b/resources/mobile.overlays/Overlay.less
@@ -1,5 +1,6 @@
@import minerva.variables;
@import minerva.mixins;
+@import mediawiki.ui/variables;
@contentHeaderBorderColor: #e2e2e2;
@@ -366,4 +367,32 @@
padding: 12px @contentPaddingTablet;
}
}
+
+ // The mobile.overlays module is a mess, cannot be refactored into
beta, alpha easily.
+ // FIXME: Move these rules into a separate file and load in beta only
+ .alpha,
+ .beta {
+ .overlay-header {
+ border-collapse: separate;
+ border-bottom: none;
+ }
+ .overlay-header-container {
+ border-bottom: 1px solid @grayLight;
+ }
+ .overlay-header,
+ .overlay-content {
+ max-width: @contentMaxWidthTablet;
+ margin: 0 auto;
+ padding: 0 @contentPaddingTablet;
+ }
+ .overlay-header .cancel,
+ .overlay-header .back {
+ // so that the icon image is aligned with the content
+ left: -@iconGutterWidth;
+ }
+ .overlay-header .clear {
+ // so that the icon image is aligned with the content
+ right: -@iconGutterWidth;
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/210612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab701bacec374e1deb0db1838e51b6f3fc713dc6
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] T97522: Add more documentation to OWL ontology - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: T97522: Add more documentation to OWL ontology .. T97522: Add more documentation to OWL ontology Change-Id: I4bdf702175322e6fe1aed2365168658ab05b7366 --- M docs/ontology.owl 1 file changed, 292 insertions(+), 2 deletions(-) Approvals: Daniel Kinzler: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/ontology.owl b/docs/ontology.owl index 92828b6..88e92ec 100644 --- a/docs/ontology.owl +++ b/docs/ontology.owl @@ -5,7 +5,7 @@ !ENTITY rdf http://www.w3.org/1999/02/22-rdf-syntax-ns#; !ENTITY rdfs http://www.w3.org/2000/01/rdf-schema#; !ENTITY owl http://www.w3.org/2002/07/owl#; - !ENTITY wikibase http://www.wikidata.org/ontology#; + !ENTITY wikibase http://wikiba.se/ontology#; ] rdf:RDF @@ -18,11 +18,301 @@ owl:Ontology rdf:about=wikibase; rdfs:labelWikibase system ontology/rdfs:label rdfs:commentThe system ontology of Wikibase, which is used to describe the user-created content./rdfs:comment +rdfs:seeAlso rdf:resource=https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format; / /owl:Ontology + + !-- + /// + // + // Classes + // + /// + -- + + owl:Class rdf:about=wikibase;Dump +rdfs:labelDump/rdfs:label +rdfs:commentA dump of wikidata content./rdfs:comment + /owl:Class + + owl:Class rdf:about=wikibase;Entity +rdfs:labelEntity/rdfs:label +rdfs:commentWikibase entity./rdfs:comment + /owl:Class + + owl:Class rdf:about=wikibase;Item +rdfs:labelItem/rdfs:label +rdfs:commentWikibase item./rdfs:comment +rdfs:subClassOf rdf:resource=wikibase;Entity/ + /owl:Class + + owl:Class rdf:about=wikibase;Property + rdfs:labelProperty/rdfs:label + rdfs:commentWikibase property./rdfs:comment + rdfs:subClassOf rdf:resource=wikibase;Entity/ + /owl:Class + owl:Class rdf:about=wikibase;Statement rdfs:labelStatement/rdfs:label rdfs:commentA reified statement./rdfs:comment /owl:Class -/rdf:RDF \ No newline at end of file + owl:Class rdf:about=wikibase;Reference +rdfs:labelReference/rdfs:label +rdfs:commentA reference to sources supporting the claim./rdfs:comment + /owl:Class + + owl:Class rdf:about=wikibase;Value +rdfs:labelValue/rdfs:label +rdfs:commentWikibase extended value./rdfs:comment + /owl:Class + + owl:Class rdf:about=wikibase;PropertyType +rdfs:labelPropertyType/rdfs:label +rdfs:commentType of a wikibase property./rdfs:comment + /owl:Class + + owl:Class rdf:about=wikibase;Rank +rdfs:labelRank/rdfs:label +rdfs:commentWikibase statement rank./rdfs:comment + /owl:Class + + !-- + /// + // + // Individuals + // + /// + -- + + owl:NamedIndividual rdf:about=wikibase;BestRank + rdfs:labelBestRank/rdfs:label + rdfs:commentThis rank marks statement that has the best rank for its property./rdfs:comment + rdf:type rdf:resource=wikibase;Rank/ + /owl:NamedIndividual + + owl:NamedIndividual rdf:about=wikibase;DeprecatedRank + rdfs:labelDeprecatedRank/rdfs:label + rdfs:commentDeprecated rank./rdfs:comment + rdf:type rdf:resource=wikibase;Rank/ + /owl:NamedIndividual + + owl:NamedIndividual rdf:about=wikibase;NormalRank + rdfs:labelNormalRank/rdfs:label + rdfs:commentNormal rank./rdfs:comment + rdf:type rdf:resource=wikibase;Rank/ + /owl:NamedIndividual + + owl:NamedIndividual rdf:about=wikibase;PreferredRank + rdfs:labelPreferredRank/rdfs:label + rdfs:commentPreferred rank./rdfs:comment + rdf:type rdf:resource=wikibase;Rank/ + /owl:NamedIndividual + + owl:NamedIndividual rdf:about=wikibase;CommonsMedia + rdfs:labelCommonsMedia/rdfs:label + rdfs:commentWikimedia Commons reference type./rdfs:comment + rdf:type rdf:resource=wikibase;PropertyType/ + /owl:NamedIndividual + + owl:NamedIndividual rdf:about=wikibase;Globecoordinate + rdfs:labelGlobecoordinate/rdfs:label + rdfs:commentCoordinate type./rdfs:comment + rdf:type rdf:resource=wikibase;PropertyType/ + /owl:NamedIndividual + + owl:NamedIndividual rdf:about=wikibase;Monolingualtext + rdfs:labelMonolingualtext/rdfs:label + rdfs:commentType for text in single language./rdfs:comment + rdf:type rdf:resource=wikibase;PropertyType/ + /owl:NamedIndividual + + owl:NamedIndividual rdf:about=wikibase;Quantity + rdfs:labelQuantity/rdfs:label + rdfs:commentType for numerical quantity./rdfs:comment + rdf:type rdf:resource=wikibase;PropertyType/ + /owl:NamedIndividual + + owl:NamedIndividual
[MediaWiki-commits] [Gerrit] Introduce ParserOutputDataUpdater class - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce ParserOutputDataUpdater class
..
Introduce ParserOutputDataUpdater class
This is for updating ParserOutput properties and extension
data (e.g wikibase_item for the connected item for a page)
that Wikibase sets in the client. The code is split off
from LangLinkHandler.
Bug: T98981
Change-Id: I7bee7412bd3ae6a8469950770bc617e91793d656
---
M client/includes/LangLinkHandler.php
A client/includes/ParserOutputDataUpdater.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/Hooks/ParserAfterParseHookHandlerTest.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
A client/tests/phpunit/includes/ParserOutputDataUpdaterTest.php
M client/tests/phpunit/includes/WikibaseClientTest.php
7 files changed, 371 insertions(+), 45 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/LangLinkHandler.php
b/client/includes/LangLinkHandler.php
index a9dc393..67c1e92 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -8,6 +8,7 @@
use Title;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
+use Wikibase\Client\ParserOutputDataUpdater;
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
@@ -27,11 +28,6 @@
* @author Katie Filbert aude.w...@gmail.com
*/
class LangLinkHandler {
-
- /**
-* @var OtherProjectsSidebarGeneratorFactory
-*/
- private $otherProjectsSidebarGeneratorFactory;
/**
* @var LanguageLinkBadgeDisplay
@@ -54,6 +50,11 @@
private $entityLookup;
/**
+* @var ParserOutputDataUpdater
+*/
+ private $parserOutputDataUpdater;
+
+ /**
* @var SiteStore
*/
private $siteStore;
@@ -69,30 +70,30 @@
private $siteGroup;
/**
-* @param OtherProjectsSidebarGeneratorFactory
$otherProjectsSidebarGeneratorFactory
* @param LanguageLinkBadgeDisplay $badgeDisplay
* @param NamespaceChecker $namespaceChecker determines which
namespaces wikibase is enabled on
* @param SiteLinkLookup $siteLinkLookup A site link lookup service
* @param EntityLookup $entityLookup An entity lookup service
+* @param ParserOutputDataUpdater $parserOutputDataUpdater
* @param SiteStore $sites
* @param string $siteId The global site ID for the local wiki
* @param string $siteGroup The ID of the site group to use for showing
language links.
*/
public function __construct(
- OtherProjectsSidebarGeneratorFactory
$otherProjectsSidebarGeneratorFactory,
LanguageLinkBadgeDisplay $badgeDisplay,
NamespaceChecker $namespaceChecker,
SiteLinkLookup $siteLinkLookup,
EntityLookup $entityLookup,
+ ParserOutputDataUpdater $parserOutputDataUpdater,
SiteStore $siteStore,
$siteId,
$siteGroup
) {
- $this-otherProjectsSidebarGeneratorFactory =
$otherProjectsSidebarGeneratorFactory;
$this-badgeDisplay = $badgeDisplay;
$this-namespaceChecker = $namespaceChecker;
$this-siteLinkLookup = $siteLinkLookup;
$this-entityLookup = $entityLookup;
+ $this-parserOutputDataUpdater = $parserOutputDataUpdater;
$this-siteStore = $siteStore;
$this-siteId = $siteId;
$this-siteGroup = $siteGroup;
@@ -110,7 +111,10 @@
public function getEntityLinks( Title $title ) {
$links = array();
- $itemId = $this-getItemIdForTitle( $title );
+ $itemId = $this-siteLinkLookup-getItemIdForLink(
+ $this-siteId,
+ $title-getFullText()
+ );
if ( $itemId !== null ) {
//NOTE: SiteLinks we could get from
$this-siteLinkLookup do not contain badges,
@@ -428,48 +432,21 @@
*
* @param Title $title
* @param ParserOutput $out
+*
+* @deprecated instead use ParserOutputDataUpdater::updateItemIdProperty
*/
public function updateItemIdProperty( Title $title, ParserOutput $out )
{
- $itemId = $this-getItemIdForTitle( $title );
-
- if ( $itemId ) {
- $out-setProperty( 'wikibase_item',
$itemId-getSerialization() );
-
- $usageAccumulator = new ParserOutputUsageAccumulator(
$out );
- $usageAccumulator-addSiteLinksUsage( $itemId );
- } else {
-
