summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-02-01 23:58:04 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2016-02-02 09:18:08 +0100
commit055afab5c7d33d061d339c270bd258ed847450f3 (patch)
treee72ba0bc495456f3f106d23576810cec4238af21 /app/views/admin
parent7df149bb63c91792fb958db87b24bb120463a49e (diff)
downloadgitlab-ce-055afab5c7d33d061d339c270bd258ed847450f3.tar.gz
Make the CI permission model simpler
This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions.
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/builds/_build.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
index c395bd908c3..bd7fb0b36f4 100644
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -4,7 +4,7 @@
= ci_status_with_icon(build.status)
%td.build-link
- - if build.target_url
+ - if can?(current_user, :read_build, project) && build.target_url
= link_to build.target_url do
%strong Build ##{build.id}
- else
@@ -60,10 +60,10 @@
%td
.pull-right
- - if current_user && can?(current_user, :read_build_artifacts, project) && build.artifacts?
+ - if can?(current_user, :read_build, project) && build.artifacts?
= link_to build.artifacts_download_url, title: 'Download artifacts' do
%i.fa.fa-download
- - if current_user && can?(current_user, :manage_builds, build.project)
+ - if current_user && can?(current_user, :update_build, build.project)
- if build.active?
- if build.cancel_url
= link_to build.cancel_url, method: :post, title: 'Cancel' do