diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-27 23:05:31 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-27 23:05:31 -0400 |
| commit | deaf1f5db268b8fd2ff1838e461c8142d3882dc8 (patch) | |
| tree | edaa5f8da18649aa7abdf5467d704b4792c74f89 /app/controllers/sessions_controller.rb | |
| parent | 17169088974477c2702377a5ea3e14afff62e009 (diff) | |
| parent | 2d7313767442956eab00671ac555c0ce4e583b5f (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers/sessions_controller.rb')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index a0390ad..9f0a8e3 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -18,7 +18,7 @@ class SessionsController < ApplicationController if @user && @user.authenticate(params[:session][:password]) sign_in @user format.html { redirect_to root_path } - #format.json { #TODO } + #format.json { # TODO } else format.html { render action: 'new' } format.json { render json: @user.errors, status: :unprocessable_entity } |