diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
| commit | a1700f50ee800cfbfb93bd7dfff7b5d79ae2cb2f (patch) | |
| tree | c9db0b8bdd4818f5ce2ff982657e2aedfda98f8f /db | |
| parent | 706392b7c4520382ddd8f827b31205c6b71f5320 (diff) | |
| parent | 63830b0f939db5f6911218950525428420c4d467 (diff) | |
Merge branch 'master2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
config/routes.rb
Diffstat (limited to 'db')
| -rw-r--r-- | db/seeds.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/seeds.rb b/db/seeds.rb index ab130a8..c1e0057 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) # -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",min_players_per_team: 5, max_players_per_team: 5, min_teams_per_match: 5, max_teams_per_match: 5, set_rounds: nil, randomized_teams: false) |