CE upstream
@iamphill can you please help me to resolve the below conflicts:
app/views/projects/_merge_request_settings.html.haml
spec/javascripts/datetime_utility_spec.js.coffee
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
@iamphill can you please help me to resolve the below conflicts:
app/views/projects/_merge_request_settings.html.haml
spec/javascripts/datetime_utility_spec.js.coffee