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 | |
| parent | 0c01ac6eaa42f70994459df6f1b34547a3d373ca (diff) | |
| parent | 76f7a694f9c171270921a2ae7d4b0be6a9ee7f5d (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 2 | ||||
| -rw-r--r-- | db/seeds.rb | 2 | ||||
| -rwxr-xr-x | start.sh | 5 |
3 files changed, 7 insertions, 2 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 diff --git a/db/seeds.rb b/db/seeds.rb index 58c9eba..ab130a8 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -6,6 +6,6 @@ # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) # Mayor.create(name: 'Emanuel', city: cities.first) # -league = Game.create([{name: "League of Legends"}, {players_per_team: 5}, {teams_per_match: 2}, {set_rounds: 1}, {randomized_teams: 0}]) +Game.create(name: "League of Legends", players_per_team: 5, teams_per_match: 2, set_rounds: 1, randomized_teams: 0) diff --git a/start.sh b/start.sh new file mode 100755 index 0000000..01b7f72 --- /dev/null +++ b/start.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +generate.sh +bundle exec rails server 2> server.talk & + |