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>2018-07-12 14:45:36 +0300
committerJacob Vosmaer <jacob@gitlab.com>2018-07-12 14:45:36 +0300
commit493920d7ef2a0e9a5bceb2e84f6cae4e67479334 (patch)
treee50772830352695013140c4b1d5a53cadeb68ea0
parent9ca86cc4770659d7e5fe318adbf3ecb19fff603f (diff)
Version 0.111.1v0.111.1
-rw-r--r--CHANGELOG.md8
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/fix-commit-size-nil-panic.yml5
-rw-r--r--changelogs/unreleased/nil-committer-author.yml5
4 files changed, 9 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3c2a10fa..06d740e4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Gitaly changelog
+## v0.111.1
+
+#### Fixed
+- Fix nil commit author dereference
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/800
+- Remove unnecessary commit size calculations
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/791
+
## v0.111.0
#### Added
diff --git a/VERSION b/VERSION
index 5af665a17..3925f58df 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.111.0
+0.111.1
diff --git a/changelogs/unreleased/fix-commit-size-nil-panic.yml b/changelogs/unreleased/fix-commit-size-nil-panic.yml
deleted file mode 100644
index 4b46a87bb..000000000
--- a/changelogs/unreleased/fix-commit-size-nil-panic.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove unnecessary commit size calculations
-merge_request: 791
-author:
-type: fixed
diff --git a/changelogs/unreleased/nil-committer-author.yml b/changelogs/unreleased/nil-committer-author.yml
deleted file mode 100644
index 9d84a049e..000000000
--- a/changelogs/unreleased/nil-committer-author.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix nil commit author dereference
-merge_request: 800
-author:
-type: fixed