diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-11 13:07:02 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-11 13:07:02 +0100 |
| commit | 7e4a7d9ecc02db06c568a0de47e096edbdc1224b (patch) | |
| tree | 701af1b1789f17950a22a19df4cf8f69d3beb173 /app/views/admin/users/show.html.haml | |
| parent | 3f08e4b186bd02b37f34ccf1bc641a95f9d865ce (diff) | |
| parent | dfa09789061bbd3891c17ebbcc23f7bd6b95336c (diff) | |
| download | gitlab-ce-7e4a7d9ecc02db06c568a0de47e096edbdc1224b.tar.gz | |
Merge branch 'master' into copying-file-seen-as-licence
Diffstat (limited to 'app/views/admin/users/show.html.haml')
| -rw-r--r-- | app/views/admin/users/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index a383ea57384..0848504b7a6 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -8,13 +8,13 @@ = @user.name %ul.well-list %li - = image_tag avatar_icon(@user.email, 60), class: "avatar s60" + = image_tag avatar_icon(@user, 60), class: "avatar s60" %li %span.light Profile page: %strong = link_to user_path(@user) do = @user.username - = render 'users/profile', user: @user + = render 'admin/users/profile', user: @user .panel.panel-default .panel-heading |