summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* elastic search init commitValery Sizov2016-01-051-0/+1
* Merge branch 'master' into ce_upstreamValery Sizov2015-12-231-1/+1
|\
| * Backport JIRA serviceDrew Blessing2015-12-181-1/+1
* | Merge remote-tracking branch 'ce/master'Robert Speicher2015-12-171-3/+1
|\ \ | |/
| * Fixed Rubocop offensesGabriel Mazetto2015-12-151-3/+1
* | Merge branch 'master' into ee_masterValery Sizov2015-12-141-22/+51
|\ \ | |/
| * Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-091-0/+4
| |\
| | * Add indication to merge request list item that MR cannot be merged automaticallyDouwe Maan2015-12-081-0/+4
| * | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-081-1/+1
| |\ \ | | |/
| * | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-071-2/+9
| |\ \
| * | | Incorporate feedbackZeger-Jan van de Weg2015-12-051-22/+24
| * | | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-021-7/+6
| * | | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-231-2/+9
| * | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-181-1/+2
| |\ \ \
| * | | | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-1/+5
| * | | | Merge when build succeedsZeger-Jan van de Weg2015-11-021-0/+13
* | | | | Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-091-2/+6
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-071-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | fox specsValery Sizov2015-12-071-1/+1
| * | | | Autolink first so we don't pick up numeric anchors as issue references.Douwe Maan2015-12-011-5/+2
| * | | | Recognize issue/MR/snippet/commit links as references.Douwe Maan2015-11-301-2/+9
| * | | | Show local issues and MRs in "This X closes... / closed by..." sentenceDouwe Maan2015-11-301-1/+1
| |/ / /
* | | | Negative approvals requiredValery Sizov2015-12-081-1/+1
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into rebase-use-sharedJacob Vosmaer2015-11-261-1/+3
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-11-241-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Handle removed source projects in MR CI commitsfix-merge-requests-without-source-projectsYorick Peterse2015-11-201-1/+1
| | * | | Use a JOIN in IssuableFinder#by_projectYorick Peterse2015-11-191-0/+3
| | | |/ | | |/|
| * | | Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-eeRobert Speicher2015-11-211-1/+1
| |\ \ \
| | * | | Merge branch 'fix-merge-requests-without-source-projects' into 'master' Dmitriy Zaporozhets2015-11-211-1/+1
| | |/ /
* | | | Use the 'shared' directory for MR rebasingJacob Vosmaer2015-11-241-1/+1
|/ / /
* | | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-11-151-0/+1
|\ \ \ | |/ /
| * | Annotate modelsDmitriy Zaporozhets2015-11-131-0/+1
* | | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-11-131-1/+1
|\ \ \ | |/ /
| * | Add ignore white space option in merge request diffMinsik Yoon2015-11-131-1/+1
| |/
* | Merge remote-tracking branch 'origin/master' into ce_upsteramValery Sizov2015-11-051-3/+9
|\ \ | |/
| * Render CI status on merge requests index pageDmitriy Zaporozhets2015-10-231-2/+8
| * Fix: Inability to reply to code comments in the MR view, if the MR comes from...comments_fixValery Sizov2015-10-221-1/+1
* | When someone as marked as a required approver for a merge request, an email s...Valery Sizov2015-10-301-0/+2
* | Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-10-231-5/+17
|\ \ | |/
| * Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-201-1/+13
| * Only accept open issues and merge requestsZeger-Jan van de Weg2015-10-161-4/+0
| * Show merge requests which close current issueZeger-Jan van de Weg2015-10-161-0/+4
* | Fix rebase onto masterValery Sizov2015-10-161-1/+1
* | Merge remote-tracking branch 'origin/master' into ce_upstream_15_10Valery Sizov2015-10-151-2/+3
|\ \ | |/
| * merge_request: add work_in_progress to MR hooksBen Boeckel2015-10-081-1/+2
| * merge_request: coerce work_in_progress? into a booleanBen Boeckel2015-10-081-1/+1
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-09-221-1/+13
|\ \ | |/
| * Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refsDmitriy Zaporozhets2015-09-211-1/+13
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-09-161-0/+1
|\ \ | |/
| * Re-annotate modelsStan Hu2015-09-061-0/+1
View Lorry Controller Status