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

Conflicts:
	app/controllers/sessions_controller.rb
	app/views/sessions/new.html.erb

4 files changed, 4 insertions, 4 deletions

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 4ecff17..5780152 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -69,6 +69,6 @@ class GamesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def game_params
-      params.require(:game).permit(:name, :players_per_team, :teams_per_match, :set_rounds, :randomized_teams)
+      params.require(:game).permit(:name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams)
     end
 end
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|
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
index f14c97f..ccd6781 100644
--- a/app/controllers/teams_controller.rb
+++ b/app/controllers/teams_controller.rb
@@ -69,6 +69,6 @@ class TeamsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def team_params
-      params[:team]
+      params.require(:team).permit(:match_id)
     end
 end
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 1d17205..cf618aa 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -81,6 +81,6 @@ class TournamentsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def tournament_params
-      params.require(:tournament).permit(:game_id, :game)
+      params.require(:tournament).permit(:game, :game_id, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :status)
     end
 end