CE upstream - 2018-05-18 12:27 UTC
Files to resolve:
-
@blackst0ne Please resolve (UU) doc/api/README.md
-
@crollison Please resolve (UU) spec/lib/gitlab/incoming_email_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-05-18
branch.
Thanks in advance!
@blackst0ne 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