diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-21 12:47:32 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-21 12:47:32 -0500 |
| commit | 3b39214f29f5c2e773f2af923cec70a463f39a73 (patch) | |
| tree | 5e519a86c4f0431ca3f309474746a33d70dd1c9f /lib/gitlab/gon_helper.rb | |
| parent | d4f6d39896392a964c254ad542eeefeb7c254093 (diff) | |
| parent | 1c7c114e76510349bebb2494c951713813526489 (diff) | |
| download | gitlab-ce-3b39214f29f5c2e773f2af923cec70a463f39a73.tar.gz | |
Merge remote-tracking branch 'origin/master' into issue_14904
Diffstat (limited to 'lib/gitlab/gon_helper.rb')
| -rw-r--r-- | lib/gitlab/gon_helper.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index 9d81ffb3e6c..ab900b641c4 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -8,7 +8,6 @@ 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 |