Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 7 deletions

diff --git a/lib/gitlab/ci/config/entry/trigger.rb b/lib/gitlab/ci/config/entry/trigger.rb
index 7202784842a..c6ba53adfd7 100644
--- a/lib/gitlab/ci/config/entry/trigger.rb
+++ b/lib/gitlab/ci/config/entry/trigger.rb
@@ -25,8 +25,7 @@ module Gitlab
             strategy :CrossProjectTrigger, if: -> (config) { !config.key?(:include) }
 
             strategy :SameProjectTrigger, if: -> (config) do
-              ::Feature.enabled?(:ci_parent_child_pipeline, default_enabled: true) &&
-                config.key?(:include)
+              config.key?(:include)
             end
 
             class CrossProjectTrigger < ::Gitlab::Config::Entry::Node
@@ -72,11 +71,7 @@ module Gitlab
 
             class UnknownStrategy < ::Gitlab::Config::Entry::Node
               def errors
-                if ::Feature.enabled?(:ci_parent_child_pipeline, default_enabled: true)
-                  ['config must specify either project or include']
-                else
-                  ['config must specify project']
-                end
+                ['config must specify either project or include']
               end
             end
           end