From 691f1c496834078ba41209597558259d20790a0b Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 8 Dec 2016 15:31:42 +0800 Subject: [PATCH] Simply give result if result[:status] == :error --- app/services/create_branch_service.rb | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/app/services/create_branch_service.rb b/app/services/create_branch_service.rb index 076f976ed06..1b5e504573a 100644 --- a/app/services/create_branch_service.rb +++ b/app/services/create_branch_service.rb @@ -1,8 +1,9 @@ class CreateBranchService < BaseService def execute(branch_name, ref) - failure = validate_new_branch(branch_name) + result = ValidateNewBranchService.new(project, current_user). + execute(branch_name) - return failure if failure + return result if result[:status] == :error new_branch = repository.add_branch(current_user, branch_name, ref) @@ -18,13 +19,4 @@ class CreateBranchService < BaseService def success(branch) super().merge(branch: branch) end - - private - - def validate_new_branch(branch_name) - result = ValidateNewBranchService.new(project, current_user). - execute(branch_name) - - error(result[:message]) if result[:status] == :error - end end