diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-12-30 17:16:25 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-01-12 13:41:29 -0200 |
| commit | ca0cf5a3cd2829db4cfac007c36d5588ed369f87 (patch) | |
| tree | bc5783a137de10e25358a24d764b50daabdf68ef /app/views/projects/merge_requests/show/_diffs.html.haml | |
| parent | ec4fe4432a2c4daa14c8e8f7c5d8567553062ebf (diff) | |
| download | gitlab-ce-issue_25017.tar.gz | |
Show 'too many changes' message for merge requestissue_25017
Diffstat (limited to 'app/views/projects/merge_requests/show/_diffs.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/show/_diffs.html.haml | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/views/projects/merge_requests/show/_diffs.html.haml b/app/views/projects/merge_requests/show/_diffs.html.haml index 99c71e1454a..5f048d04b27 100644 --- a/app/views/projects/merge_requests/show/_diffs.html.haml +++ b/app/views/projects/merge_requests/show/_diffs.html.haml @@ -1,13 +1,5 @@ -- if @merge_request_diff.collected? +- if @merge_request_diff.collected? || @merge_request_diff.overflow? = render 'projects/merge_requests/show/versions' = render "projects/diffs/diffs", diffs: @diffs - elsif @merge_request_diff.empty? .nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch} -- else - .alert.alert-warning - %h4 - Changes view for this comparison is extremely large. - %p - You can - = link_to "download it", merge_request_path(@merge_request, format: :diff), class: "vlink" - instead. |