diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 15:09:52 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 15:09:52 +0000 |
commit | e43077ab4742ba5083a01a1e5341db1a1b7a1701 (patch) | |
tree | c33a00fb176caff735243c484bbd594a3b08bb6e /app/policies | |
parent | 211a8c3361ccf4eb92f36edbdcf15c98fcdcc8b7 (diff) | |
download | gitlab-ce-e43077ab4742ba5083a01a1e5341db1a1b7a1701.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies')
-rw-r--r-- | app/policies/project_policy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index ee22a2d84e7..507e227c952 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -370,7 +370,7 @@ class ProjectPolicy < BasePolicy # There's two separate cases when builds_disabled is true: # 1. When internal CI is disabled - builds_disabled && internal_builds_disabled - # - We do not prevent the user from accessing Pipelines to allow him to access external CI + # - We do not prevent the user from accessing Pipelines to allow them to access external CI # 2. When the user is not allowed to access CI - builds_disabled && ~internal_builds_disabled # - We prevent the user from accessing Pipelines rule { (builds_disabled & ~internal_builds_disabled) | repository_disabled }.policy do |