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 /.vagrant_enabled | |
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)
![Screen_Shot_2016-06-16_at_12.26.19_PM](/uploads/bad845142e9704a7385b2eaca51fd4eb/Screen_Shot_2016-06-16_at_12.26.19_PM.png)
![Screen_Shot_2016-06-20_at_4.24.54_PM](/uploads/6e452dd269e06f0be23841ce93866ed6/Screen_Shot_2016-06-20_at_4.24.54_PM.png)
/cc @jschatz1 this MR touches the UI. Please review.
See merge request !4696
Diffstat (limited to '.vagrant_enabled')
0 files changed, 0 insertions, 0 deletions