diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:31:47 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:31:47 -0500 |
| commit | 1ecd3d50d0ac73968362f885c9f60ec38253be9a (patch) | |
| tree | 324f79ad4d4da1af623fc93f215643287d6210f3 /app/controllers/matches_controller.rb | |
| parent | b2e0b1397596ee8f624ef4de122cc71599d4dc0d (diff) | |
| parent | c1f714a479eb7ca9e9125e283361a471dd928278 (diff) | |
Merge branch 'clean'
Conflicts:
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/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 f285c8e..986bb44 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) + params.require(:match).permit(:tournament_id, :name, :winner_id) end end |