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/index.html.erb | |
| 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/index.html.erb')
| -rw-r--r-- | app/views/games/index.html.erb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index 79acd1e..abb0d8a 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -10,6 +10,7 @@ <th>Max teams per match</th> <th>Set rounds</th> <th>Randomized teams</th> + <th>Sampling method</th> <th></th> <th></th> <th></th> @@ -26,6 +27,7 @@ <td><%= game.max_teams_per_match %></td> <td><%= game.set_rounds %></td> <td><%= game.randomized_teams %></td> + <td><%= game.sampling_method %></td> <td><%= link_to 'Show', game %></td> <td><%= link_to 'Edit', edit_game_path(game) %></td> <td><%= link_to 'Destroy', game, method: :delete, data: { confirm: 'Are you sure?' } %></td> |