Fix conflicts in app/models/user.rb, app/services/ci/create_pipeline_service.rb, and spec/features/issues/form_spec.rb