From 9c6d349ebc826f8e27b5964bb69ee335b00018fc Mon Sep 17 00:00:00 2001 From: Supratik Das Date: Thu, 3 Sep 2020 01:01:11 +0530 Subject: [PATCH] cleanup(1415): remove leftout commit texts --- plugins/pipelines/update.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/plugins/pipelines/update.js b/plugins/pipelines/update.js index 68af06167..7ab3aafbb 100644 --- a/plugins/pipelines/update.js +++ b/plugins/pipelines/update.js @@ -45,14 +45,7 @@ module.exports = () => ({ security: [{ token: [] }] } }, -<<<<<<< HEAD handler: async (request, h) => { -======= - // eslint-disable-next-line max-statements - // eslint-disable-next-line max-lines-per-function - // eslint-disable-next-line max-statements - handler: (request, reply) => { ->>>>>>> 85389c2... fix(1415): Fix update-sync sequence in update pipeline const checkoutUrl = helper.formatCheckoutUrl(request.payload.checkoutUrl); const rootDir = helper.sanitizeRootDir(request.payload.rootDir); const { id } = request.params; @@ -150,7 +143,7 @@ module.exports = () => ({ const result = await updatedPipeline.sync(); - return reply(result.toJson()).code(200); + return h.response(result.toJson()).code(200); }); }) )