diff options
author | Vladimir Shushlin <vshushlin@gitlab.com> | 2019-07-12 16:53:44 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-07-12 16:53:44 +0000 |
commit | 7b5936ebdad8df646cbce7a9c035da62cac7cfce (patch) | |
tree | a9810f2171b3a19045717ff487ff5b4bedde7561 /lib | |
parent | 66333bc78b200f5cfdd3fc47aa1ed52a0eb4220a (diff) | |
download | gitlab-ce-7b5936ebdad8df646cbce7a9c035da62cac7cfce.tar.gz |
Remove auto ssl feature flags
* remove feature flag for admin settings
* remove feature flag for domain settings
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/lets_encrypt.rb | 11 |
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 |