summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Gliga <otzy_007@yahoo.com>2016-05-10 18:45:39 +0300
committerAndrei Gliga <otzy_007@yahoo.com>2016-05-12 13:44:46 +0300
commitab7f9c9ae1281857bef655a1af64774c628befa1 (patch)
treeed62b300ca601a0567809def0d839708c9514e67
parent9bfa74fcfe79c244fe4fd7d074b87bb22ba7971f (diff)
downloadgitlab-ce-ab7f9c9ae1281857bef655a1af64774c628befa1.tar.gz
Array(enabled_oauth_sign_in_sources) instead of the if
-rw-r--r--app/controllers/admin/application_settings_controller.rb2
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 a2dfed0b7a6..c3005602366 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -57,7 +57,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
params[:application_setting][:disabled_oauth_sign_in_sources] =
AuthHelper.button_based_providers.map(&:to_s) -
- (enabled_oauth_sign_in_sources.nil? ? [] : enabled_oauth_sign_in_sources)
+ Array(enabled_oauth_sign_in_sources)
params[:application_setting].delete(:enabled_oauth_sign_in_sources)