summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-06-14 02:05:01 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-06-14 02:05:01 +0800
commitc61392b4e4493a5ca3ab2472d1ea8a385d0aa4de (patch)
tree6864b9741639e4570ba910a65eb424c4b745e0c6
parentcc1b03545c83c83e5791b5d04d7ff0b86f892364 (diff)
downloadgitlab-ce-c61392b4e4493a5ca3ab2472d1ea8a385d0aa4de.tar.gz
Bring changes from EE for parallel_importer.rb
-rw-r--r--lib/gitlab/github_import/parallel_importer.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/gitlab/github_import/parallel_importer.rb b/lib/gitlab/github_import/parallel_importer.rb
index b02b123c98e..a77ac1e4fa6 100644
--- a/lib/gitlab/github_import/parallel_importer.rb
+++ b/lib/gitlab/github_import/parallel_importer.rb
@@ -15,6 +15,15 @@ module Gitlab
true
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)
@project = project
end