diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-10-05 12:17:34 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2016-10-05 12:17:34 +0100 |
| commit | c7afe1e5790c71965366e26ed38234654ef81a60 (patch) | |
| tree | 22df8d0e433cf8c1d0f104fdfeaf65ff84844bd8 | |
| parent | 5e1c986b7da3ede00d50990689fbefb58328ca65 (diff) | |
| download | gitlab-ce-c7afe1e5790c71965366e26ed38234654ef81a60.tar.gz | |
Adds reference to the merge request in the commit column
| -rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/deployments/_commit.html.haml | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index bf863632689..0a7d3235d85 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -39,4 +39,10 @@ width: 20px; text-align: center; } + + .branch-commit { + .commit-id { + margin-right: 0px; + } + } } diff --git a/app/views/projects/deployments/_commit.html.haml b/app/views/projects/deployments/_commit.html.haml index 28813babd7b..f71754597b6 100644 --- a/app/views/projects/deployments/_commit.html.haml +++ b/app/views/projects/deployments/_commit.html.haml @@ -1,3 +1,5 @@ +- merge_request = deployment.deployable.try(:merge_request) + %div.branch-commit - if deployment.ref .icon-container @@ -6,6 +8,10 @@ .icon-container = custom_icon("icon_commit") = 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 %span |