diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-02-01 23:59:14 +0100 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-02-01 23:59:14 +0100 |
commit | e6487168ea1e0016a76e3e62f156990dd4412679 (patch) | |
tree | a8be6c33c094af653f91656225cb6beb62ad6487 /app/models/project.rb | |
parent | a31539847fd431e18053d0ea5a007dc38134b3f2 (diff) | |
download | gitlab-ce-e6487168ea1e0016a76e3e62f156990dd4412679.tar.gz |
Read the AutoDevOps instance domain in ProjectAutoDevOps
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index cbcf8b80e8e..ef67b86d3e8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1609,13 +1609,7 @@ class Project < ActiveRecord::Base def auto_devops_variables return [] unless auto_devops_enabled? - auto_devops&.variables || if current_application_settings.auto_devops_domain.present? - [{ key: 'AUTO_DEVOPS_DOMAIN', - value: current_application_settings.auto_devops_domain, - public: true }] - else - [] - end + (auto_devops || ProjectAutoDevops.new)&.variables end def append_or_update_attribute(name, value) |