Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-02-09 20:13:58 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-02-09 20:13:58 +0300
commit7ea60fbfc872e5acc0cc444d442958990747c6b3 (patch)
treebd4a38293d5d03b5cf3842fab04562fe8b775739 /app/views/admin
parenta52c5778bb9d95097cc965539731a2ef846c3ff0 (diff)
parent201fb4c7e3f9ab4265f87f548ae22bb4008015c9 (diff)
Merge remote-tracking branch 'dev/master' into 'master'
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..34d955568f2 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 can?(current_user, :update_build, build.project)
- if build.active?
- if build.cancel_url
= link_to build.cancel_url, method: :post, title: 'Cancel' do