CE upstream - 2018-02-23 15:23 UTC
Files to resolve:
-
@yorickpeterse Please resolve (UU) app/finders/autocomplete_users_finder.rb
-
@yorickpeterse Please resolve (UU) lib/tasks/migrate/setup_postgresql.rake
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-23
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