summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2019-03-04 09:06:42 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2019-03-04 09:06:42 +0000
commit4b0036b87ee30ce0a3687dd052514b571f4d520f (patch)
tree629d1311d247a4ca86a4b331196d7edf247f62b4 /changelogs
parent8c6c1a3fedce8cdf39c45a8900cfeee0d504f9f4 (diff)
parentc78861bc4268049777bd279f5de5981ec4e78019 (diff)
downloadgitlab-ce-4b0036b87ee30ce0a3687dd052514b571f4d520f.tar.gz
Merge branch 'allow-to-recursively-include' into 'master'
Allow to recursively expand includes Closes #55937 and #56836 See merge request gitlab-org/gitlab-ce!24356
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/allow-to-recursively-include.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/allow-to-recursively-include.yml b/changelogs/unreleased/allow-to-recursively-include.yml
new file mode 100644
index 00000000000..edfbfcb0146
--- /dev/null
+++ b/changelogs/unreleased/allow-to-recursively-include.yml
@@ -0,0 +1,5 @@
+---
+title: Allow to recursively expand includes
+merge_request: 24356
+author:
+type: added