diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-30 11:35:40 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-30 11:35:40 +0300 |
| commit | f438bd415ffc4405c2e81360a92ffaf907cd87ad (patch) | |
| tree | 6543a5114236effcba0dc3f4ac307b7d33d65cc3 /app/views/users/show.html.haml | |
| parent | 0904cc485c23385e4ac0628ddce5e1c842909af4 (diff) | |
| parent | d9c02f30e56592986b98bcbf8e7c1abd712b696f (diff) | |
| download | gitlab-ce-f438bd415ffc4405c2e81360a92ffaf907cd87ad.tar.gz | |
Merge branch 'master' into 6-0-dev
Conflicts:
app/controllers/admin/teams/projects_controller.rb
app/views/team_members/_team_member.html.haml
app/views/teams/members/_member.html.haml
Diffstat (limited to 'app/views/users/show.html.haml')
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 80c83a98b2f..b70f4193209 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -1,7 +1,7 @@ .row .span8 %h3.page_title - = image_tag gravatar_icon(@user.email, 90), class: "avatar s90" + = image_tag gravatar_icon(@user.email, 90), class: "avatar s90", alt: '' = @user.name - if @user == current_user .pull-right |