• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-26 · 68985a90
    GitLab Bot authored
    # Conflicts:
    #	app/assets/javascripts/monitoring/components/dashboard.vue
    #	app/assets/javascripts/vue_merge_request_widget/ee_switch_mr_widget_options.js
    #	app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js
    #	app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_get_state_key.js
    #	app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_mr_widget_store.js
    #	app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_state_maps.js
    
    [ci skip]
    68985a90
todo.vue 2.01 KB