Fix conflicts for 9.2.6 CE->EE merge
Conflicts
-
@lbennett / @iamphill: fix app/assets/javascripts/dispatcher.js -
@fatihacet / @brycepj: fix app/assets/javascripts/vue_merge_request_widget/dependencies.js -
@ClemMakesApps / @DouweM: fix app/controllers/autocomplete_controller.rb -
@ayufan / @grzesiek: fix app/models/project_services/kubernetes_service.rb -
@vsizov / @smcgivern: fix app/services/issuable_base_service.rb -
@brycepj / @fatihacet: fix app/views/shared/issuable/form/_merge_params.html.haml -
@ClemMakesApps / @iamphill: fix spec/features/issues/form_spec.rb (fixed by merging in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2088) -
@ayufan / @grzesiek: spec/models/project_services/kubernetes_service_spec.rb -
@vsizov / @rymai: fix spec/models/user_spec.rb
Edited by Sean McGivern