CE upstream - 2018-08-21 07:49 UTC
Files to resolve:
-
@rpaik Please resolve (UU) README.md
-
@yorickpeterse Please resolve (UU) app/controllers/autocomplete_controller.rb
-
@yorickpeterse Please resolve (AA) app/finders/autocomplete/users_finder.rb
-
@yorickpeterse Please resolve (UU) app/models/user.rb
-
@groulot Please resolve (AA) changelogs/unreleased/6010_remove_gemnasium_service.yml
-
@SteveAzz Please resolve (UU) doc/ci/README.md
-
@groulot Please resolve (UU) doc/user/project/integrations/project_services.md
-
@groulot Please resolve (UU) lib/api/services.rb
-
@crollison Please resolve (UU) lib/gitlab/hook_data/issue_builder.rb
-
@crollison Please resolve (UU) lib/gitlab/hook_data/merge_request_builder.rb
-
@yorickpeterse Please resolve (UU) spec/models/user_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-08-21
branch.
Thanks in advance!
@yorickpeterse After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!
Edited by Rémy Coutable