diff options
| author | Jen-Shin Lin <jen-shin@gitlab.com> | 2017-10-17 10:12:24 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-10-17 15:58:58 -0700 |
| commit | bd46c8abfd5ee964c47eff0ace021e45cbbe6687 (patch) | |
| tree | e22dc885b8d70829cf3893cc65c49f6351bc2d34 /app/models/note.rb | |
| parent | 9978ef9884023df12b3fbc5758cf93d166100c80 (diff) | |
| download | gitlab-ce-bd46c8abfd5ee964c47eff0ace021e45cbbe6687.tar.gz | |
Merge branch 'security-10-1' into '10-1-stable'
Security fixes for 10.1 RC
See merge request gitlab/gitlabhq!2209
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index ceded9f2aef..8939e590ef1 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -169,7 +169,7 @@ class Note < ActiveRecord::Base end def cross_reference? - system? && SystemNoteService.cross_reference?(note) + system? && matches_cross_reference_regex? end def diff_note? |