diff options
| -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 | ||||
| -rw-r--r-- | doc/api/rest/index.md | 1 | ||||
| -rw-r--r-- | lefthook.yml | 6 |
4 files changed, 5 insertions, 17 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" diff --git a/doc/api/rest/index.md b/doc/api/rest/index.md index 039129d24c6..fd98952185b 100644 --- a/doc/api/rest/index.md +++ b/doc/api/rest/index.md @@ -804,6 +804,7 @@ For questions about these integrations, use the [GitLab community forum](https:/ ### `C#` - [`GitLabApiClient`](https://github.com/nmklotas/GitLabApiClient) +- [`NGitLab`](https://github.com/ubisoft/NGitLab) ### Go diff --git a/lefthook.yml b/lefthook.yml index e57a6cce518..7272b64096f 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -107,7 +107,7 @@ pre-push: tags: backend style files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD glob: '*.{rb,rake}' - run: REVEAL_RUBOCOP_TODO=0 bundle exec rubocop --parallel --force-exclusion {files} + run: REVEAL_RUBOCOP_TODO=0 bundle exec rubocop --parallel --force-exclusion --no-server {files} scripts: "merge_conflicts": @@ -124,7 +124,7 @@ pre-commit: tags: backend style files: git diff --name-only --diff-filter=d --staged glob: '*.{rb,rake}' - run: REVEAL_RUBOCOP_TODO=0 bundle exec rubocop --parallel --force-exclusion {files} + run: REVEAL_RUBOCOP_TODO=0 bundle exec rubocop --parallel --force-exclusion --no-server {files} secrets-detection: tags: secrets files: git diff --name-only --diff-filter=d --staged @@ -152,7 +152,7 @@ auto-fix: tags: backend style files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD) --cached glob: '*.{rb,rake}' - run: REVEAL_RUBOCOP_TODO=0 bundle exec rubocop --parallel --autocorrect --force-exclusion {files} + run: REVEAL_RUBOCOP_TODO=0 bundle exec rubocop --parallel --autocorrect --force-exclusion --no-server {files} gettext: tags: backend frontend view haml files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD --cached | while read file;do git diff --unified=1 $(git merge-base origin/master HEAD)..HEAD $file | grep -Fqe '_(' && echo $file;done; true |