summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Update TODO: allow_collaboration column renamingfix-todo-allow_collaborationMark Chao2019-07-031-0/+1
* Use actual_head_pipeline to enforce presenceFabio Pitino2019-06-251-2/+2
* Require pipeline if "Pipeline must succeed" is setrequire-pipeline-when-enabling-only-allow-merge-if-pipeline-succeedsFabio Pitino2019-06-251-1/+1
* Avoid touching the MR status if MR is not openedOswaldo Ferreira2019-06-211-4/+0
* Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-06-201-21/+19
* Raise an error if creating the MergeRequestDiff failsNick Thomas2019-06-131-1/+1
* Revert "Automatically update MR merge-ref along merge status"Oswaldo Ferreira2019-06-111-15/+21
* Create BaseService for Auto Merge architecturecreate-base-class-for-auto-merge-architectureShinya Maeda2019-06-061-15/+0
* Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-031-21/+15
|\
| * Add payload to the service responseOswaldo Ferreira2019-05-311-4/+0
| * Simplify merge_ref_head methodsOswaldo Ferreira2019-05-311-6/+4
| * Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-05-311-21/+21
* | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-031-0/+12
|\ \
| * \ Merge branch 'security-60039' into 'master'GitLab Release Tools Bot2019-06-031-0/+12
| |\ \ | | |/ | |/|
| | * Validate MR branch namesMark Chao2019-05-031-0/+12
* | | Abstract auto merge processesShinya Maeda2019-06-031-6/+18
|/ /
* | Fix remaining failures in shoulda-matcherStan Hu2019-05-211-0/+2
* | Fix merge request pipeline exist methodfix-merge-request-pipeline-exist-methodShinya Maeda2019-05-061-7/+3
* | Fix environment automatic on_stop triggerShinya Maeda2019-04-301-0/+10
* | Upgrade Rails to 5.1.6.1Jasper Maes2019-04-231-1/+1
* | Backport changes from EEMatija Čupić2019-04-161-1/+1
* | [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-081-47/+4
|/
* Do not show system notes on commits in the MR page55268-exclude-system-notes-from-commits-in-mrHeinrich Lee Yu2019-04-021-9/+10
* Backport splitting approval changes from CEIgor2019-04-021-6/+2
* Merge branch 'issue_51789_part_1' into 'master'Sean McGivern2019-04-021-0/+4
|\
| * Merge masterFelipe Artur2019-03-271-41/+90
| |\
| * \ Merge branch 'master' into issue_51789_part_1Felipe Artur2019-02-191-4/+4
| |\ \
| * | | Fix broken specsFelipe Artur2019-02-141-1/+1
| * | | Split background migration for issues and merge requestsFelipe Artur2019-02-141-1/+1
| * | | Code improvementsFelipe Artur2019-02-131-1/+4
| * | | Improve batch sizeFelipe Artur2019-02-121-1/+0
| * | | Migrate issuable states to integer patch 1Felipe Artur2019-02-111-0/+2
* | | | Merge branch 'check-mergeability-in-merge-to-ref-service' into 'master'Douglas Barbosa Alexandre2019-04-011-2/+1
|\ \ \ \
| * | | | Check mergeability in merge to ref servicecheck-mergeability-in-merge-to-ref-serviceShinya Maeda2019-04-011-2/+1
* | | | | Fix MergeRequest#has_commits? nil comparisonFrancisco Javier López2019-04-011-1/+1
|/ / / /
* | | | Merge branch 'persist-fulll-ref-path-for-mr-pipelines' into 'master'Kamil Trzciński2019-03-291-0/+4
|\ \ \ \
| * | | | Create detached merge request pipelinespersist-fulll-ref-path-for-mr-pipelinesShinya Maeda2019-03-291-0/+4
| | |_|/ | |/| |
* | | | Inherit from ApplicationRecord instead of ActiveRecord::BaseNick Thomas2019-03-281-1/+1
|/ / /
* | | Prepare suggestion implementation for multi-lineOswaldo Ferreira2019-03-271-0/+1
* | | Add multiple assignees migration and table populationOswaldo Ferreira2019-03-251-0/+15
* | | Update merge request widget pipeline blockNathan Friend2019-03-211-1/+1
* | | Make all_pipelines method compatible with pipelines for merge requestsShinya Maeda2019-03-131-6/+11
* | | Filter merge requests by target branchHiroyuki Sato2019-03-091-0/+16
* | | Significantly reduce N+1 queries in /api/v4/todos endpointStan Hu2019-03-061-0/+7
* | | Merge branch 'merge-dev-to-master' into 'master'John Jarvis2019-03-051-5/+4
|\ \ \
| * \ \ Merge branch 'security-2773-milestones-fix' into 'master'Yorick Peterse2019-03-041-4/+3
| |\ \ \
| | * | | Check issue milestone availabilityJarka Košanová2019-02-141-4/+3
| | |/ /
| * | | Arbitrary file read via MergeRequestDiffFrancisco Javier López2019-03-041-1/+1
* | | | Merge branch 'master' into expose-additional-merge-request-pipeline-variablesHiroyuki Sato2019-03-041-29/+21
|/ / /
* | | Support merge to ref for merge-commit and squashOswaldo Ferreira2019-02-251-0/+14
| |/ |/|