diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-07 17:55:38 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-07 17:55:38 -0500 |
| commit | bb84a760960c558857876e106bca94e31e15fe7d (patch) | |
| tree | d081a20550405cb3745c563362321e223d158697 | |
| parent | da284d090e74d790bd80a8e4ed0400eb073e36b6 (diff) | |
| parent | 5fe8ef2c4f33480766a477a27dcdfed6b6a26137 (diff) | |
better tournaments and tournament glitch fix
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/controllers/tournaments_controller.rb
| -rw-r--r-- | db/seeds.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/db/seeds.rb b/db/seeds.rb index 5567a30..06b46a6 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -6,6 +6,7 @@ # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) # Mayor.create(name: 'Emanuel', city: cities.first) # -Game.create(name: "League of Legends",min_players_per_team: 5, max_players_per_team: 5, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: nil, randomized_teams: false) - +Game.create(name: "League of Legends",min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: nil, randomized_teams: true) +Game.create(name: "Chess", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: nil, randomized_teams: true) +#User.create(id: 1, name: "Andrew", email: "amurrel@example.com", user_name: "ImFromNASA", created_at: "2014-03-07 22:48:53", updated_at: "2014-03-07 22:48:53", password_digest: "$2a$10$W0FwPRDzdQp8arolCHGt5ezXqkOiTLNsXI5GKGtu9qr3...", remember_token: "1583722b02663e024533296171cad79f29037ebc", groups: 0) |