diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 17:26:47 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 17:26:47 -0500 |
| commit | 5c10b29700eea58c5b34b6601c2f98e7685b2fa4 (patch) | |
| tree | fd51aa9af2947275b68892bf963c6fb61a351f47 /lib/gitlab/gon_helper.rb | |
| parent | c9f11db21914ff5d5bd7799aebdc7948d66d08e3 (diff) | |
| parent | 7e6d59067eb614a139cfa438d4c9f9f9f5368a47 (diff) | |
| download | gitlab-ce-5c10b29700eea58c5b34b6601c2f98e7685b2fa4.tar.gz | |
Merge remote-tracking branch 'origin/master' into issue_14904
# Conflicts:
# app/views/shared/issuable/_sidebar.html.haml
Diffstat (limited to 'lib/gitlab/gon_helper.rb')
| -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..9d81ffb3e6c 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.sentry_dsn = ApplicationSetting.current.sentry_dsn if Rails.env.production? if current_user gon.current_user_id = current_user.id |