diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-08-30 20:35:14 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-08-30 20:35:14 +0300 |
| commit | 966b635221d104d53de94bdb88fe541b66d0c4ee (patch) | |
| tree | 02db212fd8107225bb2277d497d35123c2ef87a8 /lib/api/merge_requests.rb | |
| parent | b190c6abe78f0fd75b6728f939a87ae73e41b07f (diff) | |
| parent | 54b0f57b2e286680b7b2dc2757c31536858478ce (diff) | |
Merge branch '28453-add-time-estimate-time-spent-to-api-issue-output' into 'master'
Add time stats to Issue and Merge Request API
Closes #28453
See merge request !13335
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 969c6064662..eec8d9357aa 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -21,7 +21,7 @@ module API return merge_requests if args[:view] == 'simple' merge_requests - .preload(:notes, :author, :assignee, :milestone, :merge_request_diff, :labels) + .preload(:notes, :author, :assignee, :milestone, :merge_request_diff, :labels, :timelogs) end params :merge_requests_params do |