diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
| commit | 5f8baf6334f427506193ea8efd1356812468e191 (patch) | |
| tree | 216b749f9d589739eefa69e02122ed60654a2d9b /app/views/tournaments/index.json.jbuilder | |
| parent | 7bcd854443e368806cf1f4ece562c157db723d1a (diff) | |
| parent | c9f2abad7b9c967e23ed2b2867d426eb27f61387 (diff) | |
Merge branch 'clean'
Conflicts:
app/controllers/tournaments_controller.rb
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 df8eee4..e95c6a7 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, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :status + 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.url tournament_url(tournament, format: :json) end |