Skip to content

CE upstream

Nick Thomas requested to merge nick.thomas/gitlab-ee:ce-to-ee into master

Conflicts:

        both modified:   app/services/search/global_service.rb
        both modified:   app/views/shared/_import_form.html.haml

Merge request reports