CE Upstream - Monday
-
@rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/filtered_search/dropdown_user.js -
@innerwhisper please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/controllers/autocomplete_controller.rb -
@mbergeron please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/controllers/boards/issues_controller.rb -
@yorickpeterse please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/ci/pipeline.rb -
@jacobvosmaer-gitlab please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/repository.rb -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/layouts/nav/sidebar/_admin.html.haml -
@kushalpandya please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/layouts/nav/sidebar/_group.html.haml -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/layouts/nav/sidebar/_project.html.haml -
@yorickpeterse please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/db/schema.rb -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/features/search.feature -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/features/steps/search.rb -
@yorickpeterse please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/models/ci/pipeline_spec.rb -
@jacobvosmaer-gitlab please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/models/repository_spec.rb -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/views/layouts/nav/sidebar/_project.html.haml_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!
Edited by Yorick Peterse