diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-10-04 21:41:36 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-06 13:16:14 +0200 |
| commit | 34a980851ebdaeff1734c2adb031253fdfe7b46f (patch) | |
| tree | 3f57cd9ec9ba743a34be7c5dd522dde855cd4190 | |
| parent | ed975fdcd4bb2ecb47753e2e1c017175c211adbe (diff) | |
| download | gitlab-ce-34a980851ebdaeff1734c2adb031253fdfe7b46f.tar.gz | |
Adds close button to builds list
4 files changed, 6 insertions, 8 deletions
diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml index a1d9da285c0..01b33be719f 100644 --- a/app/views/projects/deployments/_actions.haml +++ b/app/views/projects/deployments/_actions.haml @@ -14,10 +14,9 @@ = custom_icon('icon_play') %span= action.name.humanize - - if :can_be_stopped? - .inline - %a.close-env-link.btn - = icon('stop', class: 'close-env-icon') + .inline + %a.close-env-link.btn + = icon('stop', class: 'close-env-icon') - if local_assigns.fetch(:allow_rollback, false) = link_to [:retry, @project.namespace.becomes(Namespace), @project, deployment.deployable], method: :post, class: 'btn btn-build' do diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml index cd95841ca5a..fce7b1cb34e 100644 --- a/app/views/projects/deployments/_deployment.html.haml +++ b/app/views/projects/deployments/_deployment.html.haml @@ -14,5 +14,5 @@ %td #{time_ago_with_tooltip(deployment.created_at)} - %td + %td.hidden-xs = render 'projects/deployments/actions', deployment: deployment, allow_rollback: true diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml index 27b7254fcfb..2e9c395f08a 100644 --- a/app/views/projects/environments/_environment.html.haml +++ b/app/views/projects/environments/_environment.html.haml @@ -1,5 +1,4 @@ - last_deployment = environment.last_deployment -- can_be_stopped = true %tr.environment %td @@ -22,4 +21,4 @@ #{time_ago_with_tooltip(last_deployment.created_at)} %td.hidden-xs - = render 'projects/deployments/actions', deployment: last_deployment, can_be_stopped: can_be_stopped + = render 'projects/deployments/actions', deployment: last_deployment diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index 393f9e0d57b..949f0855777 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -42,5 +42,5 @@ %th Last Deployment %th Commit %th - %th + %th.hidden-xs = render @environments |