diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-26 03:09:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-26 03:09:35 +0300 |
| commit | 0c85feba3d97838ae9776c277da9f63521e98df9 (patch) | |
| tree | 8f9b711694a8c29c382c093a4022f8a2df3df835 /app/helpers/application_settings_helper.rb | |
| parent | 27852d1997e461079865ca6bd35145ed5cc5ccaf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 9245cc1cb1c..585d13279dd 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, @@ -345,6 +345,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 |