diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-04-01 08:38:16 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-04-01 08:38:16 +0000 |
| commit | 2e3c2a355fbb362364c27ecceb1f21ef83aeddbb (patch) | |
| tree | 72c447598f7325b6b76ac0d9203d3b8034f0e635 /app/services/todo_service.rb | |
| parent | 670f8540fabb37ac83c02738100eea5e69a66369 (diff) | |
| parent | e60f034126712b7e5a3b3ff9c5e92359aaf96e10 (diff) | |
| download | gitlab-ce-2e3c2a355fbb362364c27ecceb1f21ef83aeddbb.tar.gz | |
Merge branch 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764' into 'master'
Fix Error 500 when searching for a comment in a project snippet
Closes #14764. /cc @stanhu, and thank you for the spec! ;)
See merge request !3468
Diffstat (limited to 'app/services/todo_service.rb')
| -rw-r--r-- | app/services/todo_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb index cfd69064548..42c5bca90fd 100644 --- a/app/services/todo_service.rb +++ b/app/services/todo_service.rb @@ -123,7 +123,7 @@ class TodoService def handle_note(note, author) # Skip system notes, and notes on project snippet - return if note.system? || note.for_project_snippet? + return if note.system? || note.for_snippet? project = note.project target = note.noteable |