The source project of this merge request has been removed.
CE upstream
Conflicts:
both modified: app/services/search/global_service.rb
both modified: app/views/shared/_import_form.html.haml
Conflicts:
both modified: app/services/search/global_service.rb
both modified: app/views/shared/_import_form.html.haml