Merge branch 'master' into luke

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/tournaments_controller.rb

1 files changed, 12 insertions, 9 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 82edae7..bcb45aa 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,6 +1,7 @@
 class UsersController < ApplicationController
 
 	# GET /users
+
 	# GET /users.json
 	def index
 		@users = User.all
@@ -23,15 +24,17 @@ class UsersController < ApplicationController
 	# POST /users
 	# POST /users.json
 	def create
-		@user = User.new(user_params)
-		respond_to do |format|
-			if @user.save
-				sign_in @user
-				format.html { redirect_to root_path, notice: 'User was successfully created.' }
-				format.json { render action: 'show', status: :created, location: @user }
-			else
-				format.html { render action: 'new', status: :unprocessable_entity }
-				format.json { render json: @user.errors, status: :unprocessable_entity }
+		if simple_captcha_valid?
+			@user = User.new(user_params)
+			respond_to do |format|
+				if @user.save
+					sign_in @user
+					format.html { redirect_to root_path, notice: 'User was successfully created.' }
+					format.json { render action: 'show', status: :created, location: @user }
+				else
+					format.html { render action: 'new', status: :unprocessable_entity }
+					format.json { render json: @user.errors, status: :unprocessable_entity }
+				end
 			end
 		end
 	end