diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 09:07:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 09:07:45 +0300 |
| commit | 6047d21a899cba25dfb554cca1776fed689dc951 (patch) | |
| tree | afc5785b2deb50393df933546c090f6568b38fe8 /lib/gitlab/ci/status | |
| parent | 9d01bd9d462eccffda96e5dcc1caeb8b86e0efe8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/status')
| -rw-r--r-- | lib/gitlab/ci/status/composite.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/ci/status/composite.rb b/lib/gitlab/ci/status/composite.rb index 5368e020a50..3b2da773102 100644 --- a/lib/gitlab/ci/status/composite.rb +++ b/lib/gitlab/ci/status/composite.rb @@ -95,11 +95,7 @@ module Gitlab end def any_skipped_or_ignored? - if ::Feature.enabled?(:ci_fix_pipeline_status_for_dag_needs_manual, @project, default_enabled: :yaml) - any_of?(:skipped) || any_of?(:ignored) - else - any_of?(:skipped) - end + any_of?(:skipped) || any_of?(:ignored) end def consume_all_statuses(all_statuses) |