Add latest changes from gitlab-org/gitlab@master

3 files changed, 19 insertions, 4 deletions

diff --git a/app/views/layouts/nav/_ask_duo_button.html.haml b/app/views/layouts/nav/_ask_duo_button.html.haml
new file mode 100644
index 00000000000..f17ccfc8afe
--- /dev/null
+++ b/app/views/layouts/nav/_ask_duo_button.html.haml
@@ -0,0 +1,13 @@
+- if Gitlab.ee? && ::Gitlab::Llm::TanukiBot.show_breadcrumbs_entry_point_for?(user: current_user)
+  - label = s_('TanukiBot|Ask GitLab Duo')
+  = render Pajamas::ButtonComponent.new(variant: :confirm,
+    category: :secondary,
+    icon: 'tanuki-ai',
+    size: 'small',
+    button_options: { class: 'js-tanuki-bot-chat-toggle gl-ml-3 gl-display-none gl-md-display-inline', data: { track_action: 'click_button', track_label: 'tanuki_bot_breadcrumbs_button' }, aria: { label: label }}) do
+    = label
+  = render Pajamas::ButtonComponent.new(variant: :confirm,
+    category: :secondary,
+    icon: 'tanuki-ai',
+    size: 'small',
+    button_options: { class: 'js-tanuki-bot-chat-toggle has-tooltip gl-ml-3 gl-md-display-none', title: label, data: { track_action: 'click_button', track_label: 'tanuki_bot_breadcrumbs_button', placement: 'left' }, aria: { label: label }})
diff --git a/app/views/layouts/nav/_top_bar.html.haml b/app/views/layouts/nav/_top_bar.html.haml
index 4f7e321b3c5..73b253e18bd 100644
--- a/app/views/layouts/nav/_top_bar.html.haml
+++ b/app/views/layouts/nav/_top_bar.html.haml
@@ -5,10 +5,11 @@
   - 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 }
-  .top-bar-container.gl-display-flex.gl-align-items-center{ :class => top_bar_container_class }
+%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 gl-mr-2', title: _('Expand sidebar'), aria: { controls: 'super-sidebar', expanded: 'false', label: _('Navigation sidebar') } })
+      = render Pajamas::ButtonComponent.new(icon: 'sidebar', category: :tertiary, button_options: { class: 'js-super-sidebar-toggle-expand super-sidebar-toggle gl-ml-n3', title: _('Expand sidebar'), aria: { controls: 'super-sidebar', expanded: 'false', label: _('Navigation sidebar') } })
     - elsif defined?(@left_sidebar)
-      = render Pajamas::ButtonComponent.new(icon: 'sidebar', category: :tertiary, button_options: { class: 'toggle-mobile-nav gl-ml-n3 gl-mr-2', data: { testid: 'toggle_mobile_nav_button' }, aria: { label: _('Open 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') } })
     = render "layouts/nav/breadcrumbs/breadcrumbs"
+    = render "layouts/nav/ask_duo_button"
diff --git a/app/views/layouts/nav/sidebar/_organization.html.haml b/app/views/layouts/nav/sidebar/_organization.html.haml
new file mode 100644
index 00000000000..de6c87f97d7
--- /dev/null
+++ b/app/views/layouts/nav/sidebar/_organization.html.haml
@@ -0,0 +1 @@
+= render partial: 'shared/nav/sidebar', object: Sidebars::Organizations::Panel.new(organization_sidebar_context(@organization, current_user))