diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-04-23 21:47:34 -0400 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-04-23 21:47:34 -0400 |
commit | 8003c0f8326f231b6e0c8bb29feb48736271ea21 (patch) | |
tree | ec0fcef385cac365f6a0f2c3f348ef8a3d65d090 /app/views/games/show.json.jbuilder | |
parent | 8010bd28db76dd5783b2be046de4c63fa27738f6 (diff) | |
parent | cfa41fcc58acc9ae50b84eb51e3d9fa9ecb3b79e (diff) |
Merge branch 'clean2'
Conflicts:
app/models/game.rb
Diffstat (limited to 'app/views/games/show.json.jbuilder')
-rw-r--r-- | app/views/games/show.json.jbuilder | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/games/show.json.jbuilder b/app/views/games/show.json.jbuilder index 60d0a4a..087a156 100644 --- a/app/views/games/show.json.jbuilder +++ b/app/views/games/show.json.jbuilder @@ -1 +1 @@ -json.extract! @game, :id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :created_at, :updated_at +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, :created_at, :updated_at |