kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/views/projects/diffs/_content.html.haml

35 lines
1.6 KiB
Text
Raw Normal View History

Collapse large diffs by default When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
2016-06-28 12:25:32 -04:00
.diff-content.diff-wrap-lines
HAMLLint: Fix `RubyComments` offences
2017-01-16 09:57:33 -05:00
-# Skip all non non-supported blobs
Collapse large diffs by default When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
2016-06-28 12:25:32 -04:00
- return unless blob.respond_to?(:text?)
- if diff_file.too_large?
.nothing-here-block This diff could not be displayed because it is too large.
Use Blob methods instead of BlobHelper helpers
2017-04-13 12:57:43 -04:00
- elsif blob.too_large?
Rephrase error message for a diff with a blob that’s too large
2017-04-13 13:19:50 -04:00
.nothing-here-block The file could not be displayed because it is too large.
Use Blob methods instead of BlobHelper helpers
2017-04-13 12:57:43 -04:00
- elsif blob.readable_text?
Collapse large diffs by default When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
2016-06-28 12:25:32 -04:00
- if !project.repository.diffable?(blob)
.nothing-here-block This diff was suppressed by a .gitattributes entry.
Collapsed diffs lines/size don't accumulate to overflow diffs.
2016-07-15 03:04:18 -04:00
- elsif diff_file.collapsed?
Fix expanding a collapsed diff when converting a symlink to a regular file In this case comparing old_path and new_path is not enough because there are two entires that match.
2016-11-10 12:24:12 -05:00
- url = url_for(params.merge(action: :diff_for_path, old_path: diff_file.old_path, new_path: diff_file.new_path, file_identifier: diff_file.file_identifier))
HAMLLint: Fix `SpaceInsideHashAttributes` offences
2016-12-26 05:47:16 -05:00
.nothing-here-block.diff-collapsed{ data: { diff_for_path: url } }
Updated diff toggle targets and added icon
2016-09-02 10:26:45 -04:00
This diff is collapsed.
%a.click-to-expand
Click to expand it.
Collapse large diffs by default When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
2016-06-28 12:25:32 -04:00
- elsif diff_file.diff_lines.length > 0
fix build failures
2017-01-25 15:22:29 -05:00
- total_lines = 0
- if blob.lines.any?
- total_lines = blob.lines.last.chomp == '' ? blob.lines.size - 1 : blob.lines.size
Add unfold links for Side-by-Side view
2016-07-21 14:44:12 -04:00
- if diff_view == :parallel
only show diff unfolding link if there are more lines to show
2017-01-24 18:53:25 -05:00
= render "projects/diffs/parallel_view", diff_file: diff_file, total_lines: total_lines
Collapse large diffs by default When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
2016-06-28 12:25:32 -04:00
- else
only show diff unfolding link if there are more lines to show
2017-01-24 18:53:25 -05:00
= render "projects/diffs/text_file", diff_file: diff_file, total_lines: total_lines
Collapse large diffs by default When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
2016-06-28 12:25:32 -04:00
- else
- if diff_file.mode_changed?
.nothing-here-block File mode changed
- elsif diff_file.renamed_file
.nothing-here-block File moved
- elsif blob.image?
Fix Error 500 when creating a merge request that contains an image that was deleted and added Steps to reproduce: 1. Start with a repo with an image 2. Add a commit to delete the image 3. Add another commit to replace the image with another image In a diff comparison, we really just compare about what the image was before the diff, not the direct parent of the last commit. This MR fixes that. Closes #3893, gitlab-org/gitlab-ee#678 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-08-27 23:59:48 -04:00
- old_blob = diff_file.old_blob(diff_file.old_content_commit || @base_commit)
Collapse large diffs by default When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
2016-06-28 12:25:32 -04:00
= render "projects/diffs/image", diff_file: diff_file, old_file: old_blob, file: blob
- else
.nothing-here-block No preview for this file type
Copy permalink