• Rémy Coutable's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-19 · 5c401b5e
    Rémy Coutable authored
    # Conflicts:
    #	GITALY_SERVER_VERSION
    #	app/views/layouts/nav/_new_group_sidebar.html.haml
    #	lib/gitlab/git/branch.rb
    #	lib/gitlab/git/repository.rb
    #	lib/gitlab/gitaly_client/ref_service.rb
    #	spec/features/boards/boards_spec.rb
    #	spec/lib/gitlab/gitaly_client/commit_service_spec.rb
    #	spec/services/git_push_service_spec.rb
    [ci skip]
    5c401b5e
environments.md 25.9 KB