summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-22 20:47:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-22 20:47:30 +0000
commit0ca9e9b7230cb262a04b524aee8ffe99dbe63060 (patch)
treeb26b9c2667a025a7e72f690e6789292028ece9de /changelogs
parentfe69f9a3841ee9b9ef2b35cb72b3e973c0301fcb (diff)
downloadgitlab-ce-0ca9e9b7230cb262a04b524aee8ffe99dbe63060.tar.gz
Add latest changes from gitlab-org/gitlab@13-11-stable-ee
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/docs-eb-pages-deployment-migration.yml5
-rw-r--r--changelogs/unreleased/nicolasdular-update-email-language-for-self-managed.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/docs-eb-pages-deployment-migration.yml b/changelogs/unreleased/docs-eb-pages-deployment-migration.yml
new file mode 100644
index 00000000000..88e86063efa
--- /dev/null
+++ b/changelogs/unreleased/docs-eb-pages-deployment-migration.yml
@@ -0,0 +1,5 @@
+---
+title: Add documentation about Pages deployment migration
+merge_request: 59475
+author:
+type: added
diff --git a/changelogs/unreleased/nicolasdular-update-email-language-for-self-managed.yml b/changelogs/unreleased/nicolasdular-update-email-language-for-self-managed.yml
new file mode 100644
index 00000000000..7bfe58aa1dd
--- /dev/null
+++ b/changelogs/unreleased/nicolasdular-update-email-language-for-self-managed.yml
@@ -0,0 +1,5 @@
+---
+title: Change unsubscribe language for email campaign on self managed
+merge_request: 59121
+author:
+type: changed