diff options
| author | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
| commit | 3e744e4e226eae3ea2f900d9fccc32b6c046d65f (patch) | |
| tree | 1b19232d08229b178c094c92e2242ce1686099ae /users/app/controllers/sessions_controller.rb | |
| parent | d9d67bd60d3fdfa4106977de9e5aba11f659fc79 (diff) | |
| parent | bf74255d1530fe5852dc6e6c27ef975ce9aa8d3c (diff) | |
Merge branch 'develop' into help_develop
Conflicts:
users/app/views/sessions/_nav.html.haml
Diffstat (limited to 'users/app/controllers/sessions_controller.rb')
| -rw-r--r-- | users/app/controllers/sessions_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb index 486f67e..bc910b5 100644 --- a/users/app/controllers/sessions_controller.rb +++ b/users/app/controllers/sessions_controller.rb @@ -3,7 +3,11 @@ class SessionsController < ApplicationController skip_before_filter :verify_authenticity_token def new - @errors = authentication_error + @session = Session.new + if authentication_errors + @errors = authentication_errors + render :status => 422 + end end def create |