diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
commit | 7d40d2ed8bd686b32ff9bc620936a72044a610bc (patch) | |
tree | 4e46ac6a1fca51e272837ef0d8f5921f3991e914 /app/controllers/games_controller.rb | |
parent | d3bee0f1ce0c5dc3fa741338bc6d9914e9e92787 (diff) | |
parent | 07476fd9a2b942e8d6056804bb1cdbd5e9a1c528 (diff) |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'app/controllers/games_controller.rb')
-rw-r--r-- | app/controllers/games_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index f18a5ad..1f0bdd8 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -67,6 +67,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, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_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, :sampling_method) end end |