diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-07-07 22:33:32 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-07 22:33:32 +0900 |
| commit | e0c150da2f8f266cfa045e7ded0e579a83a964c3 (patch) | |
| tree | 2f6b8e4975f29c6604f84ba526b063e1bf6977cc /app/policies | |
| parent | 45e516c9ff32bfe966b6334f66ea948465734deb (diff) | |
| parent | 87d90b5b5e2fa6d0eed469db61878b942afdbee7 (diff) | |
| download | gitlab-ce-e0c150da2f8f266cfa045e7ded0e579a83a964c3.tar.gz | |
Merge from master(Fix conflicts)
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/group_policy.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index dcb37416ca3..6defab75fce 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -31,6 +31,8 @@ class GroupPolicy < BasePolicy rule { master }.policy do enable :create_projects enable :admin_milestones + enable :admin_pipeline + enable :admin_build end rule { owner }.policy do |