CE Upstream - Monday

• Lin Jen-Shin please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/dispatcher.js
• Lin Jen-Shin please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/pipelines/components/graph/graph_component.vue
• @annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/layouts/nav/_group.html.haml
• @tauriedavis please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/layouts/nav/_new_group_sidebar.html.haml
• @iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/_merge_request_settings.html.haml
• @iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/edit.html.haml

Once the conflicts resolved, please push (no force-push!) to the ce-to-ee branch.

People mentioned here are picked by git log -1 -- FILENAME. If you are wrong person to resolve the conflict - please ping me.

Thanks for help!