[CE upstream] fixes after merge

.rubocop.yml

@@ -706,7 +706,7 @@ Metrics/ClassLength:
 # of test cases needed to validate a method.
 Metrics/CyclomaticComplexity:
   Enabled: true
-  Max: 17
+  Max: 18
 
 # Limit lines to 80 characters.
 Metrics/LineLength:

app/models/ability.rb

@@ -19,7 +19,7 @@ class Ability
         when Namespace then namespace_abilities(user, subject)
         when GroupMember then group_member_abilities(user, subject)
         when ProjectMember then project_member_abilities(user, subject)
-	when User then user_abilities
+        when User then user_abilities
         else []
         end.concat(global_abilities(user))