summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 15:09:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 15:09:27 +0000
commit8d4aaa4dd07cd02383f7d09d74eb66ffe47a41c4 (patch)
tree684210b8b7c8b5664e8d7b529e59ffde6bcfaed4 /lib
parentcbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2 (diff)
downloadgitlab-ce-8d4aaa4dd07cd02383f7d09d74eb66ffe47a41c4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/config/external/file/artifact.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/external/file/artifact.rb b/lib/gitlab/ci/config/external/file/artifact.rb
index fcfdda21c08..a8f78b62d8d 100644
--- a/lib/gitlab/ci/config/external/file/artifact.rb
+++ b/lib/gitlab/ci/config/external/file/artifact.rb
@@ -30,7 +30,7 @@ module Gitlab
def matching?
super &&
- Feature.enabled?(:ci_dynamic_child_pipeline, project)
+ Feature.enabled?(:ci_dynamic_child_pipeline, project, default_enabled: true)
end
private