diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-21 21:09:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-21 21:09:45 +0300 |
| commit | 36b0a5b87569e1b0e9f193630e50d1a376a71a4a (patch) | |
| tree | 149dc553a092cd184bd196877d98964b4f8b3825 /app/policies/ci | |
| parent | a6578252111f8ce77de356eca6fd55c470893d54 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies/ci')
| -rw-r--r-- | app/policies/ci/build_policy.rb | 2 | ||||
| -rw-r--r-- | app/policies/ci/pipeline_policy.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/policies/ci/build_policy.rb b/app/policies/ci/build_policy.rb index 0879a740f8a..cc66ad0577d 100644 --- a/app/policies/ci/build_policy.rb +++ b/app/policies/ci/build_policy.rb @@ -3,7 +3,7 @@ module Ci class BuildPolicy < CommitStatusPolicy condition(:protected_ref) do - access = ::Gitlab::UserAccess.new(@user, project: @subject.project) + access = ::Gitlab::UserAccess.new(@user, container: @subject.project) if @subject.tag? !access.can_create_tag?(@subject.ref) diff --git a/app/policies/ci/pipeline_policy.rb b/app/policies/ci/pipeline_policy.rb index 662c29a0973..4d21da0226b 100644 --- a/app/policies/ci/pipeline_policy.rb +++ b/app/policies/ci/pipeline_policy.rb @@ -42,7 +42,7 @@ module Ci end def ref_protected?(user, project, tag, ref) - access = ::Gitlab::UserAccess.new(user, project: project) + access = ::Gitlab::UserAccess.new(user, container: project) if tag !access.can_create_tag?(ref) |