Add latest changes from gitlab-org/gitlab@master

7 files changed, 11 insertions, 13 deletions

diff --git a/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue b/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue
index 29009c14e1b..ff2dcd4393a 100644
--- a/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue
+++ b/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue
@@ -1,7 +1,6 @@
 <script>
 import { GlAvatar, GlAvatarLink, GlBadge } from '@gitlab/ui';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import { isNumeric } from '~/lib/utils/number_utils';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
 import CiResourceAbout from './ci_resource_about.vue';
 import CiResourceHeaderSkeletonLoader from './ci_resource_header_skeleton_loader.vue';
@@ -64,9 +63,7 @@ export default {
       return this.resource.rootNamespace;
     },
     versionBadgeText() {
-      return isNumeric(this.latestVersion.tagName)
-        ? `v${this.latestVersion.tagName}`
-        : this.latestVersion.tagName;
+      return this.latestVersion.tagName;
     },
   },
 };
diff --git a/app/assets/javascripts/invite_members/components/invite_modal_base.vue b/app/assets/javascripts/invite_members/components/invite_modal_base.vue
index 6dc8e8baf0e..81aea12f311 100644
--- a/app/assets/javascripts/invite_members/components/invite_modal_base.vue
+++ b/app/assets/javascripts/invite_members/components/invite_modal_base.vue
@@ -158,11 +158,6 @@ export default {
     datepickerId() {
       return `${this.modalId}_expires_at`;
     },
-    selectedRoleName() {
-      return Object.keys(this.accessLevels).find(
-        (key) => this.accessLevels[key] === Number(this.selectedAccessLevel),
-      );
-    },
     contentSlots() {
       return [...DEFAULT_SLOTS, ...(this.extraSlots || [])];
     },
diff --git a/app/assets/javascripts/snippets/components/snippet_blob_edit.vue b/app/assets/javascripts/snippets/components/snippet_blob_edit.vue
index 9b0a1db23f2..3a85f66cfa2 100644
--- a/app/assets/javascripts/snippets/components/snippet_blob_edit.vue
+++ b/app/assets/javascripts/snippets/components/snippet_blob_edit.vue
@@ -56,6 +56,7 @@ export default {
         .get(url, {
           // This prevents axios from automatically JSON.parse response
           transformResponse: [(f) => f],
+          headers: { 'Cache-Control': 'no-cache' },
         })
         .then((res) => {
           this.notifyAboutUpdates({ content: res.data });
diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index 33c8a0254fd..6606f5b35a3 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -71,6 +71,11 @@ body {
 }
 
 .alert-wrapper {
+  @include gl-media-breakpoint-up(xl) {
+    --gl-alert-padding-x: #{$gl-spacing-scale-3};
+    --gl-broadcast-message-padding-x: #{$gl-spacing-scale-3};
+  }
+
   .alert {
     margin-bottom: 0;
 
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index f48157cb65a..2477a00757b 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -211,7 +211,7 @@ module GroupsHelper
 
   def group_title_link(group, hidable: false, show_avatar: false, for_dropdown: false)
     link_to(group_path(group), class: "group-path #{'breadcrumb-item-text' unless for_dropdown} js-breadcrumb-item-text #{'hidable' if hidable}") do
-      icon = group_icon(group, alt: group.name, class: "avatar-tile", width: 15, height: 15) if group.try(:avatar_url) || show_avatar
+      icon = render Pajamas::AvatarComponent.new(group, alt: group.name, class: "avatar-tile", size: 16) if group.try(:avatar_url) || show_avatar
       [icon, simple_sanitize(group.name)].join.html_safe
     end
   end
diff --git a/app/views/groups/_home_panel.html.haml b/app/views/groups/_home_panel.html.haml
index 269a7309ec2..e981070cea9 100644
--- a/app/views/groups/_home_panel.html.haml
+++ b/app/views/groups/_home_panel.html.haml
@@ -6,7 +6,7 @@
   .gl-display-flex.gl-justify-content-space-between.gl-flex-wrap.gl-flex-direction-column.gl-md-flex-direction-row.gl-gap-3.gl-my-5
     .home-panel-title-row.gl-display-flex.gl-align-items-center
       .avatar-container.rect-avatar.s64.home-panel-avatar.gl-flex-shrink-0.float-none{ class: 'gl-mr-3!' }
-        = group_icon(@group, class: 'avatar avatar-tile s64', width: 64, height: 64, itemprop: 'logo')
+        = render Pajamas::AvatarComponent.new(@group, alt: @group.name, size: 64, avatar_options: { itemprop: 'logo' })
       %div
         %h1.home-panel-title.gl-font-size-h1.gl-mt-3.gl-mb-2.gl-display-flex.gl-word-break-word{ itemprop: 'name' }
           = @group.name
diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml
index f8304d5e44e..68863788735 100644
--- a/app/views/shared/groups/_group.html.haml
+++ b/app/views/shared/groups/_group.html.haml
@@ -2,9 +2,9 @@
 - access = user&.max_member_access_for_group(group.id)
 
 %li.group-row.py-3.gl-align-items-center{ class: "gl-display-flex!" }
-  .avatar-container.rect-avatar.s40.gl-flex-shrink-0
+  .avatar-container.rect-avatar.s48.gl-flex-shrink-0
     = link_to group do
-      = group_icon(group, class: "avatar s40")
+      = render Pajamas::AvatarComponent.new(group, alt: group.name, size: 48)
   .gl-min-w-0.gl-flex-grow-1
     .title
       = link_to group.full_name, group, class: 'group-name'