Merge branch 'id-fix-diverging-counts' into 'master'

Use select instead of filter to support 2.5

See merge request gitlab-org/gitlab-ce!31480

app/finders/branches_finder.rb

@@ -69,7 +69,7 @@ class BranchesFinder
     return branches unless names
 
     branch_names = names.to_set
-    branches.filter do |branch|
+    branches.select do |branch|
       branch_names.include?(branch.name)
     end
   end