Get changes to generate.sh from master

1 files changed, 2 insertions, 5 deletions

diff --git a/generate.sh b/generate.sh
index b8651c2..e965fde 100755
--- a/generate.sh
+++ b/generate.sh
@@ -21,8 +21,8 @@ bundle exec rails generate delayed_job:active_record
 
 # The whole shebang, models, views, and controllers
 bundle exec rails generate scaffold server default_user_permissions:integer
-bundle exec rails generate scaffold match status:integer tournament_stage:references name:string winner:references remote_id:string submitted_peer_evaluations:integer
-bundle exec rails generate scaffold team match:references
+bundle exec rails generate scaffold match status:integer tournament_stage:references winner:references remote_id:text submitted_peer_evaluations:integer
+bundle exec rails generate scaffold team
 bundle exec rails generate scaffold alert author:references message:text
 bundle exec rails generate scaffold pm author:references recipient:references message:text
 bundle exec rails generate scaffold tournament game:references status:integer name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer set_rounds:integer randomized_teams:boolean sampling_method:string
@@ -60,9 +60,6 @@ bundle exec rails generate controller static
 # not stick these in the views or anything.
 bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string permissions:integer
 
-#for the tournament controller to generate options
-#bundle exec rails generate scaffold
-
 bundle exec rake db:drop
 bundle exec rake db:migrate
 bundle exec rake db:seed