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/matches/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/matches/index.html.erb')
| -rw-r--r-- | app/views/matches/index.html.erb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 60df1b5..d862d57 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -3,6 +3,7 @@ <table> <thead> <tr> + <th>Status</th> <th>Tournament</th> <th>Name</th> <th>Winner</th> @@ -16,6 +17,8 @@ <% @tournament.matches.each do |match| %> <tr> <td><%= match.tournament.id %></td> + <td><%= match.status %></td> + <td><%= match.tournament %></td> <td><%= match.name %></td> <td><%= match.winner %></td> <td><%= link_to 'Show', tournament_match_path(@tournament, match) %></td> |