diff --git a/lib/config/default.js b/lib/config/default.js index 91ac5d98668e61707dcd0672f595e15cee011b60..028fed68157d78a519f616e0de8b90a293754b77 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 391f9443493c98949b2520098560ce2f935d1f2b..0c91d723598f312d2572f74ee5f6a2f55f2fcae3 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)