diff options
Diffstat (limited to 'app/views/users')
-rw-r--r-- | app/views/users/calendar_activities.html.haml | 2 | ||||
-rw-r--r-- | app/views/users/show.html.haml | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml index 8da1aa09215..3571031fbfa 100644 --- a/app/views/users/calendar_activities.html.haml +++ b/app/views/users/calendar_activities.html.haml @@ -20,7 +20,7 @@ - if event.note? = link_to event.note_target.to_reference, event_note_target_url(event), class: 'has-tooltip', title: event.target_title - elsif event.target - = link_to event.target.to_reference, [event.project, event.target], class: 'has-tooltip', title: event.target_title + = link_to event.target.to_reference, Gitlab::UrlBuilder.build(event.target, only_path: true), class: 'has-tooltip', title: event.target_title = s_('UserProfile|at') %strong diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 03ecf8cac22..af29de6b0c4 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -18,14 +18,7 @@ icon: 'pencil', button_options: { class: 'gl-flex-grow-1 gl-mx-1 has-tooltip', title: s_('UserProfile|Edit profile'), 'aria-label': 'Edit profile', data: { toggle: 'tooltip', placement: 'bottom', container: 'body' }}) - elsif current_user - - if @user.abuse_report - = render Pajamas::ButtonComponent.new(variant: :danger, - icon: 'error', - button_options: { class: 'gl-flex-grow-1 gl-mx-1 has-tooltip', title: s_('UserProfile|Already reported for abuse'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' }}) - - else - = render Pajamas::ButtonComponent.new(href: new_abuse_report_path(user_id: @user.id, ref_url: request.referer), - icon: 'error', - button_options: { class: 'gl-flex-grow-1 gl-mx-1 has-tooltip', title: _('Report abuse to administrator'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' }}) + #js-report-abuse{ data: { report_abuse_path: add_category_abuse_reports_path, reported_user_id: @user.id, reported_from_url: user_url(@user) } } - verified_gpg_keys = @user.gpg_keys.select(&:verified?) - if verified_gpg_keys.any? = render Pajamas::ButtonComponent.new(href: user_gpg_keys_path, |