diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-03 22:23:45 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-03 22:23:45 +0000 |
commit | 257075e43b88056fa38ca157f3552d3fa87653b2 (patch) | |
tree | 91a871b5baec5ba7f25efde222289994ad073caf /app/views/projects/edit.html.haml | |
parent | ac1bbe7a78b0d861850de26797552c797966b309 (diff) | |
parent | fb3229d771a42b0022f4bbbd084ce245a17626fe (diff) | |
download | gitlab-ce-257075e43b88056fa38ca157f3552d3fa87653b2.tar.gz |
Merge branch 'project-container-repo-disable' into 'master'
Hides registry if project repository is disabled
## What does this MR do?
When disabling the projects repository it now hides the container registry as well.
## Screenshots (if relevant)
![Screen_Shot_2016-10-21_at_11.23.29](/uploads/e07d74e0666348748690689ab993f9d8/Screen_Shot_2016-10-21_at_11.23.29.png)
![Screen_Shot_2016-10-21_at_11.23.32](/uploads/e2f0757397a4524eca5aa069c1fabad3/Screen_Shot_2016-10-21_at_11.23.32.png)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/19734#note_17224181
See merge request !7036
Diffstat (limited to 'app/views/projects/edit.html.haml')
-rw-r--r-- | app/views/projects/edit.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index c40ad06969e..a5422966617 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -102,7 +102,7 @@ = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs') - if Gitlab.config.registry.enabled - .form-group + .form-group.js-container-registry{ style: ("display: none;" if @project.project_feature.send(:repository_access_level) == 0) } .checkbox = f.label :container_registry_enabled do = f.check_box :container_registry_enabled @@ -290,4 +290,4 @@ Saving project. %p Please wait a moment, this page will automatically refresh when ready. -= render 'shared/confirm_modal', phrase: @project.path
\ No newline at end of file += render 'shared/confirm_modal', phrase: @project.path |