diff options
Diffstat (limited to 'doc/user/search')
| -rw-r--r-- | doc/user/search/advanced_search.md | 4 | ||||
| -rw-r--r-- | doc/user/search/img/basic_search_v14_4.png (renamed from doc/user/search/img/basic_search.png) | bin | 8344 -> 8344 bytes | |||
| -rw-r--r-- | doc/user/search/img/issues_mrs_shortcut.png | bin | 4523 -> 0 bytes | |||
| -rw-r--r-- | doc/user/search/img/issues_mrs_shortcut_v14_4.png | bin | 0 -> 6741 bytes | |||
| -rw-r--r-- | doc/user/search/index.md | 11 |
5 files changed, 8 insertions, 7 deletions
diff --git a/doc/user/search/advanced_search.md b/doc/user/search/advanced_search.md index f994539b9fc..f68951badff 100644 --- a/doc/user/search/advanced_search.md +++ b/doc/user/search/advanced_search.md @@ -26,7 +26,7 @@ when searching in: - Comments - Code - Commits -- Wiki +- Wiki (except [group wikis](../project/wiki/group.md)) - Users The Advanced Search can be useful in various scenarios: @@ -139,4 +139,4 @@ its performance: | Commits | `global_search_commits_tab` | When enabled, the global search includes commits as part of the search. | | Issues | `global_search_issues_tab` | When enabled, the global search includes issues as part of the search. | | Merge Requests | `global_search_merge_requests_tab` | When enabled, the global search includes merge requests as part of the search. | -| Wiki | `global_search_wiki_tab` | When enabled, the global search includes wiki as part of the search. | +| Wiki | `global_search_wiki_tab` | When enabled, the global search includes wiki as part of the search. [Group wikis](../project/wiki/group.md) are not included. | diff --git a/doc/user/search/img/basic_search.png b/doc/user/search/img/basic_search_v14_4.png Binary files differindex 86aab68f1f0..86aab68f1f0 100644 --- a/doc/user/search/img/basic_search.png +++ b/doc/user/search/img/basic_search_v14_4.png diff --git a/doc/user/search/img/issues_mrs_shortcut.png b/doc/user/search/img/issues_mrs_shortcut.png Binary files differdeleted file mode 100644 index 5be8079030a..00000000000 --- a/doc/user/search/img/issues_mrs_shortcut.png +++ /dev/null diff --git a/doc/user/search/img/issues_mrs_shortcut_v14_4.png b/doc/user/search/img/issues_mrs_shortcut_v14_4.png Binary files differnew file mode 100644 index 00000000000..2610e611446 --- /dev/null +++ b/doc/user/search/img/issues_mrs_shortcut_v14_4.png diff --git a/doc/user/search/index.md b/doc/user/search/index.md index 7cf62f09303..325e5386417 100644 --- a/doc/user/search/index.md +++ b/doc/user/search/index.md @@ -35,7 +35,7 @@ You can also filter the results using the search and filter field, as described GitLab shows shortcuts to issues and merge requests created by you or assigned to you in the search field in the upper right corner: - + ### Filter issue and merge request lists @@ -118,7 +118,7 @@ You can add this URL to your feed reader. You can filter the **Issues** list to individual instances by their ID. For example, enter filter `#10` to return only issue 10. The same applies to the **Merge Requests** list. Enter filter `#30` to return only merge request 30. - + ### Filtering merge requests by approvers **(PREMIUM)** @@ -290,7 +290,7 @@ To start a search, type into the search bar on the top-right of the screen. You in all GitLab and may also see the options to search in a group or project if you are in the group or project dashboard. - + After the results are returned, you can modify the search, select a different type of data to search, or choose a specific group or project. @@ -321,9 +321,10 @@ GitLab instance. ## Search settings -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/292941) in GitLab 13.8 behind a feature flag, disabled by default. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/292941) in GitLab 13.8 [with a flag](../../administration/feature_flags.md) named `search_settings_in_page`. Disabled by default. > - [Added to Group, Administrator, and User settings](https://gitlab.com/groups/gitlab-org/-/epics/4842) in GitLab 13.9. -> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/294025) in GitLab 13.11. +> - [Feature flag `search_settings_in_page` removed](https://gitlab.com/gitlab-org/gitlab/-/issues/294025) in GitLab 13.11. +> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/294025) in GitLab 13.11. You can search inside a Project, Group, Administrator, or User's settings by entering a search term in the search box located at the top of the page. The search results |
