diff options
author | Rémy Coutable <remy@rymai.me> | 2018-08-01 18:21:24 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-08-01 18:21:24 +0300 |
commit | 83a0db0c551236518bdec1a7ae3a1ed1d05f5aaa (patch) | |
tree | e13ad022ea223e7bde5202a31ee81169225fec99 /app/views/shared | |
parent | ea6fc714bb0306ac8ca56b5dafe4b6777aafe5fc (diff) | |
parent | 12095251c3777c5231cab97854d5dca69d31cc5d (diff) |
Merge branch 'bvl-user-status-message-35463' into 'master'
Allow users to set a status
Closes #35463
See merge request gitlab-org/gitlab-ce!20614
Diffstat (limited to 'app/views/shared')
-rw-r--r-- | app/views/shared/members/_member.html.haml | 1 | ||||
-rw-r--r-- | app/views/shared/notes/_note.html.haml | 4 | ||||
-rw-r--r-- | app/views/shared/snippets/_header.html.haml | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 46debe1f2b9..af29c0fe59e 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -11,6 +11,7 @@ = image_tag avatar_icon_for_user(user, 40), class: "avatar s40", alt: '' .user-info = link_to user.name, user_path(user), class: 'member' + = user_status(user) %span.cgray= user.to_reference - if user == current_user diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml index f5464058bc0..84adbd444c5 100644 --- a/app/views/shared/notes/_note.html.haml +++ b/app/views/shared/notes/_note.html.haml @@ -31,7 +31,9 @@ .note-header .note-header-info %a{ href: user_path(note.author) } - %span.note-header-author-name= sanitize(note.author.name) + %span.note-header-author-name + = sanitize(note.author.name) + = user_status(note.author) %span.note-headline-light = note.author.to_reference %span.note-headline-light diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml index 828ec870dc0..10bfc30492a 100644 --- a/app/views/shared/snippets/_header.html.haml +++ b/app/views/shared/snippets/_header.html.haml @@ -8,6 +8,7 @@ Authored = time_ago_with_tooltip(@snippet.created_at, placement: 'bottom', html_class: 'snippet_updated_ago') by #{link_to_member(@project, @snippet.author, size: 24, author_class: "author item-title", avatar_class: "d-none d-sm-inline")} + = user_status(@snippet.author) .detail-page-header-actions - if @snippet.project_id? |