diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
| commit | a683a208e31d5bafe7658521921f9f2c1a637418 (patch) | |
| tree | abf23ef14f584583973796b3da573c5061eb8533 /app/controllers/matches_controller.rb | |
| parent | aeda550c2ad04c9496a803b1d7f1d34a4566a9fe (diff) | |
| parent | d8acc6785ee41a2628cd0d59d91916b2f087290b (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/views/tournaments/show.html.erb
Diffstat (limited to 'app/controllers/matches_controller.rb')
| -rw-r--r-- | app/controllers/matches_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 1f0d964..b312e9e 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -72,6 +72,6 @@ class MatchesController < ApplicationController end # Never trust parameters from the scary internet, only allow the white list through. def match_params - params.require(:match).permit(:tournament_id, :name, :winner_id) + params.require(:match).permit(:status, :tournament_id, :name, :winner_id) end end |