Prepare 9.3.7 EE
Contains CE => EE for 9.3.7 picked commits
Merge request reports
Activity
assigned to @ClemMakesApps
@nick.thomas can you help with the failures? We did CE => EE and it failed. I'm assuming this will probably also happen when we do CE => EE for
masteradded 1 commit
- 90d5dd4c - Fix spec/lib/gitlab/current_settings_spec.rb
@ClemMakesApps this was previously dealt with in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2402
I've picked 89f9c75b into this branch as well. Hopefully that's all we need.
@ClemMakesApps it's green!
EE MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12816) is still failing.
I think the CE MR is a different issue @kushalpandya
added 2 commits
- 28491556 - Pick changes from !2251 (merged)
- 4054ecf8 - Merge branch 'hotpatch-mirror-available-capacity-going-below-zero' into 'master'
assigned to @jamedjo
assigned to @ClemMakesApps
Any ideas on the failing builds @rspeicher? I tried them locally and they passed but I can't get them to pass on CI
added 1 commit
- e2738e4b - Merge branch 'hotpatch-mirror-available-capacity-going-below-zero' into 'master'
Re-pushing to see if that fixes it as per @psimyn's recommendation
@tiagonbotelho can you help determine the cause of the failures?
@ClemMakesApps I think https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2417#note_35206075 (e2738e4b) shouldn't be picked. It's using something which is not defined here. This can't pass locally.
We may want to hold back on this until https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2460 is done anyway. @tiagonbotelho can confirm.
I do not know about the
SharedState:/ maybe @rspeicher can help?-
Maybe we should postpone https://gitlab.com/gitlab-org/gitlab-ee/commit/e2738e4beb8cf40bf7800be267df5eb8a0538cec from this and add it in 9.4.
@tiagonbotelho Actually it should be quite simple to fix it. Let's see if !2461 (merged) is ok
mentioned in merge request !2461 (merged)
We had to resolve the same conflict in 9.4, and !2461 (merged) looks like the code I ended up with. I think I found that was how @tiagonbotelho's original code had been before a rebase onto the latest master.
enabled an automatic merge when the pipeline for b9222d02 succeeds
mentioned in commit 00efa782
