• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-06 · 2f943b06
    GitLab Bot authored
    # Conflicts:
    #	Gemfile.lock
    #	app/helpers/branches_helper.rb
    #	app/services/projects/update_pages_service.rb
    #	app/views/projects/branches/index.html.haml
    #	config/prometheus/additional_metrics.yml
    #	db/schema.rb
    #	doc/user/project/integrations/prometheus_library/kubernetes.md
    
    [ci skip]
    2f943b06
runner_spec.rb 2.89 KB