diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-13 16:00:35 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-13 16:00:35 +0400 |
commit | 59e1819561912cb38bf00a7a34de1ac9e85c3a35 (patch) | |
tree | 3ed7b36ccd2b637aa6bc1256d077ea2fc8cc85ef /app | |
parent | 04e8b5184fe7a1af514314a8f1f9557d25ee8af0 (diff) |
Apply soft diff limits to MergeRequest#new page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 3 | ||||
-rw-r--r-- | app/views/projects/commits/_diffs.html.haml | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index e15e1be2c6d..f8447691d6d 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -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 diff --git a/app/views/projects/commits/_diffs.html.haml b/app/views/projects/commits/_diffs.html.haml index 466085139f9..ed95a30bc7e 100644 --- a/app/views/projects/commits/_diffs.html.haml +++ b/app/views/projects/commits/_diffs.html.haml @@ -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" |