1 files changed, 19 insertions, 1 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 55750269bb4..0e76d2cc3ab 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -20,6 +20,8 @@ module MergeRequests
       if merge_request.can_be_created
         compare_branches
         assign_title_and_description
+        assign_labels
+        assign_milestone
       end
 
       merge_request
@@ -135,6 +137,20 @@ module MergeRequests
       append_closes_description
     end
 
+    def assign_labels
+      return unless target_project.issues_enabled? && issue
+      return if merge_request.label_ids&.any?
+
+      merge_request.label_ids = issue.try(:label_ids)
+    end
+
+    def assign_milestone
+      return unless target_project.issues_enabled? && issue
+      return if merge_request.milestone_id.present?
+
+      merge_request.milestone_id = issue.try(:milestone_id)
+    end
+
     def append_closes_description
       return unless issue&.to_reference.present?
 
@@ -185,7 +201,9 @@ module MergeRequests
     end
 
     def issue
-      @issue ||= target_project.get_issue(issue_iid, current_user)
+      strong_memoize(:issue) do
+        target_project.get_issue(issue_iid, current_user)
+      end
     end
   end
 end