diff options
author | Azul <azul@riseup.net> | 2016-07-05 08:54:43 +0200 |
---|---|---|
committer | Azul <azul@riseup.net> | 2016-07-05 08:54:43 +0200 |
commit | 798c1240b59403b8d8de9559776718266b2ecba5 (patch) | |
tree | 74b53a8762710a76c4ca5d270b6ef9545dfca221 /config/routes.rb | |
parent | fcc8207f84249612eba719b8aa77cd7c51e5ad5a (diff) | |
parent | 30da8e6ffa1eefafb9762645efb85e0beed236c6 (diff) |
Merge remote-tracking branch 'pr/222' into merge-branch
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb index 7fbedf2..b152c9c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -44,8 +44,8 @@ LeapWeb::Application.routes.draw do get "login" => "sessions#new", :as => "login" delete "logout" => "sessions#destroy", :as => "logout" - get "signup" => "users#new", :as => "signup" - resources :users, :except => [:create, :update] do + get "signup" => "account#new", :as => "signup" + resources :users, :except => [:new, :create, :update] do # resource :email_settings, :only => [:edit, :update] # resources :email_aliases, :only => [:destroy], :id => /.*/ post 'deactivate', on: :member |