diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-29 19:57:17 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-29 19:57:17 +0000 |
commit | 37e3c3bb33c3d331fceb2840cf3c1d3c466dcfa9 (patch) | |
tree | 9d3739f627b491b42ede6424acd11b589beed25f /app/helpers | |
parent | b55baf593e63db9be3f446ea0cca0281a69dd2e2 (diff) | |
download | gitlab-ce-37e3c3bb33c3d331fceb2840cf3c1d3c466dcfa9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/application_settings_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index aa118a9bc45..ddaac37e7ed 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -262,7 +262,7 @@ module ApplicationSettingsHelper :login_recaptcha_protection_enabled, :receive_max_input_size, :repository_checks_enabled, - :repository_storages, + :repository_storages_weighted, :require_two_factor_authentication, :restricted_visibility_levels, :rsa_key_restriction, |