summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-04-20 19:52:27 +0000
committerRobert Speicher <robert@gitlab.com>2016-04-20 19:52:27 +0000
commit0f309794e78243b1ee16ba6f1451dbb0752956c5 (patch)
tree7e3588951ee09746973d2583fd2b890fa0e3a2f7 /lib
parent1e596fef1c42a1dd925636c48fea01be444dc3ab (diff)
parent3e7a8b0789745080e499f68862ff29e3bc178453 (diff)
downloadgitlab-ce-0f309794e78243b1ee16ba6f1451dbb0752956c5.tar.gz
Merge branch 'sentry-js' into 'master'
Add Sentry logging for JavaScript errors Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12675 See merge request !3795
Diffstat (limited to 'lib')
-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 5ebaad6ca6e..eb27d82f110 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -7,6 +7,7 @@ module Gitlab
gon.max_file_size = current_application_settings.max_attachment_size
gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
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