diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
| commit | 031b31dfcc2b99836021d6e251c78a9fc339d444 (patch) | |
| tree | 4193ce7f3cd69f60a304e7d720baf943cf09da86 /app/controllers/matches_controller.rb | |
| parent | cd6b94cfc989800d65acc0fbceeebe35da5be4af (diff) | |
| parent | 0f2b05889cba090e4824f62965ee8d131da09973 (diff) | |
Settled Merge Conflicts.
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 b312e9e..53028a4 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(:status, :tournament_id, :name, :winner_id) + params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id) end end |