Resolve conflicts in config/routes/import.rb
This commit is contained in:
parent
de3bfd2848
commit
9a3b09ad4b
|
@ -1,11 +1,7 @@
|
||||||
# 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"
|
||||||
|
|
Loading…
Reference in New Issue