diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-05-16 17:20:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-05-16 17:20:31 +0000 |
| commit | 59e62fc4866215eda1d291a240b6c4faaee2e961 (patch) | |
| tree | 9db48ca4c378bb900780c8dbba6f9a6333468799 /app/views | |
| parent | 5dd013f1452e1a521dfa0db99ae9910b1dc27b0e (diff) | |
| parent | 72577033888a77eeb2f4d362c2ae2331c1cbf6d7 (diff) | |
| download | gitlab-ce-59e62fc4866215eda1d291a240b6c4faaee2e961.tar.gz | |
Merge branch 'docker-registry' into 'master'
Added authentication service for docker registry
This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes.
I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry?
What do you think @jacobvosmaer @sytses @marin?
cc @marin
See merge request !3787
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/edit.html.haml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 76a4f41193c..f6a53fddf17 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -84,6 +84,16 @@ %br %span.descr Share code pastes with others out of git repository + - if Gitlab.config.registry.enabled + .form-group + .col-sm-offset-2.col-sm-10 + .checkbox + = f.label :container_registry_enabled do + = f.check_box :container_registry_enabled + %strong Container Registry + %br + %span.descr Enable Container Registry for this repository + = render 'builds_settings', f: f %fieldset.features |