diff options
| author | Cindy Pallares 🦉 <cindy@gitlab.com> | 2019-07-10 03:08:15 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-07-10 03:08:15 +0000 |
| commit | 275f37030fbda23e97b0d2db8c1964868e651e52 (patch) | |
| tree | a599a8ded75f24ffd5dcbe32c1279de9be5550e1 /doc/api/projects.md | |
| parent | 9e0a66c4f196f16c040577663458337639ee8f16 (diff) | |
| download | gitlab-ce-275f37030fbda23e97b0d2db8c1964868e651e52.tar.gz | |
Include merge method link in attribute description
Currently, the project visibility methods attribute description link to
the descriptions and options for visibility methods. The merge methods
attribute description doesn't should do the same.
Diffstat (limited to 'doc/api/projects.md')
| -rw-r--r-- | doc/api/projects.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md index c199babc1be..781192fb92e 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -727,7 +727,7 @@ POST /projects | `public_builds` | boolean | no | If `true`, jobs can be viewed by non-project-members | | `only_allow_merge_if_pipeline_succeeds` | boolean | no | Set whether merge requests can only be merged with successful jobs | | `only_allow_merge_if_all_discussions_are_resolved` | boolean | no | Set whether merge requests can only be merged when all the discussions are resolved | -| `merge_method` | string | no | Set the merge method used | +| `merge_method` | string | no | Set the [merge method](#project-merge-method) used | | `lfs_enabled` | boolean | no | Enable LFS | | `request_access_enabled` | boolean | no | Allow users to request member access | | `tag_list` | array | no | The list of tags for a project; put array of tags, that should be finally assigned to a project | @@ -784,7 +784,7 @@ POST /projects/user/:user_id | `public_builds` | boolean | no | If `true`, jobs can be viewed by non-project-members | | `only_allow_merge_if_pipeline_succeeds` | boolean | no | Set whether merge requests can only be merged with successful jobs | | `only_allow_merge_if_all_discussions_are_resolved` | boolean | no | Set whether merge requests can only be merged when all the discussions are resolved | -| `merge_method` | string | no | Set the merge method used | +| `merge_method` | string | no | Set the [merge method](#project-merge-method) used | | `lfs_enabled` | boolean | no | Enable LFS | | `request_access_enabled` | boolean | no | Allow users to request member access | | `tag_list` | array | no | The list of tags for a project; put array of tags, that should be finally assigned to a project | @@ -841,7 +841,7 @@ PUT /projects/:id | `public_builds` | boolean | no | If `true`, jobs can be viewed by non-project-members | | `only_allow_merge_if_pipeline_succeeds` | boolean | no | Set whether merge requests can only be merged with successful jobs | | `only_allow_merge_if_all_discussions_are_resolved` | boolean | no | Set whether merge requests can only be merged when all the discussions are resolved | -| `merge_method` | string | no | Set the merge method used | +| `merge_method` | string | no | Set the [merge method](#project-merge-method) used | | `lfs_enabled` | boolean | no | Enable LFS | | `request_access_enabled` | boolean | no | Allow users to request member access | | `tag_list` | array | no | The list of tags for a project; put array of tags, that should be finally assigned to a project | |