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>2019-04-23 23:32:25 +0300
committerPaul Okstad <pokstad@gitlab.com>2019-04-23 23:32:25 +0300
commitfdf1ce8bf5f1d5917bd9ec3237ef06c6a8a3499c (patch)
treece2d997e90f252b67d2030500b252c7dfa261d8a
parentbd47844663af0e8a3c4fe4318bc29478866a98e1 (diff)
Version 1.35.1v1.35.1
-rw-r--r--CHANGELOG.md16
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/jc-geo-fetch.yml5
-rw-r--r--changelogs/unreleased/jc-praefect-proto-registry.yml5
-rw-r--r--changelogs/unreleased/loosen_regex_for_exception_sanitization.yml5
-rw-r--r--changelogs/unreleased/sh-bump-bundler-version.yml5
6 files changed, 17 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ecd5bd21..086bdc5a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
# Gitaly changelog
+## v1.35.1
+
+#### Added
+- adding ProtoRegistry
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1188
+
+#### Other
+- Bump Ruby bundler version to 1.17.3
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1215
+- Update FetchRemote ruby to write http auth as well as add remote
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1126
+
+#### Security
+- Loosen regex for exception sanitization
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/25
+
## v1.35.0
diff --git a/VERSION b/VERSION
index 2aeaa11ee..7eee78574 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.35.0
+1.35.1
diff --git a/changelogs/unreleased/jc-geo-fetch.yml b/changelogs/unreleased/jc-geo-fetch.yml
deleted file mode 100644
index 6b9aad103..000000000
--- a/changelogs/unreleased/jc-geo-fetch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update FetchRemote ruby to write http auth as well as add remote
-merge_request: 1126
-author:
-type: other
diff --git a/changelogs/unreleased/jc-praefect-proto-registry.yml b/changelogs/unreleased/jc-praefect-proto-registry.yml
deleted file mode 100644
index 118c041fd..000000000
--- a/changelogs/unreleased/jc-praefect-proto-registry.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: adding ProtoRegistry
-merge_request: 1188
-author:
-type: added
diff --git a/changelogs/unreleased/loosen_regex_for_exception_sanitization.yml b/changelogs/unreleased/loosen_regex_for_exception_sanitization.yml
deleted file mode 100644
index 4a2be5735..000000000
--- a/changelogs/unreleased/loosen_regex_for_exception_sanitization.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Loosen regex for exception sanitization
-merge_request: 25
-author:
-type: security
diff --git a/changelogs/unreleased/sh-bump-bundler-version.yml b/changelogs/unreleased/sh-bump-bundler-version.yml
deleted file mode 100644
index 41a684195..000000000
--- a/changelogs/unreleased/sh-bump-bundler-version.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump Ruby bundler version to 1.17.3
-merge_request: 1215
-author:
-type: other