From b068ad65975ca27cd2012e92818a98f7acba9446 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@keylocation.sg>
Date: Fri, 20 Jan 2017 13:55:27 +0100
Subject: [PATCH] Move all templates into config root
---
lib/config/default.js | 10 ++++------
lib/worker.js | 8 ++++----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/lib/config/default.js b/lib/config/default.js
index 91ac5d9866..028fed6815 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -5,12 +5,10 @@ module.exports = {
ignoreDeps: [],
assignees: [],
labels: [],
- templates: {
- branchName: 'renovate/{{depName}}-{{newVersionMajor}}.x',
- commitMessage: 'Update dependency {{depName}} to version {{newVersion}}',
- prTitle: '{{#if isPin}}Pin{{else}}Update{{/if}} dependency {{depName}} to version {{#if isMajor}}{{newVersionMajor}}.x{{else}}{{newVersion}}{{/if}}',
- prBody: 'This Pull Request updates dependency {{depName}} from version {{currentVersion}} to {{newVersion}}\n\n{{changelog}}',
- },
+ branchName: 'renovate/{{depName}}-{{newVersionMajor}}.x',
+ commitMessage: 'Update dependency {{depName}} to version {{newVersion}}',
+ prTitle: '{{#if isPin}}Pin{{else}}Update{{/if}} dependency {{depName}} to version {{#if isMajor}}{{newVersionMajor}}.x{{else}}{{newVersion}}{{/if}}',
+ prBody: 'This Pull Request updates dependency {{depName}} from version {{currentVersion}} to {{newVersion}}\n\n{{changelog}}',
ignoreFuture: true,
ignoreUnstable: true,
respectLatest: true,
diff --git a/lib/worker.js b/lib/worker.js
index 391f944349..0c91d72359 100644
--- a/lib/worker.js
+++ b/lib/worker.js
@@ -115,9 +115,9 @@ function updateDependency(upgrade) {
params.isMinor = true;
}
// Use templates to generate strings
- const branchName = handlebars.transform(config.templates.branchName, params);
- const commitMessage = handlebars.transform(config.templates.commitMessage, params);
- const prTitle = handlebars.transform(config.templates.prTitle, params);
+ const branchName = handlebars.transform(config.branchName, params);
+ const commitMessage = handlebars.transform(config.commitMessage, params);
+ const prTitle = handlebars.transform(config.prTitle, params);
return checkForUnmergeablePr()
.then(ensureBranch)
@@ -257,7 +257,7 @@ function updateDependency(upgrade) {
function ensurePr(upgradeWithChangeLog) {
logger.debug('Ensuring PR');
- const prBody = handlebars.transform(config.templates.prBody, upgradeWithChangeLog);
+ const prBody = handlebars.transform(config.prBody, upgradeWithChangeLog);
return github.getBranchPr(branchName)
.then(processExistingPr)
--
GitLab