diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
commit | 38d6960be1efdb6345445ab293a8cd605193785f (patch) | |
tree | df37e79b5744b570aded5aa4d7fe38cd772a49fe /generate.sh | |
parent | bcfa571b0328a4b3e94479a31c027621ceb86ad5 (diff) | |
parent | d14dcf9af11a0f2eab2609efb7d9e59a9cc18bb0 (diff) |
Merge branch 'master' into luke
Conflicts:
app/controllers/application_controller.rb
app/controllers/tournaments_controller.rb
Diffstat (limited to 'generate.sh')
-rwxr-xr-x | generate.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/generate.sh b/generate.sh index 728e122..0998488 100755 --- a/generate.sh +++ b/generate.sh @@ -12,6 +12,8 @@ cd "$srcdir" git rm -rf app test config/routes.rb db/migrate 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 |