[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wdbuild: Add wikidata extensions to extension-list

2017-11-30 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394282 )

Change subject: wdbuild: Add wikidata extensions to extension-list
..


wdbuild: Add wikidata extensions to extension-list

Also removes the code adding a file from the build
to $wgExtensionEntryPointListFiles

Bug: T177060
Change-Id: Ie321c43f91c87bc6848afcbf8c685f0725810d22
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
3 files changed, 9 insertions(+), 14 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 93ab2d5..b529ac4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3136,11 +3136,6 @@
$wgWikiDiff2MovedParagraphDetectionCutoff = 25;
 }
 
-// XXX: T177060
-if ( $wmfRealm !== 'labs' ) {
-   $wgExtensionEntryPointListFiles[] = 
"$IP/extensions/Wikidata/extension-list-wikidata";
-}
-
 if ( $wmgUseCognate ) {
wfLoadExtension( 'Cognate' );
$wgCognateDb = 'cognate_' . $wmgUseCognate;
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 4b0bd29..3b78ade 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -4,6 +4,7 @@
 $IP/extensions/AntiSpoof/extension.json
 $IP/extensions/ApiFeatureUsage/extension.json
 $IP/extensions/ArticleCreationWorkflow/extension.json
+$IP/extensions/ArticlePlaceholder/ArticlePlaceholder.php
 $IP/extensions/Babel/extension.json
 $IP/extensions/BetaFeatures/extension.json
 $IP/extensions/BounceHandler/extension.json
@@ -108,6 +109,7 @@
 $IP/extensions/Poem/extension.json
 $IP/extensions/Popups/extension.json
 $IP/extensions/ProofreadPage/extension.json
+$IP/extensions/PropertySuggester/PropertySuggester.php
 $IP/extensions/PoolCounter/extension.json
 $IP/extensions/QuickSurveys/extension.json
 $IP/extensions/Quiz/extension.json
@@ -149,10 +151,16 @@
 $IP/extensions/UserMerge/extension.json
 $IP/extensions/VipsScaler/extension.json
 $IP/extensions/VisualEditor/extension.json
+$IP/extensions/Wikibase/client/WikibaseClient.php
+$IP/extensions/Wikibase/repo/Wikibase.php
+$IP/extensions/WikibaseQuality/WikibaseQuality.php
+$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php
+$IP/extensions/Wikidata.org/WikidataOrg.php
 $IP/extensions/WikidataPageBanner/extension.json
 $IP/extensions/WikiEditor/extension.json
 $IP/extensions/wikihiero/extension.json
 $IP/extensions/WikiLove/extension.json
+$IP/extensions/WikimediaBadges/extension.json
 $IP/extensions/WikimediaEvents/extension.json
 $IP/extensions/WikimediaIncubator/extension.json
 $IP/extensions/WikimediaMessages/extension.json
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 4e560b1..e61c08c 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -5,12 +5,4 @@
 $IP/extensions/PerformanceInspector/extension.json
 $IP/extensions/ReadingLists/extension.json
 $IP/extensions/Sentry/extension.json
-$IP/extensions/ArticlePlaceholder/ArticlePlaceholder.php
-$IP/extensions/PropertySuggester/PropertySuggester.php
-$IP/extensions/Wikibase/client/WikibaseClient.php
-$IP/extensions/Wikibase/repo/Wikibase.php
-$IP/extensions/Wikidata.org/WikidataOrg.php
-$IP/extensions/WikimediaBadges/extension.json
-$IP/extensions/WikibaseQuality/WikibaseQuality.php
-$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php
-$IP/extensions/Wikidata/extensions/Wikidata.credits.php
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie321c43f91c87bc6848afcbf8c685f0725810d22
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wdbuild: Add wikidata extensions to extension-list

2017-11-30 Thread Addshore (Code Review) 
Addshore has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394282 )

Change subject: wdbuild: Add wikidata extensions to extension-list
..

wdbuild: Add wikidata extensions to extension-list

Also removes the code adding a file from the build
to $wgExtensionEntryPointListFiles

Change-Id: Ie321c43f91c87bc6848afcbf8c685f0725810d22
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
3 files changed, 9 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/82/394282/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 93ab2d5..b529ac4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3136,11 +3136,6 @@
$wgWikiDiff2MovedParagraphDetectionCutoff = 25;
 }
 
-// XXX: T177060
-if ( $wmfRealm !== 'labs' ) {
-   $wgExtensionEntryPointListFiles[] = 
"$IP/extensions/Wikidata/extension-list-wikidata";
-}
-
 if ( $wmgUseCognate ) {
wfLoadExtension( 'Cognate' );
$wgCognateDb = 'cognate_' . $wmgUseCognate;
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 4b0bd29..3b78ade 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -4,6 +4,7 @@
 $IP/extensions/AntiSpoof/extension.json
 $IP/extensions/ApiFeatureUsage/extension.json
 $IP/extensions/ArticleCreationWorkflow/extension.json
+$IP/extensions/ArticlePlaceholder/ArticlePlaceholder.php
 $IP/extensions/Babel/extension.json
 $IP/extensions/BetaFeatures/extension.json
 $IP/extensions/BounceHandler/extension.json
@@ -108,6 +109,7 @@
 $IP/extensions/Poem/extension.json
 $IP/extensions/Popups/extension.json
 $IP/extensions/ProofreadPage/extension.json
+$IP/extensions/PropertySuggester/PropertySuggester.php
 $IP/extensions/PoolCounter/extension.json
 $IP/extensions/QuickSurveys/extension.json
 $IP/extensions/Quiz/extension.json
@@ -149,10 +151,16 @@
 $IP/extensions/UserMerge/extension.json
 $IP/extensions/VipsScaler/extension.json
 $IP/extensions/VisualEditor/extension.json
+$IP/extensions/Wikibase/client/WikibaseClient.php
+$IP/extensions/Wikibase/repo/Wikibase.php
+$IP/extensions/WikibaseQuality/WikibaseQuality.php
+$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php
+$IP/extensions/Wikidata.org/WikidataOrg.php
 $IP/extensions/WikidataPageBanner/extension.json
 $IP/extensions/WikiEditor/extension.json
 $IP/extensions/wikihiero/extension.json
 $IP/extensions/WikiLove/extension.json
+$IP/extensions/WikimediaBadges/extension.json
 $IP/extensions/WikimediaEvents/extension.json
 $IP/extensions/WikimediaIncubator/extension.json
 $IP/extensions/WikimediaMessages/extension.json
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 4e560b1..e61c08c 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -5,12 +5,4 @@
 $IP/extensions/PerformanceInspector/extension.json
 $IP/extensions/ReadingLists/extension.json
 $IP/extensions/Sentry/extension.json
-$IP/extensions/ArticlePlaceholder/ArticlePlaceholder.php
-$IP/extensions/PropertySuggester/PropertySuggester.php
-$IP/extensions/Wikibase/client/WikibaseClient.php
-$IP/extensions/Wikibase/repo/Wikibase.php
-$IP/extensions/Wikidata.org/WikidataOrg.php
-$IP/extensions/WikimediaBadges/extension.json
-$IP/extensions/WikibaseQuality/WikibaseQuality.php
-$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php
-$IP/extensions/Wikidata/extensions/Wikidata.credits.php
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie321c43f91c87bc6848afcbf8c685f0725810d22
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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