diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-16 23:56:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-16 23:56:14 +0300 |
commit | 6f7bb71388464e05d3c197cc0ba41e8d127f8abd (patch) | |
tree | 48de45390eafb43dd2861d3d10a321654b39f23b | |
parent | faafdaeef2688b0ea66abcb3cc69648212c0c67c (diff) |
Add latest changes from gitlab-org/gitlab@12-9-stable-ee
8 files changed, 24 insertions, 26 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md index 72631db24ab..6d1fb38d45d 100644 --- a/CHANGELOG-EE.md +++ b/CHANGELOG-EE.md @@ -1,5 +1,17 @@ Please view this file on the master branch, on stable branches it's out of date. +## 12.9.4 (2020-04-16) + +### Fixed (2 changes) + +- Update index_options to fix advanced search queries. !28712 +- Geo: Fix repository verification on the primary. !28893 + +### Other (1 change) + +- Use prefix search instead of ngrams for sha fields. !27597 + + ## 12.9.3 (2020-04-14) ### Security (1 change) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8369e524b91..8bdc7fbe346 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 12.9.4 (2020-04-16) + +### Fixed (5 changes, 1 of them is from the community) + +- Fix not working File upload from Project overview page. !26828 (Gilang Gumilar) +- Fix storage rollback regression caused by previous refactor. !28496 +- Fix incorrect regex used in FileUploader#extract_dynamic_path. !28683 +- Fully qualify id columns for keyset pagination (Projects API). !29026 +- Fix Slack notifications when upgrading from old GitLab versions. !29111 + + ## 12.9.3 (2020-04-14) ### Security (3 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 07c5481ea9d..2d34d0dc1f7 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -12.9.3 +12.9.4 diff --git a/changelogs/unreleased/209059-fix-project-show-file-upload-not-working.yml b/changelogs/unreleased/209059-fix-project-show-file-upload-not-working.yml deleted file mode 100644 index 92675668950..00000000000 --- a/changelogs/unreleased/209059-fix-project-show-file-upload-not-working.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix not working File upload from Project overview page. -merge_request: 26828 -author: Gilang Gumilar -type: fixed diff --git a/changelogs/unreleased/209940-geo-fails-to-sync-file-uploads-with-improper-formatted-path.yml b/changelogs/unreleased/209940-geo-fails-to-sync-file-uploads-with-improper-formatted-path.yml deleted file mode 100644 index 521fc9f83b7..00000000000 --- a/changelogs/unreleased/209940-geo-fails-to-sync-file-uploads-with-improper-formatted-path.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix incorrect regex used in FileUploader#extract_dynamic_path -merge_request: 28683 -author: -type: fixed diff --git a/changelogs/unreleased/211452-rollback_to_legacy-causes-repos-to-404.yml b/changelogs/unreleased/211452-rollback_to_legacy-causes-repos-to-404.yml deleted file mode 100644 index 73955b4c2c3..00000000000 --- a/changelogs/unreleased/211452-rollback_to_legacy-causes-repos-to-404.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix storage rollback regression caused by previous refactor -merge_request: 28496 -author: -type: fixed diff --git a/changelogs/unreleased/212073-slack-notifications-stop-working-after-updating-gitlab.yml b/changelogs/unreleased/212073-slack-notifications-stop-working-after-updating-gitlab.yml deleted file mode 100644 index 3814ed9476a..00000000000 --- a/changelogs/unreleased/212073-slack-notifications-stop-working-after-updating-gitlab.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix Slack notifications when upgrading from old GitLab versions -merge_request: 29111 -author: -type: fixed diff --git a/changelogs/unreleased/ab-keyset-ambig-bug.yml b/changelogs/unreleased/ab-keyset-ambig-bug.yml deleted file mode 100644 index b4111794671..00000000000 --- a/changelogs/unreleased/ab-keyset-ambig-bug.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fully qualify id columns for keyset pagination (Projects API) -merge_request: 29026 -author: -type: fixed |