diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
commit | 45c5d311492ef98ed702beaf043d289a705a5e0b (patch) | |
tree | c0bea2e65d21127a1fd34a245b5bb7fc47123bb0 /app/views/matches/_form.html.erb | |
parent | 9d226fcd27b6c2470edf718ad36a262348891470 (diff) | |
parent | c927cd7c043d982f8ffb51c8a78288d88d825d82 (diff) |
Merge branch 'clean2'
Conflicts:
app/models/team.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'app/views/matches/_form.html.erb')
-rw-r--r-- | app/views/matches/_form.html.erb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index 88fe733..9d402b3 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -9,16 +9,12 @@ <%= f.text_field :tournament_stage_id %> </div> <div class="field"> - <%= f.label :name %><br> - <%= f.text_field :name %> - </div> - <div class="field"> <%= f.label :winner_id %><br> <%= f.text_field :winner_id %> </div> <div class="field"> <%= f.label :remote_id %><br> - <%= f.text_field :remote_id %> + <%= f.text_area :remote_id %> </div> <div class="field"> <%= f.label :submitted_peer_evaluations %><br> |