summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
...
* Always create merge_request_diff if MR createdDmitriy Zaporozhets2014-01-221-0/+2
* Improve commit render performnace for MR show pageDmitriy Zaporozhets2014-01-221-1/+4
* Remove commits/diff store login from MergeRequest modelDmitriy Zaporozhets2014-01-221-114/+5
* Fix mr controller specsDmitriy Zaporozhets2014-01-141-4/+5
* MergeRequest#automerge accepts custom message now. MergeRequest#merge_commit_...Dmitriy Zaporozhets2014-01-131-2/+10
* Fix dashboard event cachingDrew Blessing2013-12-131-0/+14
* Allow close of broken MRDmitriy Zaporozhets2013-12-121-1/+5
* Add new methods to MR to check if source or target branch existsDmitriy Zaporozhets2013-12-121-1/+29
* Fix bugs when discussion visible in wrong projectDmitriy Zaporozhets2013-10-071-1/+5
* Annotate!Dmitriy Zaporozhets2013-10-011-0/+1
* Add description to MergeRequest modelDmitriy Zaporozhets2013-09-091-2/+1
* Link issues from comments and automatically close themash wilson2013-08-251-1/+15
* ReannotateDmitriy Zaporozhets2013-08-211-15/+16
* Add iids to milestones. Moved iids logic to separate concernDmitriy Zaporozhets2013-08-211-1/+1
* Sett iid on create. Use iid as value to_paramDmitriy Zaporozhets2013-08-191-0/+4
* Fix filter context. Dont duplicate target project name for MRDmitriy Zaporozhets2013-08-081-1/+1
* Fix unmerged diff for non-fork MRDmitriy Zaporozhets2013-08-081-1/+2
* Merge branch 'master' into karlhungus-mr-on-forkDmitriy Zaporozhets2013-08-081-5/+6
|\
| * Update main calls to gitlab_gitDmitriy Zaporozhets2013-08-051-1/+1
* | Style changes from review with @randxIzaak Alpert2013-07-171-7/+15
* | MR on fork: Email fixes, style fixesIzaak Alpert2013-07-171-2/+0
* | Rebase on masterIzaak Alpert2013-07-171-2/+2
* | MR on fork: Some cleanup, test updatesIzaak Alpert2013-07-171-18/+11
* | Merge Request on forked projectsIzaak Alpert2013-07-171-34/+69
|/
* Cache MR diffs result. Improve diff outputDmitriy Zaporozhets2013-07-081-1/+3
* AnnotatedDmitriy Zaporozhets2013-06-191-2/+2
* Check for existing MR only for opened/reopened MRDmitriy Zaporozhets2013-06-141-4/+6
* IMprove MR validation logicDmitriy Zaporozhets2013-06-141-1/+4
* Prevent creating several open merge requests for same branchesDmitriy Zaporozhets2013-06-141-0/+4
* Fix huge MR exceptions. Fixed link to diff for itDmitriy Zaporozhets2013-05-221-3/+3
* handle broken diffs gracefullyDmitriy Zaporozhets2013-05-221-4/+16
* Remove native git calls from MR. Dump diff as array, not classDmitriy Zaporozhets2013-04-151-14/+12
* Gitlab::Git::Tree & Blob addedDmitriy Zaporozhets2013-04-021-1/+1
* store commits for MR as array of hashesDmitriy Zaporozhets2013-04-021-18/+12
* reset st_commits before setting new value to prevent error when old st_commit...Dmitriy Zaporozhets2013-04-021-0/+6
* Extend models functionality with old decorator methods. Use Repository modelDmitriy Zaporozhets2013-03-311-2/+11
* Remove grit logic from app/Dmitriy Zaporozhets2013-03-311-1/+1
* reannotatedDmitriy Zaporozhets2013-03-151-3/+3
* Merge branch 'master' into fixes/api, code clean up and tests fixedSebastian Ziebell2013-03-071-1/+1
* Prevent duplicate merge eventsDmitriy Zaporozhets2013-02-271-8/+1
* Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq int...Dmitriy Zaporozhets2013-02-261-57/+30
|\
| * human_merge_status replaced by human_merge_status_nameAndrew8xx82013-02-201-5/+0
| * class.self methods moved to scopesAndrew8xx82013-02-201-18/+3
| * State machine added for merge_status fieldAndrew8xx82013-02-201-35/+28
* | Fix merge request closed filter. Fixed one more testDmitriy Zaporozhets2013-02-211-0/+4
|/
* Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-...Dmitriy Zaporozhets2013-02-191-32/+45
|\
| * Hash syntax improvedAndrew8xx82013-02-181-2/+2
| * Merge Request uses StateMachine nowAndrew8xx82013-02-181-1/+1
| * Merge Request uses StateMachine nowAndrew8xx82013-02-181-22/+32
| * State renamed to merge_statusAndrew8xx82013-02-181-9/+9
View Lorry Controller Status