diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
| commit | f8e9b0349b82278c8fb015037e901dd5a77e30e7 (patch) | |
| tree | c54eae2919f7d6a8532527ec4db7b33c26b71a71 /app/views/games/index.json.jbuilder | |
| parent | 8abfaf4ce71dff7294424a7cb37efe4db5e0d581 (diff) | |
| parent | e08e007a6c50e1959a29a9d18dec8c52146a233c (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.jbuilder | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/games/index.json.jbuilder b/app/views/games/index.json.jbuilder index 0e9769b..d196201 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, :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, :scoring_method json.url game_url(game, format: :json) end |