CE upstream - 2018-05-24 09:42 UTC
Files to resolve:
-
@lulalala Please resolve (UU) app/mailers/emails/merge_requests.rb
-
lulalala Please resolve (UU) app/services/notification_service.rb
-
lulalala Please resolve (UU) app/services/todo_service.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-05-24
branch.
Thanks in advance!
@lulalala 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 Mark Chao