summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-03-02 18:41:22 -0500
committerAndrewMurrell <amurrel@purdue.edu>2014-03-02 18:41:22 -0500
commitfd059f33294c86bc5a9fcd718461de992786a223 (patch)
tree193ab9196ebcd62e15cb7f8009cb8c9184578449
parent723b767367e8e6d574139ebee081c142a6288173 (diff)
The start script is less obnoxious now.
-rw-r--r--db/migrate/20140304020443_create_servers.rb (renamed from db/migrate/20140304020354_create_servers.rb)0
-rw-r--r--db/migrate/20140304020445_create_tournaments.rb (renamed from db/migrate/20140304020356_create_tournaments.rb)0
-rw-r--r--db/migrate/20140304020447_create_matches.rb (renamed from db/migrate/20140304020359_create_matches.rb)0
-rw-r--r--db/migrate/20140304020450_create_teams.rb (renamed from db/migrate/20140304020401_create_teams.rb)0
-rw-r--r--db/migrate/20140304020456_create_users.rb (renamed from db/migrate/20140304020407_create_users.rb)0
-rw-r--r--db/migrate/20140304020458_create_user_team_pairs.rb (renamed from db/migrate/20140304020410_create_user_team_pairs.rb)0
-rw-r--r--db/migrate/20140304020501_create_team_match_pairs.rb (renamed from db/migrate/20140304020412_create_team_match_pairs.rb)0
-rw-r--r--db/migrate/20140304020503_create_alerts.rb (renamed from db/migrate/20140304020414_create_alerts.rb)0
-rw-r--r--db/migrate/20140304020505_create_pms.rb (renamed from db/migrate/20140304020416_create_pms.rb)0
-rw-r--r--db/migrate/20140304020508_create_games.rb (renamed from db/migrate/20140304020419_create_games.rb)0
-rw-r--r--db/migrate/20140304020510_create_game_attributes.rb (renamed from db/migrate/20140304020421_create_game_attributes.rb)0
-rw-r--r--db/migrate/20140304020512_create_server_settings.rb (renamed from db/migrate/20140304020423_create_server_settings.rb)0
-rw-r--r--db/migrate/20140304020521_create_tournament_options.rb (renamed from db/migrate/20140304020432_create_tournament_options.rb)0
-rw-r--r--db/schema.rb2
-rwxr-xr-xstart.sh2
15 files changed, 2 insertions, 2 deletions
diff --git a/db/migrate/20140304020354_create_servers.rb b/db/migrate/20140304020443_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304020354_create_servers.rb
+++ b/db/migrate/20140304020443_create_servers.rb
diff --git a/db/migrate/20140304020356_create_tournaments.rb b/db/migrate/20140304020445_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304020356_create_tournaments.rb
+++ b/db/migrate/20140304020445_create_tournaments.rb
diff --git a/db/migrate/20140304020359_create_matches.rb b/db/migrate/20140304020447_create_matches.rb
index 6c0c157..6c0c157 100644
--- a/db/migrate/20140304020359_create_matches.rb
+++ b/db/migrate/20140304020447_create_matches.rb
diff --git a/db/migrate/20140304020401_create_teams.rb b/db/migrate/20140304020450_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304020401_create_teams.rb
+++ b/db/migrate/20140304020450_create_teams.rb
diff --git a/db/migrate/20140304020407_create_users.rb b/db/migrate/20140304020456_create_users.rb
index f0986d4..f0986d4 100644
--- a/db/migrate/20140304020407_create_users.rb
+++ b/db/migrate/20140304020456_create_users.rb
diff --git a/db/migrate/20140304020410_create_user_team_pairs.rb b/db/migrate/20140304020458_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304020410_create_user_team_pairs.rb
+++ b/db/migrate/20140304020458_create_user_team_pairs.rb
diff --git a/db/migrate/20140304020412_create_team_match_pairs.rb b/db/migrate/20140304020501_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304020412_create_team_match_pairs.rb
+++ b/db/migrate/20140304020501_create_team_match_pairs.rb
diff --git a/db/migrate/20140304020414_create_alerts.rb b/db/migrate/20140304020503_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304020414_create_alerts.rb
+++ b/db/migrate/20140304020503_create_alerts.rb
diff --git a/db/migrate/20140304020416_create_pms.rb b/db/migrate/20140304020505_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304020416_create_pms.rb
+++ b/db/migrate/20140304020505_create_pms.rb
diff --git a/db/migrate/20140304020419_create_games.rb b/db/migrate/20140304020508_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304020419_create_games.rb
+++ b/db/migrate/20140304020508_create_games.rb
diff --git a/db/migrate/20140304020421_create_game_attributes.rb b/db/migrate/20140304020510_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304020421_create_game_attributes.rb
+++ b/db/migrate/20140304020510_create_game_attributes.rb
diff --git a/db/migrate/20140304020423_create_server_settings.rb b/db/migrate/20140304020512_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304020423_create_server_settings.rb
+++ b/db/migrate/20140304020512_create_server_settings.rb
diff --git a/db/migrate/20140304020432_create_tournament_options.rb b/db/migrate/20140304020521_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304020432_create_tournament_options.rb
+++ b/db/migrate/20140304020521_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index dc34863..87bf66d 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: 20140304020432) do
+ActiveRecord::Schema.define(version: 20140304020521) do
create_table "alerts", force: true do |t|
t.integer "author_id"
diff --git a/start.sh b/start.sh
index 01b7f72..6c0d594 100755
--- a/start.sh
+++ b/start.sh
@@ -1,5 +1,5 @@
#!/bin/bash
generate.sh
-bundle exec rails server 2> server.talk &
+nohup bundle exec rails server &