Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix reload with full diff link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
a7fded9b95
commit
971e47520f
|
@ -16,9 +16,8 @@ require Rails.root.join("app/models/commit")
|
|||
class MergeRequestDiff < ActiveRecord::Base
|
||||
include Sortable
|
||||
|
||||
# Prevent store of diff
|
||||
# if commits amount more then 200
|
||||
COMMITS_SAFE_SIZE = 200
|
||||
# Prevent store of diff if commits amount more then 500
|
||||
COMMITS_SAFE_SIZE = 500
|
||||
|
||||
attr_reader :commits, :diffs
|
||||
|
||||
|
@ -124,12 +123,12 @@ class MergeRequestDiff < ActiveRecord::Base
|
|||
if new_diffs.any?
|
||||
if new_diffs.size > Commit::DIFF_HARD_LIMIT_FILES
|
||||
self.state = :overflow_diff_files_limit
|
||||
new_diffs = []
|
||||
new_diffs = new_diffs.first[Commit::DIFF_HARD_LIMIT_LINES]
|
||||
end
|
||||
|
||||
if new_diffs.sum { |diff| diff.diff.lines.count } > Commit::DIFF_HARD_LIMIT_LINES
|
||||
self.state = :overflow_diff_lines_limit
|
||||
new_diffs = []
|
||||
new_diffs = new_diffs.first[Commit::DIFF_HARD_LIMIT_LINES]
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
Too many changes to show.
|
||||
.pull-right
|
||||
- unless diff_hard_limit_enabled?
|
||||
= link_to "Reload with full diff", url_for(params.merge(force_show_diff: true)), class: "btn btn-sm btn-warning"
|
||||
= link_to "Reload with full diff", url_for(params.merge(force_show_diff: true, format: nil)), class: "btn btn-sm btn-warning"
|
||||
|
||||
- if current_controller?(:commit) or current_controller?(:merge_requests)
|
||||
- if current_controller?(:commit)
|
||||
|
|
Loading…
Reference in New Issue