Merge pull request #231 from WikiWorks/master

Removes DPL as submodule and installs DiscussionTools (#28)
waldronlab · Jul 7, 2024 · 667a688 · 667a688
2 parents db20381 + dbd19fe
commit 667a688
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -8,9 +8,6 @@
 [submodule "_resources/extensions/SemanticDependencyUpdater"]
 	path = _resources/extensions/SemanticDependencyUpdater
 	url = https://github.com/WikiTeq/SemanticDependencyUpdater.git
-[submodule "_resources/extensions/DynamicPageList3"]
-	path = _resources/extensions/DynamicPageList3
-	url = https://github.com/Universal-Omega/DynamicPageList3.git
 [submodule "_resources/extensions/CategoryLockdown"]
 	path = _resources/extensions/CategoryLockdown
 	url = https://github.com/wikimedia/mediawiki-extensions-CategoryLockdown.git

diff --git a/_resources/extensions/DynamicPageList3 b/_resources/extensions/DynamicPageList3
diff --git a/_settings/LocalSettings.php b/_settings/LocalSettings.php
@@ -429,3 +429,10 @@
 $wgHiddenPrefs[] = 'skin-responsive';
 $wgHiddenPrefs[] = 'skin-prefs';
 $wgHiddenPrefs[] = 'VectorSkinVersion'; // 1.35 Vector
+
+// WLDR-301 Install DiscussionTools
+wfLoadExtensions([
+    'VisualEditor',
+    'Linter',
+    'DiscussionTools'
+]);
diff --git a/compose.yml b/compose.yml
@@ -74,7 +74,6 @@ services:
             - ./_resources/extensions/CategoryLockdown:/var/www/mediawiki/w/extensions/CategoryLockdown
             - ./_resources/extensions/Echo_patched_MBSD-230:/var/www/mediawiki/w/extensions/Echo
             - ./_resources/extensions/DisplayTitle:/var/www/mediawiki/w/extensions/DisplayTitle # WLDR-366 TODO remove when merged
-            - ./_resources/extensions/DynamicPageList3:/var/www/mediawiki/w/extensions/DynamicPageList3
             - ./_resources/extensions/SubpageWatchlist:/var/www/mediawiki/w/extensions/SubpageWatchlist
             - ./_resources/extensions/SemanticScribunto:/var/www/mediawiki/w/extensions/SemanticScribunto
             - ./_resources/extensions/SemanticDependencyUpdater:/var/www/mediawiki/w/extensions/SemanticDependencyUpdater