Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_trigger.vue

@@ -37,8 +37,8 @@ export default {
   <gl-button
     :class="[
       {
-        'ml-3': !contextCommitsEmpty,
-        'mt-3': !commitsEmpty && contextCommitsEmpty,
+        'gl-ml-5': !contextCommitsEmpty,
+        'gl-mt-5': !commitsEmpty && contextCommitsEmpty,
       },
     ]"
     :variant="commitsEmpty ? 'info' : 'default'"

app/assets/javascripts/groups/components/group_item.vue

@@ -4,6 +4,7 @@ import {
   GlLoadingIcon,
   GlBadge,
   GlIcon,
+  GlLabel,
   GlTooltipDirective,
   GlSafeHtmlDirective,
 } from '@gitlab/ui';
@@ -28,11 +29,8 @@ export default {
     GlBadge,
     GlLoadingIcon,
     GlIcon,
+    GlLabel,
     UserAccessRoleBadge,
-    ComplianceFrameworkLabel: () =>
-      import(
-        'ee_component/vue_shared/components/compliance_framework_label/compliance_framework_label.vue'
-      ),
     itemCaret,
     itemTypeIcon,
     itemActions,
@@ -184,12 +182,13 @@ export default {
             <user-access-role-badge v-if="group.permission" class="gl-mt-3">
               {{ group.permission }}
             </user-access-role-badge>
-            <compliance-framework-label
+            <gl-label
               v-if="hasComplianceFramework"
               class="gl-mt-3"
-              :name="complianceFramework.name"
-              :color="complianceFramework.color"
+              :title="complianceFramework.name"
+              :background-color="complianceFramework.color"
               :description="complianceFramework.description"
+              size="sm"
             />
           </div>
           <div v-if="group.description" class="description">

app/assets/javascripts/user_popovers.js

@@ -117,7 +117,7 @@ function launchPopover(el, mountPopover) {
   mountPopover(popoverInstance);
 }
 
-const userLinkSelector = 'a.js-user-link, a.gfm-project_member';
+const userLinkSelector = 'a.js-user-link[data-user], a.js-user-link[data-user-id]';
 
 const getUserLinkNode = (node) => node.closest(userLinkSelector);
 

app/views/groups/show.html.haml

@@ -25,7 +25,7 @@
 
 = render partial: 'flash_messages'
 
-= render_if_exists 'trials/banner', namespace: @group
+= render_if_exists 'trials/alert', namespace: @group
 
 = render 'groups/home_panel'
 

doc/administration/auth/oidc.md

@@ -339,7 +339,7 @@ The trailing forward slash is required.
 This configuration corresponds with the `Supported account types` setting used when
   creating the `IdentityExperienceFramework` app.
 
-#### Keycloak
+### Keycloak
 
 GitLab works with OpenID providers that use HTTPS. Although a Keycloak
 server can be set up using HTTP, GitLab can only communicate
@@ -380,7 +380,7 @@ gitlab_rails['omniauth_providers'] = [
 ]
 ```
 
-##### Configure Keycloak with a symmetric key algorithm
+#### Configure Keycloak with a symmetric key algorithm
 
 > Introduced in GitLab 14.2.
 
@@ -461,7 +461,7 @@ To use symmetric key encryption:
 If after reconfiguring, you see the error `JSON::JWS::VerificationFailed` error message, this means
 the incorrect secret was specified.
 
-#### Casdoor
+### Casdoor
 
 GitLab works with OpenID providers that use HTTPS. To connect to GitLab using OpenID with Casdoor, use HTTPS instead of HTTP.
 

qa/qa/page/alert/free_trial.rb

@@ -4,8 +4,7 @@ module QA
   module Page
     module Alert
       class FreeTrial < Chemlab::Page
-        # TODO: Supplant with data-qa-selectors
-        h4 :trial_activated_message, class: 'gl-banner-title'
+        element :trial_activated_message
       end
     end
   end

spec/frontend/user_popovers_spec.js

@@ -12,12 +12,8 @@ jest.mock('~/api/user_api', () => ({
 describe('User Popovers', () => {
   const fixtureTemplate = 'merge_requests/merge_request_with_mentions.html';
 
-  const selector = '.js-user-link, .gfm-project_member';
-  const findFixtureLinks = () => {
-    return Array.from(document.querySelectorAll(selector)).filter(
-      ({ dataset }) => dataset.user || dataset.userId,
-    );
-  };
+  const selector = '.js-user-link[data-user], .js-user-link[data-user-id]';
+  const findFixtureLinks = () => Array.from(document.querySelectorAll(selector));
   const createUserLink = () => {
     const link = document.createElement('a');
 
@@ -95,6 +91,24 @@ describe('User Popovers', () => {
     });
   });
 
+  it('does not initialize the popovers for group references', async () => {
+    const [groupLink] = Array.from(document.querySelectorAll('.js-user-link[data-group]'));
+
+    triggerEvent('mouseover', groupLink);
+    jest.runOnlyPendingTimers();
+
+    expect(findPopovers().length).toBe(0);
+  });
+
+  it('does not initialize the popovers for @all references', async () => {
+    const [projectLink] = Array.from(document.querySelectorAll('.js-user-link[data-project]'));
+
+    triggerEvent('mouseover', projectLink);
+    jest.runOnlyPendingTimers();
+
+    expect(findPopovers().length).toBe(0);
+  });
+
   it('does not initialize the user popovers twice for the same element', async () => {
     const [firstUserLink] = findFixtureLinks();
     triggerEvent('mouseover', firstUserLink);