Commit be493207 authored by Cindy Pallares's avatar Cindy Pallares

Alias the lfs_enabled method

We currently check for `project.lfs_enabled` to display
the state of lfs being enabled/disabled, but this is set to nil by
default, even when lfs is enabled.

Aliasing the method to #lfs_enabled? will return the correct state.
parent 019701ce
...@@ -548,6 +548,8 @@ class Project < ActiveRecord::Base ...@@ -548,6 +548,8 @@ class Project < ActiveRecord::Base
self[:lfs_enabled] && Gitlab.config.lfs.enabled self[:lfs_enabled] && Gitlab.config.lfs.enabled
end end
alias_method :lfs_enabled, :lfs_enabled?
def auto_devops_enabled? def auto_devops_enabled?
if auto_devops&.enabled.nil? if auto_devops&.enabled.nil?
has_auto_devops_implicitly_enabled? 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 ...@@ -335,7 +335,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
restored_project_json restored_project_json
expect(project.lfs_enabled).to be_nil expect(project.lfs_enabled).to be_falsey
end end
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