diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-07 22:47:56 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-07 22:47:56 +0000 |
| commit | f6433c54b1fb87a51956bd1cd3ce1667054dfd31 (patch) | |
| tree | cddb5016e388e247389e76b8fc2fce8049035d9b | |
| parent | 36def7074324772e5707b5c5fed563437eb47e5f (diff) | |
| parent | 0c2d915a7180a0450aa73473361d15b572f19ab9 (diff) | |
| download | gitlab-ce-f6433c54b1fb87a51956bd1cd3ce1667054dfd31.tar.gz | |
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
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 11 | ||||
| -rw-r--r-- | changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 09339e520dd..4b1da9c73e5 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -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 diff --git a/changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml b/changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml new file mode 100644 index 00000000000..d35ad0be0db --- /dev/null +++ b/changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml @@ -0,0 +1,4 @@ +--- +title: Show organisation membership and delete comment on smaller viewports, plus change comment author name to username +merge_request: +author: |