summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-21 17:43:58 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-21 17:43:58 +0100
commit17ed42e362032e3594ae1cf34e6a970be826bdca (patch)
treee87fec13bf16f3ed4c0638b933d21dfb067d523e /app/views/projects
parent1be8a3e087efd8f7d7127a02fcabcfd7570b6e36 (diff)
parentc43fbaab937815e44856fe9d8371759986024e42 (diff)
downloadgitlab-ce-17ed42e362032e3594ae1cf34e6a970be826bdca.tar.gz
Merge branch 'issue_3452'
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/builds/show.html.haml4
1 files changed, 4 insertions, 0 deletions
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)