diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 21:08:57 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 21:08:57 +0000 |
commit | a6c2be7cd20a9515b347e72d63c5b47bb9b79457 (patch) | |
tree | 568212b4debeb2a35bb1133209b98e1468d9ee85 /lib/gitlab/checks | |
parent | 74a2d57b337034cfdcd719615e4da06643b69114 (diff) | |
download | gitlab-ce-a6c2be7cd20a9515b347e72d63c5b47bb9b79457.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/checks')
-rw-r--r-- | lib/gitlab/checks/lfs_integrity.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/checks/lfs_integrity.rb b/lib/gitlab/checks/lfs_integrity.rb index 1652d5a30a4..e18cf6ff8f2 100644 --- a/lib/gitlab/checks/lfs_integrity.rb +++ b/lib/gitlab/checks/lfs_integrity.rb @@ -9,7 +9,6 @@ module Gitlab @time_left = time_left end - # rubocop: disable CodeReuse/ActiveRecord def objects_missing? return false unless @newrev && @project.lfs_enabled? @@ -19,12 +18,11 @@ module Gitlab return false unless new_lfs_pointers.present? existing_count = @project.all_lfs_objects - .where(oid: new_lfs_pointers.map(&:lfs_oid)) + .for_oids(new_lfs_pointers.map(&:lfs_oid)) .count existing_count != new_lfs_pointers.count end - # rubocop: enable CodeReuse/ActiveRecord end end end |