Commit 6e36452e authored by Michael Kozono's avatar Michael Kozono

Refactor

parent 473ddfb4
...@@ -98,12 +98,6 @@ module Gitlab ...@@ -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 ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment