diff options
author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
---|---|---|
committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
commit | a683a208e31d5bafe7658521921f9f2c1a637418 (patch) | |
tree | abf23ef14f584583973796b3da573c5061eb8533 /app/views/tournaments/index.json.jbuilder | |
parent | aeda550c2ad04c9496a803b1d7f1d34a4566a9fe (diff) | |
parent | d8acc6785ee41a2628cd0d59d91916b2f087290b (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/views/tournaments/show.html.erb
Diffstat (limited to 'app/views/tournaments/index.json.jbuilder')
-rw-r--r-- | app/views/tournaments/index.json.jbuilder | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder index e95c6a7..4038f04 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, :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, :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.url tournament_url(tournament, format: :json) end |