Download as
Browse Code »

Commit 193a5ed3c3c352f043752c8ed3b0f3d1cb8c0ddc

Authored by Dmitriy Zaporozhets
1 parent 79bfbe59
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Render MR diff correctly 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 5 additions and 4 deletions   Show diff stats
app/controllers/projects/merge_requests_controller.rb
  Diff comments   View file @193a5ed
... ... @@ -213,6 +213,7 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
213 213 # or from cache if already merged
214 214 @commits = @merge_request.commits
215 215  
  216 + @merge_request_diff = @merge_request.merge_request_diff
216 217 @allowed_to_merge = allowed_to_merge?
217 218 @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
218 219 end
... ...
app/views/projects/merge_requests/show/_diffs.html.haml
  Diff comments   View file @193a5ed
1   -- if @merge_request.valid_diffs?
  1 +- if @merge_request_diff.collected?
2 2 = render "projects/commits/diffs", diffs: @merge_request.diffs, project: @merge_request.source_project
3   -- elsif @merge_request.broken_diffs?
  3 +- elsif @merge_request_diff.empty?
  4 + %h4.nothing_here_message Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
  5 +- else
4 6 %h4.nothing_here_message
5 7 Can't load diff.
6 8 You can
7 9 = link_to "download it", project_merge_request_path(@merge_request.source_project, @merge_request), format: :diff, class: "vlink"
8 10 instead.
9   -- else
10   - %h4.nothing_here_message Nothing to merge
... ...