• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-06 · e52c401e
    GitLab Bot authored
    # Conflicts:
    #	app/assets/javascripts/api.js
    #	app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
    #	app/finders/license_template_finder.rb
    #	app/finders/template_finder.rb
    #	app/models/commit_status.rb
    #	app/models/issue.rb
    #	app/models/note.rb
    #	app/models/system_note_metadata.rb
    #	app/services/ci/process_build_service.rb
    #	db/schema.rb
    #	doc/api/README.md
    #	spec/features/projects/jobs_spec.rb
    #	spec/models/issue_spec.rb
    
    [ci skip]
    e52c401e
build_spec.rb 88.1 KB