diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-08 06:09:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-08 06:09:37 +0300 |
| commit | 1741eab29cacbe9bc0ada51f60496774eb177cc9 (patch) | |
| tree | a21755b25d99523dd443325d46b2c263932b411f /app/models/concerns/enums | |
| parent | b4ddc240452f468b7db1662c6cc36d15b9995030 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/enums')
| -rw-r--r-- | app/models/concerns/enums/ci/pipeline.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/concerns/enums/ci/pipeline.rb b/app/models/concerns/enums/ci/pipeline.rb index 28eb4c11746..a5706af0e52 100644 --- a/app/models/concerns/enums/ci/pipeline.rb +++ b/app/models/concerns/enums/ci/pipeline.rb @@ -54,6 +54,10 @@ module Enums sources.except(*dangling_sources.keys) end + def self.ci_branch_sources + ci_sources.except(:merge_request_event) + end + def self.ci_and_parent_sources ci_sources.merge(sources.slice(:parent_pipeline)) end |