CE upstream - 2018-10-06 21:38 UTC
Files to resolve:
-
@andr3 Please resolve (UU) app/assets/javascripts/mr_notes/stores/index.js
-
@andr3 Please resolve (UU) app/assets/javascripts/notes/components/noteable_note.vue
-
@ayufan Please resolve (UU) app/services/merge_requests/refresh_service.rb
-
@andr3 Please resolve (UU) locale/gitlab.pot
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-10-06
branch.
Thanks in advance!
@andr3 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 André Luís