diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-08-31 09:17:23 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-08-31 09:17:23 +0100 |
| commit | f884a4bbd7ccaf448e0d998711d20497cef6ac71 (patch) | |
| tree | 65c9b70b58dea175d188114ce066cd17baf12888 /lib/api/merge_requests.rb | |
| parent | 32a68328d719327d26e82684cdf354ed25598416 (diff) | |
| parent | 3e092caa91853afeab3bb01be10869e45c39de5d (diff) | |
| download | gitlab-ce-repo-bugs.tar.gz | |
Merge remote-tracking branch 'origin/master' into repo-bugsrepo-bugs
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 |