Add latest changes from gitlab-org/gitlab@master

8 files changed, 17 insertions, 34 deletions

diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue
index c8a4f32d5a7..3796c5440f7 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue
@@ -119,9 +119,15 @@ export default {
     tagLocation() {
       return this.tag.path?.replace(`:${this.tag.name}`, '');
     },
+    isEmptyRevision() {
+      return this.tag.revision === '';
+    },
     isInvalidTag() {
       return !this.tag.digest;
     },
+    showConfigDigest() {
+      return !this.isInvalidTag && !this.isEmptyRevision;
+    },
   },
 };
 </script>
@@ -235,7 +241,7 @@ export default {
         />
       </details-row>
     </template>
-    <template v-if="!isInvalidTag" #details-configuration-digest>
+    <template v-if="showConfigDigest" #details-configuration-digest>
       <details-row icon="cloud-gear" data-testid="configuration-detail">
         <gl-sprintf :message="$options.i18n.CONFIGURATION_DETAILS_ROW_TEST">
           <template #digest>
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index ce2296e319a..9608e294d30 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -406,21 +406,6 @@
   @include media-breakpoint-down(xs) { margin-right: 3px; }
 }
 
-.toggle-mobile-nav {
-  @include gl-display-none;
-
-  @include media-breakpoint-down(sm) {
-    @include gl-display-block;
-
-    + .breadcrumbs {
-      @include gl-pl-4;
-      @include gl-border-l-1;
-      @include gl-border-l-solid;
-      @include gl-border-gray-100;
-    }
-  }
-}
-
 .top-nav-menu-item {
   &.active,
   &:hover {
diff --git a/app/controllers/jwks_controller.rb b/app/controllers/jwks_controller.rb
index d3a8d3dafea..2e030cf46c4 100644
--- a/app/controllers/jwks_controller.rb
+++ b/app/controllers/jwks_controller.rb
@@ -2,6 +2,10 @@
 
 class JwksController < Doorkeeper::OpenidConnect::DiscoveryController
   def index
+    if ::Feature.enabled?(:cache_control_headers_for_openid_jwks)
+      expires_in 24.hours, public: true, must_revalidate: true, 'no-transform': true
+    end
+
     render json: { keys: payload }
   end
 
diff --git a/app/models/organizations/organization.rb b/app/models/organizations/organization.rb
index 38c1c65ee54..ab42df99d44 100644
--- a/app/models/organizations/organization.rb
+++ b/app/models/organizations/organization.rb
@@ -24,6 +24,7 @@ module Organizations
 
     validates :path,
       presence: true,
+      uniqueness: { case_sensitive: false },
       'organizations/path': true,
       length: { minimum: 2, maximum: 255 }
 
diff --git a/app/views/layouts/nav/_top_bar.html.haml b/app/views/layouts/nav/_top_bar.html.haml
index c938cad5c42..af88d38fe3e 100644
--- a/app/views/layouts/nav/_top_bar.html.haml
+++ b/app/views/layouts/nav/_top_bar.html.haml
@@ -1,15 +1,5 @@
-- if show_super_sidebar?
-  - top_bar_class = 'top-bar-fixed container-fluid'
-  - top_bar_container_class = nil
-- else
-  - top_bar_class = [@no_top_bar_container ? 'container-fluid' : container_class, @content_class]
-  - top_bar_container_class = 'gl-border-b'
-
-%div{ class: top_bar_class, data: { testid: 'top-bar' } }
-  .top-bar-container.gl-display-flex.gl-align-items-center.gl-gap-2{ :class => top_bar_container_class }
-    - if show_super_sidebar?
-      = render Pajamas::ButtonComponent.new(icon: 'sidebar', category: :tertiary, button_options: { class: 'js-super-sidebar-toggle-expand super-sidebar-toggle gl-ml-n3', aria: { controls: 'super-sidebar', expanded: 'false', label: _('Primary navigation sidebar') } })
-    - elsif defined?(@left_sidebar)
-      = render Pajamas::ButtonComponent.new(icon: 'sidebar', category: :tertiary, button_options: { class: 'toggle-mobile-nav gl-ml-n3', data: { testid: 'toggle-mobile-nav-button' }, aria: { label: _('Open sidebar') } })
+%div{ class: 'top-bar-fixed container-fluid', data: { testid: 'top-bar' } }
+  .top-bar-container.gl-display-flex.gl-align-items-center.gl-gap-2
+    = render Pajamas::ButtonComponent.new(icon: 'sidebar', category: :tertiary, button_options: { class: 'js-super-sidebar-toggle-expand super-sidebar-toggle gl-ml-n3', aria: { controls: 'super-sidebar', expanded: 'false', label: _('Primary navigation sidebar') } })
     = render "layouts/nav/breadcrumbs/breadcrumbs"
     = render_if_exists "layouts/nav/ask_duo_button"
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index 9d6f67bd190..97909dc8c18 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -1,4 +1,4 @@
-- page_title _('Contributor statistics')
+- page_title _('Contributor analytics')
 - graph_path = project_graph_path(@project, current_ref, ref_type: @ref_type, format: :json)
 - commits_path = project_commits_path(@project, current_ref, ref_type: @ref_type)
 
diff --git a/app/views/shared/_auto_devops_callout.html.haml b/app/views/shared/_auto_devops_callout.html.haml
index 3f613a1b383..af09b62c229 100644
--- a/app/views/shared/_auto_devops_callout.html.haml
+++ b/app/views/shared/_auto_devops_callout.html.haml
@@ -1,6 +1,4 @@
-- container = @no_top_bar_container ? 'container-fluid' : container_class
-
-%div{ class: [container, @content_class, 'gl-pt-5!'] }
+%div{ class: [container_class, @content_class, 'gl-pt-5!'] }
   = render Pajamas::BannerComponent.new(button_text: s_('AutoDevOps|Enable in settings'),
     button_link: project_settings_ci_cd_path(@project, anchor: 'autodevops-settings'),
     svg_path: 'illustrations/autodevops.svg',
diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml
index 882730f536d..7ea2062eea1 100644
--- a/app/views/shared/boards/_show.html.haml
+++ b/app/views/shared/boards/_show.html.haml
@@ -1,5 +1,4 @@
 - board = local_assigns.fetch(:board, nil)
-- @no_top_bar_container = true
 - @no_container = true
 - @content_wrapper_class = "#{@content_wrapper_class} gl-relative gl-pb-0"
 - @content_class = "issue-boards-content js-focus-mode-board"