Merge branch 'performance_improve_jira_connect_client' into 'master'

Avoid N+1 queries in JiraConnect::client

See merge request gitlab-org/gitlab!46783

app/assets/javascripts/environments/components/environment_stop.vue

@@ -4,7 +4,7 @@
  * Used in environments table.
  */
 
-import { GlTooltipDirective, GlButton } from '@gitlab/ui';
+import { GlTooltipDirective, GlButton, GlModalDirective } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import eventHub from '../event_hub';
 
@@ -14,6 +14,7 @@ export default {
   },
   directives: {
     GlTooltip: GlTooltipDirective,
+    GlModalDirective,
   },
   props: {
     environment: {
@@ -54,14 +55,13 @@ export default {
 <template>
   <gl-button
     v-gl-tooltip="{ id: $options.stopEnvironmentTooltipId }"
+    v-gl-modal-directive="'stop-environment-modal'"
     :loading="isLoading"
     :title="title"
     :aria-label="title"
     icon="stop"
     category="primary"
     variant="danger"
-    data-toggle="modal"
-    data-target="#stop-environment-modal"
     @click="onClick"
   />
 </template>

app/assets/javascripts/environments/components/stop_environment_modal.vue

 <script>
-/* eslint-disable @gitlab/vue-require-i18n-strings */
-import { GlSprintf, GlTooltipDirective } from '@gitlab/ui';
-import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue';
+import { GlSprintf, GlTooltipDirective, GlModal } from '@gitlab/ui';
 import eventHub from '../event_hub';
+import { __, s__ } from '~/locale';
 
 export default {
   id: 'stop-environment-modal',
   name: 'StopEnvironmentModal',
 
   components: {
-    GlModal: DeprecatedModal2,
+    GlModal,
     GlSprintf,
   },
 
@@ -24,6 +23,20 @@ export default {
     },
   },
 
+  computed: {
+    primaryProps() {
+      return {
+        text: s__('Environments|Stop environment'),
+        attributes: [{ variant: 'danger' }],
+      };
+    },
+    cancelProps() {
+      return {
+        text: __('Cancel'),
+      };
+    },
+  },
+
   methods: {
     onSubmit() {
       eventHub.$emit('stopEnvironment', this.environment);
@@ -34,18 +47,23 @@ export default {
 
 <template>
   <gl-modal
-    :id="$options.id"
-    :footer-primary-button-text="s__('Environments|Stop environment')"
-    footer-primary-button-variant="danger"
-    @submit="onSubmit"
+    :modal-id="$options.id"
+    :action-primary="primaryProps"
+    :action-cancel="cancelProps"
+    @primary="onSubmit"
   >
-    <template #header>
-      <h4 class="modal-title d-flex mw-100">
-        Stopping
-        <span v-gl-tooltip :title="environment.name" class="text-truncate ml-1 mr-1 flex-fill">
-          {{ environment.name }}?
-        </span>
-      </h4>
+    <template #modal-title>
+      <gl-sprintf :message="s__('Environments|Stopping %{environmentName}')">
+        <template #environmentName>
+          <span
+            v-gl-tooltip
+            :title="environment.name"
+            class="gl-text-truncate gl-ml-2 gl-mr-2 gl-flex-fill"
+          >
+            {{ environment.name }}?
+          </span>
+        </template>
+      </gl-sprintf>
     </template>
 
     <p>{{ s__('Environments|Are you sure you want to stop this environment?') }}</p>

doc/ci/caching/index.md

@@ -411,6 +411,8 @@ job B:
     - cat vendor/hello.txt
   cache:
     key: build-cache
+    paths:
+      - vendor/
 ```
 
 Here's what happens behind the scenes:

ee/app/assets/javascripts/security_dashboard/components/project_pipeline_status.vue

@@ -59,13 +59,13 @@ export default {
         <span class="gl-font-weight-bold gl-mr-3">{{ $options.i18n.lastUpdated }}</span>
         <span class="gl-white-space-nowrap">
           <time-ago-tooltip class="gl-pr-3" :time="pipeline.createdAt" />
-          <gl-link :href="pipeline.path" target="_blank">#{{ pipeline.id }}</gl-link>
+          <gl-link :href="pipeline.path">#{{ pipeline.id }}</gl-link>
           <pipeline-status-badge :pipeline="pipeline" class="gl-ml-3" />
         </span>
       </div>
       <div v-if="autoFixMrsCount" data-testid="auto-fix-mrs-link">
         <span class="gl-font-weight-bold gl-mr-3">{{ $options.i18n.autoFixSolutions }}</span>
-        <gl-link :href="autoFixMrsPath" target="_blank" class="gl-white-space-nowrap">{{
+        <gl-link :href="autoFixMrsPath" class="gl-white-space-nowrap">{{
           sprintf($options.i18n.autoFixMrsLink, { mrsCount: autoFixMrsCount })
         }}</gl-link>
       </div>

ee/app/views/layouts/header/_ee_subscribable_banner.html.haml

@@ -3,7 +3,7 @@
 
 - if message.present? && subscribable.present?
   .container-fluid.container-limited.pt-3
-    .gl-alert.alert-dismissible.gitlab-ee-license-banner.hidden.js-gitlab-ee-license-banner.pb-5.border-width-1px.border-style-solid.border-color-default.border-radius-default{ role: 'alert', data: { license_expiry: subscribable.expires_at } }
+    .gl-alert.alert-dismissible.gitlab-ee-license-banner.hidden.js-gitlab-ee-license-banner.gl-pb-7.gl-border-1.gl-border-solid.gl-border-gray-100.gl-rounded-base{ role: 'alert', data: { license_expiry: subscribable.expires_at } }
       %button.close.p-2{ type: 'button', 'aria-label' => 'Dismiss banner', data: { dismiss: 'alert', track_event: 'click_button', track_label: 'dismiss_subscribable_banner' } }
         %span{ 'aria-hidden' => 'true' }
           = sprite_icon('merge-request-close-m', size: 24)

ee/changelogs/unreleased/276497-pipeline-status-widget-target-blank.yml

+---
+title: Ooen pipeline status widget links in the same tab
+merge_request: 46893
+author:
+type: changed

locale/gitlab.pot

@@ -10451,6 +10451,9 @@ msgstr ""
 msgid "Environments|Stopping"
 msgstr ""
 
+msgid "Environments|Stopping %{environmentName}"
+msgstr ""
+
 msgid "Environments|There was an error fetching the logs. Please try again."
 msgstr ""