diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-23 17:10:07 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-31 21:44:15 +0200 |
| commit | 47a0276e53de4635df43124607ac1a101d6f1b70 (patch) | |
| tree | e7c8d5644f9aceca23c00c280490c5bbad5b1607 /app/models/ci | |
| parent | f06daa26efc127565e4e68ca9d4ac62e5a1e3b36 (diff) | |
| download | gitlab-ce-47a0276e53de4635df43124607ac1a101d6f1b70.tar.gz | |
Initial implementation for real time job view
Added the needed keys and paths to a new entity, BuildDetailsEntity.
Not renaming BuildEntity to BuildBasicEntity on explicit request. Most
code now has test coverage, but not all. This will be added on later
commits on this branch.
Resolves gitlab-org/gitlab-ce#31397
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 60b71ff0d93..ff6860bc181 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -204,14 +204,17 @@ module Ci end def merge_request - merge_requests = MergeRequest.includes(:merge_request_diff) - .where(source_branch: ref, - source_project: pipeline.project) - .reorder(iid: :asc) - - merge_requests.find do |merge_request| - merge_request.commits_sha.include?(pipeline.sha) - end + @merge_request ||= + begin + merge_requests = MergeRequest.includes(:merge_request_diff) + .where(source_branch: ref, + source_project: pipeline.project) + .reorder(iid: :asc) + + merge_requests.find do |merge_request| + merge_request.commits_sha.include?(pipeline.sha) + end + end end def repo_url |