gitlab-org--gitlab-foss/lib
Robert Speicher caaa4597a0 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
2016-10-13 16:54:39 +00:00
..
api Merge branch 'api-order-mounts' into 'master' 2016-10-13 16:03:22 +00:00
assets
backup lib/backup: fix broken permissions when creating repo dir 2016-08-30 13:35:50 +02:00
banzai Convert UTF-8 Emoji to Gitlab emoji 2016-10-13 13:18:30 +02:00
ci Extract method that checks if ci runner needs update 2016-10-03 12:07:47 +02:00
constraints Make user constrainer lookup same as controller and add more constrainer tests 2016-10-06 19:50:48 +03:00
container_registry Make rubocop happy 2016-07-15 18:05:39 +02:00
gitlab Convert UTF-8 Emoji to Gitlab emoji 2016-10-13 13:18:30 +02:00
json_web_token Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
omni_auth
rouge/formatters Trim extra displayed carriage returns in diffs and files with CRLFs 2016-08-01 13:24:06 +02:00
support Revert "Defend against 'Host' header injection" 2016-08-08 13:02:44 +02:00
tasks Improve the branch existence and merge checks 2016-10-13 17:42:06 +02:00
banzai.rb Add markdown cache columns to the database, but don't use them yet 2016-10-07 02:54:25 +01:00
disable_email_interceptor.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
event_filter.rb Fix inconsistent highlighting of already selected activity nav-links 2016-10-05 15:38:18 -05:00
expand_variables.rb Update support for dynamic environments 2016-09-19 10:07:13 +02:00
extracts_path.rb Allow browsing branches that end with '.atom' 2016-10-11 13:31:12 +01:00
file_size_validator.rb Get rid of more requires, which causes warnings when code is reloaded 2016-04-19 11:48:10 +02:00
file_streamer.rb
gitlab.rb Update Gitlab.com? to support staging 2016-06-27 15:10:36 -04:00
gt_one_coercion.rb
repository_cache.rb Use project ID in repository cache to prevent stale data from persisting across projects 2016-07-25 05:09:28 -07:00
static_model.rb
unfold_form.rb
uploaded_file.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
version_check.rb