diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
| commit | b677983475513c78108406901fccd5cbe9604ca6 (patch) | |
| tree | f83b5e20930cbe1be890af41ea1d0c0d2ebf5e2e /app/views/matches/index.html.erb | |
| parent | 4e682a9a8596326a2d1faab6c44e5a54918c5ba0 (diff) | |
| parent | 1bfc0513fa113f5b4a61e89d74e42dd78ece44e7 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
Diffstat (limited to 'app/views/matches/index.html.erb')
| -rw-r--r-- | app/views/matches/index.html.erb | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb deleted file mode 100644 index d8122ac..0000000 --- a/app/views/matches/index.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -<h1>Listing matches</h1> - -<table> - <thead> - <tr> - <th>Tournament</th> - <th></th> - <th></th> - <th></th> - </tr> - </thead> - - <tbody> - <% @matches.each do |match| %> - <tr> - <td><%= match.tournament %></td> - <td><%= link_to 'Show', match %></td> - <td><%= link_to 'Edit', edit_match_path(match) %></td> - <td><%= link_to 'Destroy', match, method: :delete, data: { confirm: 'Are you sure?' } %></td> - </tr> - <% end %> - </tbody> -</table> - -<br> - -<%= link_to 'New Match', new_match_path %> |