spec/lib/gitlab/import_export/all_models.yml · 92962d0758098f7ddfab9bfd9c538d4da1cae9f1 · nexedi / gitlab-ce

Remove conflicts created by repository languages · 92962d07

Zeger-Jan van de Weg authored Aug 02, 2018

Resolved conflicts:
- app/workers/all_queues.yml
- config/sidekiq_queues.yml
- spec/lib/gitlab/import_export/all_models.yml

CE MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19480
EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6611

92962d07

all_models.yml 5.49 KB

Replace all_models.yml