diff options
author | tkimia <tkimia@purdue.edu> | 2014-04-10 17:43:47 -0400 |
---|---|---|
committer | tkimia <tkimia@purdue.edu> | 2014-04-10 17:43:47 -0400 |
commit | efa8017199d496a84ed7385a35cfde9e4cd32b1a (patch) | |
tree | a39cf49a4adca19d92584906f04724c67370fe52 /db/migrate | |
parent | eab572fdecdaf3cf7464d189f0b1de1d1c3b2c46 (diff) | |
parent | b09b504fad01988004745363332375697135800a (diff) |
Merge branch 'clean2'
Conflicts:
app/assets/stylesheets/matches.css.scss
app/assets/stylesheets/tournaments.css.scss
app/controllers/alerts_controller.rb
app/controllers/games_controller.rb
app/controllers/matches_controller.rb
app/controllers/pms_controller.rb
app/controllers/servers_controller.rb
app/controllers/sessions_controller.rb
app/controllers/teams_controller.rb
app/controllers/tournaments_controller.rb
app/controllers/users_controller.rb
app/helpers/sessions_helper.rb
app/models/alert.rb
app/models/game.rb
app/models/match.rb
app/models/server.rb
app/models/session.rb
app/models/team.rb
app/models/tournament.rb
app/models/user.rb
app/views/alerts/show.html.erb
app/views/games/index.html.erb
app/views/games/show.html.erb
app/views/matches/_form.html.erb
app/views/matches/index.html.erb
app/views/matches/index.json.jbuilder
app/views/matches/new.html.erb
app/views/matches/show.html.erb
app/views/matches/show.json.jbuilder
app/views/pms/show.html.erb
app/views/servers/_form.html.erb
app/views/servers/edit.html.erb
app/views/servers/show.html.erb
app/views/sessions/new.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/new.html.erb
app/views/tournaments/show.html.erb
app/views/users/_form.html.erb
app/views/users/edit.html.erb
app/views/users/index.html.erb
app/views/users/new.html.erb
app/views/users/show.html.erb
config/routes.rb
db/migrate/20140406195921_create_simple_captcha_data.rb
db/migrate/20140406235927_create_delayed_jobs.rb
db/migrate/20140406235933_create_servers.rb
db/migrate/20140406235940_create_matches.rb
db/migrate/20140406235946_create_teams.rb
db/migrate/20140406235952_create_alerts.rb
db/migrate/20140406235958_create_pms.rb
db/migrate/20140407000005_create_tournaments.rb
db/migrate/20140407000011_create_games.rb
db/migrate/20140407000017_create_users.rb
db/migrate/20140407000024_create_sessions.rb
db/migrate/20140407000030_create_server_settings.rb
db/migrate/20140407000036_create_game_settings.rb
db/migrate/20140407000042_create_tournament_preferences.rb
db/migrate/20140407000048_create_scores.rb
db/migrate/20140407000054_create_remote_usernames.rb
db/migrate/20140407000100_create_tournament_players_join_table.rb
db/migrate/20140407000106_create_tournament_hosts_join_table.rb
db/migrate/20140407000112_create_team_user_join_table.rb
db/migrate/20140407000118_create_match_team_join_table.rb
db/migrate/20140407000143_add_hidden_attrs_to_user.rb
db/migrate/20140407041416_create_simple_captcha_data.rb
db/migrate/20140407081419_create_delayed_jobs.rb
db/migrate/20140407081422_create_servers.rb
db/migrate/20140407081425_create_matches.rb
db/migrate/20140407081427_create_teams.rb
db/migrate/20140407081430_create_alerts.rb
db/migrate/20140407081434_create_pms.rb
db/migrate/20140407081437_create_tournaments.rb
db/migrate/20140407081440_create_games.rb
db/migrate/20140407081443_create_users.rb
db/migrate/20140407081446_create_sessions.rb
db/migrate/20140407081449_create_server_settings.rb
db/migrate/20140407081452_create_game_settings.rb
db/migrate/20140407081454_create_tournament_preferences.rb
db/migrate/20140407081458_create_scores.rb
db/migrate/20140407081501_create_remote_usernames.rb
db/migrate/20140407081503_create_tournament_players_join_table.rb
db/migrate/20140407081506_create_tournament_hosts_join_table.rb
db/migrate/20140407081509_create_team_user_join_table.rb
db/migrate/20140407081512_create_match_team_join_table.rb
db/migrate/20140407081524_add_hidden_attrs_to_user.rb
db/migrate/20140410170710_create_simple_captcha_data.rb
db/migrate/20140410210717_create_delayed_jobs.rb
db/migrate/20140410210723_create_servers.rb
db/migrate/20140410210730_create_matches.rb
db/migrate/20140410210736_create_teams.rb
db/migrate/20140410210743_create_alerts.rb
db/migrate/20140410210750_create_pms.rb
db/migrate/20140410210756_create_tournaments.rb
db/migrate/20140410210803_create_games.rb
db/migrate/20140410210809_create_users.rb
db/migrate/20140410210816_create_sessions.rb
db/migrate/20140410211152_create_server_settings.rb
db/migrate/20140410211158_create_game_settings.rb
db/migrate/20140410211205_create_tournament_preferences.rb
db/migrate/20140410211211_create_scores.rb
db/migrate/20140410211217_create_remote_usernames.rb
db/migrate/20140410211229_create_tournament_players_join_table.rb
db/migrate/20140410211236_create_tournament_hosts_join_table.rb
db/migrate/20140410211242_create_team_user_join_table.rb
db/migrate/20140410211248_create_match_team_join_table.rb
db/migrate/20140410211313_add_hidden_attrs_to_user.rb
db/schema.rb
test/controllers/matches_controller_test.rb
test/fixtures/matches.yml
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20140410173725_create_simple_captcha_data.rb (renamed from db/migrate/20140407041416_create_simple_captcha_data.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213731_create_delayed_jobs.rb (renamed from db/migrate/20140407081419_create_delayed_jobs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213738_create_servers.rb (renamed from db/migrate/20140407081422_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213745_create_matches.rb (renamed from db/migrate/20140407081425_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213752_create_teams.rb (renamed from db/migrate/20140407081427_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213758_create_alerts.rb (renamed from db/migrate/20140407081430_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213805_create_pms.rb (renamed from db/migrate/20140407081434_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213811_create_tournaments.rb (renamed from db/migrate/20140407081437_create_tournaments.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213818_create_games.rb (renamed from db/migrate/20140407081440_create_games.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213824_create_users.rb (renamed from db/migrate/20140407081443_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213831_create_sessions.rb (renamed from db/migrate/20140407081446_create_sessions.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213838_create_brackets.rb | 11 | ||||
-rw-r--r-- | db/migrate/20140410213844_create_server_settings.rb (renamed from db/migrate/20140407081449_create_server_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213851_create_game_settings.rb (renamed from db/migrate/20140407081452_create_game_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213857_create_tournament_preferences.rb (renamed from db/migrate/20140407081454_create_tournament_preferences.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213903_create_scores.rb (renamed from db/migrate/20140407081458_create_scores.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213909_create_remote_usernames.rb (renamed from db/migrate/20140407081501_create_remote_usernames.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213916_create_bracket_matches.rb | 11 | ||||
-rw-r--r-- | db/migrate/20140410213922_create_tournament_players_join_table.rb (renamed from db/migrate/20140407081503_create_tournament_players_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213928_create_tournament_hosts_join_table.rb (renamed from db/migrate/20140407081506_create_tournament_hosts_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213935_create_team_user_join_table.rb (renamed from db/migrate/20140407081509_create_team_user_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410213941_create_match_team_join_table.rb (renamed from db/migrate/20140407081512_create_match_team_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140410214006_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140407081524_add_hidden_attrs_to_user.rb) | 0 |
23 files changed, 22 insertions, 0 deletions
diff --git a/db/migrate/20140407041416_create_simple_captcha_data.rb b/db/migrate/20140410173725_create_simple_captcha_data.rb index 4573b20..4573b20 100644 --- a/db/migrate/20140407041416_create_simple_captcha_data.rb +++ b/db/migrate/20140410173725_create_simple_captcha_data.rb diff --git a/db/migrate/20140407081419_create_delayed_jobs.rb b/db/migrate/20140410213731_create_delayed_jobs.rb index ec0dd93..ec0dd93 100644 --- a/db/migrate/20140407081419_create_delayed_jobs.rb +++ b/db/migrate/20140410213731_create_delayed_jobs.rb diff --git a/db/migrate/20140407081422_create_servers.rb b/db/migrate/20140410213738_create_servers.rb index fbe1b02..fbe1b02 100644 --- a/db/migrate/20140407081422_create_servers.rb +++ b/db/migrate/20140410213738_create_servers.rb diff --git a/db/migrate/20140407081425_create_matches.rb b/db/migrate/20140410213745_create_matches.rb index bdeb1cd..bdeb1cd 100644 --- a/db/migrate/20140407081425_create_matches.rb +++ b/db/migrate/20140410213745_create_matches.rb diff --git a/db/migrate/20140407081427_create_teams.rb b/db/migrate/20140410213752_create_teams.rb index fdf9a68..fdf9a68 100644 --- a/db/migrate/20140407081427_create_teams.rb +++ b/db/migrate/20140410213752_create_teams.rb diff --git a/db/migrate/20140407081430_create_alerts.rb b/db/migrate/20140410213758_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140407081430_create_alerts.rb +++ b/db/migrate/20140410213758_create_alerts.rb diff --git a/db/migrate/20140407081434_create_pms.rb b/db/migrate/20140410213805_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140407081434_create_pms.rb +++ b/db/migrate/20140410213805_create_pms.rb diff --git a/db/migrate/20140407081437_create_tournaments.rb b/db/migrate/20140410213811_create_tournaments.rb index c0d8929..c0d8929 100644 --- a/db/migrate/20140407081437_create_tournaments.rb +++ b/db/migrate/20140410213811_create_tournaments.rb diff --git a/db/migrate/20140407081440_create_games.rb b/db/migrate/20140410213818_create_games.rb index 5e4f56f..5e4f56f 100644 --- a/db/migrate/20140407081440_create_games.rb +++ b/db/migrate/20140410213818_create_games.rb diff --git a/db/migrate/20140407081443_create_users.rb b/db/migrate/20140410213824_create_users.rb index 8032870..8032870 100644 --- a/db/migrate/20140407081443_create_users.rb +++ b/db/migrate/20140410213824_create_users.rb diff --git a/db/migrate/20140407081446_create_sessions.rb b/db/migrate/20140410213831_create_sessions.rb index f667f1e..f667f1e 100644 --- a/db/migrate/20140407081446_create_sessions.rb +++ b/db/migrate/20140410213831_create_sessions.rb diff --git a/db/migrate/20140410213838_create_brackets.rb b/db/migrate/20140410213838_create_brackets.rb new file mode 100644 index 0000000..8813bf2 --- /dev/null +++ b/db/migrate/20140410213838_create_brackets.rb @@ -0,0 +1,11 @@ +class CreateBrackets < ActiveRecord::Migration + def change + create_table :brackets do |t| + t.references :user, index: true + t.references :tournament, index: true + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081449_create_server_settings.rb b/db/migrate/20140410213844_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140407081449_create_server_settings.rb +++ b/db/migrate/20140410213844_create_server_settings.rb diff --git a/db/migrate/20140407081452_create_game_settings.rb b/db/migrate/20140410213851_create_game_settings.rb index b1caf5d..b1caf5d 100644 --- a/db/migrate/20140407081452_create_game_settings.rb +++ b/db/migrate/20140410213851_create_game_settings.rb diff --git a/db/migrate/20140407081454_create_tournament_preferences.rb b/db/migrate/20140410213857_create_tournament_preferences.rb index 991d659..991d659 100644 --- a/db/migrate/20140407081454_create_tournament_preferences.rb +++ b/db/migrate/20140410213857_create_tournament_preferences.rb diff --git a/db/migrate/20140407081458_create_scores.rb b/db/migrate/20140410213903_create_scores.rb index 4ca0b0b..4ca0b0b 100644 --- a/db/migrate/20140407081458_create_scores.rb +++ b/db/migrate/20140410213903_create_scores.rb diff --git a/db/migrate/20140407081501_create_remote_usernames.rb b/db/migrate/20140410213909_create_remote_usernames.rb index e265985..e265985 100644 --- a/db/migrate/20140407081501_create_remote_usernames.rb +++ b/db/migrate/20140410213909_create_remote_usernames.rb diff --git a/db/migrate/20140410213916_create_bracket_matches.rb b/db/migrate/20140410213916_create_bracket_matches.rb new file mode 100644 index 0000000..3323e31 --- /dev/null +++ b/db/migrate/20140410213916_create_bracket_matches.rb @@ -0,0 +1,11 @@ +class CreateBracketMatches < ActiveRecord::Migration + def change + create_table :bracket_matches do |t| + t.references :bracket, index: true + t.references :match, index: true + t.references :predicted_winner, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081503_create_tournament_players_join_table.rb b/db/migrate/20140410213922_create_tournament_players_join_table.rb index be240e8..be240e8 100644 --- a/db/migrate/20140407081503_create_tournament_players_join_table.rb +++ b/db/migrate/20140410213922_create_tournament_players_join_table.rb diff --git a/db/migrate/20140407081506_create_tournament_hosts_join_table.rb b/db/migrate/20140410213928_create_tournament_hosts_join_table.rb index 7521d89..7521d89 100644 --- a/db/migrate/20140407081506_create_tournament_hosts_join_table.rb +++ b/db/migrate/20140410213928_create_tournament_hosts_join_table.rb diff --git a/db/migrate/20140407081509_create_team_user_join_table.rb b/db/migrate/20140410213935_create_team_user_join_table.rb index f3b57fc..f3b57fc 100644 --- a/db/migrate/20140407081509_create_team_user_join_table.rb +++ b/db/migrate/20140410213935_create_team_user_join_table.rb diff --git a/db/migrate/20140407081512_create_match_team_join_table.rb b/db/migrate/20140410213941_create_match_team_join_table.rb index c2ed1b7..c2ed1b7 100644 --- a/db/migrate/20140407081512_create_match_team_join_table.rb +++ b/db/migrate/20140410213941_create_match_team_join_table.rb diff --git a/db/migrate/20140407081524_add_hidden_attrs_to_user.rb b/db/migrate/20140410214006_add_hidden_attrs_to_user.rb index 9b5c505..9b5c505 100644 --- a/db/migrate/20140407081524_add_hidden_attrs_to_user.rb +++ b/db/migrate/20140410214006_add_hidden_attrs_to_user.rb |