diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:47:20 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:47:20 -0500 |
| commit | 706392b7c4520382ddd8f827b31205c6b71f5320 (patch) | |
| tree | 55444920bb49c5cc104e919737ebcda44eb45321 /app/views/tournaments/show.json.jbuilder | |
| parent | eebd00ba4692a6a285c9807705331ab924ce225f (diff) | |
| parent | d72452a5965c0df32a13053ae86bcd529fc0fc9e (diff) | |
Merge branch 'clean'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/teams/show.html.erb
app/views/tournaments/index.html.erb
config/routes.rb
Diffstat (limited to 'app/views/tournaments/show.json.jbuilder')
| -rw-r--r-- | app/views/tournaments/show.json.jbuilder | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder index 0fe65a6..7bedd4b 100644 --- a/app/views/tournaments/show.json.jbuilder +++ b/app/views/tournaments/show.json.jbuilder @@ -1 +1 @@ -json.extract! @tournament, :id, :game_id, :created_at, :updated_at +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, :created_at, :updated_at |