CE upstream - 2018-06-21 18:21 UTC
Files to resolve:
-
@felipe_artur Please resolve (UU) app/assets/javascripts/notes/components/comment_form.vue
-
@felipe_artur Please resolve (UU) app/models/concerns/issuable.rb
-
@felipe_artur Please resolve (UU) app/models/merge_request.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-21
branch.
Thanks in advance!
@felipe_artur 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 Felipe Artur