diff options
author | Rydkin Maxim <maks.rydkin@gmail.com> | 2016-12-16 01:14:20 +0300 |
---|---|---|
committer | Rydkin Maxim <maks.rydkin@gmail.com> | 2016-12-16 21:37:22 +0300 |
commit | 170efaaba273792ddffc2806ef1501f33d87a5a2 (patch) | |
tree | d193abbcb948cf989f848b83583a157719512caf /app/policies | |
parent | b1120fc3e702daac001d000263eac79f4629b595 (diff) | |
download | gitlab-ce-170efaaba273792ddffc2806ef1501f33d87a5a2.tar.gz |
Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741
Diffstat (limited to 'app/policies')
-rw-r--r-- | app/policies/note_policy.rb | 2 | ||||
-rw-r--r-- | app/policies/project_policy.rb | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/policies/note_policy.rb b/app/policies/note_policy.rb index 83847466ee2..5326061bd07 100644 --- a/app/policies/note_policy.rb +++ b/app/policies/note_policy.rb @@ -12,7 +12,7 @@ class NotePolicy < BasePolicy end if @subject.for_merge_request? && - @subject.noteable.author == @user + @subject.noteable.author == @user can! :resolve_note end end diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index d5aadfce76a..b5db9c12622 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -3,7 +3,7 @@ class ProjectPolicy < BasePolicy team_access!(user) owner = project.owner == user || - (project.group && project.group.has_owner?(user)) + (project.group && project.group.has_owner?(user)) owner_access! if user.admin? || owner team_member_owner_access! if owner @@ -13,7 +13,7 @@ class ProjectPolicy < BasePolicy public_access! if project.request_access_enabled && - !(owner || user.admin? || project.team.member?(user) || project_group_member?(user)) + !(owner || user.admin? || project.team.member?(user) || project_group_member?(user)) can! :request_access end end @@ -244,10 +244,10 @@ class ProjectPolicy < BasePolicy def project_group_member?(user) project.group && - ( - project.group.members.exists?(user_id: user.id) || - project.group.requesters.exists?(user_id: user.id) - ) + ( + project.group.members.exists?(user_id: user.id) || + project.group.requesters.exists?(user_id: user.id) + ) end def named_abilities(name) |