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
Conflicts:
UU app/assets/stylesheets/framework/variables.scss
UU app/views/projects/branches/_branch.html.haml
UU spec/services/projects/update_service_spec.rb