diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-11 18:08:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-11 18:08:46 +0300 |
| commit | 5fc3c77e2b08746bd39bfffae0c5918d63178433 (patch) | |
| tree | f6d8d49f2caa07da9c09dc3333849b4c39cc857d /app/models/concerns/enums | |
| parent | 9517d0eb2ca8bde02d7fae2173e0a43b67b2b9f5 (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 f1bc43a12d8..bb8df37f649 100644 --- a/app/models/concerns/enums/ci/pipeline.rb +++ b/app/models/concerns/enums/ci/pipeline.rb @@ -53,6 +53,10 @@ module Enums sources.except(*dangling_sources.keys) end + def self.ci_and_parent_sources + ci_sources.merge(sources.slice(:parent_pipeline)) + end + # Returns the `Hash` to use for creating the `config_sources` enum for # `Ci::Pipeline`. def self.config_sources |