Aude has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379521 )

Change subject: Remove require-dev (composer merge plugin)
......................................................................

Remove require-dev (composer merge plugin)

this isn't needed in the build. any additional components/extensions
can be installed as normal MediaWiki extensions outside the build.

Change-Id: I438d6d9de76a3a982fe806262994492b0e2d1b05
---
M composer.json
1 file changed, 0 insertions(+), 11 deletions(-)


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

diff --git a/composer.json b/composer.json
index 275a495..73a7c2c 100644
--- a/composer.json
+++ b/composer.json
@@ -40,9 +40,6 @@
         "wikibase/constraints": "dev-master",
         "wikibase/media-info": "dev-master"
     },
-    "require-dev": {
-        "wikimedia/composer-merge-plugin": "1.3.1"
-    },
     "autoload": {
         "psr-4": {
             "Wikidata\\": "src/"
@@ -59,13 +56,5 @@
         "optimize-autoloader": true,
         "classmap-authoritative": true,
         "preferred-install": "dist"
-    },
-    "extra": {
-        "merge-plugin": {
-            "include": [
-                "composer.local.json"
-            ],
-            "merge-dev": false
-        }
     }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I438d6d9de76a3a982fe806262994492b0e2d1b05
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/build-resources
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to