diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:31:47 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:31:47 -0500 |
commit | 1ecd3d50d0ac73968362f885c9f60ec38253be9a (patch) | |
tree | 324f79ad4d4da1af623fc93f215643287d6210f3 /generate.sh | |
parent | b2e0b1397596ee8f624ef4de122cc71599d4dc0d (diff) | |
parent | c1f714a479eb7ca9e9125e283361a471dd928278 (diff) |
Merge branch 'clean'
Conflicts:
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
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 739c195..45a8ab6 100755 --- a/generate.sh +++ b/generate.sh @@ -18,7 +18,7 @@ git checkout clean-start -- app test config/routes.rb # The whole shebang, models, views, and controllers bundle exec rails generate scaffold server --force $NOTEST -bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST +bundle exec rails generate scaffold match tournament:references name:string winner:references --force $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 |