summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-18 12:04:04 +0000
committerPhil Hughes <me@iamphill.com>2017-05-18 12:04:04 +0000
commit72119e7f38d5c50d2f1333adfedd6922d3e65ad1 (patch)
tree765afcd97dbe7cd5badd07fd757057728537556e
parent755bc44ea482dabe78fcfdea07d579230a32c2f4 (diff)
parente6a4b8c16337f26c6688f0b6ef5579daf9a50d39 (diff)
downloadgitlab-ce-72119e7f38d5c50d2f1333adfedd6922d3e65ad1.tar.gz
Merge branch 'add-current_user-avatar_url-to-gon' into 'master'
Add current_user_avatar_url to gon See merge request !11474
-rw-r--r--lib/gitlab/gon_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index 26473f99bc3..6200bd460ea 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -17,6 +17,7 @@ module Gitlab
gon.current_user_id = current_user.id
gon.current_username = current_user.username
gon.current_user_fullname = current_user.name
+ gon.current_user_avatar_url = current_user.avatar_url
end
end
end