diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-06-30 15:11:52 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-05 16:54:22 -0500 |
| commit | cb24650ab8558b716fce286afdde56737da9bbb4 (patch) | |
| tree | 2c73b4848107fa2b51e471e0c242c3de268fc1d1 /app/controllers/admin | |
| parent | 2e96fcff12a8944b1f9bd5179381094ed4498bd5 (diff) | |
| download | gitlab-ce-cb24650ab8558b716fce286afdde56737da9bbb4.tar.gz | |
Rebasing caused `enabled_git_access_protocol` to become plural. Fixed here.
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 51ae9264ed7..cbdf2859898 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -110,7 +110,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :send_user_confirmation_email, :container_registry_token_expire_delay, :repository_storage, - :enabled_git_access_protocols, + :enabled_git_access_protocol, restricted_visibility_levels: [], import_sources: [], disabled_oauth_sign_in_sources: [] |