There appears to be commits in EE that were merged after the freeze on the 7th, without their CE counterparts
We are seeing some issues with the ce->ee merge https://gitlab.slack.com/archives/CEGRJM81L/p1544791246361500 and believe the reason is that there are some commits that are in the EE branch without their CE counterpart.
Example:
- CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23459 (not included in the 11-6 stable branch)
- EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8716 (included in the 11-6 stable branch)
Both of these MRs were merged at approximately the same time and contain a single commit.
Here are the two merge commits for CE and EE that created the freeze:
- CE https://gitlab.com/gitlab-org/gitlab-ce/commit/2d7dc668506a0576e231fbe290c89e47cf088300
- EE https://gitlab.com/gitlab-org/gitlab-ee/commit/bc025eee6489fcdfbe2c2cd4f8945958b5930eaa
If you check out these two commits in both ce and ee there are some commits between the 7th and the 10th on EE but the last commit for CE is on the 7th.
This issue is to discuss how to proceed. Perhaps the easiest thing to do would be to take all commits up to the 10th on ce?
Edited by John Jarvis