diff --git a/lib/config/definitions.js b/lib/config/definitions.js
index ba46182ad685a2dca8acc1a62f11bbca590c51a3..7704aca8566d0042354c360e5e669e18581b84a0 100644
--- a/lib/config/definitions.js
+++ b/lib/config/definitions.js
@@ -413,7 +413,7 @@ const options = [
type: 'boolean',
},
{
- name: 'multipleMajorPrs',
+ name: 'separateMultipleMajor',
description:
'If set to true, PRs will be raised separately for each available major upgrade version',
stage: 'package',
diff --git a/lib/config/migration.js b/lib/config/migration.js
index 75955ea27a35492f427fab31c3dd398c300cf95a..ccf7f74af9cfeec0c4227cdea1ffbaa5fb678449 100644
--- a/lib/config/migration.js
+++ b/lib/config/migration.js
@@ -142,6 +142,10 @@ function migrateConfig(config) {
migratedConfig.major = migratedConfig.major || {};
migratedConfig.major.automerge = val == true; // eslint-disable-line eqeqeq
delete migratedConfig[key];
+ } else if (key === 'multipleMajorPrs') {
+ isMigrated = true;
+ delete migratedConfig.multipleMajorPrs;
+ migratedConfig.separateMultipleMajor = val;
} else if (key === 'automergePatch') {
isMigrated = true;
migratedConfig.patch = migratedConfig.patch || {};
diff --git a/lib/manager/docker/package.js b/lib/manager/docker/package.js
index 1bd05fd0236cb5d5a89e9e718b032996541dddfa..94189bcaa4918b788bd0780e2c1a2e3baf2dc2d4 100644
--- a/lib/manager/docker/package.js
+++ b/lib/manager/docker/package.js
@@ -102,7 +102,7 @@ async function getPackageUpdates(config) {
) {
// If we're not separating releases then we use a common lookup key
upgradeKey = 'latest';
- } else if (!config.multipleMajorPrs && type === 'major') {
+ } else if (!config.separateMultipleMajor && type === 'major') {
upgradeKey = 'major';
} else {
// Use major version as lookup key
diff --git a/lib/manager/npm/versions.js b/lib/manager/npm/versions.js
index 7e17b7648ce3e240bd47983348446aff7250a063..8258828a1217c71d71a63f5a76a2d2e7d8140fa5 100644
--- a/lib/manager/npm/versions.js
+++ b/lib/manager/npm/versions.js
@@ -182,7 +182,7 @@ function determineUpgrades(npmDep, config) {
) {
// If we're not separating releases then we use a common lookup key
upgradeKey = 'latest';
- } else if (!config.multipleMajorPrs && type === 'major') {
+ } else if (!config.separateMultipleMajor && type === 'major') {
upgradeKey = 'major';
} else if (type === 'patch') {
upgradeKey = `{{{newVersionMajor}}}.{{{newVersionMinor}}}`;
diff --git a/test/config/__snapshots__/index.spec.js.snap b/test/config/__snapshots__/index.spec.js.snap
index b3d948e7696c36745ad3fece7e42d70e8c4b0cf0..902106cc75560963485a34f15e1ea2fcd8d24610 100644
--- a/test/config/__snapshots__/index.spec.js.snap
+++ b/test/config/__snapshots__/index.spec.js.snap
@@ -141,7 +141,6 @@ Object {
},
"minor": Object {},
"mirrorMode": false,
- "multipleMajorPrs": false,
"node": Object {
"group": Object {
"commitMessageTopic": "Node.js",
@@ -209,6 +208,7 @@ Object {
"semanticCommitType": "chore",
"semanticCommits": null,
"separateMajorReleases": true,
+ "separateMultipleMajor": false,
"separatePatchReleases": true,
"statusCheckVerify": false,
"supportPolicy": Array [],
diff --git a/test/config/__snapshots__/migration.spec.js.snap b/test/config/__snapshots__/migration.spec.js.snap
index 6025070470a46ed8b2c401546e0fad015e3b3663..aa935e0fe198bc80b3b2f82f05619bcd0b73199f 100644
--- a/test/config/__snapshots__/migration.spec.js.snap
+++ b/test/config/__snapshots__/migration.spec.js.snap
@@ -117,6 +117,7 @@ Object {
"schedule": "on the first day of the month",
"semanticCommitScope": "deps",
"semanticCommitType": "fix",
+ "separateMultipleMajor": true,
"travis": Object {
"enabled": true,
},
diff --git a/test/config/migration.spec.js b/test/config/migration.spec.js
index 49c483c99ffe0cfa7947033908bd077df491c541..3b303d0639e635e8b5316dcad5a765d22c0b70d6 100644
--- a/test/config/migration.spec.js
+++ b/test/config/migration.spec.js
@@ -9,6 +9,7 @@ describe('config/migration', () => {
extends: [':js-app', 'config:library'],
maintainYarnLock: true,
onboarding: 'false',
+ multipleMajorPrs: true,
automerge: 'none',
automergeMajor: false,
automergeMinor: true,
diff --git a/test/manager/docker/package.spec.js b/test/manager/docker/package.spec.js
index 27be5fda9973d3e4a1357a7c015f967ef20a05f2..47c8474ac235db049d00b77b411bdc7a07f5b66d 100644
--- a/test/manager/docker/package.spec.js
+++ b/test/manager/docker/package.spec.js
@@ -94,7 +94,7 @@ describe('lib/manager/docker/package', () => {
config.major.automerge = false;
});
it('returns major and minor upgrades', async () => {
- config.multipleMajorPrs = true;
+ config.separateMultipleMajor = true;
dockerApi.getDigest.mockReturnValueOnce(config.currentDigest);
dockerApi.getDigest.mockReturnValueOnce('sha256:one');
dockerApi.getDigest.mockReturnValueOnce('sha256:two');
diff --git a/test/manager/npm/versions.spec.js b/test/manager/npm/versions.spec.js
index 16948c573d2b8068e4daf59ab62e9b76ef7d55a6..5f28a7fe083cdf748ce88a4d3305b009f0bdfa2c 100644
--- a/test/manager/npm/versions.spec.js
+++ b/test/manager/npm/versions.spec.js
@@ -353,7 +353,7 @@ describe('manager/npm/versions', () => {
});
it('should upgrade to two majors', () => {
config.currentVersion = '1.0.0';
- config.multipleMajorPrs = true;
+ config.separateMultipleMajor = true;
const res = versions.determineUpgrades(webpackJson, config);
expect(res).toHaveLength(3);
});
diff --git a/website/docs/configuration-options.md b/website/docs/configuration-options.md
index aa33e40d177b23a712ffa92470918d8a696ccc9f..83825233ba6ae8705618c263ff4c2de0f0c896d0 100644
--- a/website/docs/configuration-options.md
+++ b/website/docs/configuration-options.md
@@ -284,10 +284,6 @@ Set enabled to `true` to enable meteor package updating.
Add to this object if you wish to define rules that apply only to minor updates.
-## multipleMajorPrs
-
-Set this to true if you wish to receive one PR for every separate major version upgrade of a dependency. e.g. if you are on webpack@v1 currently then default behaviour is a PR for upgrading to webpack@v3 and not for webpack@v2. If this setting is true then you would get one PR for webpack@v2 and one for webpack@v3.
-
## node
Using this configuration option allows you to apply common configuration and policies across all Node.js version updates even if managed by different package managers (`npm`, `yarn`, etc.).
@@ -607,6 +603,10 @@ Renovate's default behaviour is to create a separate branch/PR if both minor and
It is recommended that you leave this setting to true, because of the polite way that Renovate handles this. For example, let's say in the above example that you decided you wouldn't update to Webpack 3 for a long time and don't want to build/test every time a new 3.x version arrives. In that case, simply close the "Update Webpack to version 3.x" PR and it _won't_ be recreated again even if subsequent Webpack 3.x versions are released. You can continue with Webpack 2.x for as long as you want and receive any updates/patches that are made for it. Then eventually when you do want to update to Webpack 3.x you can make that update to `package.json` yourself and commit it to master once it's tested. After that, Renovate will resume providing you updates to 3.x again! i.e. if you close a major upgrade PR then it won't come back again, but once you make the major upgrade yourself then Renovate will resume providing you with minor or patch updates.
+## separateMultipleMajor
+
+Set this to true if you wish to receive one PR for every separate major version upgrade of a dependency. e.g. if you are on webpack@v1 currently then default behaviour is a PR for upgrading to webpack@v3 and not for webpack@v2. If this setting is true then you would get one PR for webpack@v2 and one for webpack@v3.
+
## separatePatchReleases
By default, Renovate won't distinguish between "patch" (e.g. 1.0.x) and "minor" (e.g. 1.x.0) releases - groups them together. e.g. if you are running version 1.0.0 of a package and both versions 1.0.1 and 1.1.0 are available then Renovate will raise a single PR for version 1.1.0. If you wish to distinguish between patch and minor upgrades, for example if you wish to automerge patch but not minor, then you can set this option to `true`.