diff options
| author | Cindy Pallares <cindy@gitlab.com> | 2018-10-19 11:36:41 -0500 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-10-22 12:55:49 -0500 |
| commit | be493207b069d832d5ecb97fb157df60fa58094f (patch) | |
| tree | 9ce0c6d3f952c2fb0ae5d34d05f09f77f6dd1e6d | |
| parent | 019701ce9e0675e2727dcced84d4c406a1592f96 (diff) | |
| download | gitlab-ce-lfs-project-attribute-alias.tar.gz | |
Alias the lfs_enabled methodlfs-project-attribute-alias
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.
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/lfs-project-attribute-alias.yml | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/project_tree_restorer_spec.rb | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 086f256174f..1967f5e2427 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? diff --git a/changelogs/unreleased/lfs-project-attribute-alias.yml b/changelogs/unreleased/lfs-project-attribute-alias.yml new file mode 100644 index 00000000000..883869f651a --- /dev/null +++ b/changelogs/unreleased/lfs-project-attribute-alias.yml @@ -0,0 +1,5 @@ +--- +title: Resolve LFS not correctly showing enabled +merge_request: 22501 +author: +type: fixed diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb index 7ebfc61f5e7..b0570680d5a 100644 --- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb @@ -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 |