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
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-25 21:09:07 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-25 21:09:07 +0300
commite93121b42cb4ca672c893c6be0a8af0c8d9f7987 (patch)
treece7516c91e058ca8d940ea55b2a65a36f0612a1e /doc/user/search
parentc93641ef29cf43b834bb02101ebfe5a9f76bff92 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/search')
-rw-r--r--doc/user/search/img/basic_search.pngbin88486 -> 8344 bytes
-rw-r--r--doc/user/search/img/dashboard_links.pngbin10220 -> 0 bytes
-rw-r--r--doc/user/search/img/dashboard_links_v13_11.pngbin0 -> 2798 bytes
-rw-r--r--doc/user/search/img/issues_mrs_shortcut.pngbin26706 -> 4523 bytes
-rw-r--r--doc/user/search/img/project_search_dropdown.pngbin117963 -> 0 bytes
-rw-r--r--doc/user/search/index.md10
6 files changed, 7 insertions, 3 deletions
diff --git a/doc/user/search/img/basic_search.png b/doc/user/search/img/basic_search.png
index 234805d5a4f..86aab68f1f0 100644
--- a/doc/user/search/img/basic_search.png
+++ b/doc/user/search/img/basic_search.png
Binary files differ
diff --git a/doc/user/search/img/dashboard_links.png b/doc/user/search/img/dashboard_links.png
deleted file mode 100644
index d784ba8018e..00000000000
--- a/doc/user/search/img/dashboard_links.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/search/img/dashboard_links_v13_11.png b/doc/user/search/img/dashboard_links_v13_11.png
new file mode 100644
index 00000000000..5f2e61eee1e
--- /dev/null
+++ b/doc/user/search/img/dashboard_links_v13_11.png
Binary files differ
diff --git a/doc/user/search/img/issues_mrs_shortcut.png b/doc/user/search/img/issues_mrs_shortcut.png
index 2fe1350c806..5be8079030a 100644
--- a/doc/user/search/img/issues_mrs_shortcut.png
+++ b/doc/user/search/img/issues_mrs_shortcut.png
Binary files differ
diff --git a/doc/user/search/img/project_search_dropdown.png b/doc/user/search/img/project_search_dropdown.png
deleted file mode 100644
index e0b922a186b..00000000000
--- a/doc/user/search/img/project_search_dropdown.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index 92b616c5549..db89dddaf14 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -12,9 +12,14 @@ type: index, reference, howto
To search through issues and merge requests in multiple projects, use the **Issues** or **Merge Requests** links
in the top-right part of your screen. These instructions are valid for both.
-The number displayed on their right represents the number of issues and merge requests assigned to you:
+The numbers in the right-hand side of the top menu indicate how many issues, merge requests,
+and to-do items are assigned to you:
-![issues and MRs dashboard links](img/dashboard_links.png)
+![issues and MRs dashboard links](img/dashboard_links_v13_11.png)
+
+- **(issues)** **Issues**: The open issues assigned to you.
+- **(merge-request-open)** **Merge requests**: The [merge requests](../project/merge_requests/index.md) assigned to you.
+- **(todo-done)** **To-do items**: The [to-do items](../todos.md) assigned to you.
When you click **Issues**, GitLab shows the opened issues assigned to you:
@@ -282,7 +287,6 @@ search, or choose a specific group or project.
To search through code or other documents in a single project, you can use
the search field on the top-right of your screen while the project page is open.
-![code search dropdown](img/project_search_dropdown.png)
![code search results](img/project_code_search.png)
### SHA search