Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge branch 'master' into feature-receive

Browse source 
Conflicts:
	app/helpers/finance/order_articles_helper.rb
This commit is contained in:
wvengen 2014-01-09 18:42:29 +01:00
commit b30b424540
26 changed files with 247 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/routes.rb
View file

@ -21,7 +21,7 @@ Foodsoft::Application.routes.draw do
get '/login/forgot_password' => 'login#forgot_password', as: :forgot_password
post '/login/reset_password' => 'login#reset_password', as: :reset_password
get '/login/new_password' => 'login#new_password', as: :new_password
get '/login/update_password' => 'login#update_password', as: :update_password
put '/login/update_password' => 'login#update_password', as: :update_password
match '/login/accept_invitation/:token' => 'login#accept_invitation', as: :accept_invitation
resources :sessions, :only => [:new, :create, :destroy]