• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-05 · 39e86182
    GitLab Bot authored
    # Conflicts:
    #	app/assets/images/icons.json
    #	app/assets/images/icons.svg
    #	app/assets/javascripts/projects/project_new.js
    #	app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
    #	app/helpers/branches_helper.rb
    #	app/models/concerns/deployment_platform.rb
    #	doc/api/boards.md
    #	doc/api/settings.md
    #	lib/api/entities.rb
    #	spec/fixtures/api/schemas/entities/merge_request_widget.json
    #	spec/javascripts/lib/utils/text_utility_spec.js
    
    [ci skip]
    39e86182
_branch.html.haml 4.62 KB