summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-07 04:18:09 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-07 04:18:09 -0400
commitb5f430fd59f7140722cc7940356c1de1ddd6f4d4 (patch)
tree44f8d8f62cd3535a897a28b5a99e8dfb917dc995 /app/controllers
parent26738698ae3a26c98d81a03309c150c7e38e3488 (diff)
parentc3af0f5b51dfe842ad9e4c5ea93e202e26e818ac (diff)
Merge branch 'clean2'
Conflicts: app/views/matches/index.html.erb app/views/matches/show.html.erb
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/matches_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 9e376f7..3c93eac 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -260,7 +260,7 @@ 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_id, :name, :winner_id, :remote_id)
+ params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations)
end
# Turn of check_edit, since our #update is flexible