diff options
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 3 | ||||
-rw-r--r-- | db/migrate/20140304015246_create_servers.rb (renamed from db/migrate/20140304015206_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015248_create_tournaments.rb (renamed from db/migrate/20140304015209_create_tournaments.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015250_create_matches.rb (renamed from db/migrate/20140304015211_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015252_create_teams.rb (renamed from db/migrate/20140304015213_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015254_create_users.rb (renamed from db/migrate/20140304015215_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015257_create_user_team_pairs.rb (renamed from db/migrate/20140304015217_create_user_team_pairs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015259_create_team_match_pairs.rb (renamed from db/migrate/20140304015219_create_team_match_pairs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015301_create_alerts.rb (renamed from db/migrate/20140304015221_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015303_create_pms.rb (renamed from db/migrate/20140304015223_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015306_create_games.rb (renamed from db/migrate/20140304015226_create_games.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015308_create_game_attributes.rb (renamed from db/migrate/20140304015228_create_game_attributes.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015310_create_server_settings.rb (renamed from db/migrate/20140304015230_create_server_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140304015316_create_tournament_options.rb (renamed from db/migrate/20140304015236_create_tournament_options.rb) | 0 | ||||
-rw-r--r-- | db/schema.rb | 2 | ||||
-rwxr-xr-x | generate.sh | 5 |
17 files changed, 10 insertions, 2 deletions
@@ -3,6 +3,8 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.0.2' +gem 'bootstrap-sass' + # Use sqlite3 as the database for Active Record gem 'sqlite3' diff --git a/Gemfile.lock b/Gemfile.lock index 564ce87..75d27b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,6 +27,8 @@ GEM tzinfo (~> 0.3.37) arel (4.0.2) atomic (1.1.14) + bootstrap-sass (3.1.1.0) + sass (~> 3.2) builder (3.1.4) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -113,6 +115,7 @@ PLATFORMS ruby DEPENDENCIES + bootstrap-sass coffee-rails (~> 4.0.0) jbuilder (~> 1.2) jquery-rails diff --git a/db/migrate/20140304015206_create_servers.rb b/db/migrate/20140304015246_create_servers.rb index f33241a..f33241a 100644 --- a/db/migrate/20140304015206_create_servers.rb +++ b/db/migrate/20140304015246_create_servers.rb diff --git a/db/migrate/20140304015209_create_tournaments.rb b/db/migrate/20140304015248_create_tournaments.rb index 36fcf7e..36fcf7e 100644 --- a/db/migrate/20140304015209_create_tournaments.rb +++ b/db/migrate/20140304015248_create_tournaments.rb diff --git a/db/migrate/20140304015211_create_matches.rb b/db/migrate/20140304015250_create_matches.rb index 6c0c157..6c0c157 100644 --- a/db/migrate/20140304015211_create_matches.rb +++ b/db/migrate/20140304015250_create_matches.rb diff --git a/db/migrate/20140304015213_create_teams.rb b/db/migrate/20140304015252_create_teams.rb index dd8397d..dd8397d 100644 --- a/db/migrate/20140304015213_create_teams.rb +++ b/db/migrate/20140304015252_create_teams.rb diff --git a/db/migrate/20140304015215_create_users.rb b/db/migrate/20140304015254_create_users.rb index 6a500e5..6a500e5 100644 --- a/db/migrate/20140304015215_create_users.rb +++ b/db/migrate/20140304015254_create_users.rb diff --git a/db/migrate/20140304015217_create_user_team_pairs.rb b/db/migrate/20140304015257_create_user_team_pairs.rb index 2c492ac..2c492ac 100644 --- a/db/migrate/20140304015217_create_user_team_pairs.rb +++ b/db/migrate/20140304015257_create_user_team_pairs.rb diff --git a/db/migrate/20140304015219_create_team_match_pairs.rb b/db/migrate/20140304015259_create_team_match_pairs.rb index 8fac07e..8fac07e 100644 --- a/db/migrate/20140304015219_create_team_match_pairs.rb +++ b/db/migrate/20140304015259_create_team_match_pairs.rb diff --git a/db/migrate/20140304015221_create_alerts.rb b/db/migrate/20140304015301_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140304015221_create_alerts.rb +++ b/db/migrate/20140304015301_create_alerts.rb diff --git a/db/migrate/20140304015223_create_pms.rb b/db/migrate/20140304015303_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140304015223_create_pms.rb +++ b/db/migrate/20140304015303_create_pms.rb diff --git a/db/migrate/20140304015226_create_games.rb b/db/migrate/20140304015306_create_games.rb index 59d4ef0..59d4ef0 100644 --- a/db/migrate/20140304015226_create_games.rb +++ b/db/migrate/20140304015306_create_games.rb diff --git a/db/migrate/20140304015228_create_game_attributes.rb b/db/migrate/20140304015308_create_game_attributes.rb index b63f134..b63f134 100644 --- a/db/migrate/20140304015228_create_game_attributes.rb +++ b/db/migrate/20140304015308_create_game_attributes.rb diff --git a/db/migrate/20140304015230_create_server_settings.rb b/db/migrate/20140304015310_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140304015230_create_server_settings.rb +++ b/db/migrate/20140304015310_create_server_settings.rb diff --git a/db/migrate/20140304015236_create_tournament_options.rb b/db/migrate/20140304015316_create_tournament_options.rb index d2df22e..d2df22e 100644 --- a/db/migrate/20140304015236_create_tournament_options.rb +++ b/db/migrate/20140304015316_create_tournament_options.rb diff --git a/db/schema.rb b/db/schema.rb index ede0e8c..264a347 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: 20140304015236) do +ActiveRecord::Schema.define(version: 20140304015316) do create_table "alerts", force: true do |t| t.integer "author_id" diff --git a/generate.sh b/generate.sh index 9c6a1ab..07a7688 100755 --- a/generate.sh +++ b/generate.sh @@ -1,6 +1,9 @@ #!/bin/bash -# +# The generate.sh bash file is used to generate all of the necessary .rb files to run the website +# + + # To Start Rails Server: # bundle exec rails server # |