diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-09-24 14:39:00 +0100 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-09-24 14:39:00 +0100 |
| commit | 05afd11e16aecd43adfb869ae90aa6cae13916ec (patch) | |
| tree | 63b31431981d48ac970853778dd01a5301bb9564 /app/policies/project_policy.rb | |
| parent | 086549d986a453e1b2dd0d09ffbd19d0487d9c51 (diff) | |
| parent | 28086b203ae397e01d5e9870dfbddd66466450c2 (diff) | |
| download | gitlab-ce-05afd11e16aecd43adfb869ae90aa6cae13916ec.tar.gz | |
Merge remote-tracking branch 'origin/master' into ce-6983-promote-starting-a-gitlab-com-trial
Diffstat (limited to 'app/policies/project_policy.rb')
| -rw-r--r-- | app/policies/project_policy.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index 273a93a1423..d0e84b1aa38 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -398,6 +398,7 @@ class ProjectPolicy < BasePolicy end end + # rubocop: disable CodeReuse/ActiveRecord def project_group_member? return false if @user.nil? @@ -407,6 +408,7 @@ class ProjectPolicy < BasePolicy project.group.requesters.exists?(user_id: @user.id) ) end + # rubocop: enable CodeReuse/ActiveRecord def team_access_level return -1 if @user.nil? |