CE Upstream - Monday
-
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/.gitlab-ci.yml -
@dzaporozhets please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/hooks/service_hook.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/project_services/kubernetes_service.rb -
@dzaporozhets please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/layouts/nav/_admin.html.haml -
@dzaporozhets please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/hooks/edit.html.haml -
@brycepj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/shared/issuable/form/_merge_params.html.haml (resolved: ec5505f8) -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/config/initializers/1_settings.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/config/routes/group.rb -
@oswaldo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/fixtures/api/schemas/entities/merge_request.json -
@jarka please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/models/project_services/jira_service_spec.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/models/project_services/kubernetes_service_spec.rb -
@stanhu please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/models/project_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 Nick Thomas