diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-04 16:00:31 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-04 16:00:31 +0200 |
| commit | 705085db0c3b869f62f1b0f742686cc2082001fa (patch) | |
| tree | d4e0c79de77f0c7b9fc3335bf0eba425652406d3 | |
| parent | db69111a63cfadb31cc02cf4400d743a913bdfbd (diff) | |
| download | gitlab-ce-20621-avoid-lame-conflicts-in-ability-allowed.tar.gz | |
Move abilities by subject class to a dedicated method20621-avoid-lame-conflicts-in-ability-allowed
This will avoid lame conflicts when merging CE to EE
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | app/models/ability.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index d95a2507199..d9113ffd99a 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -6,6 +6,10 @@ class Ability return [] unless user.is_a?(User) return [] if user.blocked? + abilities_by_subject_class(user: user, subject: subject) + end + + def abilities_by_subject_class(user:, subject:) case subject when CommitStatus then commit_status_abilities(user, subject) when Project then project_abilities(user, subject) |