diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-05 16:07:27 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-05 16:07:27 +0000 |
| commit | 112ba0803a32419c50eb2f7a82bba6cfaee1cb48 (patch) | |
| tree | 18a00ab537511a4082579b138e9fed6ea4aa3e5f | |
| parent | 3dfc89ade452ad7f0185653b30ed1d4bb2544fb0 (diff) | |
| parent | 92d273a9e6fd4e68ba501e8f2c6ce39a67d5b920 (diff) | |
| download | gitlab-ce-112ba0803a32419c50eb2f7a82bba6cfaee1cb48.tar.gz | |
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
| -rw-r--r-- | app/finders/branches_finder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/branches_finder.rb b/app/finders/branches_finder.rb index b462c8053fa..291a24c1405 100644 --- a/app/finders/branches_finder.rb +++ b/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 |