summaryrefslogtreecommitdiff
path: root/changelogs/unreleased
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-03 03:06:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-03 03:06:35 +0000
commiteb10f226b83d20233f07596be2e2dcceecf83154 (patch)
tree240dc60ea65ef2709c63765c58a38771ea93d04c /changelogs/unreleased
parent10d0e5693c0eed9fd9c40f4fadeda187237db6b5 (diff)
downloadgitlab-ce-eb10f226b83d20233f07596be2e2dcceecf83154.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs/unreleased')
-rw-r--r--changelogs/unreleased/34685-Pages-template-jekyll-outdated-and-not-working-as-expected.yml5
-rw-r--r--changelogs/unreleased/Updated-hexo-project_template.yml5
-rw-r--r--changelogs/unreleased/Updated-hugo-project_template.yml5
-rw-r--r--changelogs/unreleased/ph-33813-moveMergeRequestDescription.yml5
4 files changed, 20 insertions, 0 deletions
diff --git a/changelogs/unreleased/34685-Pages-template-jekyll-outdated-and-not-working-as-expected.yml b/changelogs/unreleased/34685-Pages-template-jekyll-outdated-and-not-working-as-expected.yml
new file mode 100644
index 00000000000..0ed03916829
--- /dev/null
+++ b/changelogs/unreleased/34685-Pages-template-jekyll-outdated-and-not-working-as-expected.yml
@@ -0,0 +1,5 @@
+---
+title: Updated jekyll project_template
+merge_request: 20090
+author: Marc Schwede
+type: other
diff --git a/changelogs/unreleased/Updated-hexo-project_template.yml b/changelogs/unreleased/Updated-hexo-project_template.yml
new file mode 100644
index 00000000000..4777220ca55
--- /dev/null
+++ b/changelogs/unreleased/Updated-hexo-project_template.yml
@@ -0,0 +1,5 @@
+---
+title: Updated hexo project_template
+merge_request: 20105
+author: Marc Schwede
+type: other
diff --git a/changelogs/unreleased/Updated-hugo-project_template.yml b/changelogs/unreleased/Updated-hugo-project_template.yml
new file mode 100644
index 00000000000..58488dfcb4c
--- /dev/null
+++ b/changelogs/unreleased/Updated-hugo-project_template.yml
@@ -0,0 +1,5 @@
+---
+title: Updated hugo project_template
+merge_request: 20109
+author: Marc Schwede
+type: other
diff --git a/changelogs/unreleased/ph-33813-moveMergeRequestDescription.yml b/changelogs/unreleased/ph-33813-moveMergeRequestDescription.yml
new file mode 100644
index 00000000000..0fa53a94946
--- /dev/null
+++ b/changelogs/unreleased/ph-33813-moveMergeRequestDescription.yml
@@ -0,0 +1,5 @@
+---
+title: Move merge request description into discussions tab
+merge_request: 18940
+author:
+type: changed