CE Upstream - Friday

Resolved conflicts:

UU app/services/merge_requests/merge_service.rb
UU app/views/devise/shared/_tabs_ldap.html.haml
UU app/views/layouts/nav/_dashboard.html.haml
UU doc/user/project/merge_requests/index.md
UU spec/services/merge_requests/merge_service_spec.rb