diff options
Diffstat (limited to 'app/views/projects/deployments')
| -rw-r--r-- | app/views/projects/deployments/_confirm_rollback_modal.html.haml | 23 | ||||
| -rw-r--r-- | app/views/projects/deployments/_rollback.haml | 3 |
2 files changed, 1 insertions, 25 deletions
diff --git a/app/views/projects/deployments/_confirm_rollback_modal.html.haml b/app/views/projects/deployments/_confirm_rollback_modal.html.haml deleted file mode 100644 index 23729d6ebf9..00000000000 --- a/app/views/projects/deployments/_confirm_rollback_modal.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -- commit_sha = link_to deployment.short_sha, project_commit_path(@project, deployment.sha), class: "commit-sha has-tooltip", title: h(deployment.commit_title) -.modal.ws-normal.fade{ tabindex: -1, id: "confirm-rollback-modal-#{deployment.id}" } - .modal-dialog - .modal-content - .modal-header - %h4.modal-title.d-flex.mw-100 - - if deployment.last? - = s_("Environments|Re-deploy environment %{environment_name}?") % {environment_name: @environment.name} - - else - = s_("Environments|Rollback environment %{environment_name}?") % {environment_name: @environment.name} - .modal-body - - if deployment.last? - %p= s_('Environments|This action will relaunch the job for commit %{commit_id}, putting the environment in a previous version. Are you sure you want to continue?').html_safe % {commit_id: commit_sha} - - else - %p - = s_('Environments|This action will run the job defined by %{environment_name} for commit %{commit_id}, putting the environment in a previous version. You can revert it by re-deploying the latest version of your application. Are you sure you want to continue?').html_safe % {commit_id: commit_sha, environment_name: @environment.name} - .modal-footer - = button_tag _('Cancel'), type: 'button', class: 'btn gl-button btn-danger', data: { dismiss: 'modal' } - = link_to [:retry, @project, deployment.deployable], method: :post, class: 'btn gl-button btn-danger' do - - if deployment.last? - = s_('Environments|Re-deploy') - - else - = s_('Environments|Rollback') diff --git a/app/views/projects/deployments/_rollback.haml b/app/views/projects/deployments/_rollback.haml index 78972a5b7b9..a7befabdc96 100644 --- a/app/views/projects/deployments/_rollback.haml +++ b/app/views/projects/deployments/_rollback.haml @@ -1,8 +1,7 @@ - if deployment.deployable && can?(current_user, :create_deployment, deployment) - tooltip = deployment.last? ? s_('Environments|Re-deploy to environment') : s_('Environments|Rollback environment') - = button_tag class: 'gl-button btn btn-default btn-icon has-tooltip', type: 'button', data: { toggle: 'modal', target: "#confirm-rollback-modal-#{deployment.id}" }, title: tooltip do + = button_tag class: 'js-confirm-rollback-modal-button gl-button btn btn-default btn-icon has-tooltip', type: 'button', data: { environment_name: @environment.name, commit_short_sha: deployment.short_sha, commit_url: project_commit_path(@project, deployment.sha), is_last_deployment: deployment.last?.to_s, retry_path: retry_project_job_path(@environment.project, deployment.deployable) }, title: tooltip do - if deployment.last? = sprite_icon('repeat', css_class: 'gl-icon') - else = sprite_icon('redo', css_class: 'gl-icon') - = render 'projects/deployments/confirm_rollback_modal', deployment: deployment |