• Dmitriy Zaporozhets's avatar
    Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce · 3a9682a3
    Dmitriy Zaporozhets authored
    Conflicts:
    	VERSION
    	app/helpers/selects_helper.rb
    	app/models/project.rb
    	app/views/devise/sessions/new.html.haml
    	app/views/groups/_settings_nav.html.haml
    	app/views/layouts/nav/_admin.html.haml
    	app/views/profiles/keys/_key.html.haml
    	app/views/profiles/keys/index.html.haml
    	app/views/profiles/keys/show.html.haml
    	app/views/projects/merge_requests/show/_mr_accept.html.haml
    	config/routes.rb
    	db/schema.rb
    	doc/api/projects.md
    	features/steps/shared/paths.rb
    3a9682a3
VERSION 13 Bytes