Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index bdb7484f3d6..bf111957a32 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -17,11 +17,18 @@ module Gitlab
       gon.markdown_surround_selection = current_user&.markdown_surround_selection
       gon.markdown_automatic_lists = current_user&.markdown_automatic_lists
 
-      if Gitlab.config.sentry.enabled
+      # Support for Sentry setup via configuration will be removed in 16.0
+      # in favor of Gitlab::CurrentSettings.
+      if Feature.enabled?(:enable_old_sentry_clientside_integration) && Gitlab.config.sentry.enabled
         gon.sentry_dsn           = Gitlab.config.sentry.clientside_dsn
         gon.sentry_environment   = Gitlab.config.sentry.environment
       end
 
+      if Feature.enabled?(:enable_new_sentry_clientside_integration) && Gitlab::CurrentSettings.sentry_enabled
+        gon.sentry_dsn           = Gitlab::CurrentSettings.sentry_clientside_dsn
+        gon.sentry_environment   = Gitlab::CurrentSettings.sentry_environment
+      end
+
       gon.recaptcha_api_server_url = ::Recaptcha.configuration.api_server_url
       gon.recaptcha_sitekey      = Gitlab::CurrentSettings.recaptcha_site_key
       gon.gitlab_url             = Gitlab.config.gitlab.url