summaryrefslogtreecommitdiff
path: root/app/views/tournaments/index.json.jbuilder
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-22 11:46:11 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-22 11:46:11 -0400
commitdb45b2441bd57a5e640b529ef6239c98a3030fe2 (patch)
treebcffce81e433821f6ddd9a6588b40ee1d5f84592 /app/views/tournaments/index.json.jbuilder
parent4aeaf0e41518695c3c6ba3b09025516f67b06a11 (diff)
parent474a048ae4a4fae86e7fde93745f0ea79c7ed717 (diff)
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/tournaments/index.json.jbuilder')
-rw-r--r--app/views/tournaments/index.json.jbuilder2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index 4038f04..7118ecc 100644
--- a/app/views/tournaments/index.json.jbuilder
+++ b/app/views/tournaments/index.json.jbuilder
@@ -1,4 +1,4 @@
json.array!(@tournaments) do |tournament|
- json.extract! tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams
+ json.extract! tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method
json.url tournament_url(tournament, format: :json)
end