kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Refactor

Browse source
This commit is contained in:
Michael Kozono 2017-11-24 00:52:16 -08:00
parent 473ddfb453
commit 6e36452e96
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/gitlab/background_migration/populate_untracked_uploads.rb
View file

@ -98,12 +98,6 @@ module Gitlab
Digest::SHA256.file(absolute_path).hexdigest Digest::SHA256.file(absolute_path).hexdigest
end end
# Not including a leading slash
def path_relative_to_upload_dir
base = %r{\A#{Regexp.escape(Gitlab::BackgroundMigration::PrepareUntrackedUploads::RELATIVE_UPLOAD_DIR)}/}
@path_relative_to_upload_dir ||= path.sub(base, '')
end
private private
def matching_pattern_map def matching_pattern_map
@ -127,6 +121,12 @@ module Gitlab
project.id project.id
end end
# Not including a leading slash
def path_relative_to_upload_dir
base = %r{\A#{Regexp.escape(Gitlab::BackgroundMigration::PrepareUntrackedUploads::RELATIVE_UPLOAD_DIR)}/}
@path_relative_to_upload_dir ||= path.sub(base, '')
end
def absolute_path def absolute_path
File.join(CarrierWave.root, path) File.join(CarrierWave.root, path)
end end