diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-26 18:24:14 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-26 18:24:14 +0000 |
| commit | 8c28c3e84eb3e330f10bf2c765668a23dfce5080 (patch) | |
| tree | f48f0f99308bd9c6c81b7d318d79a72d1776f232 /config | |
| parent | 2b00b61eba758baf9d4242ba9c71f2319f8ec428 (diff) | |
| parent | cd8aaea36f3c2b69c7c48c00ed56de14267969dd (diff) | |
| download | gitlab-ce-8c28c3e84eb3e330f10bf2c765668a23dfce5080.tar.gz | |
Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'
Remove Sentry settings from application settings
See merge request gitlab-org/gitlab-ce!28447
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sentry.rb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index e5589ce0ad1..fcc6bfa5c92 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -3,18 +3,11 @@ require 'gitlab/current_settings' def configure_sentry - # allow it to fail: it may do so when create_from_defaults is executed before migrations are actually done - begin - sentry_enabled = Gitlab::CurrentSettings.current_application_settings.sentry_enabled - rescue - sentry_enabled = false - end - - if sentry_enabled + if Gitlab::Sentry.enabled? Raven.configure do |config| - config.dsn = Gitlab::CurrentSettings.current_application_settings.sentry_dsn + config.dsn = Gitlab.config.sentry.dsn config.release = Gitlab.revision - config.current_environment = Gitlab.config.sentry.environment.presence + config.current_environment = Gitlab.config.sentry.environment # Sanitize fields based on those sanitized from Rails. config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s) |