Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/rules.gitlab-ci.yml

@@ -2394,6 +2394,7 @@
       changes:
         - "{,jh/}.gitlab-ci.yml"
         - "{,jh/}.gitlab/ci/**/*"
+        - "spec/dot_gitlab_ci/**/*"
 
 .rails:rules:detect-tests:
   rules:

.rubocop_todo/gitlab/namespaced_class.yml

@@ -429,7 +429,6 @@ Gitlab/NamespacedClass:
     - 'app/presenters/project_hook_presenter.rb'
     - 'app/presenters/project_member_presenter.rb'
     - 'app/presenters/project_presenter.rb'
-    - 'app/presenters/prometheus_alert_presenter.rb'
     - 'app/presenters/release_presenter.rb'
     - 'app/presenters/search_service_presenter.rb'
     - 'app/presenters/sentry_error_presenter.rb'

.rubocop_todo/layout/line_length.yml

@@ -3903,7 +3903,6 @@ Layout/LineLength:
     - 'spec/presenters/packages/nuget/package_metadata_presenter_spec.rb'
     - 'spec/presenters/packages/nuget/packages_metadata_presenter_spec.rb'
     - 'spec/presenters/projects/security/configuration_presenter_spec.rb'
-    - 'spec/presenters/prometheus_alert_presenter_spec.rb'
     - 'spec/presenters/snippet_blob_presenter_spec.rb'
     - 'spec/rack_servers/puma_spec.rb'
     - 'spec/requests/admin/background_migrations_controller_spec.rb'

.rubocop_todo/rspec/factory_bot/avoid_create.yml

@@ -395,7 +395,6 @@ RSpec/FactoryBot/AvoidCreate:
     - 'spec/presenters/projects/import_export/project_export_presenter_spec.rb'
     - 'spec/presenters/projects/security/configuration_presenter_spec.rb'
     - 'spec/presenters/projects/settings/deploy_keys_presenter_spec.rb'
-    - 'spec/presenters/prometheus_alert_presenter_spec.rb'
     - 'spec/presenters/release_presenter_spec.rb'
     - 'spec/presenters/releases/link_presenter_spec.rb'
     - 'spec/presenters/search_service_presenter_spec.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -3881,7 +3881,6 @@ RSpec/FeatureCategory:
     - 'spec/presenters/project_presenter_spec.rb'
     - 'spec/presenters/projects/import_export/project_export_presenter_spec.rb'
     - 'spec/presenters/projects/settings/deploy_keys_presenter_spec.rb'
-    - 'spec/presenters/prometheus_alert_presenter_spec.rb'
     - 'spec/presenters/release_presenter_spec.rb'
     - 'spec/presenters/releases/link_presenter_spec.rb'
     - 'spec/presenters/sentry_error_presenter_spec.rb'

Gemfile.checksum

@@ -448,6 +448,7 @@
 {"name":"opentelemetry-common","version":"0.21.0","platform":"ruby","checksum":"fe891a44583a20bc3217b324aec76d066504494951682d391cfd57d40cd01c98"},
 {"name":"opentelemetry-exporter-otlp","version":"0.27.0","platform":"ruby","checksum":"0050cf6ade97186ee3176cd8c44087b70cb739c3c624dbfc7c33097a3a189e4c"},
 {"name":"opentelemetry-helpers-sql-obfuscation","version":"0.1.0","platform":"ruby","checksum":"bc6ef1373dbcf979647091b3bfc99d7b6fb9669f74c3ae184f58b48adfc8d432"},
+{"name":"opentelemetry-instrumentation-action_mailer","version":"0.1.0","platform":"ruby","checksum":"52fe3400bb9051d079a2aed0858fc2d98c677bfb66d163e3b438b67c795dd1a9"},
 {"name":"opentelemetry-instrumentation-action_pack","version":"0.9.0","platform":"ruby","checksum":"c5df8472afc9cdbfc1425d9af7816b9cfc1a1a69b86621f1fc624974bd9acb9a"},
 {"name":"opentelemetry-instrumentation-action_view","version":"0.7.0","platform":"ruby","checksum":"bc7c714be0b4bb76843085c29ecc9465e65cb7fe6722e34c71629e44f8c3cb75"},
 {"name":"opentelemetry-instrumentation-active_job","version":"0.7.1","platform":"ruby","checksum":"da24806c9d92fe580db42638f6c763fe1324ff90aa147d45d4247f8052c68089"},
@@ -466,7 +467,7 @@
 {"name":"opentelemetry-instrumentation-net_http","version":"0.22.5","platform":"ruby","checksum":"99bd10e03918032ea6e4670c121c8778403e729d343446a5901d1126fcc5f7be"},
 {"name":"opentelemetry-instrumentation-pg","version":"0.27.3","platform":"ruby","checksum":"b689e9c47185729d671669a0f7c206c013d9c8dfc7a355901ec50b12c94e35cd"},
 {"name":"opentelemetry-instrumentation-rack","version":"0.24.4","platform":"ruby","checksum":"be35db05a459a608e2854baea7257daadd37d34fe7a274ff75cb63b5896e82b5"},
-{"name":"opentelemetry-instrumentation-rails","version":"0.30.1","platform":"ruby","checksum":"73060c76be009c75af5c3c4bb94bf9883cb5770d6a5115bcddbc590afc823142"},
+{"name":"opentelemetry-instrumentation-rails","version":"0.30.2","platform":"ruby","checksum":"42ddd023afa551f60ea632712d5125ce8b781eeb8d311a02efc2c62e02613a12"},
 {"name":"opentelemetry-instrumentation-rake","version":"0.2.2","platform":"ruby","checksum":"fbde8a6aab77c09bf0f94d914dd26dcf2e23ec67e2300f06a1cb8294a97d8020"},
 {"name":"opentelemetry-instrumentation-redis","version":"0.25.5","platform":"ruby","checksum":"d7ce798069539ab25a0d1685837d482eb40d076c642b4b15cecfed56516333d7"},
 {"name":"opentelemetry-instrumentation-sidekiq","version":"0.25.4","platform":"ruby","checksum":"4ce1b2e0952321d504d4c3e0e4fcbd5d090ff1f4de4cb214c6aa79d70ce8a3a3"},

Gemfile.lock

@@ -1247,6 +1247,10 @@ GEM
       opentelemetry-semantic_conventions
     opentelemetry-helpers-sql-obfuscation (0.1.0)
       opentelemetry-common (~> 0.20)
+    opentelemetry-instrumentation-action_mailer (0.1.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-active_support (~> 0.1)
+      opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-action_pack (0.9.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -1311,8 +1315,9 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.21.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rails (0.30.1)
+    opentelemetry-instrumentation-rails (0.30.2)
       opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-action_mailer (~> 0.1.0)
       opentelemetry-instrumentation-action_pack (~> 0.9.0)
       opentelemetry-instrumentation-action_view (~> 0.7.0)
       opentelemetry-instrumentation-active_job (~> 0.7.0)

app/assets/javascripts/blob/components/blob_header.vue

@@ -75,6 +75,11 @@ export default {
       required: false,
       default: false,
     },
+    showWebIdeForkSuggestion: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     projectPath: {
       type: String,
       required: false,
@@ -156,6 +161,7 @@ export default {
         :edit-url="blob.editBlobPath"
         :web-ide-url="blob.ideEditPath"
         :needs-to-fork="showForkSuggestion"
+        :needs-to-fork-with-web-ide="showWebIdeForkSuggestion"
         :show-pipeline-editor-button="Boolean(blob.pipelineEditorPath)"
         :pipeline-editor-url="blob.pipelineEditorPath"
         :gitpod-url="blob.gitpodBlobUrl"

app/assets/javascripts/notes/components/toggle_replies_widget.vue

@@ -83,7 +83,7 @@ export default {
         <template #avatar="{ avatar }">
           <gl-avatar-link
             target="_blank"
-            :href="avatar.path || author.webUrl"
+            :href="avatar.path || avatar.webUrl"
             :data-user-id="avatar.id"
             :data-username="avatar.username"
             class="js-user-link"

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

@@ -22,4 +22,5 @@ fragment BaseGroup on Group {
   maxAccessLevel {
     integerValue
   }
+  isLinkedToSubscription
 }

app/assets/javascripts/repository/components/blob_content_viewer.vue

@@ -174,13 +174,23 @@ export default {
 
       return pathLock ? pathLock.user : null;
     },
-    showForkSuggestion() {
+    canFork() {
       const { createMergeRequestIn, forkProject } = this.userPermissions;
+
+      return this.isLoggedIn && !this.isUsingLfs && createMergeRequestIn && forkProject;
+    },
+    showSingleFileEditorForkSuggestion() {
       const { canModifyBlob } = this.blobInfo;
 
-      return (
-        this.isLoggedIn && !this.isUsingLfs && !canModifyBlob && createMergeRequestIn && forkProject
-      );
+      return this.canFork && !canModifyBlob;
+    },
+    showWebIdeForkSuggestion() {
+      const { canModifyBlobWithWebIde } = this.blobInfo;
+
+      return this.canFork && !canModifyBlobWithWebIde;
+    },
+    showForkSuggestion() {
+      return this.showSingleFileEditorForkSuggestion || this.showWebIdeForkSuggestion;
     },
     forkPath() {
       const forkPaths = {
@@ -265,14 +275,24 @@ export default {
       if (this.$route?.query?.plain === plain) return;
       this.$router.push({ path: this.$route.path, query: { ...this.$route.query, plain } });
     },
+    isIdeTarget(target) {
+      return target === 'ide';
+    },
+    forkSuggestionForSelectedEditor(target) {
+      return this.isIdeTarget(target)
+        ? this.showWebIdeForkSuggestion
+        : this.showSingleFileEditorForkSuggestion;
+    },
     editBlob(target) {
-      if (this.showForkSuggestion) {
+      const { ideEditPath, editBlobPath } = this.blobInfo;
+      const isIdeTarget = this.isIdeTarget(target);
+      const showForkSuggestionForSelectedEditor = this.forkSuggestionForSelectedEditor(target);
+
+      if (showForkSuggestionForSelectedEditor) {
         this.setForkTarget(target);
-        return;
+      } else {
+        visitUrl(isIdeTarget ? ideEditPath : editBlobPath);
       }
-
-      const { ideEditPath, editBlobPath } = this.blobInfo;
-      visitUrl(target === 'ide' ? ideEditPath : editBlobPath);
     },
     setForkTarget(target) {
       this.forkTarget = target;
@@ -311,7 +331,8 @@ export default {
         :has-render-error="hasRenderError"
         :show-path="false"
         :override-copy="true"
-        :show-fork-suggestion="showForkSuggestion"
+        :show-fork-suggestion="showSingleFileEditorForkSuggestion"
+        :show-web-ide-fork-suggestion="showWebIdeForkSuggestion"
         :show-blame-toggle="true"
         :project-path="projectPath"
         :project-id="projectId"
@@ -334,7 +355,7 @@ export default {
             :project-path="projectPath"
             :is-locked="Boolean(pathLockedByUser)"
             :can-lock="canLock"
-            :show-fork-suggestion="showForkSuggestion"
+            :show-fork-suggestion="showSingleFileEditorForkSuggestion"
             :is-using-lfs="isUsingLfs"
             @fork="setForkTarget('view')"
           />

app/assets/javascripts/vue_shared/components/groups_list/group_list_item_prevent_delete_modal.vue

@@ -0,0 +1,58 @@
+<script>
+import { GlModal, GlSprintf } from '@gitlab/ui';
+import { __ } from '~/locale';
+import HelpPageLink from '~/vue_shared/components/help_page_link/help_page_link.vue';
+
+export default {
+  name: 'GroupListItemPreventDeleteModal',
+  i18n: {
+    title: __("Group can't be be deleted"),
+    message: __(
+      "This group can't be deleted because it is linked to a subscription. To delete this group, %{linkStart}link the subscription%{linkEnd} with a different group.",
+    ),
+  },
+  components: {
+    GlModal,
+    GlSprintf,
+    HelpPageLink,
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      required: true,
+    },
+    modalId: {
+      type: String,
+      required: true,
+    },
+    group: {
+      type: Object,
+      required: true,
+    },
+  },
+  CANCEL_PROPS: {
+    text: __('Cancel'),
+  },
+};
+</script>
+<template>
+  <gl-modal
+    :visible="visible"
+    :modal-id="modalId"
+    :data-testid="modalId"
+    :title="$options.i18n.title"
+    size="sm"
+    :action-cancel="$options.CANCEL_PROPS"
+    @change="$emit('change', $event)"
+  >
+    <gl-sprintf :message="$options.i18n.message">
+      <template #link="{ content }">
+        <help-page-link
+          href="subscriptions/gitlab_com/index"
+          anchor="change-the-linked-namespace"
+          >{{ content }}</help-page-link
+        >
+      </template>
+    </gl-sprintf>
+  </gl-modal>
+</template>

app/assets/javascripts/vue_shared/components/groups_list/groups_list_item.vue

@@ -15,6 +15,7 @@ import {
   TIMESTAMP_TYPE_CREATED_AT,
   TIMESTAMP_TYPE_UPDATED_AT,
 } from '~/vue_shared/components/resource_lists/constants';
+import GroupListItemPreventDeleteModal from './group_list_item_prevent_delete_modal.vue';
 
 export default {
   i18n: {
@@ -33,6 +34,7 @@ export default {
     GlTruncateText,
     GlBadge,
     ListActions,
+    GroupListItemPreventDeleteModal,
     GroupListItemDeleteModal,
     TimeAgoTooltip,
     GroupListItemInactiveBadge: () =>
@@ -131,6 +133,9 @@ export default {
     onActionDelete() {
       this.isDeleteModalVisible = true;
     },
+    onModalChange(isVisible) {
+      this.isDeleteModalVisible = isVisible;
+    },
   },
 };
 </script>
@@ -240,15 +245,24 @@ export default {
       />
     </div>
 
-    <group-list-item-delete-modal
-      v-if="hasActionDelete"
-      :visible="isDeleteModalVisible"
-      :modal-id="modalId"
-      :phrase="group.fullName"
-      :confirm-loading="isActionDeleteLoading"
-      :group="group"
-      @confirm.prevent="$emit('delete', group)"
-      @change="isDeleteModalVisible = arguments[0]"
-    />
+    <template v-if="hasActionDelete">
+      <group-list-item-prevent-delete-modal
+        v-if="group.isLinkedToSubscription"
+        :visible="isDeleteModalVisible"
+        :modal-id="modalId"
+        :group="group"
+        @change="onModalChange"
+      />
+      <group-list-item-delete-modal
+        v-else
+        :visible="isDeleteModalVisible"
+        :modal-id="modalId"
+        :phrase="group.fullName"
+        :confirm-loading="isActionDeleteLoading"
+        :group="group"
+        @confirm.prevent="$emit('delete', group)"
+        @change="onModalChange"
+      />
+    </template>
   </li>
 </template>

app/assets/javascripts/vue_shared/components/web_ide_link.vue

@@ -57,6 +57,11 @@ export default {
       required: false,
       default: false,
     },
+    needsToForkWithWebIde: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     gitpodEnabled: {
       type: Boolean,
       required: false,
@@ -221,7 +226,7 @@ export default {
     webIdeAction() {
       if (!this.showWebIdeButton) return null;
 
-      const handleOptions = this.needsToFork
+      const handleOptions = this.needsToForkWithWebIde
         ? {
             handle: () => {
               if (this.disableForkModal) {

app/assets/javascripts/work_items/components/create_work_item.vue

@@ -425,7 +425,6 @@ export default {
               edit-mode
               :autofocus="false"
               :full-path="fullPath"
-              create-flow
               :show-buttons-below-field="false"
               :work-item-id="$options.NEW_WORK_ITEM_GID"
               :work-item-iid="$options.NEW_WORK_ITEM_IID"
@@ -468,7 +467,6 @@ export default {
             <template v-if="workItemLabels">
               <work-item-labels
                 class="gl-mb-5 js-labels"
-                create-flow
                 :can-update="canUpdate"
                 :full-path="fullPath"
                 :work-item-id="workItem.id"

app/assets/javascripts/work_items/components/work_item_description.vue

@@ -8,6 +8,7 @@ import EditedAt from '~/issues/show/components/edited.vue';
 import Tracking from '~/tracking';
 import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
 import {
+  newWorkItemId,
   newWorkItemFullPath,
   autocompleteDataSources,
   markdownPreviewPath,
@@ -64,11 +65,6 @@ export default {
       required: false,
       default: true,
     },
-    createFlow: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     workItemTypeName: {
       type: String,
       required: false,
@@ -119,6 +115,9 @@ export default {
     },
   },
   computed: {
+    createFlow() {
+      return this.workItemId === newWorkItemId(this.workItemType);
+    },
     workItemFullPath() {
       return this.createFlow
         ? newWorkItemFullPath(this.fullPath, this.workItemTypeName)