Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

3 files changed, 20 insertions, 3 deletions

diff --git a/app/assets/javascripts/releases/components/app_edit_new.vue b/app/assets/javascripts/releases/components/app_edit_new.vue
index 022c3224bb4..dd3f4ed636f 100644
--- a/app/assets/javascripts/releases/components/app_edit_new.vue
+++ b/app/assets/javascripts/releases/components/app_edit_new.vue
@@ -128,8 +128,13 @@ export default {
   async mounted() {
     await this.initializeRelease();
 
-    // Focus the first non-disabled input or button element
-    this.$el.querySelector('input:enabled, button:enabled').focus();
+    if (this.release?.tagName) {
+      // Focus the release title input if a tag was preselected
+      this.$refs.releaseTitleInput.$el.focus();
+    } else {
+      // Focus the first non-disabled input or button element otherwise
+      this.$el.querySelector('input:enabled, button:enabled').focus();
+    }
   },
   methods: {
     ...mapActions('editNew', [
diff --git a/app/assets/javascripts/releases/components/asset_links_form.vue b/app/assets/javascripts/releases/components/asset_links_form.vue
index b81da399a7b..7c6d44456d9 100644
--- a/app/assets/javascripts/releases/components/asset_links_form.vue
+++ b/app/assets/javascripts/releases/components/asset_links_form.vue
@@ -209,7 +209,7 @@ export default {
           :id="`asset-type-${index}`"
           ref="typeSelect"
           :value="link.linkType || $options.defaultTypeOptionValue"
-          class="form-control pr-4"
+          class="pr-4"
           name="asset-type"
           :options="$options.typeOptions"
           @change="updateAssetLinkType({ linkIdToUpdate: link.id, newType: $event })"
diff --git a/app/assets/javascripts/releases/components/release_block_header.vue b/app/assets/javascripts/releases/components/release_block_header.vue
index def38780545..070865cf84b 100644
--- a/app/assets/javascripts/releases/components/release_block_header.vue
+++ b/app/assets/javascripts/releases/components/release_block_header.vue
@@ -7,6 +7,10 @@ import { BACK_URL_PARAM } from '~/releases/constants';
 export default {
   i18n: {
     editButton: __('Edit this release'),
+    historical: __('Historical release'),
+    historicalTooltip: __(
+      'This release was created with a date in the past. Evidence collection at the moment of the release is unavailable.',
+    ),
   },
   name: 'ReleaseBlockHeader',
   components: {
@@ -65,6 +69,14 @@ export default {
       <gl-badge v-if="release.upcomingRelease" variant="warning" class="align-middle">{{
         __('Upcoming Release')
       }}</gl-badge>
+      <gl-badge
+        v-else-if="release.historicalRelease"
+        v-gl-tooltip
+        :title="$options.i18n.historicalTooltip"
+        class="gl-vertical-align-middle"
+      >
+        {{ $options.i18n.historical }}
+      </gl-badge>
     </h2>
     <gl-button
       v-if="editLink"