From 6e36452e96139658ff8eae88209710438dd14eba Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Fri, 24 Nov 2017 00:52:16 -0800 Subject: Refactor --- .../background_migration/populate_untracked_uploads.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/gitlab/background_migration/populate_untracked_uploads.rb b/lib/gitlab/background_migration/populate_untracked_uploads.rb index 50ec2260c60..f06b4ac1940 100644 --- a/lib/gitlab/background_migration/populate_untracked_uploads.rb +++ b/lib/gitlab/background_migration/populate_untracked_uploads.rb @@ -98,12 +98,6 @@ module Gitlab Digest::SHA256.file(absolute_path).hexdigest 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 def matching_pattern_map @@ -127,6 +121,12 @@ module Gitlab project.id 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 File.join(CarrierWave.root, path) end -- cgit v1.2.1