diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-13 12:12:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-13 12:12:40 +0300 |
| commit | 7ece9a7935fca35a8d91d2cb29bfad453b69be12 (patch) | |
| tree | e05801dfb42e5f940033616a4f8b09a5ed5b08ac /app/views/layouts/nav | |
| parent | ddc642df500212e4258c8ced284cdc5d45278737 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/nav')
| -rw-r--r-- | app/views/layouts/nav/_ask_duo_button.html.haml | 13 | ||||
| -rw-r--r-- | app/views/layouts/nav/_top_bar.html.haml | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/app/views/layouts/nav/_ask_duo_button.html.haml b/app/views/layouts/nav/_ask_duo_button.html.haml deleted file mode 100644 index 646133b23f5..00000000000 --- a/app/views/layouts/nav/_ask_duo_button.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -- if Gitlab.ee? && ::Gitlab::Llm::TanukiBot.show_breadcrumbs_entry_point_for?(user: current_user) - - label = s_('TanukiBot|GitLab Duo Chat') - = render Pajamas::ButtonComponent.new(variant: :default, - category: :secondary, - icon: 'tanuki-ai', - size: 'medium', - 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: :default, - category: :secondary, - icon: 'tanuki-ai', - size: 'medium', - 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 ef783b688e0..c938cad5c42 100644 --- a/app/views/layouts/nav/_top_bar.html.haml +++ b/app/views/layouts/nav/_top_bar.html.haml @@ -12,4 +12,4 @@ - 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') } }) = render "layouts/nav/breadcrumbs/breadcrumbs" - = render "layouts/nav/ask_duo_button" + = render_if_exists "layouts/nav/ask_duo_button" |