Commit graph

22 commits

Author SHA1 Message Date
Douwe Maan
7944254563 Implement diff viewers 2017-06-14 10:12:21 -05:00
Douwe Maan
ffbbd4112e Move diffable? method from Repository to Diff::File 2017-06-08 09:32:57 -05:00
Douwe Maan
aed0387f97 Consistent diff and blob size limit names 2017-05-29 17:02:02 -05:00
Douwe Maan
7c479d88a9 Pass fallback_diff_refs to Diff::File instead of using view helpers 2017-05-23 15:37:05 -05:00
Douwe Maan
7e09a9b7dc Clean up diff rendering 2017-05-23 15:37:05 -05:00
Douwe Maan
d9a0188d2f Add question mark to Gitlab::Diff::File predicate methods 2017-05-23 15:37:04 -05:00
Douwe Maan
0d1ec11e89 Use Blob methods instead of BlobHelper helpers 2017-04-27 12:23:26 -05:00
Douwe Maan
f4da1a805f Rephrase error message for a diff with a blob that’s too large 2017-04-17 13:57:45 -05:00
Mike Greiling
3b67af697c fix build failures 2017-02-16 15:40:57 -06:00
Mike Greiling
c89d9e741c only show diff unfolding link if there are more lines to show 2017-02-16 15:40:50 -06:00
Kushal Pandya
ff24f0e455 HAMLLint: Fix RubyComments offences 2017-01-24 10:09:28 -08:00
Kushal Pandya
fb3e365412 HAMLLint: Fix SpaceInsideHashAttributes offences 2016-12-31 11:58:36 +05:30
Stan Hu
0f61bb2dc5
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 , 

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-14 15:57:01 +01:00
Adam Niedzielski
3fa265d195 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 18:24:12 +01:00
Luke Bennett
ffdccaa0a8
Updated diff toggle targets and added icon 2016-09-03 20:24:31 +01:00
Tim Masliuchenko
b6d545df51 Add unfold links for Side-by-Side view 2016-08-04 09:09:59 +03:00
Paco Guzman
a404ab380d Collapsed diffs lines/size don't accumulate to overflow diffs. 2016-07-18 14:43:28 -06:00
Sean McGivern
5266ae87c4 Support renames in diff_for_path actions 2016-07-11 09:31:34 +01:00
Sean McGivern
ea1827c9a4 Make expand_all param more explicit 2016-07-08 13:54:09 +01:00
Sean McGivern
c082d92fb9 Allow expanding all diffs at once 2016-07-08 13:53:17 +01:00
Sean McGivern
90a6be190f Ensure only renderable text diffs are collapsed
Other diffs (those that are too large to render anyway, image diffs,
diffs suppressed by .gitattributes) should be rendered immediately.
2016-07-08 13:53:17 +01:00
Sean McGivern
b6b26692ea 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-07-08 10:56:55 +01:00