summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-121-1/+5
|\
| * Avoid re-fetching merge-base SHA from Gitaly unnecessarilyOswaldo Ferreira2018-03-071-1/+5
* | Submit a single batch blob RPC to Gitaly per HTTP request when viewing diffsOswaldo Ferreira2018-03-091-8/+10
|/
* Fix 500 error when diff context line has broken encoding42332-actionview-template-error-366-524-out-of-rangeSean McGivern2018-02-221-1/+11
* Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-111-0/+1
* Fix error when viewing diffs without blobs41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclassSean McGivern2018-01-041-8/+23
* Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_...Douwe Maan2017-12-221-1/+3
* Merge branch 'fix_39233' into 'master'Sean McGivern2017-12-071-1/+1
|\
| * fix #39233 - 500 in merge requestMartin Nowak2017-12-071-1/+1
* | add support for the commit reference filtermicael.bergeron2017-12-071-19/+3
|/
* Batchload blobs for diff generationZeger-Jan van de Weg2017-11-212-14/+9
* Adds Rubocop rule for line break after guard clauseJacopo2017-11-163-0/+3
* Fix 500 error for old (somewhat) MRsAlexWayfer2017-10-301-3/+5
* Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-162-10/+1
|\
| * Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-121-1/+1
| * Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-1/+1
| * Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-122-10/+1
* | Fix diff parser so it tolerates to diff special markers in the contentValery Sizov2017-10-151-1/+3
|/
* Commenting on image diffsFelipe Artur2017-10-076-59/+236
* Remove unnecessary commentsDouwe Maan2017-09-251-2/+2
* Properly compare diff refs and diff positions when shas are truncatedDouwe Maan2017-09-252-8/+25
* Migrate Gitlab::Git::Repository#diff to Gitalyfeature/migrate-repository-diffAhmad Sherif2017-09-211-2/+2
* Detect n+1 issues involving GitalyAndrew Newdigate2017-09-191-1/+4
* changed InlineDiffMarker to make it html_safe its output37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-headermicael.bergeron2017-09-121-1/+2
* Show un-highlighted diffs when blobs are the sameSean McGivern2017-08-241-1/+8
* Always return a simple diff viewerSean McGivern2017-08-221-0/+2
* Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-141-3/+3
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-081-1/+1
* Remove unused (?) codeJacob Vosmaer2017-07-311-18/+0
* 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
View Lorry Controller Status