erblint: use conditional assignment

diff --git a/.erb-lint.yml b/.erb-lint.yml
index bf591777da2700149f40aff618c7f0b3cc19ffb0..25811bccdbf45d76883771d90d2ee19d291acd24 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -31,7 +31,5 @@ linters:
         Enabled: false # TODO
       Rails/LinkToBlank:
         Enabled: false # TODO
         Enabled: false # TODO
       Rails/LinkToBlank:
         Enabled: false # TODO

-      Style/ConditionalAssignment:
-        Enabled: false # TODO

 exclude:
   - '**/vendor/**'
 exclude:
   - '**/vendor/**'

diff --git a/app/views/changesets/history.html.erb b/app/views/changesets/history.html.erb
index f27aacb8cd96a8a31b651afba07eaad4b06718db..55a137f5954986e683f994618d28fd66ed9863b6 100644 (file)
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -6,11 +6,11 @@
 
 <%
    set_title(changeset_index_title(params, current_user))
 
 <%
    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
+   @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>
 %>
 
 <h2>