Commit bce5f8f1 authored by Rémy Coutable's avatar Rémy Coutable

Move abilities by subject class to a dedicated method (EE)

This will avoid lame conflicts when merging CE to EE
Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 36931fa6
...@@ -6,7 +6,14 @@ class Ability ...@@ -6,7 +6,14 @@ class Ability
return [] unless user.is_a?(User) return [] unless user.is_a?(User)
return [] if user.blocked? return [] if user.blocked?
abilities = abilities = abilities_by_subject_class(user: user, subject: subject)
abilities -= license_blocked_abilities if License.block_changes?
abilities
end
def abilities_by_subject_class(user:, subject:)
case subject case subject
when CommitStatus then commit_status_abilities(user, subject) when CommitStatus then commit_status_abilities(user, subject)
when Project then project_abilities(user, subject) when Project then project_abilities(user, subject)
...@@ -24,10 +31,6 @@ class Ability ...@@ -24,10 +31,6 @@ class Ability
when Ci::Runner then runner_abilities(user, subject) when Ci::Runner then runner_abilities(user, subject)
else [] else []
end.concat(global_abilities(user)) end.concat(global_abilities(user))
abilities -= license_blocked_abilities if License.block_changes?
abilities
end end
def license_blocked_abilities def license_blocked_abilities
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment