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:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-22 10:54:11 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-22 10:54:11 +0300
commit8ae026a6e64846d720184dbdee30d274a4e8ca24 (patch)
treeb31b837da1d76129a92a459b9f555eb52f52abc7 /app/controllers
parent548b7ce80486f98f3685562a46c478116dd4558b (diff)
parent071ae2619cbe8d39b87518eef65009cbfb3939c9 (diff)
Merge branch 'fix-ci-permissions' into 'master'
Fix CI permissions ![Screen_Shot_2015-09-21_at_20.23.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6f40699507d0dce148d0054a093f0d63/Screen_Shot_2015-09-21_at_20.23.16.png) This fixes two problems: - Allow developers to retry builds - Hide advanced project options from CI page for non-admin users See merge request !1379
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/ci/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/ci/application_controller.rb b/app/controllers/ci/application_controller.rb
index 8d8ff75ff72..d8227e632e4 100644
--- a/app/controllers/ci/application_controller.rb
+++ b/app/controllers/ci/application_controller.rb
@@ -38,7 +38,7 @@ module Ci
end
def authorize_manage_builds!
- unless can?(current_user, :admin_project, gl_project)
+ unless can?(current_user, :manage_builds, gl_project)
return page_404
end
end