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-08-17 19:15:58 +0300
committerJacob Vosmaer <jacob@gitlab.com>2018-08-17 19:15:58 +0300
commit93cc4119d91af9644da2b748f2563fd67ee5b855 (patch)
tree0f28ccb4900725c555a8eba7bda9d9724bfce3c2
parentc3c9f1580f56fd36ea174833d1d9b0ba9f1408c1 (diff)
Version 0.117.2v0.117.2
-rw-r--r--CHANGELOG.md10
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/diff-collapsing.yml5
-rw-r--r--changelogs/unreleased/fix-collapse-lines.yml5
-rw-r--r--changelogs/unreleased/osw-prune-large-patches-by-default.yml5
5 files changed, 11 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f730d8b9b..cc8ca5309 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
# Gitaly changelog
+## v0.117.2
+
+#### Fixed
+- Fix diffs being collapsed unnecessarily
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/854
+- Fix patch size calculations to not include headers
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/859
+- Prune large patches by default when enforcing limits
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/858
+
## v0.117.1
#### Security
diff --git a/VERSION b/VERSION
index 90bdef2ea..377d8aca0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.117.1
+0.117.2
diff --git a/changelogs/unreleased/diff-collapsing.yml b/changelogs/unreleased/diff-collapsing.yml
deleted file mode 100644
index 4edbd3618..000000000
--- a/changelogs/unreleased/diff-collapsing.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix diffs being collapsed unnecessarily
-merge_request: 854
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-collapse-lines.yml b/changelogs/unreleased/fix-collapse-lines.yml
deleted file mode 100644
index 87cb3e491..000000000
--- a/changelogs/unreleased/fix-collapse-lines.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix patch size calculations to not include headers
-merge_request: 859
-author:
-type: fixed
diff --git a/changelogs/unreleased/osw-prune-large-patches-by-default.yml b/changelogs/unreleased/osw-prune-large-patches-by-default.yml
deleted file mode 100644
index 1a7bb4e69..000000000
--- a/changelogs/unreleased/osw-prune-large-patches-by-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prune large patches by default when enforcing limits
-merge_request: 858
-author:
-type: fixed