summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-05 17:51:38 +0000
committerPhil Hughes <me@iamphill.com>2017-05-05 17:51:38 +0000
commitb81535351023a3b19870ce052d8c3d0563391686 (patch)
tree0332d42df3b6fb80e752b47121f6a0f4ddb0cf92 /lib/gitlab
parentc9b246334753c47bef1111bdbfc1a45a1c9b0cfe (diff)
parente5a7ed3ac36aaa1045353e589dae98a29ca72f1e (diff)
downloadgitlab-ce-b81535351023a3b19870ce052d8c3d0563391686.tar.gz
Merge branch 'add-sentry-js-again-with-vue' into 'master'
Add sentry JS See merge request !6764
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/gon_helper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index 5ab84266b7d..26473f99bc3 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -10,6 +10,8 @@ module Gitlab
gon.user_color_scheme = Gitlab::ColorSchemes.for_user(current_user).css_class
gon.katex_css_url = ActionController::Base.helpers.asset_path('katex.css')
gon.katex_js_url = ActionController::Base.helpers.asset_path('katex.js')
+ gon.sentry_dsn = current_application_settings.clientside_sentry_dsn if current_application_settings.clientside_sentry_enabled
+ gon.gitlab_url = Gitlab.config.gitlab.url
if current_user
gon.current_user_id = current_user.id