diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-02 15:13:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-02 15:13:35 +0000 |
| commit | b2c21b99c7eb52b5fd906b1e7b4b08d4eb7a296c (patch) | |
| tree | cef64d6aa4d2d7e008bcdb84c754eab8e9ee117c /doc | |
| parent | ce459835cb32ed396fb7524fb615a5d07f8c51ef (diff) | |
| download | gitlab-ce-b2c21b99c7eb52b5fd906b1e7b4b08d4eb7a296c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/pipelines/merge_request_pipelines.md | 9 | ||||
| -rw-r--r-- | doc/user/search/advanced_search.md | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/doc/ci/pipelines/merge_request_pipelines.md b/doc/ci/pipelines/merge_request_pipelines.md index 7e18c11f234..881e94a6559 100644 --- a/doc/ci/pipelines/merge_request_pipelines.md +++ b/doc/ci/pipelines/merge_request_pipelines.md @@ -140,14 +140,7 @@ the parent project. Additionally, if you do not trust the fork project's runner, running the pipeline in the parent project uses the parent project's trusted runners. WARNING: -Fork merge requests can contain malicious code that tries to steal secrets in the -parent project when the pipeline runs, even before merge. As a reviewer, carefully -check the changes in the merge request before triggering the pipeline. If you trigger -the pipeline by selecting **Run pipeline** or applying a suggestion, GitLab shows -a warning that you must accept before the pipeline runs. If you trigger the pipeline -by using any other method, including the API, [`/rebase` quick action](../../user/project/quick_actions.md#issues-merge-requests-and-epics), -or [**Rebase** option](../../user/project/merge_requests/methods/index.md#rebasing-in-semi-linear-merge-methods), -**no warning displays**. +Fork merge requests can contain malicious code that tries to steal secrets in the parent project when the pipeline runs, even before merge. As a reviewer, carefully check the changes in the merge request before triggering the pipeline. Unless you trigger the pipeline through the API or the [`/rebase` quick action](../../user/project/quick_actions.md#issues-merge-requests-and-epics), GitLab shows a warning that you must accept before the pipeline runs. Otherwise, **no warning displays**. Prerequisites: diff --git a/doc/user/search/advanced_search.md b/doc/user/search/advanced_search.md index 4f595af7ba9..d1744e3bb4e 100644 --- a/doc/user/search/advanced_search.md +++ b/doc/user/search/advanced_search.md @@ -59,7 +59,7 @@ Advanced Search uses [Elasticsearch syntax](https://www.elastic.co/guide/en/elas FLAG: On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `user_search_simple_query_string`. -On GitLab.com, this feature is not available. +On GitLab.com, this feature is available. In user search, a [fuzzy query](https://www.elastic.co/guide/en/elasticsearch/reference/7.2/query-dsl-fuzzy-query.html) is used by default. You can refine your search with [Elasticsearch syntax](#syntax). |