2 files changed, 2 insertions, 7 deletions
diff --git a/lib/gitlab/ci/config/external/file/artifact.rb b/lib/gitlab/ci/config/external/file/artifact.rb
index a8f78b62d8d..e6ff33d6f79 100644
--- a/lib/gitlab/ci/config/external/file/artifact.rb
+++ b/lib/gitlab/ci/config/external/file/artifact.rb
@@ -28,11 +28,6 @@ module Gitlab
               end
             end
 
-            def matching?
-              super &&
-                Feature.enabled?(:ci_dynamic_child_pipeline, project, default_enabled: true)
-            end
-
             private
 
             def project
diff --git a/lib/gitlab/ci/config/external/file/template.rb b/lib/gitlab/ci/config/external/file/template.rb
index c4b4a7a0a73..47441fa3818 100644
--- a/lib/gitlab/ci/config/external/file/template.rb
+++ b/lib/gitlab/ci/config/external/file/template.rb
@@ -6,7 +6,7 @@ module Gitlab
       module External
         module File
           class Template < Base
-            attr_reader :location, :project
+            attr_reader :location
 
             SUFFIX = '.gitlab-ci.yml'
 
@@ -41,7 +41,7 @@ module Gitlab
             end
 
             def fetch_template_content
-              Gitlab::Template::GitlabCiYmlTemplate.find(template_name, project)&.content
+              Gitlab::Template::GitlabCiYmlTemplate.find(template_name, context.project)&.content
             end
           end
         end