diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 16:56:11 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 16:56:11 +0300 |
commit | 59176c1026a7b3f0b6798c295ad48af943486615 (patch) | |
tree | 2027499f259e745306b9e44961d36bd55490b6be | |
parent | c0bf026ed8253e9bf749546e40f968dbc20aaac1 (diff) | |
parent | 3bb2aa9f980eaddfff6af25b6a147f608b62c24d (diff) |
Merge branch 'master' into 'master'
Link username to profile on Group Members page
When browsing a GitLab group, a user may want to view a particular user's
other contributions or profile information. This link helps make
that process seamless.
See merge request !1099
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | app/views/groups/group_members/_group_member.html.haml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index c0a98522fd4..4f7c8ba4f5d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,8 @@ v 7.14.0 (unreleased) v 7.13.3 - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. - Allow users to send abuse reports + - Remove satellites + - Link username to profile on Group Members page (Tom Webster) v 7.13.2 - Fix randomly failed spec diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml index acc7f8b28c2..b5f359279d5 100644 --- a/app/views/groups/group_members/_group_member.html.haml +++ b/app/views/groups/group_members/_group_member.html.haml @@ -6,7 +6,8 @@ %span{class: ("list-item-name" if show_controls)} - if member.user = image_tag avatar_icon(user.email, 16), class: "avatar s16", alt: '' - %strong= user.name + %strong + = link_to user.name, user_path(user) %span.cgray= user.username - if user == current_user %span.label.label-success It's you |