CE upstream
Merge request reports
Merged by
(Mar 4, 2025 7:34pm UTC)
Activity
@vsizov or @smcgivern please check the conflict resolution made in https://gitlab.com/gitlab-org/gitlab-ee/commit/483bc386a9ef5801d2e28da09ea92998b38fb0b0 regarding this MR on CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7426
@rymai please check the conflict resolution made in https://gitlab.com/gitlab-org/gitlab-ee/commit/483bc386a9ef5801d2e28da09ea92998b38fb0b0 regarding this MR on CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7359
@eReGeBe I will take care of this https://gitlab.com/gitlab-org/gitlab-ee/builds/6309834 and this https://gitlab.com/gitlab-org/gitlab-ee/builds/6309852 builds
1715 1714 rugged = repository.rugged 1716 1715 rugged.references.create("refs/remotes/#{remote_name}/#{branch_name}", target.id) 1717 1716 end -
to make a right decision I would advise you to have somewhere handy the comparison page where you can see the diff of what you merge from CE. So when you have a conflict like this you can just look at the diff and find out what is happened on CE side. In this particular case
describe '#remove_storage_from_path' dohas been removed from CE.PS. No worry I fixed it
Edited by Valery Sizov
Thanks @eReGeBe, LGTM!
Milestone changed to %8.14
Added CE upstream label
@vsizov I will take care of https://gitlab.com/gitlab-org/gitlab-ee/builds/6320124 and have a look at https://gitlab.com/gitlab-org/gitlab-ee/builds/6320115 as well, could you please check https://gitlab.com/gitlab-org/gitlab-ee/builds/6320144?
@eReGeBe I merged https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/884 for the Redis docs, I forgot to do this when it was merged in CE :/ I see there are no conflicts, but you can rebase and get all latest changes.
-
@axil Could you merge EE master to this MR because there are two conflicts and both are yours :)
Added 7 commits:
-
7540e120...da0906c3 - 6 commits from branch
master - 0e02a85f - Merge branch 'master' into ce-upstream
-
7540e120...da0906c3 - 6 commits from branch
-
Thanks a lot @axil. Waiting for a build then, I fixed ES as well. Should be green now.
Added 1 commit:
- 93570505 - Fix broken group creation API when passing LDAP parameters (again)
-
Going to merge this since the only failing spec is because of the order of execution of the specs (see https://gitlab.com/gitlab-org/gitlab-ce/issues/24599). That spec passes locally.
Mentioned in commit 50a05e09
added Enterprise Edition label
