diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-01 20:14:09 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-01 20:14:09 -0500 |
| commit | 6a572306fc6c23c92901ae8a76bce0e3dbf7b6af (patch) | |
| tree | 3dc51a70e3898cc8ad5614aeaab7a8d712bb217b /app | |
| parent | 0c01ac6eaa42f70994459df6f1b34547a3d373ca (diff) | |
| parent | 76f7a694f9c171270921a2ae7d4b0be6a9ee7f5d (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 86b869b..56233b6 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -14,7 +14,7 @@ class TournamentsController < ApplicationController # GET /tournaments/new def new - @game_names = Game.all + @game_names = Game.all.collect @tournament = Tournament.new end |