diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/views/projects/environments/show.html.haml | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/views/projects/environments/show.html.haml')
-rw-r--r-- | app/views/projects/environments/show.html.haml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index 5b1556c9f52..0cb44bd03fb 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -3,6 +3,7 @@ - page_title _("Environments") - add_page_specific_style 'page_bundles/xterm' - add_page_specific_style 'page_bundles/environments' +- add_page_specific_style 'page_bundles/ci_status' #environments-detail-view{ data: { name: @environment.name, id: @environment.id, delete_path: environment_delete_path(@environment)} } - if @environment.available? && can?(current_user, :stop_environment, @environment) @@ -27,8 +28,8 @@ rel: 'noopener noreferrer' } = s_('Environments|Learn more about stopping environments') .modal-footer - = button_tag _('Cancel'), type: 'button', class: 'btn btn-cancel', data: { dismiss: 'modal' } - = button_to stop_project_environment_path(@project, @environment), class: 'btn btn-danger has-tooltip', method: :post do + = button_tag _('Cancel'), type: 'button', class: 'gl-button btn btn-cancel', data: { dismiss: 'modal' } + = button_to stop_project_environment_path(@project, @environment), class: 'gl-button btn btn-danger has-tooltip', method: :post do = s_('Environments|Stop environment') - if can_destroy_environment?(@environment) @@ -48,12 +49,12 @@ - if can?(current_user, :update_environment, @environment) = link_to _('Edit'), edit_project_environment_path(@project, @environment), class: 'btn' - if @environment.available? && can?(current_user, :stop_environment, @environment) - = button_tag class: 'btn btn-danger', type: 'button', data: { toggle: 'modal', + = button_tag class: 'gl-button btn btn-danger', type: 'button', data: { toggle: 'modal', target: '#stop-environment-modal' } do = sprite_icon('stop') = s_('Environments|Stop') - if can_destroy_environment?(@environment) - = button_tag class: 'btn btn-danger', type: 'button', data: { toggle: 'modal', + = button_tag class: 'gl-button btn btn-danger', type: 'button', data: { toggle: 'modal', target: '#delete-environment-modal' } do = s_('Environments|Delete') @@ -66,7 +67,7 @@ %p.blank-state-text = html_escape(_("Define environments in the deploy stage(s) in %{code_open}.gitlab-ci.yml%{code_close} to track deployments here.")) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } .text-center - = link_to _("Read more"), help_page_path("ci/environments/index.md"), class: "btn btn-success" + = link_to _("Read more"), help_page_path("ci/environments/index.md"), class: "gl-button btn btn-success" - else .table-holder.gl-overflow-visible .ci-table.environments{ role: 'grid' } |