CE upstream - 2018-05-02 09:27 UTC
Files to resolve:
-
James Ramsay Please resolve (UU) app/views/groups/_group_admin_settings.html.haml
-
Vitaliy @blackst0ne Klachkov Please resolve (UU) spec/requests/api/runner_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-05-02
branch.
Thanks in advance!
@vsizov After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!
Merge request reports
Activity
marked the checklist item James Ramsay Please resolve (UU)
app/views/groups/_group_admin_settings.html.haml
as completedmarked the checklist item Vitaliy @blackst0ne Klachkov Please resolve (UU)
spec/requests/api/runner_spec.rb
as completed@DouweM This looks like a consequence of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17867: https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/66020192
@blackst0ne Would you be able to take a look at https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/66020048?
https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/66020295 is the same as https://gitlab.com/gitlab-org/gitlab-ce/issues/45970.
assigned to @DouweM
mentioned in merge request !5542 (merged)
mentioned in merge request !5513 (merged)
This one https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/66020048 is actually from EE master UPDATE: I made a minor, unrelated fix in my MR and I have this failure too.
Edited by Valery Sizovmentioned in merge request !5543 (merged)
I will take a look at
ee/spec/features/admin/admin_sends_notification_spec.rb
. I think it needsActionMailer::Base.deliveries.clear
before the spec.Edited by Valery Sizov@rymai Looking into https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/66020192...
added 1 commit
- ee13cad7 - Actually sign in using warden so that it can also properly sign us out
assigned to @rymai
The two remaining failures have been fixed by https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5547 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18692 respectively. Next CE->EE should be green.
mentioned in commit 0be466e5
added Enterprise Edition label