summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-16 09:10:36 +0000
committerRémy Coutable <remy@rymai.me>2016-09-16 09:10:36 +0000
commit6e4582f2f203493edae9304ba59f461bf2ba29b6 (patch)
tree7cde3b0af37ae338af4363ca1c2c6803833fd51f /CHANGELOG
parent70faf5fdfbfa0e427b12d4181a9302394974c3cf (diff)
parent02ddb9dff4084f615f744614cf81dc4166d61668 (diff)
downloadgitlab-ce-6e4582f2f203493edae9304ba59f461bf2ba29b6.tar.gz
Merge branch 'group-specific-lfs-settings' into 'master'
Added group-specific setting for LFS. Groups can enable/disable LFS, but this setting can be overridden at the project level. **Admin only** Closes #18092 See merge request !6164
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f01c38b90a1..77b5cfb6d5e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -76,7 +76,8 @@ v 8.12.0 (unreleased)
- Add last commit time to repo view (ClemMakesApps)
- Fix accessibility and visibility of project list dropdown button !6140
- Fix missing flash messages on service edit page (airatshigapov)
- - Added project specific enable/disable setting for LFS !5997
+ - Added project-specific enable/disable setting for LFS !5997
+ - Added group-specific enable/disable setting for LFS !6164
- Don't expose a user's token in the `/api/v3/user` API (!6047)
- Remove redundant js-timeago-pending from user activity log (ClemMakesApps)
- Ability to manage project issues, snippets, wiki, merge requests and builds access level