diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-10-23 11:50:31 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-10-23 11:50:31 +0000 |
| commit | d16ef87793cffe545c989030c0399786fab9f517 (patch) | |
| tree | e7637190b1bb0d3bce6ac44bc5ec5c418c43416c | |
| parent | f8f447b83ef04c36d3362de46db19d19b3ac1578 (diff) | |
| parent | be493207b069d832d5ecb97fb157df60fa58094f (diff) | |
| download | gitlab-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
| -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 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? 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 |