diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | db/migrate/20140304020040_create_servers.rb (renamed from db/migrate/20140304015955_create_servers.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020042_create_tournaments.rb (renamed from db/migrate/20140304015957_create_tournaments.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020044_create_matches.rb (renamed from db/migrate/20140304020000_create_matches.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020047_create_teams.rb (renamed from db/migrate/20140304020002_create_teams.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020051_create_users.rb (renamed from db/migrate/20140304020006_create_users.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020053_create_user_team_pairs.rb (renamed from db/migrate/20140304020009_create_user_team_pairs.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020055_create_team_match_pairs.rb (renamed from db/migrate/20140304020011_create_team_match_pairs.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020058_create_alerts.rb (renamed from db/migrate/20140304020013_create_alerts.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020100_create_pms.rb (renamed from db/migrate/20140304020015_create_pms.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020102_create_games.rb (renamed from db/migrate/20140304020018_create_games.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020105_create_game_attributes.rb (renamed from db/migrate/20140304020020_create_game_attributes.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020107_create_server_settings.rb (renamed from db/migrate/20140304020022_create_server_settings.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140304020113_create_tournament_options.rb (renamed from db/migrate/20140304020029_create_tournament_options.rb) | 0 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
15 files changed, 2 insertions, 2 deletions
@@ -3,7 +3,6 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.0.2' -gem 'bootstrap-sass' # bcrypt is used for password digesting gem 'bcrypt-ruby', '3.1.2' @@ -23,6 +22,7 @@ end # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.0' +gem 'bootstrap-sass' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' diff --git a/db/migrate/20140304015955_create_servers.rb b/db/migrate/20140304020040_create_servers.rb index f33241a..f33241a 100644 --- a/db/migrate/20140304015955_create_servers.rb +++ b/db/migrate/20140304020040_create_servers.rb diff --git a/db/migrate/20140304015957_create_tournaments.rb b/db/migrate/20140304020042_create_tournaments.rb index 36fcf7e..36fcf7e 100644 --- a/db/migrate/20140304015957_create_tournaments.rb +++ b/db/migrate/20140304020042_create_tournaments.rb diff --git a/db/migrate/20140304020000_create_matches.rb b/db/migrate/20140304020044_create_matches.rb index 6c0c157..6c0c157 100644 --- a/db/migrate/20140304020000_create_matches.rb +++ b/db/migrate/20140304020044_create_matches.rb diff --git a/db/migrate/20140304020002_create_teams.rb b/db/migrate/20140304020047_create_teams.rb index dd8397d..dd8397d 100644 --- a/db/migrate/20140304020002_create_teams.rb +++ b/db/migrate/20140304020047_create_teams.rb diff --git a/db/migrate/20140304020006_create_users.rb b/db/migrate/20140304020051_create_users.rb index f0986d4..f0986d4 100644 --- a/db/migrate/20140304020006_create_users.rb +++ b/db/migrate/20140304020051_create_users.rb diff --git a/db/migrate/20140304020009_create_user_team_pairs.rb b/db/migrate/20140304020053_create_user_team_pairs.rb index 2c492ac..2c492ac 100644 --- a/db/migrate/20140304020009_create_user_team_pairs.rb +++ b/db/migrate/20140304020053_create_user_team_pairs.rb diff --git a/db/migrate/20140304020011_create_team_match_pairs.rb b/db/migrate/20140304020055_create_team_match_pairs.rb index 8fac07e..8fac07e 100644 --- a/db/migrate/20140304020011_create_team_match_pairs.rb +++ b/db/migrate/20140304020055_create_team_match_pairs.rb diff --git a/db/migrate/20140304020013_create_alerts.rb b/db/migrate/20140304020058_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140304020013_create_alerts.rb +++ b/db/migrate/20140304020058_create_alerts.rb diff --git a/db/migrate/20140304020015_create_pms.rb b/db/migrate/20140304020100_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140304020015_create_pms.rb +++ b/db/migrate/20140304020100_create_pms.rb diff --git a/db/migrate/20140304020018_create_games.rb b/db/migrate/20140304020102_create_games.rb index 59d4ef0..59d4ef0 100644 --- a/db/migrate/20140304020018_create_games.rb +++ b/db/migrate/20140304020102_create_games.rb diff --git a/db/migrate/20140304020020_create_game_attributes.rb b/db/migrate/20140304020105_create_game_attributes.rb index b63f134..b63f134 100644 --- a/db/migrate/20140304020020_create_game_attributes.rb +++ b/db/migrate/20140304020105_create_game_attributes.rb diff --git a/db/migrate/20140304020022_create_server_settings.rb b/db/migrate/20140304020107_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140304020022_create_server_settings.rb +++ b/db/migrate/20140304020107_create_server_settings.rb diff --git a/db/migrate/20140304020029_create_tournament_options.rb b/db/migrate/20140304020113_create_tournament_options.rb index d2df22e..d2df22e 100644 --- a/db/migrate/20140304020029_create_tournament_options.rb +++ b/db/migrate/20140304020113_create_tournament_options.rb diff --git a/db/schema.rb b/db/schema.rb index 196a341..6dcd3ad 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140304020029) do +ActiveRecord::Schema.define(version: 20140304020113) do create_table "alerts", force: true do |t| t.integer "author_id" |