• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-17 · 4cef8765
    GitLab Bot authored
    # Conflicts:
    #	spec/javascripts/environments/environments_store_spec.js
    #	spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js
    #	spec/javascripts/vue_shared/components/sidebar/date_picker_spec.js
    #	spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js
    
    [ci skip]
    4cef8765
environments_store_spec.js 7.01 KB