diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 12:08:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 12:08:46 +0300 |
| commit | b806264d29b8d52ccb78a41dcc3d67f2b040700c (patch) | |
| tree | af97e9d36b2c82520d6850836dee6ba8d7ed9b17 /app/helpers/application_settings_helper.rb | |
| parent | 34ab9be97ecf84dd2b7a3b8f3149c0f7d1d7ab5c (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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 66cb5d2bedb..0e14db6ddbf 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -284,7 +284,6 @@ module ApplicationSettingsHelper :unique_ips_limit_enabled, :unique_ips_limit_per_user, :unique_ips_limit_time_window, - :updating_name_disabled_for_users, :usage_ping_enabled, :instance_statistics_visibility_private, :user_default_external, |