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:
authorJacob Vosmaer <jacob@gitlab.com>2019-02-25 13:45:39 +0300
committerJacob Vosmaer <jacob@gitlab.com>2019-02-25 13:45:39 +0300
commit9c6eff7b4ad434f6fc5816e9ec19763d4ac9de79 (patch)
treea516255d2c489643a224d21a655e0cfb3b039592
parentc2985e16dc51fe7c4b2ec4bbc3688b131a6341bc (diff)
Version 1.21.0v1.21.0
-rw-r--r--CHANGELOG.md22
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/1365-version-fallback-file.yml5
-rw-r--r--changelogs/unreleased/jc-make-snapshots-work-with-dedupe.yml5
-rw-r--r--changelogs/unreleased/jc-rewrite-get-all-tags.yml5
-rw-r--r--changelogs/unreleased/osw-support-dry-merge-to-ref.yml5
-rw-r--r--changelogs/unreleased/sh-remove-gogit-test.yml5
-rw-r--r--changelogs/unreleased/zj-delete-ref-go.yml5
8 files changed, 23 insertions, 31 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index de7883b77..a6130e3c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
# Gitaly changelog
+## v1.21.0
+
+#### Added
+- Support merge ref writing (without merging to target branch)
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1057
+
+#### Fixed
+- Use VERSION file to detect version as fallback
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1056
+- Fix GetSnapshot RPC to work with repos with object pools
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1045
+
+#### Other
+- Remove another test that exercises gogit feature flag
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1086
+
+#### Performance
+- Rewrite FindAllTags in Go
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1036
+- Reimplement DeleteRefs in Go
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1069
+
## v1.20.0
#### Fixed
diff --git a/VERSION b/VERSION
index 398935591..3500250a4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.20.0
+1.21.0
diff --git a/changelogs/unreleased/1365-version-fallback-file.yml b/changelogs/unreleased/1365-version-fallback-file.yml
deleted file mode 100644
index 644a3af56..000000000
--- a/changelogs/unreleased/1365-version-fallback-file.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use VERSION file to detect version as fallback
-merge_request: 1056
-author:
-type: fixed
diff --git a/changelogs/unreleased/jc-make-snapshots-work-with-dedupe.yml b/changelogs/unreleased/jc-make-snapshots-work-with-dedupe.yml
deleted file mode 100644
index 2d6466243..000000000
--- a/changelogs/unreleased/jc-make-snapshots-work-with-dedupe.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix GetSnapshot RPC to work with repos with object pools
-merge_request: 1045
-author:
-type: fixed
diff --git a/changelogs/unreleased/jc-rewrite-get-all-tags.yml b/changelogs/unreleased/jc-rewrite-get-all-tags.yml
deleted file mode 100644
index e2b578829..000000000
--- a/changelogs/unreleased/jc-rewrite-get-all-tags.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Rewrite FindAllTags in Go
-merge_request: 1036
-author:
-type: performance
diff --git a/changelogs/unreleased/osw-support-dry-merge-to-ref.yml b/changelogs/unreleased/osw-support-dry-merge-to-ref.yml
deleted file mode 100644
index d7fab6b17..000000000
--- a/changelogs/unreleased/osw-support-dry-merge-to-ref.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Support merge ref writing (without merging to target branch)
-merge_request: 1057
-author:
-type: added
diff --git a/changelogs/unreleased/sh-remove-gogit-test.yml b/changelogs/unreleased/sh-remove-gogit-test.yml
deleted file mode 100644
index 831c28239..000000000
--- a/changelogs/unreleased/sh-remove-gogit-test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove another test that exercises gogit feature flag
-merge_request: 1086
-author:
-type: other
diff --git a/changelogs/unreleased/zj-delete-ref-go.yml b/changelogs/unreleased/zj-delete-ref-go.yml
deleted file mode 100644
index a46ac3e18..000000000
--- a/changelogs/unreleased/zj-delete-ref-go.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reimplement DeleteRefs in Go
-merge_request: 1069
-author:
-type: performance