diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
| commit | a683a208e31d5bafe7658521921f9f2c1a637418 (patch) | |
| tree | abf23ef14f584583973796b3da573c5061eb8533 /app/views/tournaments/index.html.erb | |
| parent | aeda550c2ad04c9496a803b1d7f1d34a4566a9fe (diff) | |
| parent | d8acc6785ee41a2628cd0d59d91916b2f087290b (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/views/tournaments/show.html.erb
Diffstat (limited to 'app/views/tournaments/index.html.erb')
| -rw-r--r-- | app/views/tournaments/index.html.erb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 7fb4a1d..90c3d7a 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -4,6 +4,7 @@ <table class="table table-hover"> <thead> <tr> + <th>Name</th> <th>Game</th> <th>Status</th> <th>Players per team</th> @@ -18,7 +19,7 @@ <tbody> <% @tournaments.each do |tournament| %> <tr> - <td><%= tournament.id %></td> + <td><%= tournament.name %></td> <td><% case tournament.status when 0 %> <%= form_tag(tournament_path(tournament), method: "put") do %> |