summaryrefslogtreecommitdiff
path: root/app/models/merge_request_diff.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* Add ignore white space option in merge request diffMinsik Yoon2015-11-131-1/+15
* Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-201-0/+4
* Add a system note and update relevant merge requests when a branch is deleted...Stan Hu2015-10-151-1/+2
* Fix rubocop warnings in appGuilherme Garnier2015-10-031-5/+3
* Fix Error 500 in creating merge requests with > 1000 diffsStan Hu2015-09-251-2/+2
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-12/+20
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-20/+12
* Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-111-2/+2
* Create ref for every merge request. Add documentation for fetch merge requestsDmitriy Zaporozhets2015-08-071-2/+2
* Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix ...Dmitriy Zaporozhets2015-07-161-5/+4
* Refactor compare and fetch logicDmitriy Zaporozhets2015-07-151-12/+10
* Implement update of ref when merge request code is reloadedDmitriy Zaporozhets2015-07-151-9/+18
* Implement merge from forks without satellitesDmitriy Zaporozhets2015-07-151-2/+4
* Let commit model know about its project.Douwe Maan2015-04-241-2/+2
* Explicitly define ordering in models using default_scopeDmitriy Zaporozhets2015-02-051-0/+2
* Use short_id instead of [0..N] for short version of commit shaDmitriy Zaporozhets2014-10-101-1/+1
* Annotate modelsDmitriy Zaporozhets2014-08-251-1/+1
* Use CompareService in collecting diff when create MRDmitriy Zaporozhets2014-07-291-15/+6
* Key strong paramsDmitriy Zaporozhets2014-06-261-2/+0
* Add CompareAction class for collecting commits and diffs using satellitesDmitriy Zaporozhets2014-05-071-2/+14
* Re-annotate modelsDmitriy Zaporozhets2014-04-091-0/+13
* remove dead code: broken_diffstsl09222014-02-271-6/+0
* Use gitlab_git 5.4.0 without BROKEN_DIFF constantDmitriy Zaporozhets2014-02-121-5/+3
View Lorry Controller Status