summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-05-01 15:23:11 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-05-01 15:23:11 -0300
commit6627efd6b48e70a572149865bd4196e6f711f9de (patch)
treeb8fa7e862fe83405772bdbef10413a0c5dd44aaf /config
parent43648e5ed9c23e5e34bd67255aac329b32b3e925 (diff)
downloadgitlab-ce-6627efd6b48e70a572149865bd4196e6f711f9de.tar.gz
Allow Sentry client-side DSN to be passed on gitlab.yml
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example1
-rw-r--r--config/initializers/1_settings.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 06530194907..2f822805b25 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -320,6 +320,7 @@ production: &base
sentry:
# enabled: false
# dsn: https://<key>@sentry.io/<project>
+ # clientside_dsn: https://<key>@sentry.io/<project>
# environment: 'production' # e.g. development, staging, production
#
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 154de3bc1b0..d56bd7654af 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -224,6 +224,7 @@ Settings['sentry'] ||= Settingslogic.new({})
Settings.sentry['enabled'] ||= false
Settings.sentry['dsn'] ||= nil
Settings.sentry['environment'] ||= nil
+Settings.sentry['clientside_dsn'] ||= nil
#
# Pages