Use project depended feature flag for pages ssl

Also add ::Gitlab::LetsEncrypt.enabled? shortcut
and simplify it a lot

1 files changed, 1 insertions, 9 deletions

diff --git a/lib/gitlab/lets_encrypt/client.rb b/lib/gitlab/lets_encrypt/client.rb
index 66aea137012..ad2921ed555 100644
--- a/lib/gitlab/lets_encrypt/client.rb
+++ b/lib/gitlab/lets_encrypt/client.rb
@@ -34,14 +34,6 @@ module Gitlab
         acme_client.terms_of_service
       end
 
-      def enabled?
-        return false unless Feature.enabled?(:pages_auto_ssl)
-
-        return false unless private_key
-
-        Gitlab::CurrentSettings.lets_encrypt_terms_of_service_accepted
-      end
-
       private
 
       def acme_client
@@ -65,7 +57,7 @@ module Gitlab
       end
 
       def ensure_account
-        raise 'Acme integration is disabled' unless enabled?
+        raise 'Acme integration is disabled' unless ::Gitlab::LetsEncrypt.enabled?
 
         @acme_account ||= acme_client.new_account(contact: contact, terms_of_service_agreed: true)
       end