X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..080b12330bc3045722a08989cfc6b85c85e3dc1a:/config/routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index c9563f8d4..f5b7e4e72 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -120,8 +120,8 @@ OpenStreetMap::Application.routes.draw do
   match "/user/:display_name/history" => "changeset#list", :via => :get
   match "/user/:display_name/history/feed" => "changeset#feed", :via => :get, :defaults => { :format => :atom }
   match "/user/:display_name/notes" => "notes#mine", :via => :get
-  match "/history/friends" => "changeset#list", :via => :get, :friends => true, :as => "friend_changesets"
-  match "/history/nearby" => "changeset#list", :via => :get, :nearby => true, :as => "nearby_changesets"
+  match "/history/friends" => "changeset#list", :via => :get, :friends => true, :as => "friend_changesets", :defaults => { :format => :html }
+  match "/history/nearby" => "changeset#list", :via => :get, :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html }
 
   get "/browse/way/:id",                :to => redirect(:path => "/way/%{id}")
   get "/browse/way/:id/history",        :to => redirect(:path => "/way/%{id}/history")
@@ -175,6 +175,11 @@ OpenStreetMap::Application.routes.draw do
   get "/create-account.html", :to => redirect(:path => "/user/new")
   get "/forgot-password.html", :to => redirect(:path => "/user/forgot-password")
 
+  # omniauth
+  match "/auth/failure" => "user#auth_failure", :via => :get
+  match "/auth/:provider/callback" => "user#auth_success", :via => [:get, :post], :as => :auth_success
+  match "/auth/:provider" => "user#auth", :via => [:get, :post], :as => :auth
+
   # permalink
   match "/go/:code" => "site#permalink", :via => :get, :code => /[a-zA-Z0-9_@~]+[=-]*/