gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge in config/sentry

Browse source
This commit is contained in:
Michael Ball 2021-03-08 02:58:05 -08:00
parent d1ca21f479
commit 49f77423f8
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/initializers/sentry.rb
View file

@ -1,10 +1,7 @@
Sentry.init do |config| Sentry.init do |config|
<<<<<<< HEAD
config.enabled_environments = %|production staging| config.enabled_environments = %|production staging|
config.dsn = ENV['SENTRY_DSN'] config.dsn = ENV['SENTRY_DSN']
======= # config.dsn = ENV.fetch('OSEM_SENTRY_DSN', Rails.application.secrets.sentry_dsn)
config.dsn = ENV.fetch('OSEM_SENTRY_DSN', Rails.application.secrets.sentry_dsn)
>>>>>>> osem-master
config.breadcrumbs_logger = [:active_support_logger] config.breadcrumbs_logger = [:active_support_logger]
# To activate performance monitoring, set one of these options. # To activate performance monitoring, set one of these options.