summaryrefslogtreecommitdiff
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorTomer Kimia <tkimia@purdue.edu>2014-03-02 18:04:56 -0500
committerTomer Kimia <tkimia@purdue.edu>2014-03-02 18:04:56 -0500
commit5c863b2d55d41d836c906b55951cdc8658e959ed (patch)
treef1ab13415da88d09883483c6ab338b0a664ee9dd /app/controllers/users_controller.rb
parent9438f751c264c61088aabc6368e0aa7cee4d9aef (diff)
parent2426a2b1e5b6811f47f0a05dd66a001fdd117450 (diff)
"dont worry this merge is meaningless"
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f4e1499..74ab72c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3,6 +3,16 @@ class UsersController < ApplicationController
def new
end
+ def create
+ @user = User.new(user_params)
+ if @user.save
+ sign_in @user
+ #redirect_to @user
+ else
+ render 'new'
+ end
+ end
+
def show
@user = User.find(param[:id])
end