From eb10f226b83d20233f07596be2e2dcceecf83154 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 3 Dec 2019 03:06:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- ...85-Pages-template-jekyll-outdated-and-not-working-as-expected.yml | 5 +++++ changelogs/unreleased/Updated-hexo-project_template.yml | 5 +++++ changelogs/unreleased/Updated-hugo-project_template.yml | 5 +++++ changelogs/unreleased/ph-33813-moveMergeRequestDescription.yml | 5 +++++ 4 files changed, 20 insertions(+) create mode 100644 changelogs/unreleased/34685-Pages-template-jekyll-outdated-and-not-working-as-expected.yml create mode 100644 changelogs/unreleased/Updated-hexo-project_template.yml create mode 100644 changelogs/unreleased/Updated-hugo-project_template.yml create mode 100644 changelogs/unreleased/ph-33813-moveMergeRequestDescription.yml (limited to 'changelogs/unreleased') 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 -- cgit v1.2.1