• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-25 · adc84db2
    GitLab Bot authored
    # Conflicts:
    #	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
    #	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue
    #	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
    #	app/assets/javascripts/vue_merge_request_widget/dependencies.js
    
    [ci skip]
    adc84db2
environment_item_spec.js 6.6 KB