• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-06 · 483cfb7a
    GitLab Bot authored
    # Conflicts:
    #	app/models/ci/job_artifact.rb
    #	app/views/layouts/nav/sidebar/_group.html.haml
    #	app/views/projects/clusters/index.html.haml
    #	app/workers/build_finished_worker.rb
    #	lib/api/users.rb
    #	locale/gitlab.pot
    #	spec/javascripts/clusters/clusters_bundle_spec.js
    #	spec/models/ci/job_artifact_spec.rb
    #	spec/models/project_services/kubernetes_service_spec.rb
    #	spec/requests/api/jobs_spec.rb
    #	spec/uploaders/job_artifact_uploader_spec.rb
    
    [ci skip]
    483cfb7a
job_artifact_spec.rb 3.42 KB