Skip to content

G
gitlab-ce
Commit cfdab57f authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in app/services/projects/hashed_storage/migrate_attachments_service.rb 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 241da0a1
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/services/projects/hashed_storage/migrate_attachments_service.rb
View file @ cfdab57f
...@@ -5,11 +5,8 @@ module Projects ...@@ -5,11 +5,8 @@ module Projects
class MigrateAttachmentsService < BaseService class MigrateAttachmentsService < BaseService
attr_reader :logger, :old_path, :new_path attr_reader :logger, :old_path, :new_path
<<<<<<< HEAD
prepend ::EE::Projects::HashedStorage::MigrateAttachmentsService prepend ::EE::Projects::HashedStorage::MigrateAttachmentsService
=======
>>>>>>> upstream/master
def initialize(project, logger = nil) def initialize(project, logger = nil)
@project = project @project = project
@logger = logger || Rails.logger @logger = logger || Rails.logger
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7