diff options
author | Robert Speicher <robert@gitlab.com> | 2016-10-13 16:54:39 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-10-13 16:54:39 +0000 |
commit | caaa4597a0101eca3a264546b0a88ba315e49339 (patch) | |
tree | 3dfc79f67701ea94e728519eb14ddf2477195a47 /.rubocop_todo.yml | |
parent | 9a7afd2a63ae9f9d02a403ecf6d1beea74ac13b7 (diff) | |
parent | 2650d5f895c6f7e56f7ba76e5fa448d38fd15d7c (diff) | |
download | gitlab-ce-caaa4597a0101eca3a264546b0a88ba315e49339.tar.gz |
Merge branch 'ce-to-ee-merge-check-rake-task' into 'master'
CE to EE merge check rake task
## What does this MR do?
This merge request adds a Rake task that checks whether the current branch can be merged cleanly to EE/master.
If not, it checks if a `<ce_branch>-ee` branch exists in EE, tries to merge it to EE/master and then tries to merge `ce_branch` to EE/master.
If the result of the check is that the current branch cannot be merged cleanly to EE/master, the job will fail, display troubleshooting steps, and a warning will be shown in the merge request.
## Are there points in the code the reviewer needs to double check?
Probably the steps I used to do the various checks, and also the steps I suggest to create an EE-specific branch.
## Why was this MR needed?
The goal is to catch as early as possible the possible conflicts a CE MR will cause when CE/master will be merged to EE/master. This way, the developer is warned that he/she should open a MR against EE before or as soon as the CE is merged. In the end, this should lower the work of the CE->EE merger.
## What are the relevant issue numbers?
Part of gitlab-org/gitlab-ee#715, hopefully.
See merge request !6746
Diffstat (limited to '.rubocop_todo.yml')
0 files changed, 0 insertions, 0 deletions