CE Upstream - Monday

• @rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/.gitlab-ci.yml
• @iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/dispatcher.js
• Robin Bobbitt please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/controllers/projects_controller.rb
• Robin Bobbitt please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/admin/application_settings/_form.html.haml
• Robin Bobbitt please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/edit.html.haml
• @mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/db/schema.rb
• @stanhu please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/install/requirements.md
• @rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/boards/sidebar_spec.rb
• @rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
• Robin Bobbitt please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/requests/api/settings_spec.rb

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!