677b4db9e6
Mark inline difference between old and new paths when a file is renamed
2016-01-29 19:37:17 +01:00
2fed8bf390
Merge branch 'fix-diff-comments' into 'master'
...
More highlighted diff fixes
See merge request !2545
2016-01-22 07:37:47 +00:00
16d17b78ca
Restore diff comments
2016-01-22 02:10:58 +01:00
82d0fa8e45
Fix
2016-01-22 01:53:01 +01:00
150b4f66e6
Make sure non-highlighted diffs are still escaped
2016-01-22 01:47:17 +01:00
0e992a3b4e
Properly highlight lines around '\ No newline at end of file'
2016-01-20 19:20:13 +01:00
577f2fb47a
Save and use actual diff base commit for MR diff highlighting
2016-01-20 18:44:27 +01:00
13f10efcf1
Move inline diff marker logic to its own class
2016-01-15 14:39:43 +01:00
7d31f37219
Move inline diff logic to its own class
2016-01-15 14:25:29 +01:00
71b4341a37
Method was moved
2016-01-15 14:11:36 +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
83e4fc188b
Refactor highlighting lines
2016-01-14 16:13:35 +01:00
3a1d053599
Remove duplication around highlighting.
2016-01-14 15:11:50 +01:00
c179b48c97
Use #sub instead of #gsub!. #3945
...
* This is because is not a good idea to modify the original lines
* Also I run into this issue https://gitlab.com/gitlab-org/gitlab_git/issues/14
which is returning Diff Lines with the same @new_pos value.
2016-01-13 21:04:53 -05:00
0f0af19139
Little refactor for usage of html_safe. #3945
2016-01-13 11:39:15 -05:00
7307fa48e7
Fix broken specs. #3945
2016-01-12 19:28:31 -05:00
6e3358a507
Remove no longer required code. #3945
2016-01-12 17:36:08 -05:00
f1f9b5f7d3
Small fixes from code review. #3945
2016-01-12 12:53:54 -05:00
fed10766e5
Fix broken spec for submodule commit. #3945
2016-01-09 01:55:31 -05:00
78d7c0e0d8
Fix broken specs. #3945
2016-01-08 19:05:55 -05:00
6282202ee8
Remove custom Lexer. #3945 [ci skip]
...
Inline diff is going to be generated client side now. #3945
2016-01-08 15:20:48 -05: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
3fbcf52ec8
Apply syntax highlighting when expanding diff plus some refactor. #3945
2015-12-31 01:05:52 -05:00
fd100e1ef1
Don't modify "match" diff lines. #3945
2015-12-30 21:44:12 -05:00
8b079315d9
A bit of refactoring. #3945
2015-12-30 21:23:50 -05:00
7de90f4b53
Fix broken spec and small refactor. #3945
2015-12-30 18:42:11 -05:00
b74f36c9ca
Fix Rubocop complain. #3945
2015-12-30 13:10:28 -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
Douwe Maan