Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-12

# Conflicts: # app/services/issues/move_service.rb [ci skip]

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-12
# Conflicts: # app/services/issues/move_service.rb [ci skip]
3616bc1a · GitLab Bot · a579b8af · ec3712c2 · 3616bc1a
Commit 3616bc1a authored Nov 12, 2018 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

app/services/issues/move_service.rb app/services/issues/move_service.rb +3 -0

No files found.
--- a/app/services/issues/move_service.rb
+++ b/app/services/issues/move_service.rb
@@ -2,8 +2,11 @@

 module Issues
  class MoveService < Issuable::Clone::BaseService
+<<<<<<< HEAD
    prepend ::EE::Issues::MoveService

+=======
+>>>>>>> upstream/master
    MoveError = Class.new(StandardError)

    def execute(issue, target_project)