diff options
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 9245cc1cb1c..9c408efe8cd 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -168,7 +168,7 @@ module ApplicationSettingsHelper def visible_attributes [ - :admin_notification_email, + :abuse_notification_email, :after_sign_out_path, :after_sign_up_text, :akismet_api_key, @@ -230,6 +230,7 @@ module ApplicationSettingsHelper :hashed_storage_enabled, :help_page_hide_commercial_content, :help_page_support_url, + :help_page_documentation_base_url, :help_page_text, :hide_third_party_offers, :home_page_url, @@ -265,6 +266,7 @@ module ApplicationSettingsHelper :receive_max_input_size, :repository_checks_enabled, :repository_storages_weighted, + :require_admin_approval_after_user_signup, :require_two_factor_authentication, :restricted_visibility_levels, :rsa_key_restriction, @@ -345,6 +347,12 @@ module ApplicationSettingsHelper ] end + def deprecated_attributes + [ + :admin_notification_email # ok to remove in REST API v5 + ] + end + def expanded_by_default? Rails.env.test? end @@ -382,6 +390,10 @@ module ApplicationSettingsHelper Gitlab::CurrentSettings.self_monitoring_project&.full_path } end + + def show_documentation_base_url_field? + Feature.enabled?(:help_page_documentation_redirect) + end end ApplicationSettingsHelper.prepend_if_ee('EE::ApplicationSettingsHelper') |