diff options
author | Rémy Coutable <remy@rymai.me> | 2019-01-07 14:54:35 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-01-07 14:54:35 +0300 |
commit | 4af1c77b291f7c7757143087f69720d26958153d (patch) | |
tree | 676dbc79c55f05f996c21e6046a92980b81e30a3 /lib | |
parent | e1dc0b09d55fc90fe3603ec95220c75d6aeb5e9e (diff) | |
parent | a06b7a7d5d6012b3f89ddaab5189a85f5cc49c14 (diff) |
Merge branch 'sh-fix-issue-55914' into 'master'
Fix Bitbucket Server import only including first 25 pull requests
Closes #55914
See merge request gitlab-org/gitlab-ce!24178
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bitbucket_server/paginator.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/bitbucket_server/paginator.rb b/lib/bitbucket_server/paginator.rb index aa5f84f44b3..9eda1c921b2 100644 --- a/lib/bitbucket_server/paginator.rb +++ b/lib/bitbucket_server/paginator.rb @@ -12,7 +12,7 @@ module BitbucketServer @url = url @page = nil @page_offset = page_offset - @limit = limit || PAGE_LENGTH + @limit = limit @total = 0 end @@ -34,6 +34,8 @@ module BitbucketServer attr_reader :connection, :page, :url, :type, :limit def over_limit? + return false unless @limit + @limit.positive? && @total >= @limit end @@ -42,11 +44,15 @@ module BitbucketServer end def starting_offset - [0, page_offset - 1].max * limit + [0, page_offset - 1].max * max_per_page + end + + def max_per_page + limit || PAGE_LENGTH end def fetch_next_page - parsed_response = connection.get(@url, start: next_offset, limit: @limit) + parsed_response = connection.get(@url, start: next_offset, limit: max_per_page) Page.new(parsed_response, type) end end |