solved merge conflicts

1 files changed, 13 insertions, 13 deletions

diff --git a/generate.sh b/generate.sh
index 1e15106..18d0f63 100755
--- a/generate.sh
+++ b/generate.sh
@@ -9,17 +9,17 @@ set -xe
 srcdir=$(dirname "$(readlink -f "$0")")
 cd "$srcdir"
 
-git rm -rf app test config/routes.rb db/migrate
+git rm -rf -- app test config/routes.rb db/migrate || true
 git checkout clean-start -- app test config/routes.rb
 
 bundle exec rails generate simple_captcha
 
 # The whole shebang, models, views, and controllers
-bundle exec rails generate scaffold server --force $NOTEST
-bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references remote_id:string $NOTEST
-bundle exec rails generate scaffold team 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 server default_user_permissions:integer
+bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references remote_id:string
+bundle exec rails generate scaffold team match:references
+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 name:string:unique game:references status:integer \
 	min_players_per_team:integer max_players_per_team:integer \
 	min_teams_per_match:integer max_teams_per_match:integer \
@@ -33,10 +33,10 @@ bundle exec rails generate scaffold user name:string email:string:uniq user_name
 bundle exec rails generate scaffold session user:references token:string:uniq
 
 # Just models
-bundle exec rails generate model server_setting $NOTEST
-bundle exec rails generate model game_setting game:references stype:integer name:string default:text description:text type_opt:text display_order:integer $NOTEST
-bundle exec rails generate model tournament_preference tournament:references vartype:integer name:string value:text $NOTEST
-bundle exec rails generate model score user:references match:references value:integer $NOTEST
+bundle exec rails generate model server_setting
+bundle exec rails generate model game_setting game:references stype:integer name:string default:text description:text type_opt:text display_order:integer
+bundle exec rails generate model tournament_preference tournament:references vartype:integer name:string value:text
+bundle exec rails generate model score user:references match:references value:integer
 bundle exec rails generate model remote_username game:references user:references json_value:text
 
 # Join tables
@@ -46,9 +46,9 @@ bundle exec rails generate migration CreateTeamUserJoinTable	teams	users
 bundle exec rails generate migration CreateMatchTeamJoinTable	matches teams
 
 # Just controllers
-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 search
+bundle exec rails generate controller main
+bundle exec rails generate controller static
 
 # Migrations
 # By having these separate from the original 'generate', it makes it