Add latest changes from gitlab-org/gitlab@master

4 files changed, 19 insertions, 22 deletions

diff --git a/doc/user/search/img/group_issues_filter.png b/doc/user/search/img/group_issues_filter.png
deleted file mode 100644
index 45eced79b99..00000000000
--- a/doc/user/search/img/group_issues_filter.png
+++ /dev/null
diff --git a/doc/user/search/img/issue_search_filter_v12_5.png b/doc/user/search/img/issue_search_filter_v12_5.png
deleted file mode 100644
index 1e2dd3d98a3..00000000000
--- a/doc/user/search/img/issue_search_filter_v12_5.png
+++ /dev/null
diff --git a/doc/user/search/img/issue_search_filter_v12_7.png b/doc/user/search/img/issue_search_filter_v12_7.png
new file mode 100644
index 00000000000..8a4d0165cb6
--- /dev/null
+++ b/doc/user/search/img/issue_search_filter_v12_7.png
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index 68aef567270..d7ca43b1164 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -17,8 +17,8 @@ When you click **Issues**, you'll see the opened issues assigned to you straight
 
 You can search through **Open**, **Closed**, or **All** issues.
 
-You can also filter the results using the search and filter field. This works in the same way as the ones found in the
-per project pages described below.
+You can also filter the results using the search and filter field, as described below in
+[Filtering issue and merge request lists](#filtering-issue-and-merge-request-lists).
 
 ### Issues and MRs assigned to you or created by you
 
@@ -27,19 +27,26 @@ on the search field on the top-right of your screen:
 
 ![shortcut to your issues and mrs](img/issues_mrs_shortcut.png)
 
-### Issues and merge requests per project
+### Filtering issue and merge request lists
 
-If you want to search for issues present in a specific project, navigate to
-a project's **Issues** tab, and click on the field **Search or filter results...**. It will
-display a dropdown menu, from which you can add filters per author, assignee, milestone,
-release, label, weight, confidentiality, and "my-reaction" (based on your emoji votes).
-When done, press **Enter** on your keyboard to filter the issues.
+Follow these steps to filter the **Issues** and **Merge Requests** list pages within projects and
+groups:
 
-![filter issues in a project](img/issue_search_filter_v12_5.png)
+1. Click in the field **Search or filter results...**.
+1. In the dropdown menu that appears, select the attribute you wish to filter by (for example,
+   author, assignee, milestone, and so on).
+1. Select or type the operator to use for filtering the attribute. The following operators are
+   available:
+   - `=`: Is
+   - `!=`: Is not ([Introduced](https://gitlab.com/gitlab-org/gitlab/issues/18059) in GitLab 12.7)
+1. Enter the text to filter the attribute by.
+1. Repeat this process to filter by multiple attributes. Multiple attributes are joined by a logical
+   `AND`.
 
-The same process is valid for merge requests. Navigate to your project's **Merge Requests** tab,
-and click **Search or filter results...**. Merge requests can be filtered by author, assignee,
-approver, milestone, release, label, "my-reaction", "work in progess" status, and target branch.
+For example, filtering by Author `=` Jane and Milestone `!=` 12.6 filters for the issues where Jane
+is the author and the milestone is not 12.6.
+
+![filter issues in a project](img/issue_search_filter_v12_7.png)
 
 ### Filtering by **None** / **Any**
 
@@ -66,16 +73,6 @@ You can filter issues and merge requests by specific terms included in titles or
 
 ![filter issues by specific terms](img/issue_search_by_term.png)
 
-### Issues and merge requests per group
-
-Similar to **Issues and merge requests per project**, you can also search for issues
-within a group. Navigate to a group's **Issues** tab and query search results in
-the same way as you do for projects.
-
-![filter issues in a group](img/group_issues_filter.png)
-
-The same process is valid for merge requests. Navigate to your project's **Merge Requests** tab.
-
 ## Search history
 
 You can view recent searches by clicking on the little arrow-clock icon, which is to the left of the search input. Click the search entry to run that search again. This feature is available for issues and merge requests. Searches are stored locally in your browser.