BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251645
Change subject: Bump composer-merge-plugin to v1.3.0
......................................................................
Bump composer-merge-plugin to v1.3.0
Update composer-merge-plugin and enable the new feature of omitting
"require-dev" sections from merged files. This will help prevent
Composer package conflicts when used with extensions that have dev
requirements which are not reconcilable with those of MediaWiki itself.
Requires: I7453f68e671b9d519ec3f7dfaa22de6ec8f252e9
Change-Id: I768cf21c6601496e34f2b63199df04cbc0090145
---
M composer.json
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/45/251645/1
diff --git a/composer.json b/composer.json
index 78c23ce..1cdf813 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
"wikimedia/base-convert": "1.0.1",
"wikimedia/cdb": "1.3.0",
"wikimedia/cldr-plural-rule-parser": "1.0.0",
- "wikimedia/composer-merge-plugin": "1.2.1",
+ "wikimedia/composer-merge-plugin": "1.3.0",
"wikimedia/ip-set": "1.0.1",
"wikimedia/relpath": "1.0.3",
"wikimedia/running-stat": "1.1.0",
@@ -82,7 +82,8 @@
"merge-plugin": {
"include": [
"composer.local.json"
- ]
+ ],
+ "merge-dev": false
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/251645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I768cf21c6601496e34f2b63199df04cbc0090145
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
