diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-04-17 16:55:55 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-04-17 16:55:55 +0300 |
| commit | b1d3090e5e54c27b72f2e189b88821403607a112 (patch) | |
| tree | dfb63e60771958d110fc731becb8e96847ff2519 | |
| parent | d9a15628b38d57271ff9ec2dd0ad54ae63860d5b (diff) | |
| download | gitlab-ce-b1d3090e5e54c27b72f2e189b88821403607a112.tar.gz | |
Fix conflict in app/controllers/admin/application_settings_controller.rb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 6923e304297..8958eab0423 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -56,22 +56,11 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController end def application_setting_params -<<<<<<< HEAD - import_sources = params[:application_setting][:import_sources] - if import_sources.nil? - params[:application_setting][:import_sources] = [] - else - import_sources.map! do |source| - source.to_str - end - end -======= params[:application_setting] ||= {} if params[:application_setting].key?(:enabled_oauth_sign_in_sources) enabled_oauth_sign_in_sources = params[:application_setting].delete(:enabled_oauth_sign_in_sources) enabled_oauth_sign_in_sources&.delete("") ->>>>>>> 37c8c97c22a... Merge branch 'dz-fix-admin-import-sources' into 'master' params[:application_setting][:disabled_oauth_sign_in_sources] = AuthHelper.button_based_providers.map(&:to_s) - |