diff options
-rw-r--r-- | config/routes/import.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/routes/import.rb b/config/routes/import.rb index cd7e1ee749f..da5c31d0062 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -1,11 +1,7 @@ # Alias import callbacks under the /users/auth endpoint so that # the OAuth2 callback URL can be restricted under http://example.com/users/auth # instead of http://example.com. -<<<<<<< HEAD Devise.omniauth_providers.map(&:downcase).each do |provider| -======= -Devise.omniauth_providers.each do |provider| ->>>>>>> dev/master next if provider == 'ldapmain' get "/users/auth/-/import/#{provider}/callback", to: "import/#{provider}#callback", as: "users_import_#{provider}_callback" |