diff options
author | nfoy <nfoy@purdue.edu> | 2014-04-24 19:15:27 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-04-24 19:15:27 -0400 |
commit | ddfe11c0444cf424cad3d14bc9be48d32423f3dd (patch) | |
tree | 135db4cd6bf22380953315ea1244f720a5419e2d /generate.sh | |
parent | 1b11684986136ee87da6242c3ba6aba5ef581510 (diff) | |
parent | 67d95e5b92e3d19765c7ccaf5460737ffe2173f4 (diff) |
Merge branch 'clean2'
Conflicts:
app/models/pm.rb
app/views/pms/index.html.erb
app/views/pms/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 be2e1a1..a81c0b3 100755 --- a/generate.sh +++ b/generate.sh @@ -43,7 +43,7 @@ bundle exec rails generate scaffold server default_user_permissions:integer bundle exec rails generate scaffold match status:integer tournament_stage:references winner:references remote_id:text submitted_peer_evaluations:integer 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 pm author:references recipient:references message:text subject:text conversation:references 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 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 |