diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-05 15:06:15 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-05 15:06:15 +0000 |
| commit | edab9360009c6ca30e04c2ad3c2fd68f3aa5c55f (patch) | |
| tree | 9efee3a24520ea5285cb8ceaf92b0f869ed6c6a6 /lib/api/issues.rb | |
| parent | c503429e5e8538649bec02d74963ec0eb8f0cb98 (diff) | |
| parent | 6ced2f124355ac08b111b4c2ac60ae57e3851ba4 (diff) | |
| download | gitlab-ce-edab9360009c6ca30e04c2ad3c2fd68f3aa5c55f.tar.gz | |
Merge branch 'master' into 'rd-44364-deprecate-support-for-dsa-keys'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/issues.rb')
| -rw-r--r-- | lib/api/issues.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb index b64f465ce56..25185d6edc8 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -16,7 +16,7 @@ module API args[:scope] = args[:scope].underscore if args[:scope] issues = IssuesFinder.new(current_user, args).execute - .preload(:assignees, :labels, :notes, :timelogs, :project) + .preload(:assignees, :labels, :notes, :timelogs, :project, :author) issues.reorder(args[:order_by] => args[:sort]) end |