diff options
| author | Sanad Liaquat <sliaquat@gitlab.com> | 2019-03-15 11:52:39 +0500 |
|---|---|---|
| committer | Sanad Liaquat <sliaquat@gitlab.com> | 2019-03-15 11:52:39 +0500 |
| commit | e73f8713812b912b3b0244e99b6a18b9422a2d4d (patch) | |
| tree | de67e0ab7931961752caeccef78f393365391f81 /doc/user/project | |
| parent | 82c0816d3fdd96412605845fa337b74b6a3534c4 (diff) | |
| download | gitlab-ce-qa-artillery-io-script.tar.gz | |
Add Load testing script for artillery.ioqa-artillery-io-script
Also add rake tasks that makes use of existing performance data
genertion task.
Diffstat (limited to 'doc/user/project')
| -rw-r--r-- | doc/user/project/badges.md | 6 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/merge_when_pipeline_succeeds.md | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/doc/user/project/badges.md b/doc/user/project/badges.md index 025f3af0af5..19eb95099ce 100644 --- a/doc/user/project/badges.md +++ b/doc/user/project/badges.md @@ -63,12 +63,6 @@ are available: - `%{commit_sha}`: ID of the most recent commit to the default branch of a project's repository -NOTE: **NOTE** -Placeholders allow badges to expose otherwise-private information, such as the -default branch or commit SHA when the project is configured to have a private -repository. This is by design, as badges are intended to be used publicly. Avoid -using these placeholders if the information is sensitive. - ## API You can also configure badges via the GitLab API. As in the settings, there is diff --git a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md index f8af71ab46b..bdd7d0022e6 100644 --- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md +++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md @@ -1,4 +1,4 @@ -# Merge when pipeline succeeds +# Merge When Pipeline Succeeds When reviewing a merge request that looks ready to merge but still has one or more CI jobs running, you can set it to be merged automatically when the |