summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Param should be present, not just truthybackport-eeDouwe Maan2016-01-141-1/+1
* Fixed Rubocop offensesGabriel Mazetto2015-12-151-1/+1
* Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-072-5/+1
|\
| * Rescue StandardError, not Exceptionrs-rescue-standarderrorRobert Speicher2015-11-241-1/+1
| * Generate system note after Task item has been updated on Issue or Merge Reque...Ruben Davila2015-11-191-4/+0
* | Incorporate feedbackZeger-Jan van de Weg2015-12-051-5/+4
* | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-021-4/+2
* | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-231-1/+16
* | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-182-50/+32
|\ \ | |/
| * Refactor similar code for Issue and MR update serviceDmitriy Zaporozhets2015-11-171-30/+9
| * Split huge method MergeRequests::UpdateService#executeDmitriy Zaporozhets2015-11-131-22/+25
| * Fix bug where manually merged branches in a MR would end up with an empty diffStan Hu2015-11-051-4/+4
* | API support, incorporated feedbackZeger-Jan van de Weg2015-11-183-11/+11
* | Merge when build succeedsZeger-Jan van de Weg2015-11-022-1/+50
|/
* Use issue editor as cross reference comment author when issue is edited with ...edit-new-cross-referencesDouwe Maan2015-10-281-1/+1
* Clean up MR refresh service somewhat.dm-issue-3140Douwe Maan2015-10-211-27/+47
* Make sure MR refresh service correctly determines newly added commits.Douwe Maan2015-10-211-1/+2
* Fix bug preventing mentioned issued from being closed when MR is merged using...close-issues-by-mrDouwe Maan2015-10-181-0/+10
* Add spec for refresh service adding notes to restored branchesStan Hu2015-10-161-3/+2
* Rubocop fixStan Hu2015-10-151-1/+1
* Add system notes for restored branchesStan Hu2015-10-151-5/+25
* Memoize merge request source branchesStan Hu2015-10-151-8/+9
* Improve SystemNote interface for branch add/restore caseStan Hu2015-10-151-9/+7
* Preserve target branchStan Hu2015-10-151-1/+5
* Add a system note and update relevant merge requests when a branch is deleted...Stan Hu2015-10-151-22/+33
* Simplify code around (cross)-referencesDouwe Maan2015-10-122-2/+2
* Add directory feature buttonStan Hu2015-10-071-1/+1
* Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-011-0/+4
* Check permissions on target project in merge request create service.Douwe Maan2015-08-211-2/+8
* merge with support of pre-receive and post-receive hooksDmitriy Zaporozhets2015-08-141-12/+2
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-116-62/+79
* Revert "Merge branches inside one repository using rugged instead of satellites"Dmitriy Zaporozhets2015-08-111-48/+3
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-116-79/+107
* Merge branch 'master' into comment-updated-byDouwe Maan2015-08-066-107/+79
|\
| * Fix merge request creation without branch selectedDmitriy Zaporozhets2015-08-051-2/+7
| * Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-041-0/+6
| |\
| * | Fix refresh serviceDmitriy Zaporozhets2015-07-161-1/+1
| * | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-165-87/+72
| * | Refactor compare and fetch logicDmitriy Zaporozhets2015-07-152-10/+0
| * | Implement merge from forks without satellitesDmitriy Zaporozhets2015-07-151-7/+3
| * | Remove satellitesDmitriy Zaporozhets2015-07-152-7/+2
| * | Fetch reference from fork repo when create merge requestDmitriy Zaporozhets2015-07-151-0/+9
* | | Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-301-1/+1
| |/ |/|
* | Dynamically check `:admin_*` ability in IssuableBaseServicers-issue-2092Robert Speicher2015-07-241-0/+6
* | Return true/false from AutoMergeService#merge!remove-source-branchDouwe Maan2015-07-231-0/+4
* | Fix Remove source-branch for MRs from same projectDouwe Maan2015-07-221-1/+5
|/
* Rename `notice_added_references` to `create_new_cross_references!`rs-issue-1773Robert Speicher2015-07-131-1/+1
* Simplify Issue and MergeRequest UpdateServicesrs-remove-task-statesRobert Speicher2015-07-081-6/+2
* Remove unused `task_[un]check` states from Update servicesRobert Speicher2015-07-081-5/+1
* Merge branches inside one repository using rugged instead of satellitesDmitriy Zaporozhets2015-07-011-3/+40
View Lorry Controller Status