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 #3893 , gitlab-org/gitlab-ee#678
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-14 15:57:01 +01:00
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
317e48193f
Fix the diff in the merge request view when converting a symlink to a regular file.
...
In this specific case using file_path as a cache key is not enough,
because there are two entries with the same path.
Closes #21610 .
2016-10-17 18:09:34 +02:00
8f359ea917
Move to Gitlab::Diff::FileCollection
...
Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
2016-08-03 07:00:20 +02:00
cd7c2cb6dd
Cache highlighted diff lines for merge requests
...
Introducing the concept of SafeDiffs which relates
diffs with UI highlighting.
2016-08-03 07:00:19 +02:00
a404ab380d
Collapsed diffs lines/size don't accumulate to overflow diffs.
2016-07-18 14:43:28 -06:00
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
ac26b23712
Remove duplication, unused methods, and some other style things
2016-07-06 19:29:41 -04:00
9abcc0a98f
Add Gitlab::Git::Position
2016-07-06 18:50:59 -04:00
a27462a5c6
Extract parts of LegacyDiffNote into DiffOnNote concern and move part of responsibility to other classes
2016-07-06 18:50:59 -04:00
375193455a
Style diff and blob file headers the same way
2016-07-06 18:50:59 -04:00
9fc0e11e0d
Add DiffFile#blob and #old_blob
2016-07-06 18:50:58 -04:00
a9fa45f09e
Represent DiffRefs as proper class instead of tuple array
2016-07-06 18:50:58 -04:00
3f0d780c19
Show a notice for diffs that are too large
...
This builds on the changes introduced in
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results
in merge requests with large diffs (e.g. due to them containing minified
CSS) loading much faster.
2016-03-18 12:30:46 +01:00
1764e1b7cb
Use Gitlab::Git::DiffCollections
2016-03-03 18:38:44 +01:00
577f2fb47a
Save and use actual diff base commit for MR diff highlighting
2016-01-20 18:44:27 +01:00
701513dcc7
Move parallel diff logic to separate class
2016-01-20 14:53:20 +01:00
6b9c730e91
More refactoring from last code review. #3945
...
* Use commit objects instead of IDs when generating diffs
* Use proper references when generating MR's source and target
* Update broken specs
2016-01-14 16:47:55 -05:00
8dfad143d4
Add inline diff markers in highlighted diffs.
2016-01-14 22:28:07 +01:00
21b602c60a
Change strategy to highlight diffs. #3945
...
Now we apply syntax highlighting to the whole old and new files.
This basically help us to highlight adequately multiline content.
2016-01-07 22:37:01 -05:00
8b079315d9
A bit of refactoring. #3945
2015-12-30 21:23:50 -05:00
bb96d63153
New implementation for highlighting diff files. #3945
...
* It is more performant given now we process all the diff file instead
of processing line by line.
* Multiline comments are highlighted correctly.
2015-12-30 00:52:50 -05:00
b5291f9599
Fixed Rubocop offenses
2015-12-15 00:53:52 -02:00
0d967bce57
Show additions/deletions stats on merge request diff
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-01 13:52:08 +02:00
53f2130e63
Use new version of gitlab_git with extended rugged usage
2014-09-24 13:26:53 +03:00
218219abbd
Refactoring inside refactoring. We need to go deeper
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 21:54:52 +03:00
bde3f25d26
Specs for diff parser! Yay!
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 20:42:12 +03:00
4ef809c77d
Gitlab::Diff classes added
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 16:25:50 +03:00
Stan Hu
Adam Niedzielski
Paco Guzman
Sean McGivern
Douwe Maan
Yorick Peterse
Jacob Vosmaer
Douwe Maan
Rubén Dávila
Gabriel Mazetto
Dmitriy Zaporozhets