Commit d16ef877 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'lfs-project-attribute-alias' into 'master'

Alias the lfs_enabled method

Closes #49348

See merge request gitlab-org/gitlab-ce!22501
parents f8f447b8 be493207
......@@ -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?
......
---
title: Resolve LFS not correctly showing enabled
merge_request: 22501
author:
type: fixed
......@@ -335,7 +335,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
restored_project_json
expect(project.lfs_enabled).to be_nil
expect(project.lfs_enabled).to be_falsey
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment