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

1 files changed, 3 insertions, 3 deletions

diff --git a/generate.sh b/generate.sh
index 5fe3c74..7d33ba3 100755
--- a/generate.sh
+++ b/generate.sh
@@ -29,6 +29,7 @@ cd "$srcdir"
 export RAILS_ENV=development
 
 git rm -rf -- app test config/routes.rb db/migrate || true
+git rm -f -- config/initializers/mailboxer.rb || true
 git checkout clean-start -- app test config/routes.rb
 
 bundle install
@@ -44,7 +45,7 @@ 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
-bundle exec rails generate scaffold game                                      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
+bundle exec rails generate scaffold game       parent:references              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
 bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq
 bundle exec rails generate scaffold session user:references token:string:uniq
 bundle exec rails generate scaffold bracket user:references tournament:references name:string
@@ -73,7 +74,6 @@ bundle exec rails generate migration CreateMatchTeamJoinTable	matches teams
 # Just controllers
 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
@@ -86,4 +86,4 @@ bundle exec rake db:seed
 
 find app config -type f -name '*.rb' -exec bin/autoindent {} \;
 
-git add app test config/routes.rb config/initializers db/migrate db/schema.rb Gemfile.lock
+git add app test config db/migrate db/schema.rb Gemfile.lock