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/models/project.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/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index f3f3ffbbd28..8b5a6f167bd 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -393,10 +393,9 @@ class Project < ActiveRecord::Base end def lfs_enabled? - return false unless Gitlab.config.lfs.enabled - return Gitlab.config.lfs.enabled if self[:lfs_enabled].nil? + return namespace.lfs_enabled? if self[:lfs_enabled].nil? - self[:lfs_enabled] + self[:lfs_enabled] && Gitlab.config.lfs.enabled end def repository_storage_path |