CE Upstream - Thursday & Friday
Resolved conflicts:
UU doc/user/project/merge_requests/index.md
UU spec/features/merge_requests/widget_spec.rb
Resolved conflicts:
UU doc/user/project/merge_requests/index.md
UU spec/features/merge_requests/widget_spec.rb