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

1 files changed, 8 insertions, 6 deletions

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