Commit a21038b7 authored by Kerri Miller's avatar Kerri Miller

Merge branch '271560-enable-ci_include_multiple_files_from_project' into 'master'

Enable ci_include_multiple_files_from_project by default

See merge request gitlab-org/gitlab!47609
parents 5ac5f7f3 e35e5307
---
title: Implement including multiple files from a project
merge_request: 47609
author:
type: added
...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/271560 ...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/271560
milestone: '13.6' milestone: '13.6'
type: development type: development
group: group::pipeline authoring group: group::pipeline authoring
default_enabled: false default_enabled: true
...@@ -445,10 +445,10 @@ or template includes. ...@@ -445,10 +445,10 @@ or template includes.
##### Multiple files from a project ##### Multiple files from a project
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/26793) in GitLab 13.6. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/26793) in GitLab 13.6.
> - It's [deployed behind a feature flag](../../user/feature_flags.md), disabled by default. > - It's [deployed behind a feature flag](../../user/feature_flags.md), enabled by default.
> - It's disabled on GitLab.com. > - It's enabled on GitLab.com.
> - It's not recommended for production use. > - It's recommended for production use.
> - To use it in GitLab self-managed instances, ask a GitLab administrator to enable it. **(CORE ONLY)** > - For GitLab self-managed instances, GitLab administrators can opt to disable it. **(CORE ONLY)**
You can include multiple files from the same project: You can include multiple files from the same project:
...@@ -461,10 +461,10 @@ include: ...@@ -461,10 +461,10 @@ include:
- '/templates/.tests.yml' - '/templates/.tests.yml'
``` ```
Including multiple files from the same project is under development and not ready for production use. It is Including multiple files from the same project is under development but ready for production use. It is
deployed behind a feature flag that is **disabled by default**. deployed behind a feature flag that is **enabled by default**.
[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md) [GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
can enable it. can opt to disable it.
To enable it: To enable it:
......
...@@ -54,7 +54,7 @@ module Gitlab ...@@ -54,7 +54,7 @@ module Gitlab
end end
def expand_project_files(location) def expand_project_files(location)
return location unless ::Feature.enabled?(:ci_include_multiple_files_from_project, context.project, default_enabled: false) return location unless ::Feature.enabled?(:ci_include_multiple_files_from_project, context.project, default_enabled: true)
return location unless location[:project] return location unless location[:project]
Array.wrap(location[:file]).map do |file| Array.wrap(location[:file]).map do |file|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment