diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
| commit | 0c1299795a492e6296eb8e15bca576ea5139be6b (patch) | |
| tree | 3921daf8c26d656b12b20ee22be63c97fa20f6fa /app/controllers/sessions_controller.rb | |
| parent | 110d67f433c091a3b739c5bbebe110d963efaa73 (diff) | |
| parent | fe7d5ad458b4cabd8fd57b47f81abc56dd8532ad (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/controllers/sessions_controller.rb
app/views/sessions/new.html.erb
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 4bd69a5..7cb16e8 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -11,8 +11,8 @@ class SessionsController < ApplicationController # POST /sessions.json def create # find the user... - #find by email @user = User.find_by_email(params[:session][:username_or_email]) || User.find_by_user_name(params[:session][:username_or_email]) + #@session = Session.new(@user) # ... and create a new session respond_to do |format| |