• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-06 · 08b88d89
    GitLab Bot authored
    # Conflicts:
    #	app/models/group.rb
    #	app/services/merge_requests/update_service.rb
    #	app/views/projects/_home_panel.html.haml
    #	app/views/projects/new.html.haml
    #	app/views/shared/_import_form.html.haml
    #	changelogs/unreleased/wip-new-mr-cmd.yml
    #	db/schema.rb
    #	doc/api/projects.md
    #	doc/user/project/import/repo_by_url.md
    #	lib/api/entities.rb
    #	locale/gitlab.pot
    #	spec/models/group_spec.rb
    
    [ci skip]
    08b88d89
index.html.haml 8.05 KB