diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-11 10:45:04 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-11 10:45:04 +0000 |
| commit | 01c4c8b13884eb53ec0e1ff8e9168891d10f83a5 (patch) | |
| tree | 2668308610dd6936b5b20716dc4aad6077a3d640 /lib | |
| parent | 8d74966fe8d06964514ba3f701928c617801ff9f (diff) | |
| parent | 0e9297b37ae950eb9e2cd08aa6c43cfd5ecfc646 (diff) | |
| download | gitlab-ce-01c4c8b13884eb53ec0e1ff8e9168891d10f83a5.tar.gz | |
Merge branch '46233-rails5-fix-nomethoderror-undefined-method-for-3-string' into 'master'
Resolve "[Rails5] Fix `NoMethodError: undefined method `-' for "3":String`"
Closes #46233
See merge request gitlab-org/gitlab-ce!18892
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/multi_collection_paginator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/multi_collection_paginator.rb b/lib/gitlab/multi_collection_paginator.rb index 43921a8c1c0..fd5de73c526 100644 --- a/lib/gitlab/multi_collection_paginator.rb +++ b/lib/gitlab/multi_collection_paginator.rb @@ -5,7 +5,7 @@ module Gitlab def initialize(*collections, per_page: nil) raise ArgumentError.new('Only 2 collections are supported') if collections.size != 2 - @per_page = per_page || Kaminari.config.default_per_page + @per_page = (per_page || Kaminari.config.default_per_page).to_i @first_collection, @second_collection = collections end |