summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-06-18 09:35:20 +0000
committerDouwe Maan <douwe@gitlab.com>2018-06-18 09:35:20 +0000
commita170c587a0ee2f303908c70a942ef3f163e2ddb7 (patch)
tree7f5e43a22c2e555284202e93a10a6d8ded65d7fe /changelogs
parent47bfd782bdad9a021ae3241825c9538d42eee7a4 (diff)
parent6954ebbe55688633c6e4b43c28088e195191e8fc (diff)
downloadgitlab-ce-a170c587a0ee2f303908c70a942ef3f163e2ddb7.tar.gz
Merge branch '47672-set_inline_content_type_for_ics' into 'master'
Render calendar feed inline when accessed from GitLab Closes #47672 See merge request gitlab-org/gitlab-ce!19698
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/47672-set_inline_content_type_for_ics.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/47672-set_inline_content_type_for_ics.yml b/changelogs/unreleased/47672-set_inline_content_type_for_ics.yml
new file mode 100644
index 00000000000..4bc883d41bd
--- /dev/null
+++ b/changelogs/unreleased/47672-set_inline_content_type_for_ics.yml
@@ -0,0 +1,5 @@
+---
+title: Render calendar feed inline when accessed from GitLab
+merge_request:
+author:
+type: fixed