From c61392b4e4493a5ca3ab2472d1ea8a385d0aa4de Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 14 Jun 2018 02:05:01 +0800
Subject: Bring changes from EE for parallel_importer.rb

---
 lib/gitlab/github_import/parallel_importer.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

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
-- 
cgit v1.2.1