From f1ebd266942549bf16b40da31ee1bdb03819d3c6 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 10 Oct 2017 12:32:29 +0200 Subject: [PATCH 1/4] Fix changelog --- CHANGELOG.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33d13dd3557..9b32321453b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Gitaly changelog +UNRELEASED + +- Implement OperationService::UserMergeBranch + https://gitlab.com/gitlab-org/gitaly/merge_requests/394 +- Add client feature logging and metrics + https://gitlab.com/gitlab-org/gitaly/merge_requests/392 +- Implement RepositoryService.HasLocalBranches RPC + https://gitlab.com/gitlab-org/gitaly/merge_requests/397 + v0.44.0 - Update gitlab_git to 4a0f720a502ac02423 @@ -8,10 +17,6 @@ v0.44.0 https://gitlab.com/gitlab-org/gitaly/merge_requests/385 - Implement Raw{Diff,Patch} RPCs https://gitlab.com/gitlab-org/gitaly/merge_requests/381 -- Add client feature logging and metrics - https://gitlab.com/gitlab-org/gitaly/merge_requests/392 -- Implement RepositoryService.HasLocalBranches RPC - https://gitlab.com/gitlab-org/gitaly/merge_requests/397 v0.43.0 -- GitLab From e0c3ebfc90d70fcaf63b7afcf440fed1e7784435 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 10 Oct 2017 12:33:00 +0200 Subject: [PATCH 2/4] Add new changelog entries at the top --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 99bcaeeea97..116c0c9cdf0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,7 +49,7 @@ The Gitaly style guide is [documented in it's own file](STYLE.md) Any new merge request must contain either a CHANGELOG.md entry or a justification why no changelog entry is needed. New changelog entries -should be added to the 'UNRELEASED' section of CHANGELOG.md. +should be added to the **top** of the 'UNRELEASED' section of CHANGELOG.md. If a change is specific to an RPC, start the changelog line with the RPC name. So for a change to RPC `FooBar` you would get: -- GitLab From 0534e34679d165d03d69e0c9e206917fb196c77b Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 10 Oct 2017 12:36:06 +0200 Subject: [PATCH 3/4] One more missing changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b32321453b..9f5f563b2c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ UNRELEASED https://gitlab.com/gitlab-org/gitaly/merge_requests/392 - Implement RepositoryService.HasLocalBranches RPC https://gitlab.com/gitlab-org/gitaly/merge_requests/397 +- Fix Commit Subject parsing in rubyserver + https://gitlab.com/gitlab-org/gitaly/merge_requests/388 v0.44.0 -- GitLab From bf4060914e29860cd1c490841f419afc1091ddec Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 10 Oct 2017 12:55:43 +0200 Subject: [PATCH 4/4] Version 0.45.0 --- CHANGELOG.md | 2 +- VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f5f563b2c5..ab8208ca808 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Gitaly changelog -UNRELEASED +v0.45.0 - Implement OperationService::UserMergeBranch https://gitlab.com/gitlab-org/gitaly/merge_requests/394 diff --git a/VERSION b/VERSION index a8ab6c9666a..bcce5d06b8a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.44.0 +0.45.0 -- GitLab