Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-17 00:07:25 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-17 00:07:25 +0300
commit32cfd14a94117d1e56524727e7d1b649493f5790 (patch)
tree9de87db328f7a1e83e0e195a5e16aad78cd2b24e /doc/user
parentb6b701cf9d08253d7c6f1e7500a09b1e373e18e3 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/profile/comment_templates.md10
-rw-r--r--doc/user/profile/img/saved_replies_dropdown_v15_10.pngbin23623 -> 0 bytes
-rw-r--r--doc/user/profile/img/saved_replies_dropdown_v16_0.pngbin0 -> 16149 bytes
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/user/profile/comment_templates.md b/doc/user/profile/comment_templates.md
index 8a94aff44fe..fed12454663 100644
--- a/doc/user/profile/comment_templates.md
+++ b/doc/user/profile/comment_templates.md
@@ -25,7 +25,7 @@ With comment templates, create and reuse text for any text area in:
Comment templates can be small, like approving a merge request and unassigning yourself from it,
or large, like chunks of boilerplate text you use frequently:
-![Comment templates dropdown list](img/saved_replies_dropdown_v15_10.png)
+![Comment templates dropdown list](img/saved_replies_dropdown_v16_0.png)
For more information about the rollout plan for this feature, see [issue 352956](https://gitlab.com/gitlab-org/gitlab/-/issues/352956).
@@ -33,7 +33,7 @@ For more information about the rollout plan for this feature, see [issue 352956]
To include the text of a comment template in your comment:
-1. In the editor toolbar for your comment, select **Comment templates** (**{symlink}**).
+1. In the editor toolbar for your comment, select **Comment templates** (**{comment-lines}**).
1. Select your desired comment template.
## Create comment templates
@@ -42,7 +42,7 @@ To create a comment template for future use:
1. On the top bar, in the upper-right corner, select your avatar.
1. From the dropdown list, select **Preferences**.
-1. On the left sidebar, select **Comment templates** (**{symlink}**).
+1. On the left sidebar, select **Comment templates** (**{comment-lines}**).
1. Provide a **Name** for your comment template.
1. Enter the **Content** of your reply. You can use any formatting you use in
other GitLab text areas.
@@ -54,7 +54,7 @@ To go to your comment templates:
1. On the top bar, in the upper-right corner, select your avatar.
1. From the dropdown list, select **Preferences**.
-1. On the left sidebar, select **Comment templates** (**{symlink}**).
+1. On the left sidebar, select **Comment templates** (**{comment-lines}**).
1. Scroll to **My comment templates**.
## Edit or delete comment templates
@@ -63,7 +63,7 @@ To edit or delete a previously comment template:
1. On the top bar, in the upper-right corner, select your avatar.
1. From the dropdown list, select **Preferences**.
-1. On the left sidebar, select **Comment templates** (**{symlink}**).
+1. On the left sidebar, select **Comment templates** (**{comment-lines}**).
1. Scroll to **My comment templates**, and identify the comment template you want to edit.
1. To edit, select **Edit** (**{pencil}**).
1. To delete, select **Delete** (**{remove}**), then select **Delete** again from the modal window.
diff --git a/doc/user/profile/img/saved_replies_dropdown_v15_10.png b/doc/user/profile/img/saved_replies_dropdown_v15_10.png
deleted file mode 100644
index 50313f71f4a..00000000000
--- a/doc/user/profile/img/saved_replies_dropdown_v15_10.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/profile/img/saved_replies_dropdown_v16_0.png b/doc/user/profile/img/saved_replies_dropdown_v16_0.png
new file mode 100644
index 00000000000..4608484a496
--- /dev/null
+++ b/doc/user/profile/img/saved_replies_dropdown_v16_0.png
Binary files differ