diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-08-25 17:59:31 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-08-30 16:17:41 -0500 |
| commit | 63a97c11928d483cfad87d11f83c7df84c29743d (patch) | |
| tree | 5e25c18e8489dec1000e5302b7ecf176166ce675 /app/models/project.rb | |
| parent | 0227e98d0db2eb7fc6a35ddfcd3a0581ab550948 (diff) | |
| download | gitlab-ce-63a97c11928d483cfad87d11f83c7df84c29743d.tar.gz | |
Syntax and style fixes.
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 5 |
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 |