diff options
| author | Andrei Gliga <otzy_007@yahoo.com> | 2016-05-12 09:37:15 +0300 |
|---|---|---|
| committer | Andrei Gliga <otzy_007@yahoo.com> | 2016-05-12 13:44:46 +0300 |
| commit | b17cca1d9460a00510a2e9f04300f07cfb5eb95a (patch) | |
| tree | 8dd0d31ceac7ba90f89f337fa84634dfc7070954 /app/controllers | |
| parent | 8313476f5e1f1b51b3857ba065a65a707f5ca8af (diff) | |
| download | gitlab-ce-b17cca1d9460a00510a2e9f04300f07cfb5eb95a.tar.gz | |
delete the enabled_oauth_sign_in_sources after getting it's value into enabled_oauth_sign_in_sources
just delete enabled_oauth_sign_in_sources and get it's value
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index c3005602366..b9eb7ae7921 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -53,14 +53,12 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController end end - enabled_oauth_sign_in_sources = params[:application_setting][:enabled_oauth_sign_in_sources] + enabled_oauth_sign_in_sources = params[:application_setting].delete(:enabled_oauth_sign_in_sources) params[:application_setting][:disabled_oauth_sign_in_sources] = AuthHelper.button_based_providers.map(&:to_s) - Array(enabled_oauth_sign_in_sources) - params[:application_setting].delete(:enabled_oauth_sign_in_sources) - params.require(:application_setting).permit( :default_projects_limit, :default_branch_protection, |