From 432f2bbc9cf64d53418c1eb9bb701254803a0e1e Mon Sep 17 00:00:00 2001 From: Vladimir Shushlin Date: Thu, 13 Jun 2019 14:37:45 +0300 Subject: Use project depended feature flag for pages ssl Also add ::Gitlab::LetsEncrypt.enabled? shortcut and simplify it a lot --- app/views/projects/pages_domains/_form.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') 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 -- cgit v1.2.1