diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-15 12:56:02 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-15 12:56:02 +0200 |
| commit | eb26755d63dbe3b4c32230a2ec8730a0d889f292 (patch) | |
| tree | 6ebac74a5364f2aa72b60f7dc26792451f959cc3 | |
| parent | 2bed8db99567292bd619ddd9ec8158f1ed7b54e6 (diff) | |
| download | gitlab-ce-eb26755d63dbe3b4c32230a2ec8730a0d889f292.tar.gz | |
Create_deployment ability is need to create retry or rollback deployment
| -rw-r--r-- | app/models/ability.rb | 4 | ||||
| -rw-r--r-- | app/views/projects/deployments/_deployment.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 8d76e8efa13..ecf02a0ff6f 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -249,8 +249,7 @@ class Ability :create_container_image, :update_container_image, :create_environment, - :create_deployment, - :update_deployment + :create_deployment ] end @@ -269,6 +268,7 @@ class Ability :push_code_to_protected_branches, :update_project_snippet, :update_environment, + :update_deployment, :admin_milestone, :admin_project_snippet, :admin_project_member, diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml index f065f28c6ee..d08dd92f1f6 100644 --- a/app/views/projects/deployments/_deployment.html.haml +++ b/app/views/projects/deployments/_deployment.html.haml @@ -14,7 +14,7 @@ #{time_ago_with_tooltip(deployment.created_at)} %td - - if can?(current_user, :update_deployment, deployment) && deployment.deployable + - if can?(current_user, :create_deployment, deployment) && deployment.deployable .pull-right = link_to retry_namespace_project_build_path(@project.namespace, @project, deployment.deployable), method: :post, class: 'btn btn-build' do - if deployment.last? |