diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2016-10-05 13:06:35 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2016-10-05 13:06:35 +0100 |
commit | 34efdef19e6c1bcbe0976e0f55f53bfbb12eaad2 (patch) | |
tree | d9ce78e7687ae08861799f32c3b298c087236d65 /app/views/projects/deployments | |
parent | c7afe1e5790c71965366e26ed38234654ef81a60 (diff) | |
download | gitlab-ce-34efdef19e6c1bcbe0976e0f55f53bfbb12eaad2.tar.gz |
Adds external url
Changes build column in environment details
Diffstat (limited to 'app/views/projects/deployments')
-rw-r--r-- | app/views/projects/deployments/_actions.haml | 6 | ||||
-rw-r--r-- | app/views/projects/deployments/_deployment.html.haml | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml index 16d134eb6b6..9fd97a7d753 100644 --- a/app/views/projects/deployments/_actions.haml +++ b/app/views/projects/deployments/_actions.haml @@ -1,5 +1,11 @@ - if can?(current_user, :create_deployment, deployment) && deployment.deployable .pull-right + + - external_url = deployment.deployable.try(:external_url) + - if external_url + = link_to external_url, target: '_blank', class: 'btn external-url' do + = icon('external-link') + - actions = deployment.manual_actions - if actions.present? .inline diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml index cd95841ca5a..2edbf7f5082 100644 --- a/app/views/projects/deployments/_deployment.html.haml +++ b/app/views/projects/deployments/_deployment.html.haml @@ -5,11 +5,12 @@ %td = render 'projects/deployments/commit', deployment: deployment - %td + %td.build-column - if deployment.deployable - = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable] do - = user_avatar(user: deployment.user, size: 20) + = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do = "#{deployment.deployable.name} (##{deployment.deployable.id})" + by + = user_avatar(user: deployment.user, size: 20) %td #{time_ago_with_tooltip(deployment.created_at)} |