CE Upstream - Monday
-
@mikegreiling please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/README.md -
@tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/controllers/autocomplete_controller.rb -
@grzesiek please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/services/projects/update_service.rb -
@marcia please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/README.md -
@dblessing please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/administration/auth/ldap.md -
@marcia please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/user/group/index.md -
@marcia please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/user/project/issues/index.md -
@marcia please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/user/project/issues/issues_functionalities.md -
@marcia please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/user/project/merge_requests/index.md -
@marcia please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/workflow/groups.md
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 username-removed-444