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/services | |
| 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/services')
| -rw-r--r-- | app/services/system_note_service.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 0bce20ae5b7..69bd19c1977 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -162,7 +162,6 @@ module SystemNoteService # "changed time estimate to 3d 5h" # # Returns the created Note object - def change_time_estimate(noteable, project, author) parsed_time = Gitlab::TimeTrackingFormatter.output(noteable.time_estimate) body = if noteable.time_estimate == 0 @@ -188,7 +187,6 @@ module SystemNoteService # "added 2h 30m of time spent" # # Returns the created Note object - def change_time_spent(noteable, project, author) time_spent = noteable.time_spent @@ -453,10 +451,6 @@ module SystemNoteService end end - def cross_reference?(note_text) - note_text =~ /\A#{cross_reference_note_prefix}/i - end - # Check if a cross-reference is disallowed # # This method prevents adding a "mentioned in !1" note on every single commit @@ -486,7 +480,6 @@ module SystemNoteService # mentioner - Mentionable object # # Returns Boolean - def cross_reference_exists?(noteable, mentioner) # Initial scope should be system notes of this noteable type notes = Note.system.where(noteable_type: noteable.class) |