From 108d3765abe224b99084e4e01e58d219638757a6 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Tue, 14 Feb 2017 13:39:14 +0100 Subject: Simplify implementation of build retry service --- app/services/ci/retry_build_service.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/services/ci/retry_build_service.rb b/app/services/ci/retry_build_service.rb index 009fbeaff20..3ce7a092e72 100644 --- a/app/services/ci/retry_build_service.rb +++ b/app/services/ci/retry_build_service.rb @@ -1,9 +1,9 @@ module Ci class RetryBuildService < ::BaseService def execute(build) - # return unless build.retryable? + reprocess(build).tap do |new_build| + new_build.enqueue! - self.retry(build).tap do |new_build| MergeRequests::AddTodoWhenBuildFailsService .new(build.project, current_user) .close(new_build) @@ -13,12 +13,6 @@ module Ci end end - def retry(build) - self.reprocess(build).tap do |new_build| - new_build.enqueue! - end - end - def reprocess(build) unless can?(current_user, :update_build, build) raise Gitlab::Access::AccessDeniedError -- cgit v1.2.1