summaryrefslogtreecommitdiff
path: root/lib/declarative_policy.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-11-20 09:22:14 +0000
committerRémy Coutable <remy@rymai.me>2017-11-20 09:22:14 +0000
commit4f09d099e9fa29659917f87c2dc25f2b9aa05b5e (patch)
treea70a9b3d42c8d3762974d354b31aa611590f55b8 /lib/declarative_policy.rb
parent135437b70d5bf12fff17d10adeae0c459b779138 (diff)
parent181cd299f9e06223e8338e93b1c318c671ccb1aa (diff)
downloadgitlab-ce-4f09d099e9fa29659917f87c2dc25f2b9aa05b5e.tar.gz
Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'
Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
Diffstat (limited to 'lib/declarative_policy.rb')
-rw-r--r--lib/declarative_policy.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/declarative_policy.rb b/lib/declarative_policy.rb
index ae65653645b..b1949d693ad 100644
--- a/lib/declarative_policy.rb
+++ b/lib/declarative_policy.rb
@@ -30,6 +30,7 @@ module DeclarativePolicy
policy_class = class_for_class(subject.class)
raise "no policy for #{subject.class.name}" if policy_class.nil?
+
policy_class
end
@@ -84,6 +85,7 @@ module DeclarativePolicy
while subject.respond_to?(:declarative_policy_delegate)
raise ArgumentError, "circular delegations" if seen.include?(subject.object_id)
+
seen << subject.object_id
subject = subject.declarative_policy_delegate
end