• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-07 · 807dad1e
    GitLab Bot authored
    # Conflicts:
    #	app/models/repository.rb
    #	app/views/projects/settings/repository/show.html.haml
    #	doc/api/discussions.md
    #	lib/api/discussions.rb
    #	lib/api/helpers/notes_helpers.rb
    #	lib/gitlab/utils.rb
    #	spec/requests/api/discussions_spec.rb
    #	spec/requests/api/notes_spec.rb
    
    [ci skip]
    807dad1e
repository_spec.rb 85 KB