jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342306 )
Change subject: New Wikidata Build - 2017-03-11T10:00:01+0000
......................................................................
New Wikidata Build - 2017-03-11T10:00:01+0000
Change-Id: I2a8ccab49f7c05fbad442a22cfc54897b6247a39
---
M composer.lock
M extensions/Wikibase/Gemfile
M
extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
M extensions/Wikibase/repo/includes/Rdf/EntityRdfBuilderFactory.php
M vendor/composer/installed.json
5 files changed, 10 insertions(+), 14 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 8beffb0..af326b2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1549,12 +1549,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "a6f8ad40047b7c47f79d5408fe80b352682b5e9b"
+ "reference": "afe10a570a41b9eea6236a6a4ffcb6325aa2b3b4"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/a6f8ad40047b7c47f79d5408fe80b352682b5e9b";,
- "reference": "a6f8ad40047b7c47f79d5408fe80b352682b5e9b",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/afe10a570a41b9eea6236a6a4ffcb6325aa2b3b4";,
+ "reference": "afe10a570a41b9eea6236a6a4ffcb6325aa2b3b4",
"shasum": ""
},
"require": {
@@ -1628,7 +1628,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2017-03-10 09:38:26"
+ "time": "2017-03-10 22:43:36"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/Gemfile b/extensions/Wikibase/Gemfile
index 80c8b61..37f232a 100644
--- a/extensions/Wikibase/Gemfile
+++ b/extensions/Wikibase/Gemfile
@@ -1,6 +1,3 @@
-# ruby=ruby-2.1.1
-# ruby-gemset=Wikibase
-
source 'https://rubygems.org'
gem 'activesupport', '~> 4.2', '>= 4.2.6'
diff --git
a/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
b/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
index b977b21..55460ba 100644
---
a/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
+++
b/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
@@ -191,8 +191,6 @@
* @return array
*/
public function addWikibaseConditions( array &$conds, FormOptions $opts
) {
- // do not include wikibase changes for activated enhanced
watchlist
- // since we do not support that format yet
if ( $this->shouldHideWikibaseChanges( $opts ) ) {
$dbr = $this->loadBalancer->getConnection( DB_REPLICA );
$conds[] = 'rc_source != ' . $dbr->addQuotes(
RecentChangeFactory::SRC_WIKIBASE );
@@ -225,6 +223,8 @@
* @return bool
*/
private function hasWikibaseChangesEnabled() {
+ // do not include wikibase changes for activated enhanced
watchlist
+ // since we do not support that format yet (T46222)
return $this->showExternalChanges &&
!$this->isEnhancedChangesEnabled();
}
diff --git a/extensions/Wikibase/repo/includes/Rdf/EntityRdfBuilderFactory.php
b/extensions/Wikibase/repo/includes/Rdf/EntityRdfBuilderFactory.php
index 888835e..ae69c5f 100644
--- a/extensions/Wikibase/repo/includes/Rdf/EntityRdfBuilderFactory.php
+++ b/extensions/Wikibase/repo/includes/Rdf/EntityRdfBuilderFactory.php
@@ -77,7 +77,6 @@
$builders = [];
foreach ( $this->factoryCallbacks as $key => $callback ) {
-
$builders[$key] = call_user_func(
$callback,
$flavorFlags,
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b40bae2..8bc8196 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1350,12 +1350,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "a6f8ad40047b7c47f79d5408fe80b352682b5e9b"
+ "reference": "afe10a570a41b9eea6236a6a4ffcb6325aa2b3b4"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/a6f8ad40047b7c47f79d5408fe80b352682b5e9b";,
- "reference": "a6f8ad40047b7c47f79d5408fe80b352682b5e9b",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/afe10a570a41b9eea6236a6a4ffcb6325aa2b3b4";,
+ "reference": "afe10a570a41b9eea6236a6a4ffcb6325aa2b3b4",
"shasum": ""
},
"require": {
@@ -1387,7 +1387,7 @@
"jakub-onderka/php-parallel-lint": ">=0.3 <0.10",
"mediawiki/mediawiki-codesniffer": ">=0.4 <0.8"
},
- "time": "2017-03-10 09:38:26",
+ "time": "2017-03-10 22:43:36",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/342306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a8ccab49f7c05fbad442a22cfc54897b6247a39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
