Merge branch '25134-mobile-issue-view-doesn-t-show-organization-membership' into 'master'
Show organisation membership and delete comment action on smaller viewports, plus chang… Closes #25134 See merge request !8905
This commit is contained in:
commit
f6433c54b1
|
@ -9,9 +9,12 @@
|
|||
= image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
|
||||
.timeline-content
|
||||
.note-header
|
||||
= link_to_member(note.project, note.author, avatar: false)
|
||||
.note-headline-light
|
||||
%a.visible-xs{ href: user_path(note.author) }
|
||||
= note.author.to_reference
|
||||
= link_to_member(note.project, note.author, avatar: false, extra_class: 'hidden-xs')
|
||||
.note-headline-light
|
||||
%span.hidden-xs
|
||||
= note.author.to_reference
|
||||
- unless note.system
|
||||
commented
|
||||
- if note.system
|
||||
|
@ -23,7 +26,7 @@
|
|||
.note-actions
|
||||
- access = note_max_access_for_user(note)
|
||||
- if access
|
||||
%span.note-role.hidden-xs= access
|
||||
%span.note-role= access
|
||||
|
||||
- if note.resolvable?
|
||||
- can_resolve = can?(current_user, :resolve_note, note)
|
||||
|
@ -59,7 +62,7 @@
|
|||
- if note_editable
|
||||
= link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
|
||||
= icon('pencil', class: 'link-highlight')
|
||||
= link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button hidden-xs js-note-delete danger' do
|
||||
= link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do
|
||||
= icon('trash-o', class: 'danger-highlight')
|
||||
.note-body{ class: note_editable ? 'js-task-list-container' : '' }
|
||||
.note-text.md
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Show organisation membership and delete comment on smaller viewports, plus change comment author name to username
|
||||
merge_request:
|
||||
author:
|
Loading…
Reference in New Issue