Improve MR message for huge diffs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/controllers/projects/merge_requests_controller.rb

@@ -93,6 +93,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
       diff_line_count = Commit::diff_line_count(@diffs)
       @suppress_diff = Commit::diff_suppress?(@diffs, diff_line_count)
+      @force_suppress_diff = @suppress_diff
     end
   end
 

app/views/projects/commits/_diffs.html.haml

@@ -11,12 +11,13 @@
           = 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"
+          instead.
         - 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"
-        instead.
+          instead.
     - unless @force_suppress_diff
       %p
         If you still want to see the diff