diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-21 17:43:58 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-21 17:43:58 +0100 |
| commit | 17ed42e362032e3594ae1cf34e6a970be826bdca (patch) | |
| tree | e87fec13bf16f3ed4c0638b933d21dfb067d523e /app | |
| parent | 1be8a3e087efd8f7d7127a02fcabcfd7570b6e36 (diff) | |
| parent | c43fbaab937815e44856fe9d8371759986024e42 (diff) | |
| download | gitlab-ce-17ed42e362032e3594ae1cf34e6a970be826bdca.tar.gz | |
Merge branch 'issue_3452'
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/build.rb | 10 | ||||
| -rw-r--r-- | app/views/projects/builds/show.html.haml | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 470b97a3c0f..7b89fe069ea 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -135,6 +135,16 @@ module Ci predefined_variables + yaml_variables + project_variables + trigger_variables end + def merge_request + merge_requests = MergeRequest.includes(:merge_request_diff) + .where(source_branch: ref, source_project_id: commit.gl_project_id) + .reorder(iid: :asc) + + merge_requests.find do |merge_request| + merge_request.commits.any? { |ci| ci.id == commit.sha } + end + end + def project commit.project end diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index 20a5b6a66e7..5b7ecce86ab 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -7,6 +7,10 @@ %strong.monospace= link_to @build.commit.short_sha, ci_status_path(@build.commit) from = link_to @build.ref, namespace_project_commits_path(@project.namespace, @project, @build.ref) + - merge_request = @build.merge_request + - if merge_request + via + = link_to "merge request ##{merge_request.iid}", merge_request_path(merge_request) #up-build-trace - if @commit.matrix_for_ref?(@build.ref) |