diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
commit | 7d40d2ed8bd686b32ff9bc620936a72044a610bc (patch) | |
tree | 4e46ac6a1fca51e272837ef0d8f5921f3991e914 /app/views/games/show.json.jbuilder | |
parent | d3bee0f1ce0c5dc3fa741338bc6d9914e9e92787 (diff) | |
parent | 07476fd9a2b942e8d6056804bb1cdbd5e9a1c528 (diff) |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
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 e689e7b..60d0a4a 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, :created_at, :updated_at +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 |