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

Fixes #23575

See merge request !7037
Signed-off-by: Rémy Coutable <remy@rymai.me>

CHANGELOG.md

@@ -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)
 

app/views/projects/edit.html.haml

@@ -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
             .form-group
               .checkbox
                 = f.label :container_registry_enabled do