summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/diff
Commit message (Expand)AuthorAgeFilesLines
* 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
* Fix: Timeout creating and viewing merge request for binary filetimeout-merge-request-for-binary-fileValery Sizov2016-11-251-0/+13
* 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-0/+24
* Fix line commenting for the initial commitSean McGivern2016-08-191-0/+42
* switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-035-5/+5
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-3/+43
* Ensure to_json methods take optional argumentSean McGivern2016-07-201-0/+24
* Merge branch '19820-safer-diffs' into 'master' Douwe Maan2016-07-181-0/+14
|\
| * Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-0/+14
* | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-1/+2
|/
* apparently this gets encoded now?http://jneen.net/2016-07-141-1/+1
* we no longer encode double-quoteshttp://jneen.net/2016-07-141-3/+3
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-2/+1
* Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-131-1/+2
* Merge branch 'multi-line-inline-diff' into 'master' Douwe Maan2016-07-131-10/+18
|\
| * Render inline diffs for multiple changed lines following eachotherDouwe Maan2016-07-111-10/+18
* | Avoid `describe`-ing symbols in specsrs-describe-symbolsRobert Speicher2016-07-122-3/+3
|/
* Add tests for PositionDouwe Maan2016-07-061-0/+341
* Add tests for PositionTracerDouwe Maan2016-07-061-0/+1758
* Add Gitlab::Diff::LineMapperDouwe Maan2016-07-061-0/+137
* Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-063-6/+5
* Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-1/+0
* Show a notice for diffs that are too largehide-large-diffsYorick Peterse2016-03-181-0/+14
* Return an empty Array when there aren't lines to parse.Rubén Dávila2016-03-151-0/+5
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-1/+1
* Fix specs and add a new oneDouwe Maan2016-01-301-24/+24
View Lorry Controller Status