CE upstream - 2018-07-06 12:21 UTC
Files to resolve:
-
@fjsanpedro Please resolve (UU) db/schema.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-07-06 branch.
Thanks in advance!
@fjsanpedro 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 Francisco Javier López