GITALY_SERVER_VERSION

-b1505fd2424bf8a3a5cea5e305d1c62ca18b1d48
+b6ff186eba35d03b2055c2a0b0e92c65762a6d06

app/assets/javascripts/vue_shared/components/markdown/comment_templates_dropdown.vue

@@ -3,18 +3,33 @@ import { GlCollapsibleListbox, GlTooltip, GlButton } from '@gitlab/ui';
 import fuzzaldrinPlus from 'fuzzaldrin-plus';
 import { getDerivedMergeRequestInformation } from '~/diffs/utils/merge_request';
 import { InternalEvents } from '~/tracking';
-import savedRepliesQuery from './saved_replies.query.graphql';
+import savedRepliesQuery from 'ee_else_ce/vue_shared/components/markdown/saved_replies.query.graphql';
 import {
   TRACKING_SAVED_REPLIES_USE,
   TRACKING_SAVED_REPLIES_USE_IN_MR,
   TRACKING_SAVED_REPLIES_USE_IN_OTHER,
-} from './constants';
+  COMMENT_TEMPLATES_KEYS,
+  COMMENT_TEMPLATES_TITLES,
+} from 'ee_else_ce/vue_shared/components/markdown/constants';
 
 export default {
   apollo: {
     savedReplies: {
       query: savedRepliesQuery,
-      update: (r) => r.currentUser?.savedReplies?.nodes,
+      manual: true,
+      result({ data, loading }) {
+        if (!loading) {
+          this.savedReplies = data;
+        }
+      },
+      variables() {
+        const groupPath = document.body.dataset.groupFullPath;
+
+        return {
+          groupPath,
+          hideGroup: !groupPath,
+        };
+      },
       skip() {
         return !this.shouldFetchCommentTemplates;
       },
@@ -35,18 +50,37 @@ export default {
   data() {
     return {
       shouldFetchCommentTemplates: false,
-      savedReplies: [],
+      savedReplies: {},
       commentTemplateSearch: '',
       loadingSavedReplies: false,
     };
   },
   computed: {
+    allSavedReplies() {
+      return COMMENT_TEMPLATES_KEYS.map((key) => ({
+        text: COMMENT_TEMPLATES_TITLES[key],
+        options: (this.savedReplies[key]?.savedReplies?.nodes || []).map((r) => ({
+          value: r.id,
+          text: r.name,
+          content: r.content,
+        })),
+      }));
+    },
     filteredSavedReplies() {
-      const savedReplies = this.commentTemplateSearch
-        ? fuzzaldrinPlus.filter(this.savedReplies, this.commentTemplateSearch, { key: ['name'] })
-        : this.savedReplies;
+      let savedReplies = this.allSavedReplies;
+
+      if (this.commentTemplateSearch) {
+        savedReplies = savedReplies
+          .map((group) => ({
+            ...group,
+            options: fuzzaldrinPlus.filter(group.options, this.commentTemplateSearch, {
+              key: ['text'],
+            }),
+          }))
+          .filter(({ options }) => options.length);
+      }
 
-      return savedReplies.map((r) => ({ value: r.id, text: r.name, content: r.content }));
+      return savedReplies.filter(({ options }) => options.length);
     },
   },
   mounted() {
@@ -60,8 +94,16 @@ export default {
       this.commentTemplateSearch = search;
     },
     onSelect(id) {
+      let savedReply;
       const isInMr = Boolean(getDerivedMergeRequestInformation({ endpoint: window.location }).id);
-      const savedReply = this.savedReplies.find((r) => r.id === id);
+
+      for (let i = 0, len = this.allSavedReplies.length; i < len; i += 1) {
+        const { options } = this.allSavedReplies[i];
+        savedReply = options.find(({ value }) => value === id);
+
+        if (savedReply) break;
+      }
+
       if (savedReply) {
         this.$emit('select', savedReply.content);
         this.trackEvent(TRACKING_SAVED_REPLIES_USE);

app/assets/javascripts/vue_shared/components/markdown/constants.js

+import { __ } from '~/locale';
+
 export const TRACKING_SAVED_REPLIES_USE = 'i_code_review_saved_replies_use';
 export const TRACKING_SAVED_REPLIES_USE_IN_MR = 'i_code_review_saved_replies_use_in_mr';
 export const TRACKING_SAVED_REPLIES_USE_IN_OTHER = 'i_code_review_saved_replies_use_in_other';
+
+export const COMMENT_TEMPLATES_KEYS = ['currentUser'];
+export const COMMENT_TEMPLATES_TITLES = { currentUser: __('User') };

app/models/integrations/drone_ci.rb

@@ -3,6 +3,7 @@
 module Integrations
   class DroneCi < BaseCi
     include HasWebHook
+    include HasAvatar
     include PushDataValidations
     include ReactivelyCached
     prepend EnableSslVerification
@@ -123,6 +124,10 @@ def enable_ssl_verification
       original_value.nil? ? (new_record? || url_is_saas?) : original_value
     end
 
+    def attribution_notice
+      'Drone CI icon and logo by Harness Inc. are licensed under CC NC-ND 4.0.'
+    end
+
     private
 
     def url_is_saas?

app/views/shared/_integration_settings.html.haml

@@ -12,3 +12,6 @@
         .info-well
           .well-segment
             = markdown integration.help
+            - if integration.try(:attribution_notice)
+              %p
+                %em= integration.attribution_notice

config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml

@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_unrelated
 events:
   - name: g_project_management_issue_unrelated
     unique: user.id

config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml

@@ -12,9 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61685
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-options:
-  events:
-    - agent_users_using_ci_tunnel
 events:
   - name: agent_users_using_ci_tunnel
     unique: user.id

config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_ci_access_monthly.yml

@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-options:
-  events:
-    - k8s_api_proxy_requests_unique_users_via_ci_access
 events:
   - name: k8s_api_proxy_requests_unique_users_via_ci_access
     unique: user.id

config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_monthly.yml

@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-options:
-  events:
-    - k8s_api_proxy_requests_unique_users_via_user_access
 events:
   - name: k8s_api_proxy_requests_unique_users_via_user_access
     unique: user.id

config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_monthly.yml

@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129463
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-options:
-  events:
-    - k8s_api_proxy_requests_unique_users_via_pat_access
 events:
   - name: k8s_api_proxy_requests_unique_users_via_pat_access
     unique: user.id

config/metrics/counts_28d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_28d.yml

@@ -19,9 +19,6 @@ tier:
 - free
 - premium
 - ultimate
-options:
-  events:
-    - unique_users_visiting_ci_catalog
 events:
   - name: unique_users_visiting_ci_catalog
     unique: user.id

config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml

@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_unrelated
 events:
   - name: g_project_management_issue_unrelated
     unique: user.id

config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml

@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_unlocked
 events:
   - name: g_project_management_issue_unlocked
     unique: user.id

config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml

@@ -12,9 +12,6 @@ time_frame: 7d
 data_source: internal_events
 data_category: optional
 performance_indicator_type: []
-options:
-  events:
-    - agent_users_using_ci_tunnel
 events:
   - name: agent_users_using_ci_tunnel
     unique: user.id

config/metrics/counts_7d/20230620070722_k8s_api_proxy_requests_unique_users_via_ci_access_weekly.yml

@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-options:
-  events:
-    - k8s_api_proxy_requests_unique_users_via_ci_access
 events:
   - name: k8s_api_proxy_requests_unique_users_via_ci_access
     unique: user.id

config/metrics/counts_7d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_weekly.yml

@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-options:
-  events:
-    - k8s_api_proxy_requests_unique_users_via_user_access
 events:
   - name: k8s_api_proxy_requests_unique_users_via_user_access
     unique: user.id

config/metrics/counts_7d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_weekly.yml

@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129463
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-options:
-  events:
-    - k8s_api_proxy_requests_unique_users_via_pat_access
 events:
   - name: k8s_api_proxy_requests_unique_users_via_pat_access
     unique: user.id

config/metrics/counts_7d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_7d.yml

@@ -19,9 +19,6 @@ tier:
 - free
 - premium
 - ultimate
-options:
-  events:
-    - unique_users_visiting_ci_catalog
 events:
   - name: unique_users_visiting_ci_catalog
     unique: user.id

doc/development/contributing/first_contribution/configure-dev-env-gdk-in-a-box.md

+---
+stage: none
+group: unassigned
+info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
+---
+
+# Configure GDK-in-a-box
+
+If you want to contribute to the GitLab codebase and want a development environment in which to test
+your changes, you can use
+[GDK-in-a-box](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/gdk_in_a_box.md),
+a virtual machine (VM) pre-configured with [the GitLab Development Kit (GDK)](https://gitlab.com/gitlab-org/gitlab-development-kit).
+
+The GDK is a local development environment that includes an installation of self-managed GitLab,
+sample projects, and administrator access with which you can test functionality.
+
+It requires 30 GB of disk space.
+
+![GDK](../img/gdk_home.png)
+
+If you prefer to use GDK locally without a VM, use the steps in [Install the GDK development environment](configure-dev-env-gdk.md)
+
+<!--
+The steps here are a version of the steps in the GDK repo
+https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/gdk_in_a_box.md
+-->
+
+## Download GDK-in-a-box
+
+1. Download and install virtualization software to run the virtual machine:
+   - Mac computers with [Apple silicon](https://support.apple.com/en-us/116943):
+   [UTM](https://docs.getutm.app/installation/macos/). Select **Download from GitHub**.
+   - Linux / Windows / Mac computers with Intel silicon: [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
+1. Download and unzip GDK-in-a-box. The file is up to 10 GB and might take some time to download:
+   - Mac computers with Apple silicon: [UTM image](https://go.gitlab.com/cCHpCP)
+   - Linux / Windows / Mac: [VirtualBox image](https://go.gitlab.com/5iydBP)
+1. Open UTM or VirtualBox, add the virtual machine image, then start the virtual machine:
+   - UTM: `gdk.utm`
+   - VirtualBox: `gdk.vbox`
+1. Continue to **Use VS Code to connect to GDK in the VM**.
+
+## Use VS Code to connect to GDK in the VM
+
+[View a demo video of this step](https://go.gitlab.com/b54mHb).
+
+1. Start the VM. You can minimize UTM or VirtualBox.
+
+1. In VS Code, select **Terminal > New terminal** and run a `curl` command that executes a script to
+   add an SSH key to your local `~/.ssh/config`:
+
+   ```shell
+   curl "https://gitlab.com/gitlab-org/gitlab-development-kit/-/raw/main/support/gdk-in-a-box/setup-ssh-key" | bash
+   ```
+
+   To learn more about the script, you can examine the
+   [`setup-ssh-key` code](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/support/gdk-in-a-box/setup-ssh-key).
+
+1. In VS Code, install the **Remote - SSH** extension:
+   - [VS Code](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh)
+   - [VSCodium](https://open-vsx.org/extension/jeanp413/open-remote-ssh)
+1. Connect VS Code to the VM:
+   - Select **Remote-SSH: Connect to host** from the command palette.
+   - Enter the SSH host: `debian@gdk.local`
+1. A new VS Code window opens.
+   You can close or minimize the old window to avoid confusion.
+
+   Complete the remaining steps in this section in the new VS Code window.
+
+1. In the VS Code terminal, run a `curl` command to run a script to configure Git in the GDK:
+
+   ```shell
+   curl "https://gitlab.com/gitlab-org/gitlab-development-kit/-/raw/main/support/gdk-in-a-box/setup-git" | bash
+   ```
+
+   - Enter your name and email address when prompted.
+   - Add the displayed [SSH key to your profile](https://gitlab.com/-/profile/keys).
+
+   To learn more about the script, you can examine the
+   [`setup-git` code](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/support/gdk-in-a-box/setup-git).
+
+1. In VS Code, select **File > Open folder**, and go to: `/home/debian/gitlab-development-kit/gitlab/`.
+1. Open GitLab in your browser: [http://gdk.local:3000](http://gdk.local:3000).
+1. Sign in with the username `root` and the password `5iveL!fe`.
+1. Continue to [Change the code with the GDK](contribute-gdk.md).
+
+## Shut down GDK in the VM
+
+You can select the power icon <i class="fa fa-power-off" aria-hidden="true"></i> to shut down
+the virtual machine, or enter the `shutdown` command in the terminal. Use the password `debian`:
+
+```shell
+sudo shutdown now
+```
+
+## Update GDK-in-a-box
+
+You can update GDK-in-a-box while connected to `debian@gdk.local` in VS Code.
+
+In the VS Code terminal, enter `gdk update`.
+
+## Change the code
+
+After the GDK is ready, continue to [Contribute code with the GDK](contribute-gdk.md).

doc/development/contributing/first_contribution/configure-dev-env-gdk.md

@@ -4,111 +4,22 @@ group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
 ---
 
-# Configure the GDK development environment
+# Install the GDK development environment
 
 If you want to contribute to the GitLab codebase and want a development environment in which to test
 your changes, you can use [the GitLab Development Kit (GDK)](https://gitlab.com/gitlab-org/gitlab-development-kit),
 a local version of GitLab that's yours to play with.
 
-It's just like an installation of self-managed GitLab. It includes sample projects you can use
-to test functionality, and it gives you access to administrator functionality.
+The GDK is a local development environment that includes an installation of self-managed GitLab,
+sample projects, and administrator access with which you can test functionality.
 
 ![GDK](../img/gdk_home.png)
 
-[GDK-in-a-box](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/gdk_in_a_box.md)
-is a virtual machine (VM) pre-configured with GDK.
-It requires 30 GB of disk space.
-
-<!--
-The steps here are a version of the steps in the GDK repo
-https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/gdk_in_a_box.md
--->
-
-## Download GDK-in-a-box
-
-1. Download and install virtualization software to run the virtual machine:
-   - Mac computers with [Apple silicon](https://support.apple.com/en-us/116943):
-   [UTM](https://docs.getutm.app/installation/macos/). Select **Download from GitHub**.
-   - Linux / Windows / Mac computers with Intel silicon: [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-1. Download and unzip GDK-in-a-box. The file is up to 10 GB and might take some time to download:
-   - Mac computers with Apple silicon: [UTM image](https://go.gitlab.com/cCHpCP)
-   - Linux / Windows / Mac: [VirtualBox image](https://go.gitlab.com/5iydBP)
-1. Open UTM or VirtualBox, add the virtual machine image, then start the virtual machine:
-   - UTM: `gdk.utm`
-   - VirtualBox: `gdk.vbox`
-1. Continue to **Use VS Code to connect to GDK in the VM**.
-
-## Use VS Code to connect to GDK in the VM
-
-[View a demo video of this step](https://go.gitlab.com/b54mHb).
-
-1. Start the VM. You can minimize UTM or VirtualBox.
-
-1. In VS Code, select **Terminal > New terminal** and run a `curl` command that executes a script to
-   add an SSH key to your local `~/.ssh/config`:
-
-   ```shell
-   curl "https://gitlab.com/gitlab-org/gitlab-development-kit/-/raw/main/support/gdk-in-a-box/setup-ssh-key" | bash
-   ```
-
-   To learn more about the script, you can examine the
-   [`setup-ssh-key` code](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/support/gdk-in-a-box/setup-ssh-key).
-
-1. In VS Code, install the **Remote - SSH** extension:
-   - [VS Code](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh)
-   - [VSCodium](https://open-vsx.org/extension/jeanp413/open-remote-ssh)
-1. Connect VS Code to the VM:
-   - Select **Remote-SSH: Connect to host** from the command palette.
-   - Enter the SSH host: `debian@gdk.local`
-1. A new VS Code window opens.
-   You can close or minimize the old window to avoid confusion.
-
-   Complete the remaining steps in this section in the new VS Code window.
-
-1. In the VS Code terminal, run a `curl` command to run a script to configure Git in the GDK:
-
-   ```shell
-   curl "https://gitlab.com/gitlab-org/gitlab-development-kit/-/raw/main/support/gdk-in-a-box/setup-git" | bash
-   ```
-
-   - Enter your name and email address when prompted.
-   - Add the displayed [SSH key to your profile](https://gitlab.com/-/profile/keys).
-
-   To learn more about the script, you can examine the
-   [`setup-git` code](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/support/gdk-in-a-box/setup-git).
-
-1. In VS Code, select **File > Open folder**, and go to: `/home/debian/gitlab-development-kit/gitlab/`.
-1. Open GitLab in your browser: [http://gdk.local:3000](http://gdk.local:3000).
-1. Sign in with the username `root` and the password `5iveL!fe`.
-1. Continue to [Change the code with the GDK](contribute-gdk.md).
-
-### Shut down GDK in the VM
-
-You can select the power icon <i class="fa fa-power-off" aria-hidden="true"></i> to shut down
-the virtual machine, or enter the `shutdown` command in the terminal. Use the password `debian`:
-
-```shell
-sudo shutdown now
-```
-
-### Update GDK-in-a-box
-
-You can update GDK-in-a-box while connected to `debian@gdk.local` in VS Code.
-
-In the VS Code terminal, enter `gdk update`.
-
-## Install GDK and its dependencies
-
-If you prefer to install GDK without a virtual machine, you can use the one-line GDK-installation.
-
-<details><summary>Traditional, one-line GDK installation</summary>
-
-If you already have a working GDK,
-[update it to use the community fork](#update-an-existing-gdk-installation).
+If you prefer to use GDK in a local virtual machine, use the steps in [Configure GDK-in-a-box](configure-dev-env-gdk-in-a-box.md)
 
 [View an interactive demo of this step](https://gitlab.navattic.com/xtk20s8x).
 
-### Install and configure GitLab Development Kit (GDK)
+## Install and configure GitLab Development Kit (GDK)
 
 If you already have a working GDK,
 [update it to use the community fork](#update-an-existing-gdk-installation).
@@ -121,8 +32,6 @@ also set aside some time for troubleshooting.
 It might seem like a lot of work, but after you have the GDK running,
 you'll be able to make any changes.
 
-[View an interactive demo](https://gitlab.navattic.com/ak10d67) of this step.
-
 ![GitLab in GDK](../img/gdk_home.png)
 
 To install the GDK:
@@ -202,7 +111,7 @@ To install the GDK:
 
 1. Continue to [Change the code with the GDK](contribute-gdk.md).
 
-### Update an existing GDK installation
+## Update an existing GDK installation
 
 If you have an existing GDK installation, you should update it to use the community fork.
 
@@ -222,7 +131,7 @@ To confirm it was successful:
 If you get errors, run `gdk doctor` to troubleshoot.
 For more advanced troubleshooting, continue to the [Troubleshoot GDK](#troubleshoot-gdk) section.
 
-### Troubleshoot GDK
+## Troubleshoot GDK
 
 If you encounter issues, go to the `gitlab-development-kit/gitlab`
 directory and run `gdk doctor`.
@@ -238,8 +147,6 @@ For more advanced troubleshooting, see
 the [troubleshooting documentation](https://gitlab.com/gitlab-org/gitlab-development-kit/-/tree/main/doc/troubleshooting)
 and the [#contribute channel on Discord](https://discord.com/channels/778180511088640070/997442331202564176).
 
-### Change the code
+## Change the code
 
 After the GDK is ready, continue to [Contribute code with the GDK](contribute-gdk.md).
-
-</details>