[MediaWiki-commits] [Gerrit] Add ArticlePlaceholder to the build - change (wikidata/build-resources)

2016-02-04 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add ArticlePlaceholder to the build
..


Add ArticlePlaceholder to the build

PS: I think having this in the build will help to
keep it in sync with Wikibase (especially in terms
of deployments) when there are breaking changes in
Wikibase that affect ArticlePlaceholder.

Change-Id: Ic71af2a09428bf281c634ccd255399ddfa63ed2c
---
M Wikidata.localisation.php
M Wikidata.php
M composer.json
3 files changed, 7 insertions(+), 0 deletions(-)

Approvals:
  JanZerebecki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Wikidata.localisation.php b/Wikidata.localisation.php
index a0ce8b0..c9271c3 100644
--- a/Wikidata.localisation.php
+++ b/Wikidata.localisation.php
@@ -22,6 +22,7 @@
 require_once 
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
 require_once "$wgWikidataBaseDir/extensions/Quality/WikibaseQuality.php";
 require_once 
"$wgWikidataBaseDir/extensions/Constraints/WikibaseQualityConstraints.php";
+require_once 
"$wgWikidataBaseDir/extensions/ArticlePlaceholder/ArticlePlaceholder.php";
 
 $wgExtensionCredits['wikibase'][] = array(
'path' => __DIR__,
diff --git a/Wikidata.php b/Wikidata.php
index 23597f6..fa0f420 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -9,6 +9,7 @@
$wmgUseWikibaseClient = true;
$wmgUseWikibaseQuality = true;
$wmgUseWikibaseQualityExternalValidation = true;
+   $wmgUseArticlePlaceholder = true;
 }
 
 // no magic, use wmf configs instead to control which entry points to load
@@ -46,6 +47,10 @@
 
 if ( !empty( $wmgUseWikibaseClient ) ) {
include_once 
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
+
+   if ( !empty( $wmgUseArticlePlaceholder ) ) {
+   include_once 
"$wgWikidataBaseDir/extensions/ArticlePlaceholder/ArticlePlaceholder.php";
+   }
 }
 
 if ( file_exists(  __DIR__ . '/vendor/autoload.php' ) ) {
diff --git a/composer.json b/composer.json
index 6e34412..607a12e 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,7 @@
 ],
 "require": {
 "php": ">=5.3.0",
+"mediawiki/article-placeholder": "dev-master",
 "propertysuggester/property-suggester": "~2.4.2",
 "wikibase/wikibase": "dev-master",
 "wikibase/wikimedia-badges": "dev-master",

-- 
To view, visit https://gerrit.wikimedia.org/r/268396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic71af2a09428bf281c634ccd255399ddfa63ed2c
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/build-resources
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Lucie Kaffee 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add ArticlePlaceholder to the build - change (wikidata/build-resources)

2016-02-04 Thread Aude (Code Review) 
Aude has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/268396

Change subject: Add ArticlePlaceholder to the build
..

Add ArticlePlaceholder to the build

PS: I think having this in the build will help to
keep it in sync with Wikibase (especially in terms
of deployments) when there are breaking changes in
Wikibase that affect ArticlePlaceholder.

Change-Id: Ic71af2a09428bf281c634ccd255399ddfa63ed2c
---
M Wikidata.localisation.php
M Wikidata.php
M composer.json
3 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/build-resources 
refs/changes/96/268396/1

diff --git a/Wikidata.localisation.php b/Wikidata.localisation.php
index a0ce8b0..c9271c3 100644
--- a/Wikidata.localisation.php
+++ b/Wikidata.localisation.php
@@ -22,6 +22,7 @@
 require_once 
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
 require_once "$wgWikidataBaseDir/extensions/Quality/WikibaseQuality.php";
 require_once 
"$wgWikidataBaseDir/extensions/Constraints/WikibaseQualityConstraints.php";
+require_once 
"$wgWikidataBaseDir/extensions/ArticlePlaceholder/ArticlePlaceholder.php";
 
 $wgExtensionCredits['wikibase'][] = array(
'path' => __DIR__,
diff --git a/Wikidata.php b/Wikidata.php
index 23597f6..fa0f420 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -9,6 +9,7 @@
$wmgUseWikibaseClient = true;
$wmgUseWikibaseQuality = true;
$wmgUseWikibaseQualityExternalValidation = true;
+   $wmgUseArticlePlaceholder = true;
 }
 
 // no magic, use wmf configs instead to control which entry points to load
@@ -46,6 +47,10 @@
 
 if ( !empty( $wmgUseWikibaseClient ) ) {
include_once 
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
+
+   if ( !empty( $wmgUseArticlePlaceholder ) ) {
+   include_once 
"$wgWikidataBaseDir/extensions/ArticlePlaceholder/ArticlePlaceholder.php";
+   }
 }
 
 if ( file_exists(  __DIR__ . '/vendor/autoload.php' ) ) {
diff --git a/composer.json b/composer.json
index 6e34412..607a12e 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,7 @@
 ],
 "require": {
 "php": ">=5.3.0",
+"mediawiki/article-placeholder": "dev-master",
 "propertysuggester/property-suggester": "~2.4.2",
 "wikibase/wikibase": "dev-master",
 "wikibase/wikimedia-badges": "dev-master",

-- 
To view, visit https://gerrit.wikimedia.org/r/268396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic71af2a09428bf281c634ccd255399ddfa63ed2c
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/build-resources
Gerrit-Branch: master
Gerrit-Owner: Aude 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits