Commit 767950b4 authored by Marcin Sedlak-Jakubowski's avatar Marcin Sedlak-Jakubowski

Merge branch 'patch-108' into 'master'

Fix bullet formatting on Projects API docs

See merge request gitlab-org/gitlab!31441
parents 2f928cee fa16620d
...@@ -9,10 +9,8 @@ Values for the project visibility level are: ...@@ -9,10 +9,8 @@ Values for the project visibility level are:
- `private`: - `private`:
Project access must be granted explicitly for each user. Project access must be granted explicitly for each user.
- `internal`: - `internal`:
The project can be cloned by any logged in user. The project can be cloned by any logged in user.
- `public`: - `public`:
The project can be accessed without any authentication. The project can be accessed without any authentication.
...@@ -22,11 +20,9 @@ There are currently three options for `merge_method` to choose from: ...@@ -22,11 +20,9 @@ There are currently three options for `merge_method` to choose from:
- `merge`: - `merge`:
A merge commit is created for every merge, and merging is allowed as long as there are no conflicts. A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
- `rebase_merge`: - `rebase_merge`:
A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible. A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible.
This way you could make sure that if this merge request would build, after merging to target branch it would also build. This way you could make sure that if this merge request would build, after merging to target branch it would also build.
- `ff`: - `ff`:
No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded. No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment