summaryrefslogtreecommitdiff
path: root/config/initializers/1_settings.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-05-08 22:52:23 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-05-08 22:52:23 +0000
commitfa6e00d05dedfac9ec28bf1a4735bffc38a5b4d0 (patch)
tree07c2087939b6c6dce33620c57a6989d76547e681 /config/initializers/1_settings.rb
parent204dca4436f5b2c82611a873d05186ec4ff4c17c (diff)
parent2f003b58645b3cbc987c240f844b1ff6eb0c026a (diff)
downloadgitlab-ce-fa6e00d05dedfac9ec28bf1a4735bffc38a5b4d0.tar.gz
Merge branch '11-11-stable-prepare-rc2' into '11-11-stable'
Prepare 11.11.0-rc2 release See merge request gitlab-org/gitlab-ce!28215
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r--config/initializers/1_settings.rb1
1 files changed, 1 insertions, 0 deletions
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