CE upstream
Conflicts:
UU app/assets/stylesheets/framework/variables.scss
UU app/views/projects/branches/_branch.html.haml
UU spec/services/projects/update_service_spec.rb
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Conflicts:
UU app/assets/stylesheets/framework/variables.scss
UU app/views/projects/branches/_branch.html.haml
UU spec/services/projects/update_service_spec.rb