Commit 34c652e5 authored by Sean McGivern's avatar Sean McGivern Committed by Rémy Coutable

Merge branch 'fix-container-registry-project-settings' into 'master'

Fixes #23575

See merge request !7037
Signed-off-by: default avatarRémy Coutable <>
parent 7c71ebfe
......@@ -7,6 +7,7 @@ Please view this file on the master branch, on stable branches it's out of date.
- Ensure custom provider tab labels don't break layout. !6993
- Fix issue boards user link when in subdirectory. !7018
- Refactor and add new environment functionality to CI yaml reference. !7026
- Fix typo in project settings that prevents users from enabling container registry. !7037
## 8.13.0 (2016-10-22)
......@@ -101,7 +101,7 @@
Git Large File Storage
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
- if Gitlab.config.lfs.enabled && current_user.admin?
- if Gitlab.config.registry.enabled
= f.label :container_registry_enabled do
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment