CE Upstream - Friday
Resolved conflicts:
UU LICENSE
UU app/controllers/projects/protected_branches_controller.rb
UU app/views/search/results/_blob.html.haml
UU spec/requests/api/groups_spec.rb
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Resolved conflicts:
UU LICENSE
UU app/controllers/projects/protected_branches_controller.rb
UU app/views/search/results/_blob.html.haml
UU spec/requests/api/groups_spec.rb