Commit 59176c10 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents c0bf026e 3bb2aa9f
...@@ -55,6 +55,8 @@ v 7.14.0 (unreleased) ...@@ -55,6 +55,8 @@ v 7.14.0 (unreleased)
v 7.13.3 v 7.13.3
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed. - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
- Allow users to send abuse reports - Allow users to send abuse reports
- Remove satellites
- Link username to profile on Group Members page (Tom Webster)
v 7.13.2 v 7.13.2
- Fix randomly failed spec - Fix randomly failed spec
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
%span{class: ("list-item-name" if show_controls)} %span{class: ("list-item-name" if show_controls)}
- if member.user - if member.user
= image_tag avatar_icon(user.email, 16), class: "avatar s16", alt: '' = 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 %span.cgray= user.username
- if user == current_user - if user == current_user
%span.label.label-success It's you %span.label.label-success It's you
......
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