• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-21 · 9a08a9fa
    GitLab Bot authored
    # Conflicts:
    #	README.md
    #	app/controllers/autocomplete_controller.rb
    #	app/finders/autocomplete/users_finder.rb
    #	app/models/user.rb
    #	changelogs/unreleased/6010_remove_gemnasium_service.yml
    #	doc/ci/README.md
    #	doc/user/project/integrations/project_services.md
    #	lib/api/services.rb
    #	lib/gitlab/hook_data/issue_builder.rb
    #	lib/gitlab/hook_data/merge_request_builder.rb
    #	spec/models/user_spec.rb
    
    [ci skip]
    9a08a9fa
env.rb 2.22 KB