Commit 9a3b09ad authored by Stan Hu's avatar Stan Hu

Resolve conflicts in config/routes/import.rb

parent de3bfd28
# Alias import callbacks under the /users/auth endpoint so that # Alias import callbacks under the /users/auth endpoint so that
# the OAuth2 callback URL can be restricted under http://example.com/users/auth # the OAuth2 callback URL can be restricted under http://example.com/users/auth
# instead of http://example.com. # instead of http://example.com.
<<<<<<< HEAD
Devise.omniauth_providers.map(&:downcase).each do |provider| Devise.omniauth_providers.map(&:downcase).each do |provider|
=======
Devise.omniauth_providers.each do |provider|
>>>>>>> dev/master
next if provider == 'ldapmain' next if provider == 'ldapmain'
get "/users/auth/-/import/#{provider}/callback", to: "import/#{provider}#callback", as: "users_import_#{provider}_callback" get "/users/auth/-/import/#{provider}/callback", to: "import/#{provider}#callback", as: "users_import_#{provider}_callback"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment