diff --git a/app/models/repository.rb b/app/models/repository.rb index feaaacd02a974e307dc62e9d69331934685cfb66..063dc74021d5ce5f04a2b85bef9998980fb7aff5 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -162,18 +162,14 @@ class Repository tags.find { |tag| tag.name == name } end - def add_branch(user, branch_name, target, with_hooks: true) + def add_branch(user, branch_name, target) oldrev = Gitlab::Git::BLANK_SHA ref = Gitlab::Git::BRANCH_REF_PREFIX + branch_name target = commit(target).try(:id) return false unless target - if with_hooks - GitHooksService.new.execute(user, path_to_repo, oldrev, target, ref) do - update_ref!(ref, target, oldrev) - end - else + GitHooksService.new.execute(user, path_to_repo, oldrev, target, ref) do update_ref!(ref, target, oldrev) end diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb index 2d4c9788d02aebefa557e8dbfa581dc548e66e7c..1c82599c5793d3f92db2ba4d4ee502a0e3f3ab58 100644 --- a/app/services/commits/change_service.rb +++ b/app/services/commits/change_service.rb @@ -55,7 +55,7 @@ module Commits return success if repository.find_branch(new_branch) result = CreateBranchService.new(@project, current_user) - .execute(new_branch, @target_branch, source_project: @source_project, with_hooks: false) + .execute(new_branch, @target_branch, source_project: @source_project) if result[:status] == :error raise ChangeError, "There was an error creating the source branch: #{result[:message]}" diff --git a/app/services/create_branch_service.rb b/app/services/create_branch_service.rb index a6a3461e17b13452192f30112762a203c7e1debb..757fc35a78fdf54f0a6c58498c6f371dbf94b48e 100644 --- a/app/services/create_branch_service.rb +++ b/app/services/create_branch_service.rb @@ -1,7 +1,7 @@ require_relative 'base_service' class CreateBranchService < BaseService - def execute(branch_name, ref, source_project: @project, with_hooks: true) + def execute(branch_name, ref, source_project: @project) valid_branch = Gitlab::GitRefValidator.validate(branch_name) unless valid_branch @@ -26,7 +26,7 @@ class CreateBranchService < BaseService repository.find_branch(branch_name) else - repository.add_branch(current_user, branch_name, ref, with_hooks: with_hooks) + repository.add_branch(current_user, branch_name, ref) end if new_branch diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 1802b932e0365b13e9b2341c1e19007a888fa0b3..9bd4bd464f7940253aeb7fd48014fdae3ae22cb6 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -74,7 +74,7 @@ module Files end def create_target_branch - result = CreateBranchService.new(project, current_user).execute(@target_branch, @source_branch, source_project: @source_project, with_hooks: false) + result = CreateBranchService.new(project, current_user).execute(@target_branch, @source_branch, source_project: @source_project) unless result[:status] == :success raise_error("Something went wrong when we tried to create #{@target_branch} for you: #{result[:message]}")