From: Tom Hughes Date: Sun, 15 Sep 2024 18:30:22 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/5203' X-Git-Tag: live~607 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/33c0e95ebea3aeabae694ad5d9f0250dd11b56fb?hp=496a872f02e9446533bc6dfb8b4ac3fd91bf3cf2 Merge remote-tracking branch 'upstream/pull/5203' --- diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index c73581b25..44319b384 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -81,15 +81,15 @@ <%= link_to t(".comments"), diary_comments_path(@user) %> <%= number_with_delimiter(@user.diary_comments.size) %> -
  • - <% if current_user and current_user.friends_with?(@user) %> - <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %> - <% elsif current_user %> - <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %> - <% else %> - <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name) %> - <% end %> -
  • + <% if current_user %> +
  • + <% if current_user.friends_with?(@user) %> + <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %> + <% else %> + <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %> + <% end %> +
  • + <% end %> <% if @user.blocks.exists? %>