diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
commit | 2eb8e1c090071abf3108828efc831f12128e17df (patch) | |
tree | a1410e2cc118db1b410808b7f339e4c5f52bd43c /db/migrate | |
parent | fb76b4db64583def6db3aac43e31c25d3bd489df (diff) | |
parent | aca85cf084702c29014a17eafb090421061fae8b (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/games/index.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043631_create_games.rb
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20140304043618_create_servers.rb | 8 | ||||
-rw-r--r-- | db/migrate/20140304043620_create_tournaments.rb (renamed from db/migrate/20140220221232_create_tournaments.rb) | 1 | ||||
-rw-r--r-- | db/migrate/20140304043622_create_matches.rb | 10 | ||||
-rw-r--r-- | db/migrate/20140304043624_create_teams.rb (renamed from db/migrate/20140220221239_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304043626_create_alerts.rb (renamed from db/migrate/20140220221254_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304043629_create_pms.rb (renamed from db/migrate/20140220221257_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304043631_create_games.rb | 13 | ||||
-rw-r--r-- | db/migrate/20140304043633_create_users.rb (renamed from db/migrate/20140228164606_create_users.rb) | 2 | ||||
-rw-r--r-- | db/migrate/20140304043635_create_game_attributes.rb (renamed from db/migrate/20140228014552_create_game_attributes.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304043637_create_server_settings.rb (renamed from db/migrate/20140220221301_create_server_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304043639_create_user_team_pairs.rb (renamed from db/migrate/20140220221247_create_user_team_pairs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304043642_create_team_match_pairs.rb (renamed from db/migrate/20140220221250_create_team_match_pairs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304043652_add_index_to_users_email.rb (renamed from db/migrate/20140301210808_add_index_to_users_email.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304043654_add_index_to_users_user_name.rb (renamed from db/migrate/20140301211316_add_index_to_users_user_name.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304043656_add_password_digest_to_users.rb (renamed from db/migrate/20140301213814_add_password_digest_to_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304043658_add_remember_token_to_users.rb (renamed from db/migrate/20140302210209_add_remember_token_to_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304043700_create_tournament_options.rb (renamed from db/migrate/20140228014607_create_tournament_options.rb) | 0 |
17 files changed, 33 insertions, 1 deletions
diff --git a/db/migrate/20140304043618_create_servers.rb b/db/migrate/20140304043618_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140304043618_create_servers.rb @@ -0,0 +1,8 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140220221232_create_tournaments.rb b/db/migrate/20140304043620_create_tournaments.rb index 2095590..36fcf7e 100644 --- a/db/migrate/20140220221232_create_tournaments.rb +++ b/db/migrate/20140304043620_create_tournaments.rb @@ -1,6 +1,7 @@ class CreateTournaments < ActiveRecord::Migration def change create_table :tournaments do |t| + t.references :game, index: true t.timestamps end diff --git a/db/migrate/20140304043622_create_matches.rb b/db/migrate/20140304043622_create_matches.rb new file mode 100644 index 0000000..325863d --- /dev/null +++ b/db/migrate/20140304043622_create_matches.rb @@ -0,0 +1,10 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.references :tournament, index: true + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20140220221239_create_teams.rb b/db/migrate/20140304043624_create_teams.rb index dd8397d..dd8397d 100644 --- a/db/migrate/20140220221239_create_teams.rb +++ b/db/migrate/20140304043624_create_teams.rb diff --git a/db/migrate/20140220221254_create_alerts.rb b/db/migrate/20140304043626_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140220221254_create_alerts.rb +++ b/db/migrate/20140304043626_create_alerts.rb diff --git a/db/migrate/20140220221257_create_pms.rb b/db/migrate/20140304043629_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140220221257_create_pms.rb +++ b/db/migrate/20140304043629_create_pms.rb diff --git a/db/migrate/20140304043631_create_games.rb b/db/migrate/20140304043631_create_games.rb new file mode 100644 index 0000000..59d4ef0 --- /dev/null +++ b/db/migrate/20140304043631_create_games.rb @@ -0,0 +1,13 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.text :name + t.integer :players_per_team + t.integer :teams_per_match + t.integer :set_rounds + t.integer :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140228164606_create_users.rb b/db/migrate/20140304043633_create_users.rb index 1c37f38..f0986d4 100644 --- a/db/migrate/20140228164606_create_users.rb +++ b/db/migrate/20140304043633_create_users.rb @@ -3,7 +3,7 @@ class CreateUsers < ActiveRecord::Migration create_table :users do |t| t.string :name t.string :email - t.string :user_name + t.string :user_name t.timestamps end diff --git a/db/migrate/20140228014552_create_game_attributes.rb b/db/migrate/20140304043635_create_game_attributes.rb index b63f134..b63f134 100644 --- a/db/migrate/20140228014552_create_game_attributes.rb +++ b/db/migrate/20140304043635_create_game_attributes.rb diff --git a/db/migrate/20140220221301_create_server_settings.rb b/db/migrate/20140304043637_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140220221301_create_server_settings.rb +++ b/db/migrate/20140304043637_create_server_settings.rb diff --git a/db/migrate/20140220221247_create_user_team_pairs.rb b/db/migrate/20140304043639_create_user_team_pairs.rb index 2c492ac..2c492ac 100644 --- a/db/migrate/20140220221247_create_user_team_pairs.rb +++ b/db/migrate/20140304043639_create_user_team_pairs.rb diff --git a/db/migrate/20140220221250_create_team_match_pairs.rb b/db/migrate/20140304043642_create_team_match_pairs.rb index 8fac07e..8fac07e 100644 --- a/db/migrate/20140220221250_create_team_match_pairs.rb +++ b/db/migrate/20140304043642_create_team_match_pairs.rb diff --git a/db/migrate/20140301210808_add_index_to_users_email.rb b/db/migrate/20140304043652_add_index_to_users_email.rb index 934d23b..934d23b 100644 --- a/db/migrate/20140301210808_add_index_to_users_email.rb +++ b/db/migrate/20140304043652_add_index_to_users_email.rb diff --git a/db/migrate/20140301211316_add_index_to_users_user_name.rb b/db/migrate/20140304043654_add_index_to_users_user_name.rb index 22ca8c3..22ca8c3 100644 --- a/db/migrate/20140301211316_add_index_to_users_user_name.rb +++ b/db/migrate/20140304043654_add_index_to_users_user_name.rb diff --git a/db/migrate/20140301213814_add_password_digest_to_users.rb b/db/migrate/20140304043656_add_password_digest_to_users.rb index 7ad1f62..7ad1f62 100644 --- a/db/migrate/20140301213814_add_password_digest_to_users.rb +++ b/db/migrate/20140304043656_add_password_digest_to_users.rb diff --git a/db/migrate/20140302210209_add_remember_token_to_users.rb b/db/migrate/20140304043658_add_remember_token_to_users.rb index 6d84942..6d84942 100644 --- a/db/migrate/20140302210209_add_remember_token_to_users.rb +++ b/db/migrate/20140304043658_add_remember_token_to_users.rb diff --git a/db/migrate/20140228014607_create_tournament_options.rb b/db/migrate/20140304043700_create_tournament_options.rb index d2df22e..d2df22e 100644 --- a/db/migrate/20140228014607_create_tournament_options.rb +++ b/db/migrate/20140304043700_create_tournament_options.rb |