diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-23 00:13:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-23 00:13:23 +0300 |
| commit | 2fad41087674984a064cf6a312ac34c16bb2a1aa (patch) | |
| tree | 7e912837afadac47e1ee6bce4a72009c3c9bb390 | |
| parent | 6fa452d71dd250720f6c507752de6623d59df91f (diff) | |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.1
| -rw-r--r-- | CHANGELOG.md | 11 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/docs-eb-pages-deployment-migration.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/nicolasdular-update-email-language-for-self-managed.yml | 5 |
4 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9efa167e504..096a598100e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.11.1 (2021-04-22) + +### Changed (1 change) + +- Change unsubscribe language for email campaign on self managed. !59121 + +### Added (1 change) + +- Add documentation about Pages deployment migration. !59475 + + ## 13.11.0 (2021-04-22) ### Security (3 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 78ea2cf7bed..9c43b91bbd2 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.11.0
\ No newline at end of file +13.11.1
\ No newline at end of file diff --git a/changelogs/unreleased/docs-eb-pages-deployment-migration.yml b/changelogs/unreleased/docs-eb-pages-deployment-migration.yml deleted file mode 100644 index 88e86063efa..00000000000 --- a/changelogs/unreleased/docs-eb-pages-deployment-migration.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -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 deleted file mode 100644 index 7bfe58aa1dd..00000000000 --- a/changelogs/unreleased/nicolasdular-update-email-language-for-self-managed.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Change unsubscribe language for email campaign on self managed -merge_request: 59121 -author: -type: changed |