summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff
Commit message (Collapse)AuthorAgeFilesLines
* Add leading comment space copissue_15557Felipe Artur2016-05-311-7/+7
|
* Reuse existing SCSS variablesadambutler/gitlab-ce-feature/support-diff-of-issue-title-renameRémy Coutable2016-05-181-2/+12
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler2016-05-181-7/+19
| | | | Gitlab::Diff::InlineDiff
* Enable the StringReplacement cop.Connor Shea2016-05-101-1/+1
| | | | | | | | Also fix one use of `gsub` that would be faster as `delete`. Use `tr` instead of `gsub` when you are replacing the same number of characters. Use `delete` instead of `gsub` when you are deleting characters.
* Show a notice for diffs that are too largehide-large-diffsYorick Peterse2016-03-181-0/+4
| | | | | | | 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.
* Return an empty Array when there aren't lines to parse.Rubén Dávila2016-03-151-0/+2
|
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-032-40/+41
|
* Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-293-36/+52
|
* Merge branch 'fix-diff-comments' into 'master' Robert Speicher2016-01-222-5/+8
|\ | | | | | | | | More highlighted diff fixes See merge request !2545
| * Properly highlight right side of parallel difffix-diff-commentsDouwe Maan2016-01-221-1/+3
| |
| * Restore diff commentsDouwe Maan2016-01-221-4/+5
| |
* | FixDouwe Maan2016-01-221-2/+2
| |
* | Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-221-5/+11
|/
* Validate bounds just to be sureDouwe Maan2016-01-201-0/+3
|
* Properly highlight lines around '\ No newline at end of file'Douwe Maan2016-01-203-7/+15
|
* Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-203-9/+25
|
* Properly handle HTML entities with inline diffsDouwe Maan2016-01-203-15/+19
|
* Move parallel diff logic to separate classDouwe Maan2016-01-202-0/+121
|
* Remove useless assignmentsDouwe Maan2016-01-191-2/+0
|
* Add testsDouwe Maan2016-01-152-0/+11
|
* Whoops, forgot to add filesDouwe Maan2016-01-152-0/+160
|
* Move inline diff marker logic to its own classDouwe Maan2016-01-151-95/+11
|
* Move inline diff logic to its own classDouwe Maan2016-01-151-73/+11
|
* Method was movedDouwe Maan2016-01-151-2/+2
|
* Merge branch 'master' into issue_3945Rubén Dávila2016-01-141-2/+3
|\
| * Properly generate diff of orphan commits, like the first commit in a repositoryDouwe Maan2016-01-141-2/+3
| |
* | More refactoring from last code review. #3945Rubén Dávila2016-01-142-7/+15
| | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
* | Add inline diff markers in highlighted diffs.Douwe Maan2016-01-142-34/+174
| |
* | Refactor highlighting linesDouwe Maan2016-01-141-25/+4
| |
* | Remove duplication around highlighting.Douwe Maan2016-01-141-12/+1
| |
* | Use #sub instead of #gsub!. #3945Rubén Dávila2016-01-131-1/+1
| | | | | | | | | | | | * 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.
* | Little refactor for usage of html_safe. #3945Rubén Dávila2016-01-131-2/+2
| |
* | Fix broken specs. #3945Rubén Dávila2016-01-121-1/+1
| |
* | Remove no longer required code. #3945Rubén Dávila2016-01-121-42/+9
| |
* | Small fixes from code review. #3945Rubén Dávila2016-01-121-4/+0
| |
* | Fix broken spec for submodule commit. #3945Rubén Dávila2016-01-091-2/+10
| |
* | Fix broken specs. #3945Rubén Dávila2016-01-081-5/+5
| |
* | Remove custom Lexer. #3945 [ci skip]Rubén Dávila2016-01-081-2/+1
| | | | | | | | Inline diff is going to be generated client side now. #3945
* | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-072-20/+58
| | | | | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
* | Don't process inline diffs on backend. #3945Rubén Dávila2016-01-071-4/+1
| |
* | Apply syntax highlighting when expanding diff plus some refactor. #3945Rubén Dávila2015-12-311-12/+43
| |
* | Don't modify "match" diff lines. #3945Rubén Dávila2015-12-301-1/+6
| |
* | A bit of refactoring. #3945Rubén Dávila2015-12-302-9/+9
| |
* | Fix broken spec and small refactor. #3945Rubén Dávila2015-12-302-3/+3
| |
* | Fix Rubocop complain. #3945Rubén Dávila2015-12-301-5/+5
| |
* | New implementation for highlighting diff files. #3945Rubén Dávila2015-12-303-0/+60
|/ | | | | | * It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly.
* Fixed Rubocop offensesGabriel Mazetto2015-12-151-2/+2
|
* Fix rubocop warnings in libGuilherme Garnier2015-10-031-2/+0
|
* Show additions/deletions stats on merge request diffDmitriy Zaporozhets2015-10-012-0/+16
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix commit comments on first line of diff not rendering in Merge Request ↵Douwe Maan2015-02-201-1/+1
| | | | Discussion view.
View Lorry Controller Status