diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-19 11:59:36 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-19 11:59:36 +0000 |
| commit | 856d2d5ce733e043371b780b2ee7d60ac07e887b (patch) | |
| tree | 9bcbfcc92921c591da973c6db492bcca27a37e38 | |
| parent | 694b55c8281be12d5403dbb8bc6c8951f2716df5 (diff) | |
| download | gitlab-ce-fix-environments-redeploy-button-inline.tar.gz | |
Wrapped in container like the other buttons and added a nowrap to the action buttons cellfix-environments-redeploy-button-inline
| -rw-r--r-- | app/views/projects/deployments/_rollback.haml | 11 | ||||
| -rw-r--r-- | app/views/projects/environments/_environment.html.haml | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/app/views/projects/deployments/_rollback.haml b/app/views/projects/deployments/_rollback.haml index 5941e01c6f1..95661642efd 100644 --- a/app/views/projects/deployments/_rollback.haml +++ b/app/views/projects/deployments/_rollback.haml @@ -1,6 +1,7 @@ - if can?(current_user, :create_deployment, deployment) && deployment.deployable - = link_to [:retry, @project.namespace.becomes(Namespace), @project, deployment.deployable], method: :post, class: 'btn btn-build' do - - if deployment.last? - Re-deploy - - else - Rollback + .inline + = link_to [:retry, @project.namespace.becomes(Namespace), @project, deployment.deployable], method: :post, class: 'btn btn-build' do + - if deployment.last? + Re-deploy + - else + Rollback diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml index b75d5df4150..53c5328b90a 100644 --- a/app/views/projects/environments/_environment.html.haml +++ b/app/views/projects/environments/_environment.html.haml @@ -6,7 +6,7 @@ %td.deployment-column - if last_deployment - %span ##{last_deployment.iid} + %span ##{last_deployment.iid} - if last_deployment.user by = user_avatar(user: last_deployment.user, size: 20) @@ -28,7 +28,7 @@ #{time_ago_with_tooltip(last_deployment.created_at)} %td.hidden-xs - .pull-right + .pull-right.text-nowrap = render 'projects/environments/external_url', environment: environment = render 'projects/deployments/actions', deployment: last_deployment = render 'projects/environments/stop', environment: environment |