summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-10-23 11:50:31 +0000
committerNick Thomas <nick@gitlab.com>2018-10-23 11:50:31 +0000
commitd16ef87793cffe545c989030c0399786fab9f517 (patch)
treee7637190b1bb0d3bce6ac44bc5ec5c418c43416c /app/models
parentf8f447b83ef04c36d3362de46db19d19b3ac1578 (diff)
parentbe493207b069d832d5ecb97fb157df60fa58094f (diff)
downloadgitlab-ce-d16ef87793cffe545c989030c0399786fab9f517.tar.gz
Merge branch 'lfs-project-attribute-alias' into 'master'
Alias the lfs_enabled method Closes #49348 See merge request gitlab-org/gitlab-ce!22501
Diffstat (limited to 'app/models')
-rw-r--r--app/models/project.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index be99408fcea..382fb4f463a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -548,6 +548,8 @@ class Project < ActiveRecord::Base
self[:lfs_enabled] && Gitlab.config.lfs.enabled
end
+ alias_method :lfs_enabled, :lfs_enabled?
+
def auto_devops_enabled?
if auto_devops&.enabled.nil?
has_auto_devops_implicitly_enabled?