• 🤖 GitLab Bot 🤖's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-07 · 51e3e5f6
    🤖 GitLab Bot 🤖 authored
    # Conflicts:
    #	app/views/admin/appearances/_form.html.haml
    #	app/views/groups/labels/index.html.haml
    #	app/views/projects/pipelines/_with_tabs.html.haml
    #	app/views/shared/_label_row.html.haml
    #	db/schema.rb
    #	doc/topics/autodevops/index.md
    #	lib/gitlab/favicon.rb
    #	spec/lib/gitlab/favicon_spec.rb
    #	spec/lib/gitlab/usage_data_spec.rb
    
    [ci skip]
    51e3e5f6
environments.md 26.4 KB