Merge branch 'master' of http://github.com/LukeShu/leaguer

15 files changed, 9 insertions, 7 deletions

diff --git a/db/migrate/20140304020846_create_servers.rb b/db/migrate/20140304021023_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304020846_create_servers.rb
+++ b/db/migrate/20140304021023_create_servers.rb
diff --git a/db/migrate/20140304020848_create_tournaments.rb b/db/migrate/20140304021025_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304020848_create_tournaments.rb
+++ b/db/migrate/20140304021025_create_tournaments.rb
diff --git a/db/migrate/20140304020850_create_matches.rb b/db/migrate/20140304021028_create_matches.rb
index 325863d..325863d 100644
--- a/db/migrate/20140304020850_create_matches.rb
+++ b/db/migrate/20140304021028_create_matches.rb
diff --git a/db/migrate/20140304020853_create_teams.rb b/db/migrate/20140304021030_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304020853_create_teams.rb
+++ b/db/migrate/20140304021030_create_teams.rb
diff --git a/db/migrate/20140304020906_create_alerts.rb b/db/migrate/20140304021032_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304020906_create_alerts.rb
+++ b/db/migrate/20140304021032_create_alerts.rb
diff --git a/db/migrate/20140304020908_create_pms.rb b/db/migrate/20140304021035_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304020908_create_pms.rb
+++ b/db/migrate/20140304021035_create_pms.rb
diff --git a/db/migrate/20140304020911_create_games.rb b/db/migrate/20140304021037_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304020911_create_games.rb
+++ b/db/migrate/20140304021037_create_games.rb
diff --git a/db/migrate/20140304020913_create_game_attributes.rb b/db/migrate/20140304021039_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304020913_create_game_attributes.rb
+++ b/db/migrate/20140304021039_create_game_attributes.rb
diff --git a/db/migrate/20140304020915_create_server_settings.rb b/db/migrate/20140304021042_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304020915_create_server_settings.rb
+++ b/db/migrate/20140304021042_create_server_settings.rb
diff --git a/db/migrate/20140304020859_create_users.rb b/db/migrate/20140304021044_create_users.rb
index f0986d4..f0986d4 100644
--- a/db/migrate/20140304020859_create_users.rb
+++ b/db/migrate/20140304021044_create_users.rb
diff --git a/db/migrate/20140304020902_create_user_team_pairs.rb b/db/migrate/20140304021046_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304020902_create_user_team_pairs.rb
+++ b/db/migrate/20140304021046_create_user_team_pairs.rb
diff --git a/db/migrate/20140304020904_create_team_match_pairs.rb b/db/migrate/20140304021048_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304020904_create_team_match_pairs.rb
+++ b/db/migrate/20140304021048_create_team_match_pairs.rb
diff --git a/db/migrate/20140304020924_create_tournament_options.rb b/db/migrate/20140304021101_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304020924_create_tournament_options.rb
+++ b/db/migrate/20140304021101_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index f4bff97..a2c1dc9 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: 20140304020924) do
+ActiveRecord::Schema.define(version: 20140304021101) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
diff --git a/generate.sh b/generate.sh
index 766453e..7f0467c 100755
--- a/generate.sh
+++ b/generate.sh
@@ -17,19 +17,21 @@ bundle exec rails generate scaffold server --force $NOTEST
 bundle exec rails generate scaffold tournament game:references --force $NOTEST
 bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST
 bundle exec rails generate scaffold team $NOTEST
-bundle exec rails generate controller users $NOTEST
-bundle exec rails generate controller Sessions
-bundle exec rails generate model user name:string email:string user_name:string $NOTEST
-bundle exec rails generate model user_team_pair user:references team:references $NOTEST
-bundle exec rails generate model team_match_pair team:references match:references $NOTEST
 bundle exec rails generate scaffold alert author:references message:text $NOTEST
 bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST
-bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer $NOTEST
+bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer --force $NOTEST
+
 bundle exec rails generate model game_attribute game:references key:text type:integer $NOTEST
 bundle exec rails generate model server_settings $NOTEST
+bundle exec rails generate model user name:string email:string user_name:string $NOTEST
+bundle exec rails generate model user_team_pair user:references team:references $NOTEST
+bundle exec rails generate model team_match_pair team:references match:references $NOTEST
+
 bundle exec rails generate controller search $NOTEST
 bundle exec rails generate controller main $NOTEST
 bundle exec rails generate controller static $NOTEST
+bundle exec rails generate controller users $NOTEST
+bundle exec rails generate controller Sessions
 
 #added some stuff to the database