From dddde902acfa6acfb11583c61faa67cc7c8d11b6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 26 Mar 2020 03:07:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/discussions/index.md | 2 +- doc/user/project/clusters/serverless/aws.md | 2 +- doc/user/project/issues/csv_export.md | 2 +- doc/user/project/labels.md | 2 +- doc/user/project/merge_requests/test_coverage_visualization.md | 2 +- doc/user/project/web_ide/index.md | 7 ++----- 6 files changed, 7 insertions(+), 10 deletions(-) (limited to 'doc/user') diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index f77d0d797dc..ead096b5a47 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -447,7 +447,7 @@ instead of the usual three. ![A comment editor with a suggestion with a fenced code block](img/suggestion_code_block_editor_v12_8.png) -![Ouput of a comment with a suggestion with a fenced code block](img/suggestion_code_block_output_v12_8.png) +![Output of a comment with a suggestion with a fenced code block](img/suggestion_code_block_output_v12_8.png) ### Configure the commit message for applied Suggestions diff --git a/doc/user/project/clusters/serverless/aws.md b/doc/user/project/clusters/serverless/aws.md index 0f3eea14efc..cd8f7e049a3 100644 --- a/doc/user/project/clusters/serverless/aws.md +++ b/doc/user/project/clusters/serverless/aws.md @@ -368,7 +368,7 @@ variables. To set these: 1. Navigate to the project's **{settings}** **Settings > CI / CD**. -1. Expand the **Variables** section and create entires for `AWS_ACCESS_KEY_ID` and +1. Expand the **Variables** section and create entries for `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`. 1. Mask the credentials so they do not show in logs using the **Masked** toggle. diff --git a/doc/user/project/issues/csv_export.md b/doc/user/project/issues/csv_export.md index fdc8246d102..8de0f038881 100644 --- a/doc/user/project/issues/csv_export.md +++ b/doc/user/project/issues/csv_export.md @@ -61,7 +61,7 @@ Data will be encoded with a comma as the column delimiter, with `"` used to quot | Assignee Username | Username of the author, with the `@` symbol omitted | | Confidential | `Yes` or `No` | | Locked | `Yes` or `No` | -| Due Date | Formated as `YYYY-MM-DD` | +| Due Date | Formatted as `YYYY-MM-DD` | | Created At (UTC) | Formatted as `YYYY-MM-DD HH:MM:SS` | | Updated At (UTC) | Formatted as `YYYY-MM-DD HH:MM:SS` | | Milestone | Title of the issue milestone | diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md index cd106b062f4..a6ef5f5cfcc 100644 --- a/doc/user/project/labels.md +++ b/doc/user/project/labels.md @@ -175,7 +175,7 @@ For example, `workflow::backend::review` and `workflow::backend::development` ar scoped labels, but they **can't** exist on the same issue at the same time, as they both share the same scope, `workflow::backend`. -Addtionally, `workflow::backend::review` and `workflow::frontend::review` are valid +Additionally, `workflow::backend::review` and `workflow::frontend::review` are valid scoped labels, and they **can** exist on the same issue at the same time, as they both have different scopes, `workflow::frontend` and `workflow::backend`. diff --git a/doc/user/project/merge_requests/test_coverage_visualization.md b/doc/user/project/merge_requests/test_coverage_visualization.md index 37b8b8c7b02..fe7c2c2757b 100644 --- a/doc/user/project/merge_requests/test_coverage_visualization.md +++ b/doc/user/project/merge_requests/test_coverage_visualization.md @@ -22,7 +22,7 @@ You can specify one or more coverage reports to collect, including wildcard path GitLab will then take the coverage information in all the files and combine it together. -For the coverage analysis to work, you have to provide a properly formated +For the coverage analysis to work, you have to provide a properly formatted [Cobertura XML](https://cobertura.github.io/cobertura/) report to [`artifacts:reports:cobertura`](../../../ci/yaml/README.md#artifactsreportscobertura). This format was originally developed for Java, but most coverage analysis frameworks diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md index a9e5d66aa6d..8680da3ad01 100644 --- a/doc/user/project/web_ide/index.md +++ b/doc/user/project/web_ide/index.md @@ -46,11 +46,8 @@ Single file editing is based on the [Ace Editor](https://ace.c9.io). ## Commit changes > - [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/4539) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.4 and [brought to GitLab Core](https://gitlab.com/gitlab-org/gitlab-foss/issues/44157) in 10.7. -> - From [GitLab 12.7 onwards](https://gitlab.com/gitlab-org/gitlab/issues/33441), -files were automatically staged. -> - From [GitLab 12.9 onwards](https://gitlab.com/gitlab-org/gitlab/-/issues/196609), support for staging files was removed -to prevent loss of unstaged data. All your current changes necessarily have to be -committed or discarded. +> - From [GitLab 12.7 onward](https://gitlab.com/gitlab-org/gitlab/issues/33441), files were automatically staged. +> - From [GitLab 12.9 onward](https://gitlab.com/gitlab-org/gitlab/-/issues/196609), support for staging files was removed to prevent loss of unstaged data. All your current changes necessarily have to be committed or discarded. After making your changes, click the **Commit** button on the bottom-left to review the list of changed files. -- cgit v1.2.1