Apply soft diff limits to MergeRequest#new page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
04e8b5184f
commit
59e1819561
2 changed files with 6 additions and 2 deletions
|
@ -90,6 +90,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
|||
@merge_request.title = @merge_request.source_branch.titleize.humanize
|
||||
@target_project = @merge_request.target_project
|
||||
@target_repo = @target_project.repository
|
||||
|
||||
diff_line_count = Commit::diff_line_count(@diffs)
|
||||
@suppress_diff = Commit::diff_suppress?(@diffs, diff_line_count)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -6,12 +6,13 @@
|
|||
%p
|
||||
To preserve performance the diff is not shown.
|
||||
- if current_controller?(:commit) or current_controller?(:merge_requests)
|
||||
Please, download the diff as
|
||||
- if current_controller?(:commit)
|
||||
Please, download the diff as
|
||||
= link_to "plain diff", project_commit_path(@project, @commit, format: :diff), class: "underlined-link"
|
||||
or
|
||||
= link_to "email patch", project_commit_path(@project, @commit, format: :patch), class: "underlined-link"
|
||||
- else
|
||||
- elsif @merge_request && @merge_request.persisted?
|
||||
Please, download the diff as
|
||||
= link_to "plain diff", project_merge_request_path(@project, @merge_request, format: :diff), class: "underlined-link"
|
||||
or
|
||||
= link_to "email patch", project_merge_request_path(@project, @merge_request, format: :patch), class: "underlined-link"
|
||||
|
|
Loading…
Reference in a new issue