diff options
author | Vladimir Shushlin <v.shushlin@gmail.com> | 2019-06-13 14:37:45 +0300 |
---|---|---|
committer | Vladimir Shushlin <v.shushlin@gmail.com> | 2019-06-25 10:30:12 +0200 |
commit | 432f2bbc9cf64d53418c1eb9bb701254803a0e1e (patch) | |
tree | 6f93c0b6ecafcdcf7ca7f76d48b7a5afa2319204 /app/views/projects/pages_domains | |
parent | 3115c9fc121743dea29aa92a603a0c782eb3d75b (diff) | |
download | gitlab-ce-432f2bbc9cf64d53418c1eb9bb701254803a0e1e.tar.gz |
Use project depended feature flag for pages sslpages-ssl-project-aware-feature-flag
Also add ::Gitlab::LetsEncrypt.enabled? shortcut
and simplify it a lot
Diffstat (limited to 'app/views/projects/pages_domains')
-rw-r--r-- | app/views/projects/pages_domains/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/pages_domains/_form.html.haml b/app/views/projects/pages_domains/_form.html.haml index e7edb93f05b..5b657966909 100644 --- a/app/views/projects/pages_domains/_form.html.haml +++ b/app/views/projects/pages_domains/_form.html.haml @@ -11,7 +11,7 @@ - if Gitlab.config.pages.external_https - - auto_ssl_available = ::Gitlab::LetsEncrypt::Client.new.enabled? + - auto_ssl_available = ::Gitlab::LetsEncrypt.enabled?(@domain) - auto_ssl_enabled = @domain.auto_ssl_enabled? - auto_ssl_available_and_enabled = auto_ssl_available && auto_ssl_enabled |