diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-16 14:45:10 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-16 14:45:10 +0200 |
| commit | fb5ffa89a6fc7cf2b11e7f3e7175565f24573504 (patch) | |
| tree | 269bc66f7eafa623f43d62d6bf4e158383b65ec4 /app | |
| parent | 9af2bc8907ed8904a66fdab8346d89cb1c77dd32 (diff) | |
| parent | 903132bc079970787333347209f6baebdd48800f (diff) | |
| download | gitlab-ce-fb5ffa89a6fc7cf2b11e7f3e7175565f24573504.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/system_note_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index b6801a92330..8253c1f780d 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -212,13 +212,15 @@ class SystemNoteService # Check if a cross-reference is disallowed # # This method prevents adding a "mentioned in !1" note on every single commit - # in a merge request. + # in a merge request. Additionally, it prevents the creation of references to + # external issues (which would fail). # # noteable - Noteable object being referenced # mentioner - Mentionable object # # Returns Boolean def self.cross_reference_disallowed?(noteable, mentioner) + return true if noteable.is_a?(ExternalIssue) return false unless mentioner.is_a?(MergeRequest) return false unless noteable.is_a?(Commit) |