summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-10-06 13:41:01 +0000
committerDouwe Maan <douwe@gitlab.com>2017-10-06 13:41:01 +0000
commit7f8e720f415ff50f791d9efd49b774c9da9ab109 (patch)
tree246466fd9cbf92905569a9d0199c42e34f0bd6ba /config
parentf55f24c49747f74659c4aa8ade48fd167fe67034 (diff)
parent60a35e4230404b84d4aee8015fb7821b0b194277 (diff)
downloadgitlab-ce-7f8e720f415ff50f791d9efd49b774c9da9ab109.tar.gz
Merge branch 'api-sentry-extra' into 'master'
Send API parameters as extra data for sentry errors See merge request gitlab-org/gitlab-ce!14644
Diffstat (limited to 'config')
-rw-r--r--config/initializers/sentry.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 62d0967009a..b2da3b3dc19 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -2,7 +2,7 @@
require 'gitlab/current_settings'
-if Rails.env.production?
+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
@@ -23,3 +23,5 @@ if Rails.env.production?
end
end
end
+
+configure_sentry if Rails.env.production?