Add latest changes from gitlab-org/gitlab@master

7 files changed, 45 insertions, 26 deletions

diff --git a/doc/user/packages/conan_repository/index.md b/doc/user/packages/conan_repository/index.md
index bf822169de4..bcf2fea24e3 100644
--- a/doc/user/packages/conan_repository/index.md
+++ b/doc/user/packages/conan_repository/index.md
@@ -223,7 +223,7 @@ There are two ways to remove a Conan package from the GitLab Package Registry.
   ```sh
   conan remove Hello/0.2@user/channel --remote=gitlab
   ```
-  
+
   You need to explicitly include the remote in this command, otherwise the package will only be removed from your
   local system cache.
 
@@ -263,3 +263,25 @@ The GitLab Conan repository supports the following Conan CLI commands:
 - `conan search`: Search the GitLab Package Registry for public packages, and private packages you have permission to view.
 - `conan info`: View the info on a given package from the GitLab Package Registry.
 - `conan remove`: Delete the package from the GitLab Package Registry.
+
+## Using GitLab CI with Conan packages
+
+To work with Conan commands within [GitLab CI](./../../../ci/README.md), you can use
+`CI_JOB_TOKEN` in place of the personal access token in your commands.
+
+It is easiest to provide the `CONAN_LOGIN_USERNAME` and `CONAN_PASSWORD` with each
+Conan command in your `.gitlab-ci.yml` file:
+
+```yml
+image: conanio/gcc7
+
+create_package:
+  stage: deploy
+  script:
+    - conan remote add gitlab https://gitlab.example.com/api/v4/packages/conan
+    - conan create . my-group+my-project/beta
+    - CONAN_LOGIN_USERNAME=ci_user CONAN_PASSWORD=${CI_JOB_TOKEN} conan upload Hello/0.1@root+ci-conan/beta1 --all --remote=gitlab
+```
+
+You can find additional Conan images to use as the base of your CI file
+in the [Conan docs](https://docs.conan.io/en/latest/howtos/run_conan_in_docker.html#available-docker-images).
diff --git a/doc/user/project/issues/index.md b/doc/user/project/issues/index.md
index 6abd6fd7047..f540dfe0e51 100644
--- a/doc/user/project/issues/index.md
+++ b/doc/user/project/issues/index.md
@@ -97,7 +97,7 @@ and modify them if you have the necessary [permissions](../../permissions.md).
 
 On the Issues List, you can view all issues in the current project, or from multiple
 projects when opening the Issues List from the higher-level group context. Filter the
-issue list with a [search query](../../search/index.md#issues-and-merge-requests-per-project),
+issue list with a [search query](../../search/index.md#filtering-issue-and-merge-request-lists),
 including specific metadata, such as label(s), assignees(s), status, and more. From this
 view, you can also make certain changes [in bulk](../bulk_editing.md) to the displayed issues.
 
diff --git a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
index edc7b317c94..21c8b5c682b 100644
--- a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
+++ b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
@@ -13,7 +13,7 @@ which is then reviewed, and accepted (or rejected).
 View all the merge requests within a project by navigating to **Project > Merge Requests**.
 
 When you access your project's merge requests, GitLab will present them in a list,
-and you can use the tabs available to quickly filter by open and closed. You can also [search and filter the results](../../search/index.md#issues-and-merge-requests-per-project).
+and you can use the tabs available to quickly filter by open and closed. You can also [search and filter the results](../../search/index.md#filtering-issue-and-merge-request-lists).
 
 ![Project merge requests list view](img/project_merge_requests_list_view.png)
 
@@ -21,7 +21,7 @@ and you can use the tabs available to quickly filter by open and closed. You can
 
 View merge requests in all projects in the group, including all projects of all descendant subgroups of the group. Navigate to **Group > Merge Requests** to view these merge requests. This view also has the open and closed merge requests tabs.
 
-You can [search and filter the results](../../search/index.md#issues-and-merge-requests-per-group) from here.
+You can [search and filter the results](../../search/index.md#filtering-issue-and-merge-request-lists) from here.
 
 ![Group Issues list view](img/group_merge_requests_list_view.png)
 
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.