summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-30 23:01:26 +0000
committerRobert Speicher <robert@gitlab.com>2016-08-30 23:01:26 +0000
commit88295e07426698ce2af32af73ac0c34e540a0ba0 (patch)
tree4f2a54fd0bd29130b92500b9d33c5c1f6b3c28c6 /app/models
parent1e08429d2c9aa72918a0a3328d070f0768478463 (diff)
parentcf37d623e197dae5cc7efb021c1b1d85ca9674ee (diff)
downloadgitlab-ce-88295e07426698ce2af32af73ac0c34e540a0ba0.tar.gz
Merge branch 'project-specific-lfs' into 'master'
Added project specific enable/disable setting for LFS ## What does this MR do? Adds project specific enable/disable setting for LFS ## What are the relevant issue numbers? Needed for #18092 See merge request !5997
Diffstat (limited to 'app/models')
-rw-r--r--app/models/project.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index c34064f96ce..e5027af4a0e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -390,6 +390,13 @@ class Project < ActiveRecord::Base
end
end
+ def lfs_enabled?
+ return false unless Gitlab.config.lfs.enabled
+ return Gitlab.config.lfs.enabled if self[:lfs_enabled].nil?
+
+ self[:lfs_enabled]
+ end
+
def repository_storage_path
Gitlab.config.repositories.storages[repository_storage]
end