diff options
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-brand_new_project_guidelines.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-lfs-aws-specific-storage.yml | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/Java.gitignore | 0 |
6 files changed, 9 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f14f7fa6325..e61da5fa270 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.7.5 (2021-01-25) + +### Fixed (2 changes, 1 of them is from the community) + +- New project guidelines are no longer displayed. !50736 (Roger Meier) +- Fix LFS not working with S3 specific-storage settings. !52296 + + ## 13.7.4 (2021-01-13) ### Security (1 change) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 1fabcd61c9c..59656c3591e 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.7.4
\ No newline at end of file +13.7.5
\ No newline at end of file diff --git a/changelogs/unreleased/fix-brand_new_project_guidelines.yml b/changelogs/unreleased/fix-brand_new_project_guidelines.yml deleted file mode 100644 index e8be2d2da78..00000000000 --- a/changelogs/unreleased/fix-brand_new_project_guidelines.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: New project guidelines are no longer displayed -merge_request: 50736 -author: Roger Meier -type: fixed diff --git a/changelogs/unreleased/sh-fix-lfs-aws-specific-storage.yml b/changelogs/unreleased/sh-fix-lfs-aws-specific-storage.yml deleted file mode 100644 index 064755d9116..00000000000 --- a/changelogs/unreleased/sh-fix-lfs-aws-specific-storage.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix LFS not working with S3 specific-storage settings -merge_request: 52296 -author: -type: fixed diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100644..100755 --- 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 100644..100755 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |