diff options
Diffstat (limited to 'lib/api/v3')
-rw-r--r-- | lib/api/v3/helpers.rb | 4 | ||||
-rw-r--r-- | lib/api/v3/issues.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/v3/helpers.rb b/lib/api/v3/helpers.rb index 0f234d4cdad..2683e0b4c92 100644 --- a/lib/api/v3/helpers.rb +++ b/lib/api/v3/helpers.rb @@ -2,7 +2,9 @@ module API module V3 module Helpers def find_project_issue(id) - IssuesFinder.new(current_user, project_id: user_project.id).find(id) + issue = IssuesFinder.new(current_user, project_id: user_project.id).find(id) + issue.migrate_assignee + issue end def find_project_merge_request(id) diff --git a/lib/api/v3/issues.rb b/lib/api/v3/issues.rb index cb371fdbab8..14e918502d3 100644 --- a/lib/api/v3/issues.rb +++ b/lib/api/v3/issues.rb @@ -22,6 +22,8 @@ module API issues = IssuesFinder.new(current_user, args).execute.inc_notes_with_associations + issues.each(&:migrate_assignee) + if !match_all_labels && labels.present? issues = issues.includes(:labels).where('labels.title' => labels.split(',')) end |