CE to EE merge for 10.0 RC1 (!2880) · Merge requests · GitLab.org / GitLab · GitLab

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

Jarka Kadlecova requested to merge 10-0-stable-ee-with-ce-2017-09-11 into 10-0-stable-ee Sep 11, 2017

10-0-stable CE to 10-0-stable-ee merge caused 82 conflicts - most of them were resolved in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2865 - I manually resolved them here with the help of that MR

Edited Sep 11, 2017 by Jarka Kadlecova