summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-03 14:39:20 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-03-03 14:39:20 +0000
commit433ec4d8da9d6c3b45660892a15e88a1719e7599 (patch)
tree2bd0270b1aec8309af2f4481cc11b2f81d41ceae /app
parent86d1e42ab34d15a801b97d4d1b7812fb4259f7e5 (diff)
parent2968e87aa7062db2c23265b2d22ac83b889a76d7 (diff)
downloadgitlab-ce-433ec4d8da9d6c3b45660892a15e88a1719e7599.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
Diffstat (limited to 'app')
-rw-r--r--app/services/system_note_service.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index db6a092d8fc..8e02fe3741a 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)