diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
| commit | 5f8baf6334f427506193ea8efd1356812468e191 (patch) | |
| tree | 216b749f9d589739eefa69e02122ed60654a2d9b /app/views/tournaments/show.html.erb | |
| parent | 7bcd854443e368806cf1f4ece562c157db723d1a (diff) | |
| parent | c9f2abad7b9c967e23ed2b2867d426eb27f61387 (diff) | |
Merge branch 'clean'
Conflicts:
app/controllers/tournaments_controller.rb
Diffstat (limited to 'app/views/tournaments/show.html.erb')
| -rw-r--r-- | app/views/tournaments/show.html.erb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 91c1961..0cda6c1 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -11,6 +11,11 @@ </p> <p> + <strong>Status:</strong> + <%= @tournament.status %> +</p> + +<p> <strong>Min players per team:</strong> <%= @tournament.min_players_per_team %> </p> @@ -40,10 +45,5 @@ <%= @tournament.randomized_teams %> </p> -<p> - <strong>Status:</strong> - <%= @tournament.status %> -</p> - <%= link_to 'Edit', edit_tournament_path(@tournament) %> | <%= link_to 'Back', tournaments_path %> |