diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 23:21:50 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 23:21:50 +0000 |
| commit | cea3cf177c68bb1fa9326d4e88631b7737ae8a98 (patch) | |
| tree | 7c98808bc4188586063232bff9b024731eb25df8 /lib | |
| parent | e328eab0da46f1a5d4fbf2289911ce8f4093cfb6 (diff) | |
| parent | 94826d9abe13a20aae0868a096a03d2a4e706d82 (diff) | |
| download | gitlab-ce-cea3cf177c68bb1fa9326d4e88631b7737ae8a98.tar.gz | |
Merge branch 'award-emoji-fixes' into 'master'
Award emoji fixes
Fixes #18357 #18325 and #18424
See merge request !4550
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gon_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index ab900b641c4..f751a3a12fd 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -8,6 +8,7 @@ module Gitlab gon.relative_url_root = Gitlab.config.gitlab.relative_url_root gon.shortcuts_path = help_shortcuts_path gon.user_color_scheme = Gitlab::ColorSchemes.for_user(current_user).css_class + gon.award_menu_url = emojis_path if current_user gon.current_user_id = current_user.id |