diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2019-01-23 11:36:29 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2019-01-25 10:40:13 +0100 |
| commit | 8850da27c3a1db7611c856d937a8b93e6b969b86 (patch) | |
| tree | c1844a72b96fda17689ef9537148374951d0a2f4 /app/models | |
| parent | cd9409f003019819eb9b8e041d8fd645e222f23b (diff) | |
| download | gitlab-ce-8850da27c3a1db7611c856d937a8b93e6b969b86.tar.gz | |
Extract common `when` code between CI/CD processables
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/bridge.rb | 7 | ||||
| -rw-r--r-- | app/models/ci/build.rb | 4 | ||||
| -rw-r--r-- | app/models/concerns/ci/processable.rb | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/app/models/ci/bridge.rb b/app/models/ci/bridge.rb index 3c47e870238..5450d40ea95 100644 --- a/app/models/ci/bridge.rb +++ b/app/models/ci/bridge.rb @@ -37,13 +37,6 @@ module Ci false end - ## - # TODO we probably want to add support for `when` configuration. - # - def when - 'on_success' - end - def expanded_environment_name end diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 304588a417a..35cf4f8d277 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -639,10 +639,6 @@ module Ci super || project.try(:build_coverage_regex) end - def when - read_attribute(:when) || 'on_success' - end - def options read_metadata_attribute(:options, :config_options, {}) end diff --git a/app/models/concerns/ci/processable.rb b/app/models/concerns/ci/processable.rb index e112bae7d42..1c78b1413a8 100644 --- a/app/models/concerns/ci/processable.rb +++ b/app/models/concerns/ci/processable.rb @@ -17,7 +17,7 @@ module Ci end def when - raise NotImplementedError + read_attribute(:when) || 'on_success' end def expanded_environment_name |