summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff
Commit message (Expand)AuthorAgeFilesLines
* Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-036-1/+156
* Cache highlighted diff lines for merge requestsPaco Guzman2016-08-033-4/+22
* Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-291-35/+39
|\
| * Fix method visibility in inline diff classGrzegorz Bizon2016-07-191-35/+39
* | Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-53/+10
* | Ensure to_json methods take optional argumentSean McGivern2016-07-201-2/+2
|/
* Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-5/+1
* Merge branch 'better-parallel-diff' into 'master' Robert Speicher2016-07-131-74/+55
|\
| * Actually render old and new sections of parallel diff next to each otherbetter-parallel-diffDouwe Maan2016-07-131-74/+55
* | Merge branch 'multi-line-inline-diff' into 'master' Douwe Maan2016-07-131-14/+38
|\ \
| * | Rename constant to be more descriptiveDouwe Maan2016-07-131-2/+2
| * | Extended regexes ignore whitespace, so use \smulti-line-inline-diffDouwe Maan2016-07-121-2/+2
| * | Render inline diffs for multiple changed lines following eachotherDouwe Maan2016-07-111-14/+38
| |/
* | Collapse large diffs by defaultSean McGivern2016-07-081-0/+4
|/
* Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-062-9/+9
* Add some more code comments.Douwe Maan2016-07-063-1/+16
* Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-061-3/+13
* Add Gitlab::Git::PositionTracerDouwe Maan2016-07-061-0/+168
* Add Gitlab::Diff::LineMapperDouwe Maan2016-07-061-0/+64
* Add Gitlab::Git::PositionDouwe Maan2016-07-062-0/+182
* Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-064-23/+35
* Style diff and blob file headers the same wayDouwe Maan2016-07-061-10/+5
* Add DiffFile#blob and #old_blobDouwe Maan2016-07-061-5/+21
* Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-063-16/+41
* Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-1/+0
* 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
* Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Di...Adam Butler2016-05-181-7/+19
* Enable the StringReplacement cop.Connor Shea2016-05-101-1/+1
* Show a notice for diffs that are too largehide-large-diffsYorick Peterse2016-03-181-0/+4
* 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
|\
| * 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
|\
View Lorry Controller Status