Commit 9b925d79 authored by James Lopez's avatar James Lopez

WIP - fix and spec for cross reference issue with forks

parent e933a50b
...@@ -291,8 +291,8 @@ class SystemNoteService ...@@ -291,8 +291,8 @@ class SystemNoteService
notes = notes.where(noteable_id: noteable.id) notes = notes.where(noteable_id: noteable.id)
end end
gfm_reference = mentioner.gfm_reference(noteable.project) gfm_reference = mentioner.gfm_reference(nil)
notes = notes.where(note: cross_reference_note_content(gfm_reference)) notes = notes.where('note LIKE ?', "#{cross_reference_note_prefix}%#{gfm_reference}")
notes.count > 0 notes.count > 0
end end
......
...@@ -424,6 +424,22 @@ describe SystemNoteService, services: true do ...@@ -424,6 +424,22 @@ describe SystemNoteService, services: true do
to be_falsey to be_falsey
end end
end end
context 'commit from fork' do
let(:author2) { create(:user) }
let(:forked_project) { Projects::ForkService.new(project, author2).execute }
let(:service) { CreateCommitBuildsService.new }
let(:commit2) { forked_project.commit }
before do
described_class.cross_reference(commit0, commit2, author2)
end
it 'is falsey when is a fork mentioning an external issue' do
expect(described_class.cross_reference_exists?(commit0, commit2)).
to be_falsey
end
end
end end
include JiraServiceHelper include JiraServiceHelper
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment