summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'start-with-iid-on-new-branch' into 'master' Rémy Coutable2016-04-141-1/+1
|\
| * Start with iid on branch creationZeger-Jan van de Weg2016-04-141-1/+1
* | Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202Rémy Coutable2016-04-131-2/+1
|/
* Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-202-1/+14
|\
| * Merge branch 'remove-wip' into 'master' Jacob Schatz2016-03-191-0/+13
| |\
| | * Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-183-20/+32
| | |\
| | * | Improve the "easy WIP & un-WIP from link" featureRémy Coutable2016-03-181-5/+2
| | * | Use specialized system notes when MR is (un)marked as WIPDouwe Maan2016-02-261-0/+16
| * | | \#to_branch_name now uses the iid as postfixissue-branch-iid-postfixZeger-Jan van de Weg2016-03-181-1/+1
| | |/ | |/|
* | | Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-191-0/+15
|\ \ \ | |/ /
| * | Enhance new branch button on an issueZeger-Jan van de Weg2016-03-151-4/+8
| * | new-branch-buttonZeger-Jan van de Weg2016-03-151-0/+11
* | | Update methods that use issue close serviceGrzegorz Bizon2016-03-171-1/+1
|/ /
* | Improving the original label-subscribing implementationRémy Coutable2016-03-151-5/+9
* | Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-151-1/+6
* | Merge branch 'security_bug_fix_close_issue' into 'master' Douwe Maan2016-03-051-1/+3
|\ \
| * | Security: Fix issue auto closingValery Sizov2016-03-031-1/+3
| |/
* | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-17/+3
|/
* Check the HEAD of branch when doing Merge When Succeededimprove-merge-when-succeededKamil Trzcinski2016-02-221-3/+9
* Merge branch 'tasks' into 'master' Douglas Barbosa Alexandre2016-02-223-2/+14
|\
| * Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-203-5/+5
| * Rename IssuableBaseService#have_changes? to has_changes?Douglas Barbosa Alexandre2016-02-201-1/+1
| * Create or mark task pending as soon the action happensDouglas Barbosa Alexandre2016-02-201-1/+0
| * Ensure that we only have one task per issue/mrDouglas Barbosa Alexandre2016-02-201-0/+5
| * Create a pending task when a user is mentioned when edit a issue/mr/noteDouglas Barbosa Alexandre2016-02-201-1/+1
| * Rename TaskService#mark_as_done to mark_pending_tasks_as_doneDouglas Barbosa Alexandre2016-02-201-1/+1
| * Move common behavior to to IssuableBaseServiceDouglas Barbosa Alexandre2016-02-201-17/+0
| * Marks pending tasks for an user as done when he merge the MRDouglas Barbosa Alexandre2016-02-201-0/+1
| * Marks pending tasks for an user as done when he close the MRDouglas Barbosa Alexandre2016-02-201-0/+1
| * Marks pending tasks for an user as done when he edit a MRDouglas Barbosa Alexandre2016-02-201-0/+21
| * Create a pending task when an MR is assigned to someoneDouglas Barbosa Alexandre2016-02-202-1/+3
| * Marks pending tasks for an user as done when he edit an issueDouglas Barbosa Alexandre2016-02-201-1/+1
* | Discover branches for commit statuses ref-less when doing merge when succeededmerge-when-succeededKamil Trzcinski2016-02-191-5/+10
|/
* Use adequate description for new MR.Rubén Dávila2016-02-191-1/+1
* Save merge commit id when MR is mergedRubén Dávila2016-02-191-1/+2
* 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