diff options
Diffstat (limited to 'app/finders/ci/jobs_finder.rb')
| -rw-r--r-- | app/finders/ci/jobs_finder.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/finders/ci/jobs_finder.rb b/app/finders/ci/jobs_finder.rb index 78791d737da..4408c9cdb6d 100644 --- a/app/finders/ci/jobs_finder.rb +++ b/app/finders/ci/jobs_finder.rb @@ -45,11 +45,12 @@ module Ci return unless pipeline raise Gitlab::Access::AccessDeniedError unless can?(current_user, :read_build, pipeline) - jobs_by_type(pipeline, type).latest + jobs_scope = jobs_by_type(pipeline, type) + params[:include_retried] ? jobs_scope : jobs_scope.latest end def filter_by_scope(builds) - return filter_by_statuses!(params[:scope], builds) if params[:scope].is_a?(Array) + return filter_by_statuses!(builds) if params[:scope].is_a?(Array) case params[:scope] when 'pending' @@ -63,7 +64,7 @@ module Ci end end - def filter_by_statuses!(statuses, builds) + def filter_by_statuses!(builds) unknown_statuses = params[:scope] - ::CommitStatus::AVAILABLE_STATUSES raise ArgumentError, 'Scope contains invalid value(s)' unless unknown_statuses.empty? |