summaryrefslogtreecommitdiff
path: root/app/models/lfs_object.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-09 00:06:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-09 00:06:06 +0000
commit869182cab0867d582e469f329a6f58d13f877683 (patch)
treeb98d8834894848f5ce845b7efc84681d51083695 /app/models/lfs_object.rb
parenta82d0c740b338ad981321a3111b731ad78364ba1 (diff)
downloadgitlab-ce-869182cab0867d582e469f329a6f58d13f877683.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/lfs_object.rb')
-rw-r--r--app/models/lfs_object.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/lfs_object.rb b/app/models/lfs_object.rb
index d31d6226559..535c3cf2ba1 100644
--- a/app/models/lfs_object.rb
+++ b/app/models/lfs_object.rb
@@ -2,6 +2,7 @@
class LfsObject < ApplicationRecord
include AfterCommitQueue
+ include Checksummable
include EachBatch
include ObjectStorage::BackgroundMove
@@ -46,7 +47,7 @@ class LfsObject < ApplicationRecord
# rubocop: enable DestroyAll
def self.calculate_oid(path)
- Digest::SHA256.file(path).hexdigest
+ self.hexdigest(path)
end
end