diff options
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/patch-migration.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/revert-42465-and-42343.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-improve-pre-receive-error-ff-merge-message.yml | 5 |
5 files changed, 13 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e81f19271ce..7d8186407f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.4.4 (2020-10-15) + +### Fixed (2 changes) + +- Fix rollback portion of migration that adds temporary index for container scanning findings. !44593 +- Improve merge error when pre-receive hooks fail in fast-forward merge. !44843 + +### Other (1 change) + +- Revert 42465 and 42343: Expanded collapsed diff files. !43361 + + ## 13.4.3 (2020-10-06) ### Fixed (3 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 7dfdf979eab..24a9ec7aa95 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.4.3
\ No newline at end of file +13.4.4
\ No newline at end of file diff --git a/changelogs/unreleased/patch-migration.yml b/changelogs/unreleased/patch-migration.yml deleted file mode 100644 index 6335c041a5a..00000000000 --- a/changelogs/unreleased/patch-migration.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix rollback portion of migration that adds temporary index for container scanning findings -merge_request: 44593 -author: -type: fixed diff --git a/changelogs/unreleased/revert-42465-and-42343.yml b/changelogs/unreleased/revert-42465-and-42343.yml deleted file mode 100644 index 4c7342c9d0d..00000000000 --- a/changelogs/unreleased/revert-42465-and-42343.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'Revert 42465 and 42343: Expanded collapsed diff files' -merge_request: 43361 -author: -type: other diff --git a/changelogs/unreleased/sh-improve-pre-receive-error-ff-merge-message.yml b/changelogs/unreleased/sh-improve-pre-receive-error-ff-merge-message.yml deleted file mode 100644 index af77bfcc41c..00000000000 --- a/changelogs/unreleased/sh-improve-pre-receive-error-ff-merge-message.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve merge error when pre-receive hooks fail in fast-forward merge -merge_request: 44843 -author: -type: fixed |