Refactor uploads rewriter used when moving issue

1 files changed, 6 insertions, 17 deletions

diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb
index e15e25ee536..096a3643968 100644
--- a/app/services/issues/move_service.rb
+++ b/app/services/issues/move_service.rb
@@ -62,26 +62,15 @@ module Issues
     end
 
     def rewrite_content(content)
-      rewrite_uploads(
-        unfold_references(content)
-      )
-    end
-
-    def unfold_references(content)
       return unless content
 
-      rewriter = Gitlab::Gfm::ReferenceRewriter.new(content, @old_project,
-                                                    @current_user)
-      rewriter.rewrite(@new_project)
-    end
-
-    def rewrite_uploads(content)
-      return unless content
+      rewriters = [Gitlab::Gfm::ReferenceRewriter,
+                   Gitlab::Gfm::UploadsRewriter]
 
-      rewriter = Gitlab::Gfm::UploadsRewriter.new(content, @old_project,
-                                                  @current_user)
-      return content unless rewriter.has_uploads?
-      rewriter.rewrite(@new_project)
+      rewriters.inject(content) do |text, klass|
+        rewriter = klass.new(text, @old_project, @current_user)
+        rewriter.needs_rewrite? ? rewriter.rewrite(@new_project) : text
+      end
     end
 
     def close_issue