diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-04-27 23:45:07 -0400 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-04-27 23:45:07 -0400 |
| commit | 7a3fe845d568f6eab1e7a55239daed3685797c2e (patch) | |
| tree | 18f84996ddf5c02af9d7fc1c829d85d6c62a2f18 /db | |
| parent | d38f6fa6262803f3c6380a43f32de4889fcacaec (diff) | |
| parent | 1c37ae521e29a5e0869aba52d324ed0cd4a830a6 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/Leaguer
Conflicts:
app/views/tournaments/_form.html.erb
Diffstat (limited to 'db')
| -rw-r--r-- | db/seeds.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/db/seeds.rb b/db/seeds.rb index c37dcf7..a66cc4b 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -85,7 +85,7 @@ if Rails.env.development? #chess chess_tourn = Tournament.create(game_id: 2, status: 0, name: "Chess Seed", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, - max_teams_per_match: 2, sampling_method: nil) + max_teams_per_match: 2, sampling_method: "manual") chess_tourn.hosts.push(davis) chess_tourn.join(davis) @@ -93,7 +93,7 @@ if Rails.env.development? #Rock Paper Scissors rps = Tournament.create(game_id: 4, status: 0, name: "Rock, Paper, Scissors Seed", min_players_per_team: 1, max_players_per_team: 3, min_teams_per_match: 2, - max_teams_per_match: 2, sampling_method: nil) + max_teams_per_match: 2, sampling_method: "manual") rps.hosts.push(davis) rps.join(davis) @@ -101,7 +101,7 @@ if Rails.env.development? rps.join(guntas) tourn5 = Tournament.create(game_id: 1, status: 0, name: "5 Teams, 2 Teams Per Match", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, - max_teams_per_match: 2, sampling_method: nil) + max_teams_per_match: 2, sampling_method: "manual") for i in 0..9 if i == 0 @@ -112,7 +112,7 @@ if Rails.env.development? tourn5.join(players_for_league[9]) tourn6 = Tournament.create(game_id: 1, status: 0, name: "3 teams per match", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 3, - max_teams_per_match: 3, sampling_method: nil) + max_teams_per_match: 3, sampling_method: "manual") for i in 0..9 if i == 0 |