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 (GitLab) <jacob@gitlab.com>2017-10-10 13:46:07 +0300
committerAndrew Newdigate <andrew@gitlab.com>2017-10-10 13:46:07 +0300
commitc07ef892246b6955bed4269c394a0c5860b163e6 (patch)
tree89bded0563bdb8c04bb52ad9110cc9422c4bd180
parentaecfbd6cf4aa39ac4d05bf2740612e2e4110b935 (diff)
Changelog fixes
-rw-r--r--CHANGELOG.md15
-rw-r--r--CONTRIBUTING.md2
2 files changed, 12 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33d13dd35..9f5f563b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
# 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
+- Fix Commit Subject parsing in rubyserver
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/388
+
v0.44.0
- Update gitlab_git to 4a0f720a502ac02423
@@ -8,10 +19,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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 99bcaeeea..116c0c9cd 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: