diff options
| author | Vladimir Shushlin <vshushlin@gitlab.com> | 2019-07-12 19:53:44 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-07-12 19:53:44 +0300 |
| commit | 7b5936ebdad8df646cbce7a9c035da62cac7cfce (patch) | |
| tree | a9810f2171b3a19045717ff487ff5b4bedde7561 /app/controllers | |
| parent | 66333bc78b200f5cfdd3fc47aa1ed52a0eb4220a (diff) | |
Remove auto ssl feature flags
* remove feature flag for admin settings
* remove feature flag for domain settings
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index a570da61d54..e9ec8876688 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -103,7 +103,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController [ *::ApplicationSettingsHelper.visible_attributes, *::ApplicationSettingsHelper.external_authorization_service_attributes, - *lets_encrypt_visible_attributes, + :lets_encrypt_notification_email, + :lets_encrypt_terms_of_service_accepted, :domain_blacklist_file, disabled_oauth_sign_in_sources: [], import_sources: [], @@ -143,13 +144,4 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController render action end - - def lets_encrypt_visible_attributes - return [] unless Feature.enabled?(:pages_auto_ssl) - - [ - :lets_encrypt_notification_email, - :lets_encrypt_terms_of_service_accepted - ] - end end |