diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
commit | c93c9f837c09ba0385690fb1a228a9c506ca120c (patch) | |
tree | 19f115b0bc62fefc45f9c25ec4beeefee6429c8b /generate.sh | |
parent | 9003a9099719a771fbbb9d2e8a4bfb093f35929a (diff) | |
parent | 933199499f9adfa0347783c538a10b88ffb1b98b (diff) |
Merge branch 'clean2'
Conflicts:
app/assets/stylesheets/static.css.scss
app/controllers/static_controller.rb
Diffstat (limited to 'generate.sh')
-rwxr-xr-x | generate.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generate.sh b/generate.sh index 5fe3c74..74976d3 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 @@ -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 |