CE Upstream - Tuesday
-
Paul Charlton please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/config/README.md -
Paul Charlton please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/config/initializers/sidekiq.rb -
Paul Charlton please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/gitlab/lfs_token.rb -
Paul Charlton please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/scripts/prepare_build.sh -
Paul Charlton please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/gitlab/current_settings_spec.rb -
Paul Charlton please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/requests/api/internal_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 Robert Speicher