Merge branch 'dz-fix-ee-master' into 'master'

Fix EE codebase after refactoring github repository import

Closes #9256 and #9257

See merge request gitlab-org/gitlab-ee!9211

app/services/import/github_service.rb

@@ -46,3 +46,5 @@ module Import
     end
   end
 end
+
+Import::GithubService.prepend(EE::Import::GithubService)

ee/app/controllers/ee/import/github_controller.rb

@@ -5,9 +5,9 @@ module EE
     module GithubController
       extend ::Gitlab::Utils::Override
 
-      override :extra_project_attrs
-      def extra_project_attrs
-        super.merge(ci_cd_only: params[:ci_cd_only])
+      override :permitted_import_params
+      def permitted_import_params
+        super.push(:ci_cd_only)
       end
 
       override :extra_import_params

ee/app/services/ee/import/github_service.rb

+# frozen_string_literal: true
+
+module EE
+  module Import
+    module GithubService
+      extend ::Gitlab::Utils::Override
+
+      override :extra_project_attrs
+      def extra_project_attrs
+        super.merge(ci_cd_only: params[:ci_cd_only])
+      end
+    end
+  end
+end