CE Upstream - Monday
-
@filipa please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/lib/utils/text_utility.js -
@yorickpeterse please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/db/schema.rb -
@rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/scripts/prepare_build.sh -
@lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/merge_requests/create_new_mr_spec.rb -
@filipa please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/javascripts/lib/utils/text_utility_spec.js -
@markglenfletcher please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/requests/api/services_spec.rb -
@felipe_artur please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/services/merge_requests/merge_service_spec.rb
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee
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 Felipe Artur