diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-04 18:49:17 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-04 18:49:17 -0500 |
| commit | 4cdd4e361ad691d524f9ee6163b40ef78d9938c4 (patch) | |
| tree | c683bd04e772c1e90ea9792835a6cae811e09a3c /app/controllers/sessions_controller.rb | |
| parent | cde35e3461bf49a4b32aefca7b8556e344c8090e (diff) | |
| parent | 0329e2cee29367c82ef1b4ea5e8ab700f5d82bea (diff) | |
Merge branch 'master' of github.com:LukeShu/leager
Conflicts:
app/controllers/sessions_controller.rb
Diffstat (limited to 'app/controllers/sessions_controller.rb')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index c3ff395..9e539ac 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -15,10 +15,10 @@ class SessionsController < ApplicationController sign_in @user format.html { redirect_to root_path } else - format.html { render action: 'new' } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end + format.html { render action: 'new' } + format.json { render json: @user.errors, status: :unprocessable_entity } + end + end end # DELETE /sessions/current |