CE upstream - Wednesday

Files to resolve:

• @andrewn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/5c401b5e56a08cc7bc09398aaac7c3a9abd4c99a/GITALY_SERVER_VERSION (UU)
• @annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/5c401b5e56a08cc7bc09398aaac7c3a9abd4c99a/app/views/layouts/nav/_new_group_sidebar.html.haml (UU)
• @eReGeBe Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/5c401b5e56a08cc7bc09398aaac7c3a9abd4c99a/lib/gitlab/git/branch.rb (UU)
• @eReGeBe Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/5c401b5e56a08cc7bc09398aaac7c3a9abd4c99a/lib/gitlab/git/repository.rb (UU)
• @eReGeBe Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/5c401b5e56a08cc7bc09398aaac7c3a9abd4c99a/lib/gitlab/gitaly_client/ref_service.rb (UU)
• @markglenfletcher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/5c401b5e56a08cc7bc09398aaac7c3a9abd4c99a/spec/features/boards/boards_spec.rb (UU)
• @eReGeBe Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/5c401b5e56a08cc7bc09398aaac7c3a9abd4c99a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb (UU)
• @eReGeBe Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/5c401b5e56a08cc7bc09398aaac7c3a9abd4c99a/spec/services/git_push_service_spec.rb (UU)

Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-07-19 branch.

Thanks in advance! ❤️

Note: This merge request was created by an experimental script, it's not perfect (yet)!