diff options
Diffstat (limited to 'app/finders/ci/jobs_finder.rb')
| -rw-r--r-- | app/finders/ci/jobs_finder.rb | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/app/finders/ci/jobs_finder.rb b/app/finders/ci/jobs_finder.rb index 40c610f8209..78791d737da 100644 --- a/app/finders/ci/jobs_finder.rb +++ b/app/finders/ci/jobs_finder.rb @@ -25,11 +25,7 @@ module Ci attr_reader :current_user, :pipeline, :project, :params, :type def init_collection - if Feature.enabled?(:ci_jobs_finder_refactor, default_enabled: true) - pipeline_jobs || project_jobs || all_jobs - else - project ? project_builds : all_jobs - end + pipeline_jobs || project_jobs || all_jobs end def all_jobs @@ -38,12 +34,6 @@ module Ci type.all end - def project_builds - raise Gitlab::Access::AccessDeniedError unless can?(current_user, :read_build, project) - - project.builds.relevant - end - def project_jobs return unless project raise Gitlab::Access::AccessDeniedError unless can?(current_user, :read_build, project) @@ -59,9 +49,7 @@ module Ci end def filter_by_scope(builds) - if Feature.enabled?(:ci_jobs_finder_refactor, default_enabled: true) - return filter_by_statuses!(params[:scope], builds) if params[:scope].is_a?(Array) - end + return filter_by_statuses!(params[:scope], builds) if params[:scope].is_a?(Array) case params[:scope] when 'pending' |