1 files changed, 12 insertions, 4 deletions
diff --git a/app/assets/javascripts/sentry/index.js b/app/assets/javascripts/sentry/index.js
index 176745b4177..5539a061726 100644
--- a/app/assets/javascripts/sentry/index.js
+++ b/app/assets/javascripts/sentry/index.js
@@ -1,26 +1,34 @@
 import '../webpack';
 
+import * as Sentry from 'sentrybrowser7';
 import SentryConfig from './sentry_config';
 
 const index = function index() {
+  // Configuration for newer versions of Sentry SDK (v7)
   SentryConfig.init({
     dsn: gon.sentry_dsn,
+    environment: gon.sentry_environment,
     currentUserId: gon.current_user_id,
-    whitelistUrls:
+    allowUrls:
       process.env.NODE_ENV === 'production'
         ? [gon.gitlab_url]
         : [gon.gitlab_url, 'webpack-internal://'],
-    environment: gon.sentry_environment,
     release: gon.revision,
     tags: {
       revision: gon.revision,
       feature_category: gon.feature_category,
     },
   });
-
-  return SentryConfig;
 };
 
 index();
 
+// The _Sentry object is globally exported so it can be used by
+//   ./sentry_browser_wrapper.js
+// This hack allows us to load a single version of `@sentry/browser`
+// in the browser, see app/views/layouts/_head.html.haml to find how it is imported.
+
+// eslint-disable-next-line no-underscore-dangle
+window._Sentry = Sentry;
+
 export default index;