diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-08-20 06:33:53 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-08-20 06:53:14 -0700 |
| commit | 1954bb17eca49d375c92a4b8fa7f52fa39873a7d (patch) | |
| tree | c5ccf8bd6806f024db38299400517ef056b2be7b /app/models/ability.rb | |
| parent | be95e03a5633696d79260ae61bb9e8f4c6755855 (diff) | |
| download | gitlab-ce-1954bb17eca49d375c92a4b8fa7f52fa39873a7d.tar.gz | |
Make Ability#project_abilities return unique values and fix countsfix-rspec-failures-due-to-cached-permissions
Diffstat (limited to 'app/models/ability.rb')
| -rw-r--r-- | app/models/ability.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index b82632ccc0b..a49dd703926 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -203,7 +203,7 @@ class Ability rules -= project_archived_rules end - rules - project_disabled_features_rules(project) + (rules - project_disabled_features_rules(project)).uniq end def project_team_rules(team, user) |