diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-07 06:12:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-07 06:12:22 +0300 |
| commit | 6a5b78ac6945c0b0cd42293f11c94c2b3750fddc (patch) | |
| tree | 766f1d511d9737437d9f7e2b24f41c6887bf2229 /app/models/todo.rb | |
| parent | ec6dd14345a117d1ff4db3b0b19a1c0fa4c7e61b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/todo.rb')
| -rw-r--r-- | app/models/todo.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/todo.rb b/app/models/todo.rb index d7c22bf8510..dc436570f52 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -70,7 +70,7 @@ class Todo < ApplicationRecord scope :for_type, -> (type) { where(target_type: type) } scope :for_target, -> (id) { where(target_id: id) } scope :for_commit, -> (id) { where(commit_id: id) } - scope :with_entity_associations, -> { preload(:target, :author, :note, group: :route, project: [:route, { namespace: :route }]) } + scope :with_entity_associations, -> { preload(:target, :author, :note, group: :route, project: [:route, { namespace: [:route, :owner] }]) } scope :joins_issue_and_assignees, -> { left_joins(issue: :assignees) } enum resolved_by_action: { system_done: 0, api_all_done: 1, api_done: 2, mark_all_done: 3, mark_done: 4 }, _prefix: :resolved_by |