Commit c7afe1e5 authored by Filipa Lacerda's avatar Filipa Lacerda

Adds reference to the merge request in the commit column

parent 5e1c986b
...@@ -39,4 +39,10 @@ ...@@ -39,4 +39,10 @@
width: 20px; width: 20px;
text-align: center; text-align: center;
} }
.branch-commit {
.commit-id {
margin-right: 0px;
}
}
} }
- merge_request = deployment.deployable.try(:merge_request)
%div.branch-commit %div.branch-commit
- if deployment.ref - if deployment.ref
.icon-container .icon-container
...@@ -7,6 +9,10 @@ ...@@ -7,6 +9,10 @@
= custom_icon("icon_commit") = custom_icon("icon_commit")
= link_to deployment.short_sha, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-id monospace" = link_to deployment.short_sha, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-id monospace"
- if merge_request
%span in
= link_to_gfm merge_request.to_reference, merge_request_path(merge_request)
%p.commit-title %p.commit-title
%span %span
- if commit_title = deployment.commit_title - if commit_title = deployment.commit_title
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment