diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-24 17:06:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-25 15:15:32 +0200 |
| commit | 34c652e55340dfa65bc07a6f2b9cc2e3401a0a7c (patch) | |
| tree | 8b56cc43be60aa8153b4eab6056242b2cf904375 | |
| parent | 7c71ebfe521d660a18b286686eee544d4f239007 (diff) | |
| download | gitlab-ce-34c652e55340dfa65bc07a6f2b9cc2e3401a0a7c.tar.gz | |
Merge branch 'fix-container-registry-project-settings' into 'master'
Fixes #23575
See merge request !7037
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f2efe02f677..5723c358618 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index fb776e3a3e7..c36a3f00728 100644 --- a/app/views/projects/edit.html.haml +++ b/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 |