summaryrefslogtreecommitdiff
path: root/app/views/games/index.json.jbuilder
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-04-27 13:30:07 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-04-27 13:30:07 -0400
commit8c1d3841142f06752cca7b521f420d2838928223 (patch)
tree8281b59d3c241861bb610cb912cc4779bdc2d338 /app/views/games/index.json.jbuilder
parenteacf4fcc2a45142cd865795f35d65341dfe665ad (diff)
parent9a8d6814511ce257241a03b5763430294ed3e381 (diff)
Merge branch 'clean2'
Conflicts: app/controllers/tournaments_controller.rb app/views/tournaments/_form.html.erb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb
Diffstat (limited to 'app/views/games/index.json.jbuilder')
-rw-r--r--app/views/games/index.json.jbuilder2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/games/index.json.jbuilder b/app/views/games/index.json.jbuilder
index 7964f2c..0e9769b 100644
--- a/app/views/games/index.json.jbuilder
+++ b/app/views/games/index.json.jbuilder
@@ -1,4 +1,4 @@
json.array!(@games) do |game|
- json.extract! game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method
+ json.extract! game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :sampling_method, :scoring_method
json.url game_url(game, format: :json)
end