Merge branch 'user-callout-showing-on-all-profiles' into 'master'

Fix usercallout to only show on the current logged in user profile

Closes #29839

See merge request !10151

app/views/users/show.html.haml

@@ -97,7 +97,8 @@
           Snippets
 
   %div{ class: container_class }
-    .user-callout{ 'callout-svg' => custom_icon('icon_customization') }
+    - if @user == current_user
+      .user-callout{ 'callout-svg' => custom_icon('icon_customization') }
     .tab-content
       #activity.tab-pane
         .row-content-block.calender-block.white.second-block.hidden-xs

changelogs/unreleased/user-callout-showing-on-all-profiles.yml

+---
+title: User callout only shows on current users profile
+merge_request:
+author:

spec/features/user_callout_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'User Callouts', js: true do
   let(:user) { create(:user) }
+  let(:another_user) { create(:user) }
   let(:project) { create(:empty_project, path: 'gitlab', name: 'sample') }
 
   before do
@@ -32,6 +33,11 @@ describe 'User Callouts', js: true do
     within('.user-callout') do
       find('.close-user-callout').click
     end
-    expect(page).not_to have_selector('#user-callout')
+    expect(page).not_to have_selector('.user-callout')
+  end
+
+  it 'does not show callout on another users profile' do
+    visit user_path(another_user)
+    expect(page).not_to have_selector('.user-callout')
   end
 end