Commit f6433c54 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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
parents 36def707 0c2d915a
...@@ -9,9 +9,12 @@ ...@@ -9,9 +9,12 @@
= image_tag avatar_icon(note.author), alt: '', class: 'avatar s40' = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
.timeline-content .timeline-content
.note-header .note-header
= link_to_member(note.project, note.author, avatar: false) %a.visible-xs{ href: user_path(note.author) }
.note-headline-light
= note.author.to_reference = 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 - unless note.system
commented commented
- if note.system - if note.system
...@@ -23,7 +26,7 @@ ...@@ -23,7 +26,7 @@
.note-actions .note-actions
- access = note_max_access_for_user(note) - access = note_max_access_for_user(note)
- if access - if access
%span.note-role.hidden-xs= access %span.note-role= access
- if note.resolvable? - if note.resolvable?
- can_resolve = can?(current_user, :resolve_note, note) - can_resolve = can?(current_user, :resolve_note, note)
...@@ -59,7 +62,7 @@ ...@@ -59,7 +62,7 @@
- if note_editable - if note_editable
= link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
= icon('pencil', class: 'link-highlight') = 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') = icon('trash-o', class: 'danger-highlight')
.note-body{ class: note_editable ? 'js-task-list-container' : '' } .note-body{ class: note_editable ? 'js-task-list-container' : '' }
.note-text.md .note-text.md
......
---
title: Show organisation membership and delete comment on smaller viewports, plus change comment author name to username
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment