diff --git a/config/routes.rb b/config/routes.rb index 2827c4cc771f3127e89495b2f9dc6d1b6c8397de..bcb237671f9cee454155ba3e2fe3ce4aabec74bd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,9 @@ Diaspora::Application.routes.draw do resources :requests, :except => [:edit, :update] resources :photos, :except => [:index] resources :albums - + + devise_for :users, :controllers => {:registrations => "registrations", + :password => "devise/passwords"} # added public route to user match 'public/:username', :to => 'users#public' resources :users, :except => [:create, :new, :show] @@ -31,7 +33,6 @@ Diaspora::Application.routes.draw do match 'set_profile_photo', :to => "dev_utilities#set_profile_photo" #routes for devise, not really sure you will need to mess with this in the future, lets put default, #non mutable stuff in anohter file - devise_for :users, :controllers => {:registrations => "registrations"} match 'login', :to => 'devise/sessions#new', :as => "new_user_session" match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session" match 'signup', :to => 'registrations#new', :as => "new_user_registration"