Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Okstad <pokstad@gitlab.com>2020-01-29 07:30:58 +0300
committerPaul Okstad <pokstad@gitlab.com>2020-01-29 07:30:58 +0300
commit2559193a878dc50ce2485dc03e321518936254a5 (patch)
tree1d978cb9532310a4c5e6312db99a3ddd14e6a73f
parentc6099504b3355f12ea618451b7912b5b80a36593 (diff)
Version 1.85.0v1.85.01-85-stable
-rw-r--r--CHANGELOG.md10
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/jc-praefect-test.yml5
-rw-r--r--changelogs/unreleased/po-revert-squash-branch-removal.yml5
-rw-r--r--ruby/proto/gitaly/version.rb2
5 files changed, 12 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04198f795..b0f7d31a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
# Gitaly changelog
+## v1.85.0
+
+#### Deprecated
+- Revert branch field removal in UserSquashRequest message for RPC operations.UserSquash
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1792
+
+#### Other
+- Add praefect as a transparent pass through for tests
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1736
+
## v1.84.0
#### Added
diff --git a/VERSION b/VERSION
index bd0f9e6c2..f288d1114 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.84.0
+1.85.0
diff --git a/changelogs/unreleased/jc-praefect-test.yml b/changelogs/unreleased/jc-praefect-test.yml
deleted file mode 100644
index 94149b755..000000000
--- a/changelogs/unreleased/jc-praefect-test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add praefect as a transparent pass through for tests
-merge_request: 1736
-author:
-type: other
diff --git a/changelogs/unreleased/po-revert-squash-branch-removal.yml b/changelogs/unreleased/po-revert-squash-branch-removal.yml
deleted file mode 100644
index 6b341d536..000000000
--- a/changelogs/unreleased/po-revert-squash-branch-removal.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Revert branch field removal in UserSquashRequest message for RPC operations.UserSquash
-merge_request: 1792
-author:
-type: deprecated
diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb
index 657ded0c2..9cb3c54ab 100644
--- a/ruby/proto/gitaly/version.rb
+++ b/ruby/proto/gitaly/version.rb
@@ -1,4 +1,4 @@
# This file was auto-generated by _support/release
module Gitaly
- VERSION = '1.84.0'
+ VERSION = '1.85.0'
end