diff options
| author | Roger Meier <r.meier@siemens.com> | 2019-04-07 21:21:52 +0200 |
|---|---|---|
| committer | Roger Meier <r.meier@siemens.com> | 2019-04-30 18:10:57 +0200 |
| commit | aebb2f70257882dd530b820f3cfdd67621d2a3fd (patch) | |
| tree | ffc70dec184fbd478ad0898368ec58ad5398ef16 /lib | |
| parent | 2432a540cff461c5d9c0346dd4021229078d674d (diff) | |
| download | gitlab-ce-aebb2f70257882dd530b820f3cfdd67621d2a3fd.tar.gz | |
feat: allow Sentry configuration to be passed on gitlab.yml
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gon_helper.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index e00309e7946..582c3065189 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -15,7 +15,12 @@ module Gitlab gon.relative_url_root = Gitlab.config.gitlab.relative_url_root gon.shortcuts_path = Gitlab::Routing.url_helpers.help_page_path('shortcuts') gon.user_color_scheme = Gitlab::ColorSchemes.for_user(current_user).css_class - gon.sentry_dsn = Gitlab::CurrentSettings.clientside_sentry_dsn if Gitlab::CurrentSettings.clientside_sentry_enabled + + if Gitlab::CurrentSettings.clientside_sentry_enabled + gon.sentry_dsn = Gitlab::CurrentSettings.clientside_sentry_dsn + gon.sentry_environment = Gitlab.config.sentry.environment + end + gon.gitlab_url = Gitlab.config.gitlab.url gon.revision = Gitlab.revision gon.gitlab_logo = ActionController::Base.helpers.asset_path('gitlab_logo.png') |