1 files changed, 7 insertions, 2 deletions
diff --git a/app/workers/gitlab/github_import/stage/import_attachments_worker.rb b/app/workers/gitlab/github_import/stage/import_attachments_worker.rb
index e9086dca503..e4a413b4081 100644
--- a/app/workers/gitlab/github_import/stage/import_attachments_worker.rb
+++ b/app/workers/gitlab/github_import/stage/import_attachments_worker.rb
@@ -28,7 +28,12 @@ module Gitlab
 
         # For future issue/mr/milestone/etc attachments importers
         def importers
-          [::Gitlab::GithubImport::Importer::ReleasesAttachmentsImporter]
+          [
+            ::Gitlab::GithubImport::Importer::Attachments::ReleasesImporter,
+            ::Gitlab::GithubImport::Importer::Attachments::NotesImporter,
+            ::Gitlab::GithubImport::Importer::Attachments::IssuesImporter,
+            ::Gitlab::GithubImport::Importer::Attachments::MergeRequestsImporter
+          ]
         end
 
         def start_importer(project, importer, client)
@@ -50,7 +55,7 @@ module Gitlab
         end
 
         def feature_disabled?(project)
-          Feature.disabled?(:github_importer_attachments_import, project.group, type: :ops)
+          import_settings(project).disabled?(:attachments_import)
         end
       end
     end