Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml

@@ -422,6 +422,20 @@ update-patch:
     - !reference [.rules:test:omnibus-base, rules]
     - !reference [.rules:test:update-patch, rules]
 
+# Job tests upgrade from previous internal release to latest if available
+# Requires GITLAB_QA_DEV_ACCESS_TOKEN to pull internal release
+update-patch-from-internal-to-internal:
+  extends:
+    - .omnibus-e2e
+    - .update-script
+  variables:
+    UPDATE_TYPE: internal_patch
+    QA_RSPEC_TAGS: --tag health_check
+  rules:
+    - !reference [.rules:test:update-jobs-never, rules]
+    - !reference [.rules:test:omnibus-base, rules]
+    - !reference [.rules:test:update-patch, rules]
+
 update-from-patch-to-stable:
   extends:
     - .omnibus-e2e

app/assets/javascripts/api/groups_api.js

@@ -5,6 +5,7 @@ import { buildApiUrl } from './api_utils';
 const GROUP_PATH = '/api/:version/groups/:id';
 const GROUPS_PATH = '/api/:version/groups.json';
 const GROUP_MEMBERS_PATH = '/api/:version/groups/:id/members';
+const GROUP_MEMBER_PATH = '/api/:version/groups/:id/members/:user_id';
 const GROUP_ALL_MEMBERS_PATH = '/api/:version/groups/:id/members/all';
 const DESCENDANT_GROUPS_PATH = '/api/:version/groups/:id/descendant_groups';
 const GROUP_TRANSFER_LOCATIONS_PATH = 'api/:version/groups/:id/transfer_locations';
@@ -72,6 +73,12 @@ export const getGroupMembers = (groupId, inherited = false, params = {}) => {
   return axios.get(url, { params });
 };
 
+export const deleteGroupMember = (groupId, userId) => {
+  const url = buildApiUrl(GROUP_MEMBER_PATH).replace(':id', groupId).replace(':user_id', userId);
+
+  return axios.delete(url);
+};
+
 export const createGroup = (params) => {
   const url = buildApiUrl(GROUPS_PATH);
   return axios.post(url, params);

app/assets/javascripts/ci/runner/components/cells/runner_actions_cell.vue

@@ -22,6 +22,11 @@ export default {
       default: null,
       required: false,
     },
+    size: {
+      type: String,
+      default: 'medium',
+      required: false,
+    },
   },
   emits: ['toggledPaused', 'deleted'],
   computed: {
@@ -45,13 +50,21 @@ export default {
 
 <template>
   <gl-button-group>
-    <runner-edit-button v-if="canUpdate && editUrl" :href="editUrl" />
+    <slot><!-- space for other actions --></slot>
+    <runner-edit-button v-if="canUpdate && editUrl" :size="size" :href="editUrl" />
     <runner-pause-button
       v-if="canUpdate"
       :runner="runner"
       :compact="true"
+      :size="size"
       @toggledPaused="onToggledPaused"
     />
-    <runner-delete-button v-if="canDelete" :runner="runner" :compact="true" @deleted="onDeleted" />
+    <runner-delete-button
+      v-if="canDelete"
+      :runner="runner"
+      :compact="true"
+      :size="size"
+      @deleted="onDeleted"
+    />
   </gl-button-group>
 </template>

app/assets/javascripts/ci/runner/components/runner_delete_button.vue

@@ -22,6 +22,11 @@ export default {
       required: false,
       default: false,
     },
+    size: {
+      type: String,
+      default: 'medium',
+      required: false,
+    },
   },
   emits: ['deleted'],
   computed: {
@@ -73,6 +78,7 @@ export default {
         v-gl-tooltip="loading ? '' : tooltip"
         :aria-label="ariaLabel"
         :icon="loading ? '' : icon"
+        :size="size"
         :class="buttonClass"
         :loading="loading"
         variant="danger"

app/assets/javascripts/ci/runner/components/runner_edit_button.vue

@@ -15,6 +15,11 @@ export default {
       required: false,
       default: null,
     },
+    size: {
+      type: String,
+      default: 'medium',
+      required: false,
+    },
   },
   I18N_EDIT,
 };
@@ -26,6 +31,7 @@ export default {
     v-gl-tooltip="$options.I18N_EDIT"
     :aria-label="$options.I18N_EDIT"
     :href="href"
+    :size="size"
     icon="pencil"
     v-on="$listeners"
   />

app/assets/javascripts/ci/runner/components/runner_list.vue

@@ -50,6 +50,11 @@ export default {
       required: false,
       default: false,
     },
+    fixed: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
     loading: {
       type: Boolean,
       required: false,
@@ -124,10 +129,10 @@ export default {
       :items="runners"
       :fields="fields"
       :tbody-tr-attr="runnerTrAttr"
+      :fixed="fixed"
       data-testid="runner-list"
       stacked="md"
       primary-key="id"
-      fixed
     >
       <template #head(checkbox)>
         <runner-bulk-delete-checkbox :runners="runners" />

app/assets/javascripts/ci/runner/components/runner_pause_button.vue

@@ -23,6 +23,11 @@ export default {
       required: false,
       default: false,
     },
+    size: {
+      type: String,
+      default: 'medium',
+      required: false,
+    },
   },
   emits: ['toggledPaused'],
   computed: {
@@ -60,6 +65,7 @@ export default {
       <gl-button
         v-gl-tooltip="loading ? '' : tooltip"
         :icon="icon"
+        :size="size"
         :aria-label="ariaLabel"
         :loading="loading"
         @click="onClick"

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

@@ -53,11 +53,12 @@ export default {
         text: __('Cancel'),
       };
     },
-    groupLeaveConfirmationMessage() {
+    groupLeaveConfirmationTitle() {
       if (!this.targetGroup) {
         return '';
       }
-      return sprintf(s__('GroupsTree|Are you sure you want to leave the "%{fullName}" group?'), {
+
+      return sprintf(s__('GroupsTree|Are you sure you want to leave "%{fullName}"?'), {
         fullName: this.targetGroup.fullName,
       });
     },
@@ -240,13 +241,24 @@ export default {
     <gl-modal
       modal-id="leave-group-modal"
       :visible="isModalVisible"
-      :title="__('Are you sure?')"
+      :title="groupLeaveConfirmationTitle"
       :action-primary="primaryProps"
       :action-cancel="cancelProps"
       @primary="leaveGroup"
       @hide="hideModal"
     >
-      {{ groupLeaveConfirmationMessage }}
+      <p>{{ s__('GroupsTree|When you leave this group:') }}</p>
+      <ul>
+        <li>{{ s__('GroupsTree|You lose access to all projects within this group') }}</li>
+        <li>
+          {{
+            s__(
+              'GroupsTree|Your assigned issues and merge requests remain, but you cannot view or modify them',
+            )
+          }}
+        </li>
+        <li>{{ s__('GroupsTree|You need an invitation to rejoin') }}</li>
+      </ul>
     </gl-modal>
   </div>
 </template>

app/assets/javascripts/groups/your_work/graphql/utils.js

@@ -14,6 +14,7 @@ export const formatGroup = (group) => ({
   updatedAt: group.updated_at,
   avatarUrl: group.avatar_url,
   userPermissions: {
+    canLeave: group.can_leave,
     removeGroup: group.can_remove,
     viewEditPage: group.can_edit,
   },

app/assets/javascripts/merge_requests/components/sticky_header.vue

@@ -261,7 +261,6 @@ export default {
           </ul>
           <div class="gl-ml-auto gl-hidden gl-items-center lg:gl-flex">
             <discussion-counter :blocks-merge="blocksMerge" hide-options />
-            <submit-review-button v-if="glFeatures.improvedReviewExperience" class="gl-mr-3" />
             <div v-if="isSignedIn" :class="{ 'gl-flex gl-gap-3': isNotificationsTodosButtons }">
               <todo-widget
                 :issuable-id="issuableId"
@@ -276,6 +275,7 @@ export default {
                 issuable-type="merge_request"
               />
             </div>
+            <submit-review-button v-if="glFeatures.improvedReviewExperience" class="gl-ml-3" />
           </div>
         </div>
       </div>

app/assets/javascripts/organizations/shared/graphql/fragments/group.fragment.graphql

@@ -16,6 +16,7 @@ fragment Group on Group {
   createdAt
   updatedAt
   userPermissions {
+    canLeave
     removeGroup
     viewEditPage
   }

app/assets/javascripts/organizations/shared/utils.js

@@ -1,5 +1,9 @@
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import { ACTION_EDIT, ACTION_DELETE } from '~/vue_shared/components/list_actions/constants';
+import {
+  ACTION_EDIT,
+  ACTION_DELETE,
+  ACTION_LEAVE,
+} from '~/vue_shared/components/list_actions/constants';
 import {
   TIMESTAMP_TYPE_CREATED_AT,
   TIMESTAMP_TYPE_UPDATED_AT,
@@ -14,6 +18,10 @@ const availableGroupActions = (userPermissions) => {
     baseActions.push(ACTION_EDIT);
   }
 
+  if (userPermissions.canLeave) {
+    baseActions.push(ACTION_LEAVE);
+  }
+
   if (userPermissions.removeGroup) {
     baseActions.push(ACTION_DELETE);
   }

app/assets/javascripts/repository/components/header_area/open_mr_badge.vue

@@ -140,6 +140,7 @@ export default {
           class="gl-h-full"
           :title="badgeTitle"
           :aria-label="badgeTitle"
+          tag="a"
         >
           {{ openMRsCountText }}
         </gl-badge>

app/assets/javascripts/sidebar/mount_sidebar.js

@@ -58,7 +58,7 @@ function mountSubmitReviewButton(pinia) {
     el,
     pinia,
     render(h) {
-      return h(SubmitReviewButton, { attrs: { class: 'gl-mr-3' } });
+      return h(SubmitReviewButton, { attrs: { class: 'gl-ml-3' } });
     },
   });
 }

app/assets/javascripts/todos/components/todo_item_body.vue

@@ -19,8 +19,7 @@ import {
   TODO_ACTION_TYPE_UNMERGEABLE,
   TODO_ACTION_TYPE_SSH_KEY_EXPIRED,
   TODO_ACTION_TYPE_SSH_KEY_EXPIRING_SOON,
-  TODO_ACTION_TYPE_DUO_PRO_ACCESS_GRANTED,
-  TODO_ACTION_TYPE_DUO_ENTERPRISE_ACCESS_GRANTED,
+  DUO_ACCESS_GRANTED_ACTIONS,
 } from '../constants';
 
 export default {
@@ -61,15 +60,11 @@ export default {
         this.todo.action !== TODO_ACTION_TYPE_UNMERGEABLE &&
         this.todo.action !== TODO_ACTION_TYPE_SSH_KEY_EXPIRED &&
         this.todo.action !== TODO_ACTION_TYPE_SSH_KEY_EXPIRING_SOON &&
-        this.todo.action !== TODO_ACTION_TYPE_DUO_PRO_ACCESS_GRANTED &&
-        this.todo.action !== TODO_ACTION_TYPE_DUO_ENTERPRISE_ACCESS_GRANTED
+        !DUO_ACCESS_GRANTED_ACTIONS.includes(this.todo.action)
       );
     },
     showAvatarOnNote() {
-      return (
-        this.todo.action !== TODO_ACTION_TYPE_DUO_PRO_ACCESS_GRANTED &&
-        this.todo.action !== TODO_ACTION_TYPE_DUO_ENTERPRISE_ACCESS_GRANTED
-      );
+      return !DUO_ACCESS_GRANTED_ACTIONS.includes(this.todo.action);
     },
     author() {
       if (this.isHiddenBySaml) {
@@ -162,13 +157,7 @@ export default {
         name = s__('Todos|Your SSH key is expiring soon');
       }
 
-      if (this.todo.action === TODO_ACTION_TYPE_DUO_PRO_ACCESS_GRANTED) {
-        name = s__(
-          'Todos|You now have access to AI-powered features. Learn how to set up Code Suggestions and Chat in your IDE',
-        );
-      }
-
-      if (this.todo.action === TODO_ACTION_TYPE_DUO_ENTERPRISE_ACCESS_GRANTED) {
+      if (DUO_ACCESS_GRANTED_ACTIONS.includes(this.todo.action)) {
         name = s__(
           'Todos|You now have access to AI-powered features. Learn how to set up Code Suggestions and Chat in your IDE',
         );

app/assets/javascripts/todos/components/todo_item_title.vue

@@ -12,8 +12,7 @@ import {
   TODO_TARGET_TYPE_MERGE_REQUEST,
   TODO_TARGET_TYPE_PIPELINE,
   TODO_TARGET_TYPE_SSH_KEY,
-  TODO_ACTION_TYPE_DUO_PRO_ACCESS_GRANTED,
-  TODO_ACTION_TYPE_DUO_ENTERPRISE_ACCESS_GRANTED,
+  DUO_ACCESS_GRANTED_ACTIONS,
 } from '../constants';
 
 export default {
@@ -44,10 +43,7 @@ export default {
       return this.todo.action === TODO_ACTION_TYPE_MEMBER_ACCESS_REQUESTED;
     },
     isDuoActionType() {
-      return (
-        this.todo.action === TODO_ACTION_TYPE_DUO_PRO_ACCESS_GRANTED ||
-        this.todo.action === TODO_ACTION_TYPE_DUO_ENTERPRISE_ACCESS_GRANTED
-      );
+      return DUO_ACCESS_GRANTED_ACTIONS.includes(this.todo.action);
     },
     issuableType() {
       if (this.isMergeRequest) {

app/assets/javascripts/todos/constants.js

@@ -29,6 +29,13 @@ export const TODO_ACTION_TYPE_SSH_KEY_EXPIRED = 'ssh_key_expired';
 export const TODO_ACTION_TYPE_SSH_KEY_EXPIRING_SOON = 'ssh_key_expiring_soon';
 export const TODO_ACTION_TYPE_DUO_PRO_ACCESS_GRANTED = 'duo_pro_access_granted';
 export const TODO_ACTION_TYPE_DUO_ENTERPRISE_ACCESS_GRANTED = 'duo_enterprise_access_granted';
+export const TODO_ACTION_TYPE_DUO_CORE_ACCESS_GRANTED = 'duo_core_access_granted';
+
+export const DUO_ACCESS_GRANTED_ACTIONS = [
+  TODO_ACTION_TYPE_DUO_PRO_ACCESS_GRANTED,
+  TODO_ACTION_TYPE_DUO_ENTERPRISE_ACCESS_GRANTED,
+  TODO_ACTION_TYPE_DUO_CORE_ACCESS_GRANTED,
+];
 
 export const TODO_EMPTY_TITLE_POOL = [
   s__("Todos|Good job! Looks like you don't have anything left on your To-Do List"),

app/assets/javascripts/token_access/components/token_access_app.vue

@@ -33,7 +33,7 @@ export default {
       <token-permissions v-if="glFeatures.allowPushRepositoryForJobToken" />
       <inbound-token-access />
       <auth-log />
-      <outbound-token-access />
+      <outbound-token-access v-if="!glFeatures.removeLimitCiJobTokenScope" />
     </template>
   </gl-intersection-observer>
 </template>

app/assets/javascripts/vue_shared/access_tokens/stores/access_tokens.js

@@ -167,6 +167,9 @@ export const useAccessTokens = defineStore('accessTokens', {
           message: s__('AccessTokens|The token was revoked successfully.'),
           variant: 'success',
         });
+        // Reset the token to avoid a situation where a token is created or rotated and then revoked,
+        // but the `Your token` banner still displays the token.
+        this.token = null;
         // Reset pagination to avoid situations like: page 2 contains only one token and after it
         // is revoked the page shows `No tokens access tokens` (but there are 20 tokens on page 1).
         this.page = 1;