diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-30 21:27:27 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-30 21:27:27 +0300 |
| commit | 29c5174274feafebc4ecb182eaece3dfb2197d22 (patch) | |
| tree | e1632a18a93076b6cad8f92b1258579ff6e93e8f /lib | |
| parent | 93a332a620f54038d78bd82ce6f1f553d92b7f46 (diff) | |
| parent | aebb2f70257882dd530b820f3cfdd67621d2a3fd (diff) | |
Merge branch 'feat/sentry-environment' into 'master'
feat: add option to define the Sentry Environment
See merge request gitlab-org/gitlab-ce!27091
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') |