summaryrefslogtreecommitdiff
path: root/app/services/issuable/clone/base_service.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 03:10:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 03:10:04 +0000
commitfefca4c7b96dddf0afcd34f33be8bf249448918b (patch)
treeaba2b19e32894ff00067e940bfaf20732da8aca3 /app/services/issuable/clone/base_service.rb
parentb5452c76b5b35884482214dbf6fe9971e0276d3b (diff)
downloadgitlab-ce-fefca4c7b96dddf0afcd34f33be8bf249448918b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/issuable/clone/base_service.rb')
-rw-r--r--app/services/issuable/clone/base_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/issuable/clone/base_service.rb b/app/services/issuable/clone/base_service.rb
index 639423ed4bf..b2f9c083b5b 100644
--- a/app/services/issuable/clone/base_service.rb
+++ b/app/services/issuable/clone/base_service.rb
@@ -44,7 +44,7 @@ module Issuable
current_user,
original_entity.description,
original_entity.project,
- new_entity.project
+ new_parent
).execute
new_entity.update!(description: rewritten_description)
@@ -69,7 +69,7 @@ module Issuable
end
def new_parent
- new_entity.project || new_entity.group
+ new_entity.resource_parent
end
def group