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:
authorJohn Cai <jcai@gitlab.com>2019-05-02 18:35:53 +0300
committerJohn Cai <jcai@gitlab.com>2019-05-02 18:35:53 +0300
commit104efcb503c3d455ce4d45b92e52e9c8fbcd0746 (patch)
tree00ed76f528a6771fe85ad22435251102b258bf54
parent6b486b391c0c033e6ec967bc9647bd646ac08428 (diff)
Version 1.39.0v1.39.0
-rw-r--r--CHANGELOG.md11
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/feat-sentry-environment.yml5
-rw-r--r--changelogs/unreleased/jc-fix-catfile-batch.yml5
4 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c54203d00..24e2a002f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
# Gitaly changelog
+## v1.39.0
+
+#### Added
+- Add option to add Sentry environment
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1216
+ Contributed by Roger Meier
+
+#### Fixed
+- Fix CacheItem pointer in cache
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1234
+
## v1.38.0
#### Other
diff --git a/VERSION b/VERSION
index ebeef2f2d..5edffce6d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.38.0
+1.39.0
diff --git a/changelogs/unreleased/feat-sentry-environment.yml b/changelogs/unreleased/feat-sentry-environment.yml
deleted file mode 100644
index 263da7368..000000000
--- a/changelogs/unreleased/feat-sentry-environment.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add option to add Sentry environment
-merge_request: 1216
-author: Roger Meier
-type: added
diff --git a/changelogs/unreleased/jc-fix-catfile-batch.yml b/changelogs/unreleased/jc-fix-catfile-batch.yml
deleted file mode 100644
index a9c51c055..000000000
--- a/changelogs/unreleased/jc-fix-catfile-batch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix CacheItem pointer in cache
-merge_request: 1234
-author:
-type: fixed