diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-22 15:08:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-22 15:08:41 +0300 |
commit | edd183a633915eacd9b73cab43ea839a4cd42bf6 (patch) | |
tree | e950000a90a3ebf05d135b5add8e569fafffbd38 /doc/user | |
parent | 9dab4d7b6492628eb9222f14954fdd8889bd6e34 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/project/merge_requests/load_performance_testing.md | 2 | ||||
-rw-r--r-- | doc/user/search/index.md | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/load_performance_testing.md b/doc/user/project/merge_requests/load_performance_testing.md index 2675f509eed..3ee88275aac 100644 --- a/doc/user/project/merge_requests/load_performance_testing.md +++ b/doc/user/project/merge_requests/load_performance_testing.md @@ -156,7 +156,7 @@ The best approach is to capture the dynamic URL in a [`.env` file](https://docs. as a job artifact to be shared, then use a custom environment variable we've provided named `K6_DOCKER_OPTIONS` to configure the k6 Docker container to use the file. With this, k6 can then use any environment variables from the `.env` file in scripts using standard JavaScript, -such as: ``http.get(`${__ENV.ENVIRONMENT_URL`})``. +such as: ``http.get(`${__ENV.ENVIRONMENT_URL}`)``. For example: diff --git a/doc/user/search/index.md b/doc/user/search/index.md index 3a2eeaca3ac..f4a306f825e 100644 --- a/doc/user/search/index.md +++ b/doc/user/search/index.md @@ -211,6 +211,7 @@ You can also type in this search bar to see autocomplete suggestions for: - Recently viewed issues (try and type some word from the title of a recently viewed issue) - Recently viewed merge requests (try and type some word from the title of a recently viewed merge request) - Recently viewed epics (try and type some word from the title of a recently viewed epic) +- [GitLab Flavored Markdown](../markdown.md#special-gitlab-references) (GFM) for issues within a project (try and type a GFM reference for an issue) ## Basic search |