• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-12-19 · a11eedd1
    GitLab Bot authored
    # Conflicts:
    #	app/assets/javascripts/dispatcher.js
    #	app/helpers/clusters_helper.rb
    #	app/serializers/merge_request_widget_entity.rb
    #	app/views/projects/merge_requests/show.html.haml
    #	app/views/projects/pipelines/_info.html.haml
    #	spec/features/issues_spec.rb
    #	spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
    
    [ci skip]
    a11eedd1
gitlab_routing_helper.rb 5.43 KB