Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 7 insertions, 2 deletions

diff --git a/app/assets/javascripts/pages/users/index.js b/app/assets/javascripts/pages/users/index.js
index 30c351359e4..af55a5dc01a 100644
--- a/app/assets/javascripts/pages/users/index.js
+++ b/app/assets/javascripts/pages/users/index.js
@@ -2,11 +2,16 @@ import $ from 'jquery';
 import { setCookie } from '~/lib/utils/common_utils';
 import UserCallout from '~/user_callout';
 import { initReportAbuse } from '~/users/profile';
+import { initProfileTabs } from '~/profile';
 import UserTabs from './user_tabs';
 
 function initUserProfile(action) {
-  // eslint-disable-next-line no-new
-  new UserTabs({ parentEl: '.user-profile', action });
+  if (gon.features?.profileTabsVue) {
+    initProfileTabs();
+  } else {
+    // eslint-disable-next-line no-new
+    new UserTabs({ parentEl: '.user-profile', action });
+  }
 
   // hide project limit message
   $('.hide-project-limit-message').on('click', (e) => {