• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-21 · fa683660
    GitLab Bot authored
    # Conflicts:
    #	app/assets/javascripts/environments/components/environment_item.vue
    #	app/assets/javascripts/environments/components/environments_table.vue
    #	app/assets/javascripts/monitoring/components/dashboard.vue
    #	app/assets/javascripts/monitoring/components/graph/flag.vue
    #	app/assets/javascripts/notes/components/note_form.vue
    #	app/assets/javascripts/pipelines/components/graph/graph_component.vue
    #	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
    #	app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
    #	app/views/repository_check_mailer/notify.html.haml
    #	app/views/repository_check_mailer/notify.text.haml
    
    [ci skip]
    fa683660
permissions.md 20.9 KB