diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-05 19:53:41 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-05 19:53:41 +0300 |
| commit | 9a3b09ad4b7fda11afeacdfb947c91c18347e503 (patch) | |
| tree | acbcfd2d6a1b701eb3a4fb337b9902ceefa62405 | |
| parent | de3bfd284891cbfbb6260d43fcae4bf7ee13b3e9 (diff) | |
Resolve conflicts in config/routes/import.rb
| -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" |