Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-13 09:09:37 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-13 09:09:37 +0300
commit0301a0cad0063d76b1607358dc6c711ea043fdda (patch)
tree894ac424a6fb370ad8dc5de4294cdc87f0ae164e /app/services/system_notes
parentdcce066c5059c4df112dce4a9edf288d74aec48b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/system_notes')
-rw-r--r--app/services/system_notes/issuables_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/system_notes/issuables_service.rb b/app/services/system_notes/issuables_service.rb
index d7787dac4b8..b555760f88e 100644
--- a/app/services/system_notes/issuables_service.rb
+++ b/app/services/system_notes/issuables_service.rb
@@ -144,7 +144,7 @@ module SystemNotes
#
# Returns Boolean
def cross_reference_disallowed?(mentioner)
- return true if noteable.is_a?(ExternalIssue) && !noteable.project.jira_tracker_active?
+ return true if noteable.is_a?(ExternalIssue) && !noteable.project&.external_references_supported?
return false unless mentioner.is_a?(MergeRequest)
return false unless noteable.is_a?(Commit)