diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-27 15:09:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-27 15:09:50 +0300 |
commit | 8827c1d18473a3d84db181c89212975418a25e37 (patch) | |
tree | 3f16c4b02b0b46fb2f501a6d5e9fc0f93f1a406f /app/views/projects/deployments | |
parent | 43b35a88ca54379d8df4dad84b5a84f9eecae3f2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/deployments')
-rw-r--r-- | app/views/projects/deployments/_actions.haml | 2 | ||||
-rw-r--r-- | app/views/projects/deployments/_confirm_rollback_modal.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml index c84c376d57b..5127d8b77d5 100644 --- a/app/views/projects/deployments/_actions.haml +++ b/app/views/projects/deployments/_actions.haml @@ -10,5 +10,5 @@ - actions.each do |action| - next unless can?(current_user, :update_build, action) %li - = link_to [:play, @project.namespace.becomes(Namespace), @project, action], method: :post, rel: 'nofollow' do + = link_to [:play, @project, action], method: :post, rel: 'nofollow' do %span= action.name diff --git a/app/views/projects/deployments/_confirm_rollback_modal.html.haml b/app/views/projects/deployments/_confirm_rollback_modal.html.haml index 9162827b501..3735ead1559 100644 --- a/app/views/projects/deployments/_confirm_rollback_modal.html.haml +++ b/app/views/projects/deployments/_confirm_rollback_modal.html.haml @@ -16,7 +16,7 @@ = 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 btn-cancel', data: { dismiss: 'modal' } - = link_to [:retry, @project.namespace.becomes(Namespace), @project, deployment.deployable], method: :post, class: 'btn btn-danger' do + = link_to [:retry, @project, deployment.deployable], method: :post, class: 'btn btn-danger' do - if deployment.last? = s_('Environments|Re-deploy') - else |