CE Upstream - Friday
Resolved conflicts:
UU app/models/application_setting.rb
UU db/schema.rb
UU doc/user/admin_area/settings/continuous_integration.md
UU spec/controllers/projects/merge_requests_controller_spec.rb
UU spec/models/user_spec.rb
Resolved conflicts:
UU app/models/application_setting.rb
UU db/schema.rb
UU doc/user/admin_area/settings/continuous_integration.md
UU spec/controllers/projects/merge_requests_controller_spec.rb
UU spec/models/user_spec.rb