Skip to content

G
gitlab-ce
Commit 6f372150 authored by Yorick Peterse's avatar Yorick Peterse
Browse files
Options

Resolved conflicts in Projects::AfterRenameService

parent fcc8ce26
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/services/projects/after_rename_service.rb
View file @ 6f372150
...@@ -12,11 +12,8 @@ module Projects ...@@ -12,11 +12,8 @@ module Projects
# #
# Projects::AfterRenameService.new(project).execute # Projects::AfterRenameService.new(project).execute
class AfterRenameService class AfterRenameService
<<<<<<< HEAD
prepend ::EE::Projects::AfterRenameService prepend ::EE::Projects::AfterRenameService
=======
>>>>>>> upstream/master
attr_reader :project, :full_path_before, :full_path_after, :path_before attr_reader :project, :full_path_before, :full_path_after, :path_before
RenameFailedError = Class.new(StandardError) RenameFailedError = Class.new(StandardError)
......
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