Commit 7cf571e9 authored by Stan Hu's avatar Stan Hu

Merge branch 'unify-parallel_importer' into 'master'

Bring changes from EE for parallel_importer.rb

See merge request gitlab-org/gitlab-ce!19779
parents e76b176d c61392b4
...@@ -15,6 +15,15 @@ module Gitlab ...@@ -15,6 +15,15 @@ module Gitlab
true true
end end
# This is a workaround for a Ruby 2.3.7 bug. rspec-mocks cannot restore
# the visibility of prepended modules. See
# https://github.com/rspec/rspec-mocks/issues/1231 for more details.
if Rails.env.test?
def self.requires_ci_cd_setup?
raise NotImplementedError
end
end
def initialize(project) def initialize(project)
@project = project @project = project
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment