CE upstream - Friday
Files to resolve:
-
@psimyn Please resolve (UU) app/assets/javascripts/dispatcher.js
-
@lbennett Please resolve (UU) app/mailers/emails/merge_requests.rb
-
@lbennett Please resolve (UU) app/services/notification_service.rb
-
@dzaporozhets Please resolve (UU) spec/javascripts/lib/utils/text_utility_spec.js
-
@lbennett Please resolve (UU) spec/mailers/notify_spec.rb
-
@timzallmann Please resolve (UU) yarn.lock
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-19
branch.
Thanks in advance!
@mdelaossa 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 Luke Bennett