diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 00:10:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 00:10:22 +0300 |
commit | 5b829393a732143e31e2f9a62b6ca2cfb7ebb147 (patch) | |
tree | 85260ce9fd49ea62df0cea5b750f8c0db1b5a082 /app/services/todo_service.rb | |
parent | f69bc1dab50e86440bb4ffdc507ca5efd94bf459 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/todo_service.rb')
-rw-r--r-- | app/services/todo_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb index fc6543a8efc..71bb813f384 100644 --- a/app/services/todo_service.rb +++ b/app/services/todo_service.rb @@ -316,6 +316,8 @@ class TodoService attributes.merge!(target_id: nil, commit_id: target.id) elsif target.is_a?(Issue) attributes[:issue_type] = target.issue_type + elsif target.is_a?(Discussion) + attributes.merge!(target_type: nil, target_id: nil, discussion: target) end attributes |