diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-07 12:41:32 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-07 12:41:32 +0000 |
| commit | d08bf247bc2a99120498e939ba573f44e5f27f07 (patch) | |
| tree | 6fe348f4ffdc1b104374743a8e4a19621188e895 /app/models/project.rb | |
| parent | 2b5d5b107ccc852f498d226d05d276160fc30c5a (diff) | |
| parent | 5291c0bb51ae19109e09ff0ee7fca6f118288923 (diff) | |
| download | gitlab-ce-d08bf247bc2a99120498e939ba573f44e5f27f07.tar.gz | |
Merge branch '38175-add-domain-field-to-auto-devops-application-setting' into 'master'
Resolve "Add domain field to Auto DevOps application setting"
Closes #38175
See merge request gitlab-org/gitlab-ce!16604
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 34fb39dd28e..fd8917467e9 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1601,7 +1601,7 @@ class Project < ActiveRecord::Base def auto_devops_variables return [] unless auto_devops_enabled? - auto_devops&.variables || [] + (auto_devops || build_auto_devops)&.variables end def append_or_update_attribute(name, value) |