CE upstream - 2018-11-09 05:08 UTC
Files to resolve:
-
@fatihacet Please resolve (UU) app/assets/javascripts/notes/components/noteable_discussion.vue
-
@psimyn Please resolve (UU) app/views/layouts/nav/sidebar/_project.html.haml
-
@tiagonbotelho Please resolve (UU) app/workers/stuck_import_jobs_worker.rb
-
@mayra-cabrera Please resolve (UU) doc/user/project/clusters/index.md
-
@fatihacet Please resolve (UU) locale/gitlab.pot
-
@tkuah Please resolve (UU) spec/serializers/issue_serializer_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-09
branch.
Thanks in advance!
@fatihacet 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!