Fix merge in config/sentry
This commit is contained in:
parent
d1ca21f479
commit
49f77423f8
1 changed files with 1 additions and 4 deletions
|
|
@ -1,10 +1,7 @@
|
|||
Sentry.init do |config|
|
||||
<<<<<<< HEAD
|
||||
config.enabled_environments = %|production staging|
|
||||
config.dsn = ENV['SENTRY_DSN']
|
||||
=======
|
||||
config.dsn = ENV.fetch('OSEM_SENTRY_DSN', Rails.application.secrets.sentry_dsn)
|
||||
>>>>>>> osem-master
|
||||
# config.dsn = ENV.fetch('OSEM_SENTRY_DSN', Rails.application.secrets.sentry_dsn)
|
||||
config.breadcrumbs_logger = [:active_support_logger]
|
||||
|
||||
# To activate performance monitoring, set one of these options.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue