• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-25 · 6b37f335
    GitLab Bot authored
    # Conflicts:
    #	app/views/layouts/devise.html.haml
    #	app/views/layouts/devise_empty.html.haml
    #	app/views/layouts/mailer.text.erb
    #	app/views/layouts/nav/sidebar/_admin.html.haml
    #	app/views/layouts/nav/sidebar/_profile.html.haml
    #	doc/api/users.md
    #	locale/gitlab.pot
    
    [ci skip]
    6b37f335
merge_request_presenter.rb 6.39 KB