summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoginth <me@yoginth.com>2019-01-23 08:43:49 +0000
committerPhil Hughes <me@iamphill.com>2019-01-23 08:43:49 +0000
commiteae751fafeec4d8331384f791b060a85f90bc52f (patch)
treed1279e3bf753695f6983e5baaf40b28d163f0567
parente67af0698970beb7f12ae0945870a5b217f8d45d (diff)
downloadgitlab-ce-eae751fafeec4d8331384f791b060a85f90bc52f.tar.gz
Add Avatar in the settings sidebar
-rw-r--r--app/views/layouts/nav/sidebar/_profile.html.haml2
-rw-r--r--changelogs/unreleased/yoginth-avatar-on-settings-sidebar.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/layouts/nav/sidebar/_profile.html.haml b/app/views/layouts/nav/sidebar/_profile.html.haml
index 69167edb1df..1e3bb8f1224 100644
--- a/app/views/layouts/nav/sidebar/_profile.html.haml
+++ b/app/views/layouts/nav/sidebar/_profile.html.haml
@@ -3,7 +3,7 @@
.context-header
= link_to profile_path, title: _('Profile Settings') do
.avatar-container.s40.settings-avatar
- = sprite_icon('user', size: 24)
+ = image_tag avatar_icon_for_user(current_user, 40), class: "avatar s40 avatar-tile", alt: current_user.name
.sidebar-context-title User Settings
%ul.sidebar-top-level-items
= nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
diff --git a/changelogs/unreleased/yoginth-avatar-on-settings-sidebar.yml b/changelogs/unreleased/yoginth-avatar-on-settings-sidebar.yml
new file mode 100644
index 00000000000..0ec76f9ce02
--- /dev/null
+++ b/changelogs/unreleased/yoginth-avatar-on-settings-sidebar.yml
@@ -0,0 +1,5 @@
+---
+title: Added Avatar in the settings sidebar
+merge_request: 24515
+author: Yoginth
+type: changed