summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index c271448946c..7a5933bfe5e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -391,7 +391,10 @@ class Project < ActiveRecord::Base
end
def lfs_enabled?
- (Gitlab.config.lfs.enabled && enable_lfs) || (enable_lfs.nil? && Gitlab.config.lfs.enabled)
+ return false unless Gitlab.config.lfs.enabled
+ return Gitlab.config.lfs.enabled if enable_lfs.nil?
+
+ enable_lfs
end
def repository_storage_path