Combine last_updated_by and last_updated_at columns on issues index

[rails.git] / app / views / user / reset_password.html.erb

diff --git a/app/views/user/reset_password.html.erb b/app/views/user/reset_password.html.erb
index d1718a5e4853f074a77c3b6dd488a62c1057e68e..895bd98b6fef24b5fc4993578dbc92e903e7aa43 100644 (file)
--- a/app/views/user/reset_password.html.erb
+++ b/app/views/user/reset_password.html.erb
@@ -1,8 +1,8 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t 'user.reset_password.heading', :user => @user.display_name %></h1>
+  <h1><%= t 'user.reset_password.heading', :user => current_user.display_name %></h1>

 <% end %>
 
 <% end %>
 

-<%= error_messages_for :user %>
+<%= error_messages_for current_user %>

 
 <%= form_tag do %>
 <%= hidden_field_tag(:token, params[:token]) %>
 
 <%= form_tag do %>
 <%= hidden_field_tag(:token, params[:token]) %>