Merge branch '36443-do-not-create-notes-if-issue-was-not-successfully-related' into 'master'

Create system notes only if issue was successfully related to another

Closes gitlab-ce#36443

See merge request !2684

app/services/issue_links/create_service.rb

@@ -21,8 +21,9 @@ module IssueLinks
       end
     end
 
+    # Returns a Boolean indicating if the Issue was related.
     def relate_issues(referenced_issue)
-      IssueLink.create(source: @issue, target: referenced_issue)
+      IssueLink.new(source: @issue, target: referenced_issue).save
     end
 
     def create_notes(referenced_issue)

changelogs/unreleased-ee/36443-do-not-create-notes-if-issue-was-not-successfully-related.yml

+---
+title: Create system notes only if issue was successfully related
+merge_request:
+author:
+type: fixed

spec/services/issue_links/create_service_spec.rb

@@ -60,6 +60,22 @@ describe IssueLinks::CreateService do
       end
     end
 
+    context 'source and target are the same issue' do
+      let(:params) do
+        { issue_references: [issue.to_reference] }
+      end
+
+      it 'does not create notes' do
+        expect(SystemNoteService).not_to receive(:relate_issue)
+
+        subject
+      end
+
+      it 'no relationship is created' do
+        expect { subject }.not_to change(IssueLink, :count)
+      end
+    end
+
     context 'when there is an issue to relate' do
       let(:issue_a) { create :issue, project: project }
       let(:another_project) { create :project, namespace: project.namespace }