-
Winnie Hellmann please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/helpers/sorting_helper.rb -
Winnie Hellmann please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/branches/_branch.html.haml -
@winh please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/branches/index.html.haml -
Kamil Trzcinski please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/changelogs/unreleased-ee/do-not-perform-disk-check.yml -
@tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/gitlab/usage_data.rb -
@tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/gitlab/usage_data_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!