Merge remote-tracking branch 'origin/master'

1 files changed, 1 insertions, 1 deletions

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index a9e91b0..2fc82ed 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -99,7 +99,7 @@ class TournamentsController < ApplicationController
 					format.html { redirect_to @tournament, notice: 'You have joined this tournament.' }
 					format.json { head :no_content }
 				else
-					format.html { render action: 'permission_denied', status: :forbidden }
+					format.html { redirect_to @tournament, notice: "You don't have permission to start this tournament." }
 					format.json { render json: "Permission denied", status: :forbidden }
 				end
 			end