summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2023-01-12 14:33:50 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2023-01-12 14:33:50 +0000
commit1e791e09f760064c41216535f210d935ee6435d7 (patch)
tree32a0a3afd816c2bcaa9027a56ee5667d4ba52ace
parent58bf38d100263e4a95b55abe3a338b30f41f5b8f (diff)
parentb61e07e972952ca47f2da7a44c371fd507fee0c0 (diff)
downloadgitlab-shell-1e791e09f760064c41216535f210d935ee6435d7.tar.gz
Merge branch 'id-release-14-15-0' into 'main'v14.15.0
Release 14.15.0 version See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/707 Merged-by: Igor Drozdov <idrozdov@gitlab.com> Approved-by: Igor Drozdov <idrozdov@gitlab.com>
-rw-r--r--CHANGELOG8
-rw-r--r--VERSION2
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8bb6169..581315f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+v14.15.0
+
+- Incorporate older edits to README !696
+- Upgrade to Ruby 3.x !706
+- feat: retry on http error !703
+
v14.14.0
- Add developer documentation to sshd package !683
@@ -5,7 +11,7 @@ v14.14.0
- Drop 1.16 compatibility in go.sum !692
- Bump x/text to 0.3.8 !692
- Update prometheus package to 1.13.1 !692
- Restrict IP access for PROXY protocol !693
+- Restrict IP access for PROXY protocol !693
- Fix broken Gitaly integration tests !694
- Clean up .gitlab-ci.yml file !695
- Use the images provided by Gitlab to run tests !698
diff --git a/VERSION b/VERSION
index e51d258..c107424 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.0
+14.15.0