diff options
author | nfoy <nfoy@purdue.edu> | 2014-04-24 19:15:27 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-04-24 19:15:27 -0400 |
commit | ddfe11c0444cf424cad3d14bc9be48d32423f3dd (patch) | |
tree | 135db4cd6bf22380953315ea1244f720a5419e2d /db/migrate | |
parent | 1b11684986136ee87da6242c3ba6aba5ef581510 (diff) | |
parent | 67d95e5b92e3d19765c7ccaf5460737ffe2173f4 (diff) |
Merge branch 'clean2'
Conflicts:
app/models/pm.rb
app/views/pms/index.html.erb
app/views/pms/show.html.erb
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20140424190540_create_simple_captcha_data.rb (renamed from db/migrate/20140424162546_create_simple_captcha_data.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230536_create_mailboxer.mailboxer_engine.rb (renamed from db/migrate/20140424202542_create_mailboxer.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230537_add_notified_object.mailboxer_engine.rb (renamed from db/migrate/20140424202543_add_notified_object.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230538_add_notification_code.mailboxer_engine.rb (renamed from db/migrate/20140424202544_add_notification_code.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230539_add_attachments.mailboxer_engine.rb (renamed from db/migrate/20140424202545_add_attachments.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230540_rename_receipts_read.mailboxer_engine.rb (renamed from db/migrate/20140424202546_rename_receipts_read.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230541_add_global_notification_support.mailboxer_engine.rb (renamed from db/migrate/20140424202547_add_global_notification_support.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230543_create_delayed_jobs.rb (renamed from db/migrate/20140424202549_create_delayed_jobs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230547_create_servers.rb (renamed from db/migrate/20140424202553_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230550_create_matches.rb (renamed from db/migrate/20140424202557_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230554_create_teams.rb (renamed from db/migrate/20140424202600_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230558_create_alerts.rb (renamed from db/migrate/20140424202604_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230602_create_pms.rb (renamed from db/migrate/20140424202608_create_pms.rb) | 2 | ||||
-rw-r--r-- | db/migrate/20140424230605_create_tournaments.rb (renamed from db/migrate/20140424202611_create_tournaments.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230609_create_games.rb (renamed from db/migrate/20140424202615_create_games.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230613_create_users.rb (renamed from db/migrate/20140424202619_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230617_create_sessions.rb (renamed from db/migrate/20140424202623_create_sessions.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230620_create_brackets.rb (renamed from db/migrate/20140424202626_create_brackets.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230624_create_game_settings.rb (renamed from db/migrate/20140424202630_create_game_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230628_create_tournament_settings.rb (renamed from db/migrate/20140424202634_create_tournament_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230632_create_tournament_stages.rb (renamed from db/migrate/20140424202638_create_tournament_stages.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230635_create_statistics.rb (renamed from db/migrate/20140424202641_create_statistics.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230639_create_remote_usernames.rb (renamed from db/migrate/20140424202645_create_remote_usernames.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230643_create_bracket_matches.rb (renamed from db/migrate/20140424202649_create_bracket_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230646_create_api_requests.rb (renamed from db/migrate/20140424202652_create_api_requests.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230650_create_tournament_players_join_table.rb (renamed from db/migrate/20140424202656_create_tournament_players_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230654_create_tournament_hosts_join_table.rb (renamed from db/migrate/20140424202659_create_tournament_hosts_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230657_create_team_user_join_table.rb (renamed from db/migrate/20140424202703_create_team_user_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230701_create_match_team_join_table.rb (renamed from db/migrate/20140424202706_create_match_team_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140424230712_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140424202717_add_hidden_attrs_to_user.rb) | 0 |
30 files changed, 2 insertions, 0 deletions
diff --git a/db/migrate/20140424162546_create_simple_captcha_data.rb b/db/migrate/20140424190540_create_simple_captcha_data.rb index 4573b20..4573b20 100644 --- a/db/migrate/20140424162546_create_simple_captcha_data.rb +++ b/db/migrate/20140424190540_create_simple_captcha_data.rb diff --git a/db/migrate/20140424202542_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140424230536_create_mailboxer.mailboxer_engine.rb index 690cec2..690cec2 100644 --- a/db/migrate/20140424202542_create_mailboxer.mailboxer_engine.rb +++ b/db/migrate/20140424230536_create_mailboxer.mailboxer_engine.rb diff --git a/db/migrate/20140424202543_add_notified_object.mailboxer_engine.rb b/db/migrate/20140424230537_add_notified_object.mailboxer_engine.rb index 7f41ac6..7f41ac6 100644 --- a/db/migrate/20140424202543_add_notified_object.mailboxer_engine.rb +++ b/db/migrate/20140424230537_add_notified_object.mailboxer_engine.rb diff --git a/db/migrate/20140424202544_add_notification_code.mailboxer_engine.rb b/db/migrate/20140424230538_add_notification_code.mailboxer_engine.rb index 04c12ef..04c12ef 100644 --- a/db/migrate/20140424202544_add_notification_code.mailboxer_engine.rb +++ b/db/migrate/20140424230538_add_notification_code.mailboxer_engine.rb diff --git a/db/migrate/20140424202545_add_attachments.mailboxer_engine.rb b/db/migrate/20140424230539_add_attachments.mailboxer_engine.rb index b8d6588..b8d6588 100644 --- a/db/migrate/20140424202545_add_attachments.mailboxer_engine.rb +++ b/db/migrate/20140424230539_add_attachments.mailboxer_engine.rb diff --git a/db/migrate/20140424202546_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140424230540_rename_receipts_read.mailboxer_engine.rb index 9ce904f..9ce904f 100644 --- a/db/migrate/20140424202546_rename_receipts_read.mailboxer_engine.rb +++ b/db/migrate/20140424230540_rename_receipts_read.mailboxer_engine.rb diff --git a/db/migrate/20140424202547_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140424230541_add_global_notification_support.mailboxer_engine.rb index 60f67ab..60f67ab 100644 --- a/db/migrate/20140424202547_add_global_notification_support.mailboxer_engine.rb +++ b/db/migrate/20140424230541_add_global_notification_support.mailboxer_engine.rb diff --git a/db/migrate/20140424202549_create_delayed_jobs.rb b/db/migrate/20140424230543_create_delayed_jobs.rb index ec0dd93..ec0dd93 100644 --- a/db/migrate/20140424202549_create_delayed_jobs.rb +++ b/db/migrate/20140424230543_create_delayed_jobs.rb diff --git a/db/migrate/20140424202553_create_servers.rb b/db/migrate/20140424230547_create_servers.rb index fbe1b02..fbe1b02 100644 --- a/db/migrate/20140424202553_create_servers.rb +++ b/db/migrate/20140424230547_create_servers.rb diff --git a/db/migrate/20140424202557_create_matches.rb b/db/migrate/20140424230550_create_matches.rb index bac92d1..bac92d1 100644 --- a/db/migrate/20140424202557_create_matches.rb +++ b/db/migrate/20140424230550_create_matches.rb diff --git a/db/migrate/20140424202600_create_teams.rb b/db/migrate/20140424230554_create_teams.rb index dd8397d..dd8397d 100644 --- a/db/migrate/20140424202600_create_teams.rb +++ b/db/migrate/20140424230554_create_teams.rb diff --git a/db/migrate/20140424202604_create_alerts.rb b/db/migrate/20140424230558_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140424202604_create_alerts.rb +++ b/db/migrate/20140424230558_create_alerts.rb diff --git a/db/migrate/20140424202608_create_pms.rb b/db/migrate/20140424230602_create_pms.rb index 93bb5c6..eb9f443 100644 --- a/db/migrate/20140424202608_create_pms.rb +++ b/db/migrate/20140424230602_create_pms.rb @@ -4,6 +4,8 @@ class CreatePms < ActiveRecord::Migration t.references :author, index: true t.references :recipient, index: true t.text :message + t.text :subject + t.references :conversation, index: true t.timestamps end diff --git a/db/migrate/20140424202611_create_tournaments.rb b/db/migrate/20140424230605_create_tournaments.rb index 716871f..716871f 100644 --- a/db/migrate/20140424202611_create_tournaments.rb +++ b/db/migrate/20140424230605_create_tournaments.rb diff --git a/db/migrate/20140424202615_create_games.rb b/db/migrate/20140424230609_create_games.rb index 23edf0b..23edf0b 100644 --- a/db/migrate/20140424202615_create_games.rb +++ b/db/migrate/20140424230609_create_games.rb diff --git a/db/migrate/20140424202619_create_users.rb b/db/migrate/20140424230613_create_users.rb index 8032870..8032870 100644 --- a/db/migrate/20140424202619_create_users.rb +++ b/db/migrate/20140424230613_create_users.rb diff --git a/db/migrate/20140424202623_create_sessions.rb b/db/migrate/20140424230617_create_sessions.rb index f667f1e..f667f1e 100644 --- a/db/migrate/20140424202623_create_sessions.rb +++ b/db/migrate/20140424230617_create_sessions.rb diff --git a/db/migrate/20140424202626_create_brackets.rb b/db/migrate/20140424230620_create_brackets.rb index 8813bf2..8813bf2 100644 --- a/db/migrate/20140424202626_create_brackets.rb +++ b/db/migrate/20140424230620_create_brackets.rb diff --git a/db/migrate/20140424202630_create_game_settings.rb b/db/migrate/20140424230624_create_game_settings.rb index 06fb72e..06fb72e 100644 --- a/db/migrate/20140424202630_create_game_settings.rb +++ b/db/migrate/20140424230624_create_game_settings.rb diff --git a/db/migrate/20140424202634_create_tournament_settings.rb b/db/migrate/20140424230628_create_tournament_settings.rb index e56697f..e56697f 100644 --- a/db/migrate/20140424202634_create_tournament_settings.rb +++ b/db/migrate/20140424230628_create_tournament_settings.rb diff --git a/db/migrate/20140424202638_create_tournament_stages.rb b/db/migrate/20140424230632_create_tournament_stages.rb index e3668cb..e3668cb 100644 --- a/db/migrate/20140424202638_create_tournament_stages.rb +++ b/db/migrate/20140424230632_create_tournament_stages.rb diff --git a/db/migrate/20140424202641_create_statistics.rb b/db/migrate/20140424230635_create_statistics.rb index cc2e97d..cc2e97d 100644 --- a/db/migrate/20140424202641_create_statistics.rb +++ b/db/migrate/20140424230635_create_statistics.rb diff --git a/db/migrate/20140424202645_create_remote_usernames.rb b/db/migrate/20140424230639_create_remote_usernames.rb index e265985..e265985 100644 --- a/db/migrate/20140424202645_create_remote_usernames.rb +++ b/db/migrate/20140424230639_create_remote_usernames.rb diff --git a/db/migrate/20140424202649_create_bracket_matches.rb b/db/migrate/20140424230643_create_bracket_matches.rb index 3323e31..3323e31 100644 --- a/db/migrate/20140424202649_create_bracket_matches.rb +++ b/db/migrate/20140424230643_create_bracket_matches.rb diff --git a/db/migrate/20140424202652_create_api_requests.rb b/db/migrate/20140424230646_create_api_requests.rb index 544c330..544c330 100644 --- a/db/migrate/20140424202652_create_api_requests.rb +++ b/db/migrate/20140424230646_create_api_requests.rb diff --git a/db/migrate/20140424202656_create_tournament_players_join_table.rb b/db/migrate/20140424230650_create_tournament_players_join_table.rb index be240e8..be240e8 100644 --- a/db/migrate/20140424202656_create_tournament_players_join_table.rb +++ b/db/migrate/20140424230650_create_tournament_players_join_table.rb diff --git a/db/migrate/20140424202659_create_tournament_hosts_join_table.rb b/db/migrate/20140424230654_create_tournament_hosts_join_table.rb index 7521d89..7521d89 100644 --- a/db/migrate/20140424202659_create_tournament_hosts_join_table.rb +++ b/db/migrate/20140424230654_create_tournament_hosts_join_table.rb diff --git a/db/migrate/20140424202703_create_team_user_join_table.rb b/db/migrate/20140424230657_create_team_user_join_table.rb index f3b57fc..f3b57fc 100644 --- a/db/migrate/20140424202703_create_team_user_join_table.rb +++ b/db/migrate/20140424230657_create_team_user_join_table.rb diff --git a/db/migrate/20140424202706_create_match_team_join_table.rb b/db/migrate/20140424230701_create_match_team_join_table.rb index c2ed1b7..c2ed1b7 100644 --- a/db/migrate/20140424202706_create_match_team_join_table.rb +++ b/db/migrate/20140424230701_create_match_team_join_table.rb diff --git a/db/migrate/20140424202717_add_hidden_attrs_to_user.rb b/db/migrate/20140424230712_add_hidden_attrs_to_user.rb index 9b5c505..9b5c505 100644 --- a/db/migrate/20140424202717_add_hidden_attrs_to_user.rb +++ b/db/migrate/20140424230712_add_hidden_attrs_to_user.rb |