diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-02 15:09:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-02 15:09:03 +0300 |
| commit | 6092dcc437ef3e9300cc32cb7c6daea9448cba40 (patch) | |
| tree | 7a93e011871915b658537ef4787b87633ada5178 /app/helpers/application_settings_helper.rb | |
| parent | 251d3d2b234a4b449edefec4ed8dcf9bc2f8be37 (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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 585d13279dd..804ba9090c2 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -167,7 +167,7 @@ module ApplicationSettingsHelper end def visible_attributes - [ + attributes = [ :abuse_notification_email, :after_sign_out_path, :after_sign_up_text, @@ -331,6 +331,9 @@ module ApplicationSettingsHelper :wiki_page_max_content_bytes, :container_registry_delete_tags_service_timeout ] + + attributes << :require_admin_approval_after_user_signup if Feature.enabled?(:admin_approval_for_new_user_signups) + attributes end def external_authorization_service_attributes |