Merge remote-tracking branch 'upstream/pull/2383'

[rails.git] / app / views / changesets / history.html.erb

diff --git a/app/views/changesets/history.html.erb b/app/views/changesets/history.html.erb
index 1117f01b3b46229282c09d4545d6ad70896d0355..e3df87490379368f9eb051780c19ad1463d72b20 100644 (file)
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -4,14 +4,12 @@
   <% end -%>
 <% end -%>
 
-<%
-   set_title(changeset_index_title(params, current_user))
-   if params[:display_name]
-     @heading = t('changesets.index.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
-   else
-     @heading = @title
-   end
-%>
+<% set_title(changeset_index_title(params, current_user))
+   @heading = if params[:display_name]
+                t("changesets.index.title_user", :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
+              else
+                @title
+              end %>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>