CE upstream - 2018-10-22 21:21 UTC
Files to resolve:
-
@mayra-cabrera Please resolve (UU) app/models/clusters/platforms/kubernetes.rb
-
@yorickpeterse Please resolve (AA) app/services/projects/after_rename_service.rb
-
@rymai Please resolve (UU) qa/qa/git/repository.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-10-22
branch.
Thanks in advance!
@rymai 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 Lin Jen-Shin