summaryrefslogtreecommitdiff
path: root/app/models/merge_request_diff.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* Set mr_diff state to collected if diff is okDmitriy Zaporozhets2014-01-221-1/+4
* MergeRequestDiff model responsoible for storing commits/diff infoDmitriy Zaporozhets2014-01-221-0/+160