Fixes

Author: nygrenh

app/views/password_reset_keys/show.html.erb

@@ -1,10 +1,9 @@
 <h1>Reset password</h1>
 
-<p>Resetting password for <%= @user.login %></p>
+<p>Resetting password for <%= @user.email %></p>
 
 <%= form_tag reset_password_path(key: @key.token), method: :delete do %>
   <%= labeled_field('New password: ', password_field_tag(:password)) %>
   <%= labeled_field('Confirm new password: ', password_field_tag(:password_confirmation)) %>
   <%= submit_tag 'Set password' %>
 <% end %>
-

lib/submission_packager.rb

@@ -157,7 +157,7 @@ def copy_extra_student_files(tmc_project_file, received, dest)
         from = "#{received}/#{rel_path}"
         to = "#{dest}/#{rel_path}"
         next unless File.exist?(from)
-        FileUtils.rm(to) if File.exist?(to)
+        FileUtils.rm_rf(to, secure: true) if File.exist?(to)
         FileUtils.mkdir_p(File.dirname(to))
         FileUtils.cp(from, to)
       end