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
@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