summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-03-25 17:56:25 -0400
committerguntasgrewal <guntasgrewal@gmail.com>2014-03-25 17:56:25 -0400
commitd8acc6785ee41a2628cd0d59d91916b2f087290b (patch)
treebdc6343b90c3ce6015f8c81bf06a250cb9580133 /app/controllers
parent53b4f8028fc987b0cf26a7a073fec7064b4b6d8a (diff)
parent433fc302fe2943e89a36657affea39d578475d20 (diff)
Adding match status after solving conflicts
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 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