Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-11 01:15:53 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-11 01:15:53 +0300
commit4f00b93ddd07d8a31a04b37dbe150340e84ccfd8 (patch)
treed54658fa105b1bfa311016b28cfb7591689eacba /app/views/projects/deployments
parent907c0e6796b69f9577c147dd489cf55748c749ac (diff)
Add deployment views
Diffstat (limited to 'app/views/projects/deployments')
-rw-r--r--app/views/projects/deployments/_deployment.html.haml14
1 files changed, 6 insertions, 8 deletions
diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml
index 363c394d6d3..539c297cad3 100644
--- a/app/views/projects/deployments/_deployment.html.haml
+++ b/app/views/projects/deployments/_deployment.html.haml
@@ -1,11 +1,11 @@
%tr.deployment
%td
- %strong= "##{environment.id}"
+ %strong= "##{deployment.iid}"
%td
%div.branch-commit
- if deployment.ref
- = link_to last.ref, namespace_project_commits_path(@project.namespace, @project, deployment.ref), class: "monospace"
+ = link_to deployment.ref, namespace_project_commits_path(@project.namespace, @project, deployment.ref), class: "monospace"
&middot;
= link_to deployment.short_sha, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-id monospace"
@@ -18,15 +18,13 @@
%td
- if deployment.deployable
- = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: "monospace" do
+ = link_to namespace_project_build_path(@project.namespace, @project, deployment.deployable), class: "monospace" do
= "#{deployment.deployable.name} (##{deployment.deployable.id})"
%td
- %p
- %i.fa.fa-calendar
- &nbsp;
- #{time_ago_with_tooltip(deployment.created_at)}
+ #{time_ago_with_tooltip(deployment.created_at)}
%td
- if can?(current_user, :update_deployment, @project) && deployment.deployable
- = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable, :retry], method: :post, title: 'Retry', class: 'btn btn-build'
+ .pull-right
+ = link_to 'Retry', retry_namespace_project_build_path(@project.namespace, @project, deployment.deployable), method: :post, class: 'btn btn-build'