summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff
Commit message (Expand)AuthorAgeFilesLines
* Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-192-20/+20
* Implement diff viewersDouwe Maan2017-06-141-1/+108
* Merge branch 'dm-diff-file-diffable' into 'master'Sean McGivern2017-06-082-4/+13
|\
| * Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-082-17/+38
* | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-082-19/+36
|/
* Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diffDouwe Maan2017-06-063-17/+13
* Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern2017-06-011-0/+4
|\
| * Fix: A diff comment on a change at last line of a file shows as two comments ...Valery Sizov2017-05-311-0/+4
* | Consistent diff and blob size limit namesDouwe Maan2017-05-291-1/+1
|/
* Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-254-40/+63
|\
| * Address feedbackDouwe Maan2017-05-251-1/+1
| * Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-233-31/+57
| * Rename Diff::File {old,new}_ref to {old,new}_shaDouwe Maan2017-05-232-7/+7
| * Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-231-7/+4
* | Address reviewDouwe Maan2017-05-241-1/+3
* | Fix specsdm-outdated-system-noteDouwe Maan2017-05-231-1/+0
* | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-233-92/+161
|/
* Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-1/+1
* Extract generic parts of Gitlab::Diff::InlineDiffMarkerDouwe Maan2017-05-102-123/+24
* Show correct size when MR diff overflowsSean McGivern2017-04-251-0/+4
* Fix commenting on an existing discussion on an unchanged line that is no long...Douwe Maan2017-04-241-1/+8
* Cache MR diffs by diff refsDouwe Maan2017-04-081-0/+6
* Fix specsDouwe Maan2017-04-051-1/+1
* Don't use original_discussion_idDouwe Maan2017-04-051-1/+1
* Better notification emails for notes and (diff) discussionsDouwe Maan2017-04-051-0/+4
* take nonewline context into account in diff parsermhasbini2017-03-132-4/+8
* Fix code for copsDouwe Maan2017-02-231-9/+10
* Enable Style/ConditionalAssignmentDouwe Maan2017-02-231-3/+3
* Enable Performance/RedundantMatchDouwe Maan2017-02-232-2/+2
* Enable Style/MutableConstantDouwe Maan2017-02-231-1/+1
* Enable `Lint/EmptyWhen` cop and correct offenseRobert Speicher2017-02-131-1/+1
* Fix MR with files hidden by .gitattributes25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-fileSean McGivern2016-12-261-1/+4
* Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass25251-actionview-template-error-undefined-method-text-for-nil-nilclassValery Sizov2016-12-021-1/+1
* Fix: Timeout creating and viewing merge request for binary filetimeout-merge-request-for-binary-fileValery Sizov2016-11-251-3/+3
* Fix Error 500 when creating a merge request that contains an image that was d...stanhu/gitlab-ce-fix-error-500-with-mr-imagesStan Hu2016-11-141-5/+8
* Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-102-2/+2
* Fix the diff in the merge request view when converting a symlink to a regular...adam-fix-mr-diff-symlink-file-conversionAdam Niedzielski2016-10-172-5/+9
* Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-221-6/+12
|\
| * Fix line commenting for the initial commitSean McGivern2016-08-191-6/+12
* | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-191-1/+19
|\ \ | |/
| * Fix specsSean McGivern2016-08-121-3/+3
| * Auto-highlight conflict when rich_text is calledSean McGivern2016-08-121-2/+9
| * Add backend for merge conflicts readingSean McGivern2016-08-121-0/+11
* | Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-151-8/+8
|/
* switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-035-40/+19
* Introduce Compare model in the codebase.Paco Guzman2016-08-034-8/+10
* 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
View Lorry Controller Status