summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/diff
Commit message (Expand)AuthorAgeFilesLines
* Method to track recoverable exceptions in sentryBob Van Landuyt2018-04-171-5/+4
* Ensure that we never assume old_blob or new_blob are nil44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binarySean McGivern2018-03-161-0/+12
* Only cache highlight results for latest MR diffsSean McGivern2018-03-151-1/+1
* Fix 500 error when diff context line has broken encoding42332-actionview-template-error-366-524-out-of-rangeSean McGivern2018-02-221-0/+22
* Fix error 500 when viewing commit and merge request diffsStan Hu2018-01-071-0/+14
* 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-0/+25
* fix #39233 - 500 in merge requestMartin Nowak2017-12-071-0/+4
* Ensure MRs always use branch refs for comparisonSean McGivern2017-11-281-2/+2
* Batchload blobs for diff generationZeger-Jan van de Weg2017-11-211-6/+2
* Fix 500 error for old (somewhat) MRsAlexWayfer2017-10-301-0/+37
* Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-161-10/+10
|\
| * Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-121-10/+10
| * Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-10/+10
| * Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-121-10/+10
* | Fix diff parser so it tolerates to diff special markers in the contentValery Sizov2017-10-151-0/+17
|/
* Commenting on image diffsFelipe Artur2017-10-074-18/+145
* Add specsdm-bitbucket-import-truncated-shasDouwe Maan2017-09-252-0/+93
* Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-151-9/+1
* Show un-highlighted diffs when blobs are the sameSean McGivern2017-08-241-4/+40
* Always return a simple diff viewerSean McGivern2017-08-221-0/+14
* Don't escape html entities when rich == raw line36041-notification-titleJarka Kadlecova2017-08-172-10/+10
* Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-011-1/+1
* Remove unused (?) codeJacob Vosmaer2017-07-311-8/+0
* Use described_class when possibleRémy Coutable2017-07-272-3/+3
* Remove superfluous lib: true, type: redis, service: true, models: true, servi...Rémy Coutable2017-07-2711-11/+11
* Implement diff viewersDouwe Maan2017-06-141-0/+301
* Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-082-13/+27
* Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diffDouwe Maan2017-06-062-0/+109
* Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-251-3/+3
|\
| * Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-231-3/+3
* | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-231-89/+226
|/
* Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-123-11/+25
|\
| * Fix specsDouwe Maan2017-05-101-2/+2
| * Extract generic parts of Gitlab::Diff::InlineDiffMarkerDouwe Maan2017-05-102-9/+23
* | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-101-4/+4
|/
* Fix commenting on an existing discussion on an unchanged line that is no long...Douwe Maan2017-04-241-7/+2
* Refactor changing files in web UIDouwe Maan2017-04-201-4/+4
* Fix specsDouwe Maan2017-03-141-3/+3
* take nonewline context into account in diff parsermhasbini2017-03-131-0/+48
* Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-231-6/+6
* Enable Style/BarePercentLiteralsDouwe Maan2017-02-231-6/+6
* Rename Files::DeleteService to Files::DestroyServicedixpac2017-02-101-1/+1
* Backport changes from EE squashSean McGivern2017-02-031-1/+3
* Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-021-3/+3
|\
| * Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-266-6/+6
| |\
| * | Fix renamingLin Jen-Shin2017-01-071-3/+3
* | | Active tense test coveragejej-backport-active-tense-specsValery Sizov2017-02-012-5/+5
| |/ |/|
* | Use `:empty_project` where possible throughout spec/librs-empty_project-libRobert Speicher2017-01-256-6/+6
|/
* Fix MR with files hidden by .gitattributes25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-fileSean McGivern2016-12-261-5/+14
* Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass25251-actionview-template-error-undefined-method-text-for-nil-nilclassValery Sizov2016-12-021-0/+8
View Lorry Controller Status