diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-04 18:33:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-04 18:33:33 +0300 |
| commit | 661d663ab2b7c69977ba8a0db02ef4afc2427e39 (patch) | |
| tree | c78a03ed3e99a4137bc265bc100ce044668fad08 | |
| parent | 4a8bd48479731b43c191f24e700672977a13603a (diff) | |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.1
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 10299ea6a0a..7f94a6ed393 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 14.6.1 (2022-01-04) + +### Fixed (2 changes) + +- [Ignore new line differences when deciding whether to squash MR](gitlab-org/gitlab@9d25380756bbc11ad5d18ea268b0ed0b60bf92fb) ([merge request](gitlab-org/gitlab!77499)) +- [Fix re-use of extensions between instances](gitlab-org/gitlab@0ad3357123bbb72493b965b0ab769dab81890397) ([merge request](gitlab-org/gitlab!77499)) + ## 14.6.0 (2021-12-21) ### Added (76 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 91462bc98bc..9b87fcc4a48 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -14.6.0
\ No newline at end of file +14.6.1
\ No newline at end of file |