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

[rails.git] / app / views / users / show.html.erb

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 44319b384f4ac313b39502b99150e05d2ce08ef8..d479b1d56dad13e0ab1e94e5188f8b6331ccf2cd 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -217,9 +217,9 @@
             <dl class="list-inline">
               <dt class="list-inline-item m-0"><%= t ".email address" %></dt>
               <dd class="list-inline-item"><%= @user.email %></dd>
             <dl class="list-inline">
               <dt class="list-inline-item m-0"><%= t ".email address" %></dt>
               <dd class="list-inline-item"><%= @user.email %></dd>

-              <% unless @user.creation_ip.nil? -%>
+              <% unless @user.creation_address.nil? -%>

                 <dt class="list-inline-item m-0"><%= t ".created from" %></dt>
                 <dt class="list-inline-item m-0"><%= t ".created from" %></dt>

-                <dd class="list-inline-item"><%= link_to @user.creation_ip, users_path(:ip => @user.creation_ip) %></dd>
+                <dd class="list-inline-item"><%= link_to @user.creation_address, users_path(:ip => @user.creation_address) %></dd>

               <% end -%>
               <dt class="list-inline-item m-0"><%= t ".status" %></dt>
               <dd class="list-inline-item"><%= link_to @user.status.capitalize, users_path(:status => @user.status) %></dd>
               <% end -%>
               <dt class="list-inline-item m-0"><%= t ".status" %></dt>
               <dd class="list-inline-item"><%= link_to @user.status.capitalize, users_path(:status => @user.status) %></dd>