From c6c262dc6f3246693407ce72a4a4736b9cd293b0 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 26 Oct 2018 17:52:47 +0200 Subject: Version 0.127.0 --- CHANGELOG.md | 20 ++++++++++++++++++++ VERSION | 2 +- changelogs/unreleased/bvl-apply-patch-rpc.yml | 5 ----- .../unreleased/sh-bump-google-protobuf-3-6-1.yml | 5 ----- changelogs/unreleased/sh-bump-rouge-3-3-0.yml | 5 ----- changelogs/unreleased/sh-bump-ruby-2-4-5.yml | 5 ----- changelogs/unreleased/support-gmake.yml | 5 ----- changelogs/unreleased/zj-self-healing-hooks.yml | 5 ----- 8 files changed, 21 insertions(+), 31 deletions(-) delete mode 100644 changelogs/unreleased/bvl-apply-patch-rpc.yml delete mode 100644 changelogs/unreleased/sh-bump-google-protobuf-3-6-1.yml delete mode 100644 changelogs/unreleased/sh-bump-rouge-3-3-0.yml delete mode 100644 changelogs/unreleased/sh-bump-ruby-2-4-5.yml delete mode 100644 changelogs/unreleased/support-gmake.yml delete mode 100644 changelogs/unreleased/zj-self-healing-hooks.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 8317c2d9f..39e0abfdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Gitaly changelog +## v0.127.0 + +#### Added +- Make git hooks self healing + https://gitlab.com/gitlab-org/gitaly/merge_requests/886 +- Add an endpoint to apply patches to a branch + https://gitlab.com/gitlab-org/gitaly/merge_requests/926 + +#### Fixed +- Use $(MAKE) when re-invoking make + https://gitlab.com/gitlab-org/gitaly/merge_requests/933 + +#### Other +- Bump google-protobuf gem to 3.6.1 + https://gitlab.com/gitlab-org/gitaly/merge_requests/941 +- Bump Rouge gem to 3.3.0 + https://gitlab.com/gitlab-org/gitaly/merge_requests/943 +- Upgrade Ruby version to 2.4.5 + https://gitlab.com/gitlab-org/gitaly/merge_requests/944 + ## v0.126.0 #### Added diff --git a/VERSION b/VERSION index bcc9c2840..489a7a5d8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.126.0 +0.127.0 diff --git a/changelogs/unreleased/bvl-apply-patch-rpc.yml b/changelogs/unreleased/bvl-apply-patch-rpc.yml deleted file mode 100644 index 56a597a68..000000000 --- a/changelogs/unreleased/bvl-apply-patch-rpc.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add an endpoint to apply patches to a branch -merge_request: 926 -author: -type: added diff --git a/changelogs/unreleased/sh-bump-google-protobuf-3-6-1.yml b/changelogs/unreleased/sh-bump-google-protobuf-3-6-1.yml deleted file mode 100644 index c60b7cbd0..000000000 --- a/changelogs/unreleased/sh-bump-google-protobuf-3-6-1.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Bump google-protobuf gem to 3.6.1 -merge_request: 941 -author: -type: other diff --git a/changelogs/unreleased/sh-bump-rouge-3-3-0.yml b/changelogs/unreleased/sh-bump-rouge-3-3-0.yml deleted file mode 100644 index 30e0b8373..000000000 --- a/changelogs/unreleased/sh-bump-rouge-3-3-0.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Bump Rouge gem to 3.3.0 -merge_request: 943 -author: -type: other diff --git a/changelogs/unreleased/sh-bump-ruby-2-4-5.yml b/changelogs/unreleased/sh-bump-ruby-2-4-5.yml deleted file mode 100644 index 8bfee2161..000000000 --- a/changelogs/unreleased/sh-bump-ruby-2-4-5.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade Ruby version to 2.4.5 -merge_request: 944 -author: -type: other diff --git a/changelogs/unreleased/support-gmake.yml b/changelogs/unreleased/support-gmake.yml deleted file mode 100644 index 5b1f09d79..000000000 --- a/changelogs/unreleased/support-gmake.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use $(MAKE) when re-invoking make -merge_request: 933 -author: -type: fixed diff --git a/changelogs/unreleased/zj-self-healing-hooks.yml b/changelogs/unreleased/zj-self-healing-hooks.yml deleted file mode 100644 index 1b64a0644..000000000 --- a/changelogs/unreleased/zj-self-healing-hooks.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make git hooks self healing -merge_request: 886 -author: -type: added -- cgit v1.2.3