diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-16 12:10:36 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-16 12:10:36 +0300 |
| commit | 6e4582f2f203493edae9304ba59f461bf2ba29b6 (patch) | |
| tree | 7cde3b0af37ae338af4363ca1c2c6803833fd51f /app/controllers/admin/groups_controller.rb | |
| parent | 70faf5fdfbfa0e427b12d4181a9302394974c3cf (diff) | |
| parent | 02ddb9dff4084f615f744614cf81dc4166d61668 (diff) | |
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 'app/controllers/admin/groups_controller.rb')
| -rw-r--r-- | app/controllers/admin/groups_controller.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index cdfa8d91a28..aed77d0358a 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -60,6 +60,14 @@ class Admin::GroupsController < Admin::ApplicationController end def group_params - params.require(:group).permit(:name, :description, :path, :avatar, :visibility_level, :request_access_enabled) + params.require(:group).permit( + :avatar, + :description, + :lfs_enabled, + :name, + :path, + :request_access_enabled, + :visibility_level + ) end end |