diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-29 03:49:54 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-29 03:49:54 -0400 |
| commit | 4f523f424cb41733c19754c5d4b538053d86ab74 (patch) | |
| tree | 55736af3a1ffe6494eb978be17f348b7e899630f /app/controllers | |
| parent | a3a72a54cc5742ffe82611fb87b3445c251d0676 (diff) | |
| parent | 4c5c8b978d6bc70811e95e6da5afd06ec7a2e27e (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/matches_controller.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/matches_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index d2dc918..e944983 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -88,7 +88,8 @@ class MatchesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def match_params - params.require(:match).permit(:status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations, :update_action) + params.require(:match).permit(:status, :tournament_stage_id, :winner_id) + params.require(:match).permit(:status, :tournament_stage_id, :winner_id) end # Turn of check_edit, since our #update is flexible |