diff options
| author | at.ramya <rauthappan@gitlab.com> | 2018-10-29 15:50:13 +0530 |
|---|---|---|
| committer | at.ramya <rauthappan@gitlab.com> | 2018-10-29 15:50:13 +0530 |
| commit | aaa87a57d16254d7265abf4b9a9bdbafc59262ac (patch) | |
| tree | 1c347d9aa41744d668093a8c5278fcd4686f78aa /app/services/resource_events/merge_into_notes_service.rb | |
| parent | 06d3986a0fa44567a0034354a651050096fcf111 (diff) | |
| parent | 5a460397a1ff9456e8bb85cf1938aed1e0c35722 (diff) | |
| download | gitlab-ce-aaa87a57d16254d7265abf4b9a9bdbafc59262ac.tar.gz | |
Merge branch 'master' into qa-filter-comments-in-issuesqa-filter-comments-in-issues
Diffstat (limited to 'app/services/resource_events/merge_into_notes_service.rb')
| -rw-r--r-- | app/services/resource_events/merge_into_notes_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/resource_events/merge_into_notes_service.rb b/app/services/resource_events/merge_into_notes_service.rb index 596c0105ea0..7504773a002 100644 --- a/app/services/resource_events/merge_into_notes_service.rb +++ b/app/services/resource_events/merge_into_notes_service.rb @@ -34,7 +34,7 @@ module ResourceEvents def label_events_by_discussion_id return [] unless resource.respond_to?(:resource_label_events) - events = resource.resource_label_events.includes(:label, :user) + events = resource.resource_label_events.includes(:label, user: :status) events = since_fetch_at(events) events.group_by { |event| event.discussion_id } |