diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 18:53:04 -0500 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 18:53:04 -0500 |
| commit | aebb2153938d884ac2c2f3516f682c987b4805ca (patch) | |
| tree | 369b54c3b1f495ee7f54d06691c00f9ff26e3df5 /app/controllers | |
| parent | 66d5669dbcc042317ca5d10759276ea5813f7081 (diff) | |
| parent | 4cdd4e361ad691d524f9ee6163b40ef78d9938c4 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 25af8a1..9e539ac 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -13,12 +13,12 @@ class SessionsController < ApplicationController respond_to do |format| if @user && @user.authenticate(params[:session][:password]) sign_in @user - format.html { redirect_to root_path } + 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 |