diff options
author | Robert Speicher <robert@gitlab.com> | 2016-02-25 21:54:06 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-02-25 21:54:06 +0300 |
commit | 37e5b944995fd778dd36d1c7a97ec6759947cf32 (patch) | |
tree | c739f114493565b292e85dd372aab84edf3e78a3 /app | |
parent | 820d227b9e233b8bb8c78b49ef4a26f757e86953 (diff) | |
parent | c1482943c4b77e2195fc4e64cc804302807335b9 (diff) |
Merge branch 'fix-todos' into 'master'
Does not create a Todo when commenting on commit or project snippet
Closes #13733
See merge request !2964
Diffstat (limited to 'app')
-rw-r--r-- | app/services/notes/create_service.rb | 1 | ||||
-rw-r--r-- | app/services/todo_service.rb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index b970439b921..2bb312bb252 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -13,6 +13,5 @@ module Notes note end - end end diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb index dc270602ebc..4392e2d17fe 100644 --- a/app/services/todo_service.rb +++ b/app/services/todo_service.rb @@ -130,8 +130,8 @@ class TodoService end def handle_note(note, author) - # Skip system notes, like status changes and cross-references - return if note.system + # Skip system notes, notes on commit, and notes on project snippet + return if note.system? || ['Commit', 'Snippet'].include?(note.noteable_type) project = note.project target = note.noteable |