diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-01 16:23:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-01 16:23:21 +0000 |
| commit | a97ccf1330bc0697e05cdac37ffd5597b6fc4eea (patch) | |
| tree | 69b70aee8fad3942c2c28a5c859945b5f856e59e | |
| parent | b935f5eb494e4eeb24ea058c03436eae5eb66c6a (diff) | |
| download | gitlab-ce-a97ccf1330bc0697e05cdac37ffd5597b6fc4eea.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-10-stable-ee
| -rw-r--r-- | CHANGELOG.md | 11 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/290288-disable-composer-shas-for-v2.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/325864-fix-image-blob-rendering.yml | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 |
6 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e6d382fef4b..fdc5bc57090 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.10.2 (2021-04-01) + +### Fixed (1 change) + +- Fixed rendering of the image blobs. !57479 + +### Added (1 change) + +- Improve performance for composer v2 clients. !55169 + + ## 13.10.1 (2021-03-31) ### Security (6 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 306c8f502bc..beab324ba37 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.10.1
\ No newline at end of file +13.10.2
\ No newline at end of file diff --git a/changelogs/unreleased/290288-disable-composer-shas-for-v2.yml b/changelogs/unreleased/290288-disable-composer-shas-for-v2.yml deleted file mode 100644 index 45838d30160..00000000000 --- a/changelogs/unreleased/290288-disable-composer-shas-for-v2.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve performance for composer v2 clients -merge_request: 55169 -author: -type: added diff --git a/changelogs/unreleased/325864-fix-image-blob-rendering.yml b/changelogs/unreleased/325864-fix-image-blob-rendering.yml deleted file mode 100644 index fa07c4abfc0..00000000000 --- a/changelogs/unreleased/325864-fix-image-blob-rendering.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed rendering of the image blobs -merge_request: 57479 -author: -type: fixed diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100755..100644 --- a/vendor/gitignore/C++.gitignore +++ b/vendor/gitignore/C++.gitignore diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index a1c2a238a96..a1c2a238a96 100755..100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |