diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /lib/gitlab/diff | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/file_collection/merge_request_diff_batch.rb | 16 | ||||
| -rw-r--r-- | lib/gitlab/diff/line.rb | 4 |
2 files changed, 15 insertions, 5 deletions
diff --git a/lib/gitlab/diff/file_collection/merge_request_diff_batch.rb b/lib/gitlab/diff/file_collection/merge_request_diff_batch.rb index c6d1e0b93a7..9af66318b89 100644 --- a/lib/gitlab/diff/file_collection/merge_request_diff_batch.rb +++ b/lib/gitlab/diff/file_collection/merge_request_diff_batch.rb @@ -18,10 +18,8 @@ module Gitlab def initialize(merge_request_diff, batch_page, batch_size, diff_options:) super(merge_request_diff, diff_options: diff_options) - batch_page ||= DEFAULT_BATCH_PAGE - batch_size ||= DEFAULT_BATCH_SIZE + @paginated_collection = load_paginated_collection(batch_page, batch_size, diff_options) - @paginated_collection = relation.page(batch_page).per(batch_size) @pagination_data = { current_page: @paginated_collection.current_page, next_page: @paginated_collection.next_page, @@ -63,6 +61,18 @@ module Gitlab def relation @merge_request_diff.merge_request_diff_files end + + def load_paginated_collection(batch_page, batch_size, diff_options) + batch_page ||= DEFAULT_BATCH_PAGE + batch_size ||= DEFAULT_BATCH_SIZE + + paths = diff_options&.fetch(:paths, nil) + + paginated_collection = relation.page(batch_page).per(batch_size) + paginated_collection = paginated_collection.by_paths(paths) if paths + + paginated_collection + end end end end diff --git a/lib/gitlab/diff/line.rb b/lib/gitlab/diff/line.rb index 379fc6af875..af9140215f0 100644 --- a/lib/gitlab/diff/line.rb +++ b/lib/gitlab/diff/line.rb @@ -8,9 +8,9 @@ module Gitlab # SERIALIZE_KEYS = %i(line_code rich_text text type index old_pos new_pos).freeze - attr_reader :line_code, :type, :old_pos, :new_pos + attr_reader :line_code, :old_pos, :new_pos attr_writer :rich_text - attr_accessor :text, :index + attr_accessor :text, :index, :type def initialize(text, type, index, old_pos, new_pos, parent_file: nil, line_code: nil, rich_text: nil) @text, @type, @index = text, type, index |