From 18c41df5c140080bb913ff7e7f347c151bec3ae6 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@keylocation.sg>
Date: Mon, 11 Dec 2017 22:26:59 +0100
Subject: [PATCH] refactor: fix up config definitions (#1291)
- Remove duplicate autodiscover (fixes #1290)
- Remove npm.pin.automerge=true
---
docs/configuration.md | 2 +-
lib/config/definitions.js | 10 -----
.../__snapshots__/resolve.spec.js.snap | 37 -------------------
.../__snapshots__/branchify.spec.js.snap | 15 --------
4 files changed, 1 insertion(+), 63 deletions(-)
diff --git a/docs/configuration.md b/docs/configuration.md
index 1b9da6e5a4..5231c00a8b 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -760,7 +760,7 @@ location with this method.
<td>`npm`</td>
<td>Configuration object for npm package.json renovation</td>
<td>json</td>
- <td><pre>{"enabled": true, "pin": {"automerge": true}}</pre></td>
+ <td><pre>{"enabled": true}</pre></td>
<td>`RENOVATE_NPM`</td>
<td>`--npm`<td>
</tr>
diff --git a/lib/config/definitions.js b/lib/config/definitions.js
index 282966bcb8..298159bfc1 100644
--- a/lib/config/definitions.js
+++ b/lib/config/definitions.js
@@ -182,13 +182,6 @@ const options = [
type: 'boolean',
default: false,
},
- {
- name: 'autodiscover',
- description: 'Autodiscover all repositories',
- stage: 'repository',
- type: 'boolean',
- default: false,
- },
{
name: 'repositories',
description: 'List of Repositories',
@@ -643,9 +636,6 @@ const options = [
type: 'json',
default: {
enabled: true,
- pin: {
- automerge: true,
- },
},
mergeable: true,
},
diff --git a/test/manager/__snapshots__/resolve.spec.js.snap b/test/manager/__snapshots__/resolve.spec.js.snap
index 087589e85c..eccd91a557 100644
--- a/test/manager/__snapshots__/resolve.spec.js.snap
+++ b/test/manager/__snapshots__/resolve.spec.js.snap
@@ -417,9 +417,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
@@ -948,9 +945,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
@@ -964,9 +958,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
"npmrc": "npmrc",
"packageFile": "package.json",
"packageLock": "package-lock.json",
- "pin": Object {
- "automerge": true,
- },
"yarnLock": "yarn.lock",
"yarnrc": "yarnrc",
},
@@ -1489,9 +1480,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
@@ -1500,9 +1488,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
Object {
"enabled": true,
"packageFile": "package.js",
- "pin": Object {
- "automerge": true,
- },
},
Object {
"branchName": "{{branchPrefix}}docker-{{depNameSanitized}}-{{newVersionMajor}}.x",
@@ -1599,7 +1584,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"packageFile": "Dockerfile",
"pin": Object {
- "automerge": true,
"branchName": "{{branchPrefix}}docker-pin-{{depNameSanitized}}-{{currentTag}}",
"group": Object {
"prBody": "This Pull Request pins Dockerfiles to use image digests. For details on Renovate's Docker support, please visit https://renovateapp.com/docs/language-support/docker
@@ -1725,9 +1709,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
",
"enabled": true,
"packageFile": ".travis.yml",
- "pin": Object {
- "automerge": true,
- },
"prBody": "This Pull Request updates {{depName}} versions from \`{{currentVersions}}\` to \`{{newVersions}}\`. This is according to the configured node.js support policy \\"{{supportPolicy}}\\".
{{#if schedule}}
@@ -1772,9 +1753,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
"content": "# travis",
"enabled": true,
"packageFile": "WORKSPACE",
- "pin": Object {
- "automerge": true,
- },
},
],
"packageNames": Array [],
@@ -2295,9 +2273,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
@@ -2309,9 +2284,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
"enabled": true,
"errors": Array [],
"packageFile": "package.json",
- "pin": Object {
- "automerge": true,
- },
"warnings": Array [],
},
],
@@ -2833,9 +2805,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
@@ -3359,9 +3328,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
@@ -3894,9 +3860,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
diff --git a/test/workers/repository/updates/__snapshots__/branchify.spec.js.snap b/test/workers/repository/updates/__snapshots__/branchify.spec.js.snap
index 66aa73c8cf..5b837c21aa 100644
--- a/test/workers/repository/updates/__snapshots__/branchify.spec.js.snap
+++ b/test/workers/repository/updates/__snapshots__/branchify.spec.js.snap
@@ -461,9 +461,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
@@ -1024,9 +1021,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
@@ -1593,9 +1587,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
@@ -2150,9 +2141,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
@@ -2702,9 +2690,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"npm": Object {
"enabled": true,
- "pin": Object {
- "automerge": true,
- },
},
"npmrc": null,
"onboarding": true,
--
GitLab