Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor

1 files changed, 2 insertions, 9 deletions

diff --git a/lib/gitlab/lets_encrypt.rb b/lib/gitlab/lets_encrypt.rb
index cdf24f24647..08ad2ab91b0 100644
--- a/lib/gitlab/lets_encrypt.rb
+++ b/lib/gitlab/lets_encrypt.rb
@@ -2,15 +2,8 @@
 
 module Gitlab
   module LetsEncrypt
-    def self.enabled?(pages_domain = nil)
-      return false unless Gitlab::CurrentSettings.lets_encrypt_terms_of_service_accepted
-
-      return false unless Feature.enabled?(:pages_auto_ssl)
-
-      # If no domain is passed, just check whether we're enabled globally
-      return true unless pages_domain
-
-      !!pages_domain.project && Feature.enabled?(:pages_auto_ssl_for_project, pages_domain.project)
+    def self.enabled?
+      Gitlab::CurrentSettings.lets_encrypt_terms_of_service_accepted
     end
   end
 end