diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 21:38:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 21:38:24 +0300 |
commit | 983a0bba5d2a042c4a3bbb22432ec192c7501d82 (patch) | |
tree | b153cd387c14ba23bd5a07514c7c01fddf6a78a0 /app/services/clusters/applications/base_service.rb | |
parent | a2bddee2cdb38673df0e004d5b32d9f77797de64 (diff) |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/services/clusters/applications/base_service.rb')
-rw-r--r-- | app/services/clusters/applications/base_service.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/services/clusters/applications/base_service.rb b/app/services/clusters/applications/base_service.rb index bd4ce693085..86b48b5228d 100644 --- a/app/services/clusters/applications/base_service.rb +++ b/app/services/clusters/applications/base_service.rb @@ -35,6 +35,18 @@ module Clusters application.modsecurity_mode = params[:modsecurity_mode] || 0 end + if application.has_attribute?(:host) + application.host = params[:host] + end + + if application.has_attribute?(:protocol) + application.protocol = params[:protocol] + end + + if application.has_attribute?(:port) + application.port = params[:port] + end + if application.respond_to?(:oauth_application) application.oauth_application = create_oauth_application(application, request) end |