diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-07-05 22:57:19 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-07-05 22:57:19 +0000 |
| commit | cfd5870b62e9d76e564ffc64db1d1281b4a363bb (patch) | |
| tree | 34adec49220b96c99aea7139cd0794405ecd7b8d /doc/api | |
| parent | 1141eaf5c83f927ccc064b6c5d162081fdd22894 (diff) | |
| parent | 0bdf6fe4ba90f0a1dc7777d17651667776dfb91b (diff) | |
| download | gitlab-ce-cfd5870b62e9d76e564ffc64db1d1281b4a363bb.tar.gz | |
Merge branch 'allow-disabling-of-git-access-protocol' into 'master'
Add setting that allows admins to choose which Git access protocols are enabled.
## What does this MR do?
It allows admins to disable one of the two protocols for Git access. They can choose to enable just SSH, HTTP or allow both. If one of them is disabled, the clone URL in the project will show only the allowed protocol, and no dropdown to change protocols will be presented.
## What are the relevant issue numbers?
Full implementation on GitLab's side for #18601
GitLab Shell implementation: gitlab-org/gitlab-shell!62
GitLab Workhorse implementation: gitlab-org/gitlab-workhorse!51
## Screenshots (if relevant)
/cc @jschatz1 this MR touches the UI. Please review.
See merge request !4696
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/settings.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 741c5a29581..d9b68eaeadf 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -68,6 +68,7 @@ PUT /application/settings | `after_sign_out_path` | string | no | Where to redirect users after logout | | `container_registry_token_expire_delay` | integer | no | Container Registry token duration in minutes | | `repository_storage` | string | no | Storage path for new projects. The value should be the name of one of the repository storage paths defined in your gitlab.yml | +| `enabled_git_access_protocol` | string | no | Enabled protocols for Git access. Allowed values are: `ssh`, `http`, and `nil` to allow both protocols. ```bash curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/application/settings?signup_enabled=false&default_project_visibility=1 |