diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-03 14:39:20 +0000 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2017-03-03 18:21:03 -0300 |
commit | 565a73791d422321fc263d3dce4ea72c814af11f (patch) | |
tree | 54f5a0131b29130c544b24a418ee2d41f7cdaffa | |
parent | 3190f32813b33ff01a8622dad7658db93bf6abab (diff) | |
download | gitlab-ce-565a73791d422321fc263d3dce4ea72c814af11f.tar.gz |
Merge branch 'revert_disallow_system_notes_for_closed_issuables' into 'master'
Revert "Disallow system notes for closed issuables"
Closes #28207
See merge request !9673
-rw-r--r-- | app/services/system_note_service.rb | 1 | ||||
-rw-r--r-- | spec/services/system_note_service_spec.rb | 39 |
2 files changed, 0 insertions, 40 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 87ba72cf991..110072e3a16 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -385,7 +385,6 @@ module SystemNoteService # Returns Boolean def cross_reference_disallowed?(noteable, mentioner) return true if noteable.is_a?(ExternalIssue) && !noteable.project.jira_tracker_active? - return true if noteable.is_a?(Issuable) && (noteable.try(:closed?) || noteable.try(:merged?)) return false unless mentioner.is_a?(MergeRequest) return false unless noteable.is_a?(Commit) diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index 7f027ae02a2..7913a180f9b 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -418,45 +418,6 @@ describe SystemNoteService, services: true do to be_truthy end end - - context 'when noteable is an Issue' do - let(:issue) { create(:issue, project: project) } - - it 'is truthy when issue is closed' do - issue.close - - expect(described_class.cross_reference_disallowed?(issue, project.commit)). - to be_truthy - end - - it 'is falsey when issue is open' do - expect(described_class.cross_reference_disallowed?(issue, project.commit)). - to be_falsy - end - end - - context 'when noteable is a Merge Request' do - let(:merge_request) { create(:merge_request, :simple, source_project: project) } - - it 'is truthy when merge request is closed' do - allow(merge_request).to receive(:closed?).and_return(:true) - - expect(described_class.cross_reference_disallowed?(merge_request, project.commit)). - to be_truthy - end - - it 'is truthy when merge request is merged' do - allow(merge_request).to receive(:closed?).and_return(:true) - - expect(described_class.cross_reference_disallowed?(merge_request, project.commit)). - to be_truthy - end - - it 'is falsey when merge request is open' do - expect(described_class.cross_reference_disallowed?(merge_request, project.commit)). - to be_falsy - end - end end describe '.cross_reference_exists?' do |