summaryrefslogtreecommitdiff
path: root/app/models/merge_request_diff.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'show-all-pipelines-from-all-diffs' into 'master' Rémy Coutable2016-09-211-0/+8
* Refactor merge request version compare featureDmitriy Zaporozhets2016-09-071-0/+4
* Change the way merge request diff compare worksdz-merge-request-versionDmitriy Zaporozhets2016-08-251-18/+6
* Add code improvements to merge request version featureDmitriy Zaporozhets2016-08-251-8/+8
* Make sure merge request is fetched before collecting base sha in merge reques...Dmitriy Zaporozhets2016-08-191-0/+1
* Fix and refactor merge request diff_refs methodDmitriy Zaporozhets2016-08-151-1/+1
* Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-151-5/+9
* Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-151-4/+8
|\
| * Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-061-1/+1
| * change the API on the merge_request_diff model from diffs -> raw_diffsuse-raw-diffs-for-merge-request-diffsPaco Guzman2016-08-031-5/+5
| * Speedup DiffNote#active? on discussions, preloading noteables and avoid touch...Paco Guzman2016-08-021-0/+4
* | Fix merge request diff create and head_commit_sha compatibilityDmitriy Zaporozhets2016-08-151-3/+14
* | Change the way old merge request diff handledDmitriy Zaporozhets2016-08-151-11/+18
* | Load merge request versions without loading whole diff from databaseDmitriy Zaporozhets2016-08-091-0/+4
* | Chnage the way how merge request diff is initialized and savedDmitriy Zaporozhets2016-08-021-23/+31
* | Add more tests to merge_request_diff and improve initializeDmitriy Zaporozhets2016-08-021-3/+1
* | Refactor MergeRequestDiff initialize methodDmitriy Zaporozhets2016-08-021-16/+12
* | Remove requirement for base_commit_sha to allow creation of merge requests fo...Dmitriy Zaporozhets2016-08-021-3/+2
* | Add improvements to merge request versionsDmitriy Zaporozhets2016-08-021-1/+3
* | Ensure merge request is created with valid diff objectDmitriy Zaporozhets2016-08-021-19/+22
* | Refactor MergeRequestDiff modelDmitriy Zaporozhets2016-08-021-15/+17
* | Refactor merge request diffDmitriy Zaporozhets2016-08-021-51/+38
* | Add ability to render different merge request versionsDmitriy Zaporozhets2016-08-021-0/+10
|/
* Squashed - fix encoding issuefix/import-export-encodingJames Lopez2016-07-191-0/+9
* Handle more than two paths in MergeRequest#diffsSean McGivern2016-07-111-3/+2
* Support renames in diff_for_path actionsSean McGivern2016-07-111-2/+3
* Memoize diffs with path options set separatelySean McGivern2016-07-081-1/+2
* Collapse large diffs by defaultSean McGivern2016-07-081-0/+6
* We can't call private methods with `self.`Douwe Maan2016-07-071-5/+5
* Make methods private that don't need to be publicDouwe Maan2016-07-061-43/+47
* Use stored start and head for MR diff without whitespaceDouwe Maan2016-07-061-2/+2
* On MRs being imported, commits aren't available yetDouwe Maan2016-07-061-1/+1
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-061-22/+21
* Store diff head and start commit shas on MR diffsDouwe Maan2016-07-061-7/+10
* Don't garbage collect commits that have related DB records like commentsDouwe Maan2016-07-041-1/+10
* Use update_columns to by_pass all the dirty code on active_recordPaco Guzman2016-06-291-10/+37
* Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-131-24/+21
|\
| * Maintain commit order in MRsSean McGivern2016-05-181-3/+1
| * Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-131-6/+20
| * Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-091-15/+0
* | started refactoring some stuff based on MR feedbackJames Lopez2016-06-011-3/+2
* | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-091-1/+3
|\ \ | |/
| * Annotate the modelsZeger-Jan van de Weg2016-05-061-1/+3
* | fix conflictsJames Lopez2016-04-211-2/+0
|\ \ | |/
| * Get rid of more requires, which causes warnings when code is reloaded15139-fix-constants-redefinition-warningsRémy Coutable2016-04-191-2/+0
* | fixing more importing issuesJames Lopez2016-04-121-1/+3
|/
* Show at most 100 commits in the web UIJacob Vosmaer2016-03-041-1/+1
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-45/+41
* Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-271-17/+11
* Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-201-0/+9
View Lorry Controller Status