Merge branch 'master' of https://github.com/LukeShu/leaguer

2 files changed, 4 insertions, 2 deletions

diff --git a/app/models/tournament_stage.rb b/app/models/tournament_stage.rb
index a3ee7df..d5a5211 100644
--- a/app/models/tournament_stage.rb
+++ b/app/models/tournament_stage.rb
@@ -17,9 +17,9 @@ class TournamentStage < ActiveRecord::Base
 		@scheduling.create_matches
 	end
 
-	def to_svg
+	def to_svg(current_user)
 		set_scheduling
-		return @scheduling.graph
+		return @scheduling.graph(current_user)
 	end
 
 	def pair
diff --git a/app/models/user.rb b/app/models/user.rb
index 57746b7..aacd7b1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -10,6 +10,8 @@ class User < ActiveRecord::Base
 
 	apply_simple_captcha
 
+	acts_as_messageable
+
 	before_save { self.email = email.downcase }
 	before_save { self.user_name = user_name }