CE => EE 9.3 RC4
-
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc4/app/assets/javascripts/locale/en/app.js -
@grzesiek please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc4/app/models/ci/build.rb -
@grzesiek please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc4/app/services/git_push_service.rb -
@grzesiek please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc4/app/services/git_tag_push_service.rb -
@axil please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc4/doc/api/README.md -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc4/locale/en/gitlab.po -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc4/locale/gitlab.pot
Once the conflicts resolved, please push (no force-push!) to the cce-to-ee-9-3-rc4
branch.
People mentioned here are picked by git log -1 -- FILENAME
. If you are wrong person to resolve the conflict - please ping me.
Thanks for help!
Edited by username-removed-408677