• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-21 · 54c11e9d
    GitLab Bot authored
    # Conflicts:
    #	app/assets/javascripts/dispatcher.js
    #	app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
    #	app/assets/javascripts/pages/search/init_filtered_search.js
    #	app/views/groups/issues.html.haml
    #	config/webpack.config.js
    #	doc/user/project/integrations/prometheus_library/kubernetes.md
    #	spec/javascripts/filtered_search/dropdown_user_spec.js
    
    [ci skip]
    54c11e9d
webpack.config.js 13.1 KB