summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge-request-closes-issues-performance' into 'master'Robert Speicher2016-02-011-4/+4
|\
| * Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performanceYorick Peterse2016-02-011-4/+4
* | Fix specsDouwe Maan2016-01-281-2/+2
* | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-271-2/+2
|/
* Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-201-3/+12
* Fix MR diff_refsDouwe Maan2016-01-201-2/+2
* Check if MR is not broken.Rubén Dávila2016-01-191-1/+1
* Merge branch 'master' into issue_3945Rubén Dávila2016-01-141-28/+34
|\
| * Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-111-1/+1
| |\
| | * Removed ORDER BY in "of_group" scopesgroup-issues-sortingYorick Peterse2016-01-071-1/+1
| | * Don't pluck IDs when getting issues/MRs per groupYorick Peterse2016-01-071-1/+1
| * | Merge branch 'annotate-models-20160105' into 'master' Dmitriy Zaporozhets2016-01-071-22/+22
| |\ \ | | |/ | |/|
| | * Annotate modelsStan Hu2016-01-061-22/+22
| * | Get "Merge when build succeeds" to work when commits were pushed to MR target...Douwe Maan2016-01-051-5/+11
| |/
* | More refactoring from last code review. #3945Rubén Dávila2016-01-141-0/+4
|/
* Backport JIRA serviceDrew Blessing2015-12-181-1/+1
* Fixed Rubocop offensesGabriel Mazetto2015-12-151-3/+1
* 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 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-071-1/+1
| |\
| | * fox specsValery Sizov2015-12-071-1/+1
* | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-071-2/+9
|\ \ \ | |/ /
| * | 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
| |/
| * 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
* | 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
|\ \ | |/
| * Annotate modelsDmitriy Zaporozhets2015-11-131-0/+1
| * Add ignore white space option in merge request diffMinsik Yoon2015-11-131-1/+1
* | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-1/+5
* | Merge when build succeedsZeger-Jan van de Weg2015-11-021-0/+13
|/
* 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
* 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
* 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
* Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refsDmitriy Zaporozhets2015-09-211-1/+13
* Re-annotate modelsStan Hu2015-09-061-0/+1
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-20/+35
* Revert "Merge branches inside one repository using rugged instead of satellites"Dmitriy Zaporozhets2015-08-111-14/+1
* Revert "Merge branch 'refactor-can-be-merge' into 'master'"Dmitriy Zaporozhets2015-08-111-1/+7
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-32/+24
* Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-111-1/+1
View Lorry Controller Status