diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-11 18:08:37 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-11 18:08:37 +0000 |
| commit | c511df8a7e79a3df0b03eb774be53651a1aa465d (patch) | |
| tree | 486d0b5dc967b610cce89286a7d7849deef8593e /config | |
| parent | e46506bcc32de1af076ec8a5d51d405f827dd986 (diff) | |
| download | gitlab-ce-c511df8a7e79a3df0b03eb774be53651a1aa465d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/new_environments_table.yml | 8 | ||||
| -rw-r--r-- | config/webpack.config.js | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/config/feature_flags/development/new_environments_table.yml b/config/feature_flags/development/new_environments_table.yml deleted file mode 100644 index b97a4d49cd8..00000000000 --- a/config/feature_flags/development/new_environments_table.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: new_environments_table -introduced_by_url: -rollout_issue_url: -milestone: '14.4' -type: development -group: group::release -default_enabled: false diff --git a/config/webpack.config.js b/config/webpack.config.js index 66c02dcc87d..360c5be05d4 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -363,6 +363,10 @@ module.exports = { name: '[name].[contenthash:8].[ext]', }, }, + { + test: /\.(yml|yaml)$/, + loader: 'raw-loader', + }, ], }, |