diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-08 16:55:44 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-08 16:55:44 +0000 |
| commit | 3016e774701746ba1dc96c76a6b1a79206690b40 (patch) | |
| tree | 784876485321fa4ebf1cf029e9a6fa80b575f9ee | |
| parent | d34300e310eca8b02c2b3956cd7c321edb3a5d0d (diff) | |
| parent | 12b89eb88c28588e86785e8b99bf98fbfdb1139e (diff) | |
| download | gitlab-ce-3016e774701746ba1dc96c76a6b1a79206690b40.tar.gz | |
Merge branch '29185-environments-folder-links' into 'master'
Style action buttons in show environments view to match index view
Closes #29185
See merge request !9804
| -rw-r--r-- | app/views/projects/deployments/_actions.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/deployments/_deployment.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/environments/show.html.haml | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml index a680b1ca017..506246f2ee6 100644 --- a/app/views/projects/deployments/_actions.haml +++ b/app/views/projects/deployments/_actions.haml @@ -1,9 +1,9 @@ - if can?(current_user, :create_deployment, deployment) - actions = deployment.manual_actions - if actions.present? - .inline + .btn-group .dropdown - %a.dropdown-new.btn.btn-default{ type: 'button', 'data-toggle' => 'dropdown' } + %button.dropdown.dropdown-new.btn.btn-default{ type: 'button', 'data-toggle' => 'dropdown' } = custom_icon('icon_play') = icon('caret-down') %ul.dropdown-menu.dropdown-menu-align-right @@ -12,4 +12,3 @@ = link_to [:play, @project.namespace.becomes(Namespace), @project, action], method: :post, rel: 'nofollow' do = custom_icon('icon_play') %span= action.name.humanize - diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml index c468202569f..260c9023daf 100644 --- a/app/views/projects/deployments/_deployment.html.haml +++ b/app/views/projects/deployments/_deployment.html.haml @@ -17,6 +17,6 @@ #{time_ago_with_tooltip(deployment.created_at)} %td.hidden-xs - .pull-right + .pull-right.btn-group = render 'projects/deployments/actions', deployment: deployment = render 'projects/deployments/rollback', deployment: deployment diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index 29a98f23b88..f463a429f65 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -16,7 +16,7 @@ - if can?(current_user, :create_deployment, @environment) && @environment.can_stop? = link_to 'Stop', stop_namespace_project_environment_path(@project.namespace, @project, @environment), data: { confirm: 'Are you sure you want to stop this environment?' }, class: 'btn btn-danger', method: :post - .deployments-container + .environments-container - if @deployments.blank? .blank-state.blank-state-no-icon %h2.blank-state-title |