summaryrefslogtreecommitdiff
path: root/doc/user/project
diff options
context:
space:
mode:
Diffstat (limited to 'doc/user/project')
-rw-r--r--doc/user/project/badges.md6
-rw-r--r--doc/user/project/merge_requests/merge_when_pipeline_succeeds.md2
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