Version 0.104.0v0.104.0

12 files changed, 33 insertions, 51 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 690f381db..d84554f15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Gitaly changelog
 
+## v0.104.0
+
+#### Added
+- Use Go-Git for the FindCommit RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/691
+
+#### Fixed
+- Ignore ENOENT when cleaning up lock files
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/740
+- Fix rename similarity in CommitDiff
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/727
+- Use grpc 1.11.0 in gitaly-ruby
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/732
+
+#### Other
+- Tests: only match error strings we create
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/743
+- Use gitaly-proto 0.101.0
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/745
+- Upgrade to Ruby 2.4.4
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/725
+- Use the same faraday gem version as gitlab-ce
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/733
+
+#### Performance
+- Rewrite IsRebase/SquashInProgress in Go
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/698
+
+#### Security
+- Use rugged 0.27.1 for security fixes
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/744
+
 ## v0.103.0
 
 #### Added
diff --git a/VERSION b/VERSION
index 89eba2c5b..e49057b33 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.103.0
+0.104.0
diff --git a/changelogs/unreleased/1141-rewrite-commit-diff.yml b/changelogs/unreleased/1141-rewrite-commit-diff.yml
deleted file mode 100644
index b73871819..000000000
--- a/changelogs/unreleased/1141-rewrite-commit-diff.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix rename similarity in CommitDiff
-merge_request: 727
-author:
-type: fixed
diff --git a/changelogs/unreleased/1165-rewrite-is-rabase-in-progress.yml b/changelogs/unreleased/1165-rewrite-is-rabase-in-progress.yml
deleted file mode 100644
index 08bc113f7..000000000
--- a/changelogs/unreleased/1165-rewrite-is-rabase-in-progress.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Rewrite IsRebase/SquashInProgress in Go
-merge_request: 698
-author:
-type: performance
diff --git a/changelogs/unreleased/cleanup-ignore-eexist.yml b/changelogs/unreleased/cleanup-ignore-eexist.yml
deleted file mode 100644
index a17cabc50..000000000
--- a/changelogs/unreleased/cleanup-ignore-eexist.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Ignore ENOENT when cleaning up lock files
-merge_request: 740
-author:
-type: fixed
diff --git a/changelogs/unreleased/gitaly-proto-0-101-0.yml b/changelogs/unreleased/gitaly-proto-0-101-0.yml
deleted file mode 100644
index 0d9e4ce84..000000000
--- a/changelogs/unreleased/gitaly-proto-0-101-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use gitaly-proto 0.101.0
-merge_request: 745
-author:
-type: other
diff --git a/changelogs/unreleased/grpc-1-11.yml b/changelogs/unreleased/grpc-1-11.yml
deleted file mode 100644
index 5f0aa7529..000000000
--- a/changelogs/unreleased/grpc-1-11.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use grpc 1.11.0 in gitaly-ruby
-merge_request: 732
-author:
-type: fixed
diff --git a/changelogs/unreleased/grpc-error-dont-match-text-2.yml b/changelogs/unreleased/grpc-error-dont-match-text-2.yml
deleted file mode 100644
index 982f6a640..000000000
--- a/changelogs/unreleased/grpc-error-dont-match-text-2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Tests: only match error strings we create'
-merge_request: 743
-author:
-type: other
diff --git a/changelogs/unreleased/pin-faraday-0-12.yml b/changelogs/unreleased/pin-faraday-0-12.yml
deleted file mode 100644
index 0158dce5e..000000000
--- a/changelogs/unreleased/pin-faraday-0-12.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use the same faraday gem version as gitlab-ce
-merge_request: 733
-author:
-type: other
diff --git a/changelogs/unreleased/sh-bump-rugged.yml b/changelogs/unreleased/sh-bump-rugged.yml
deleted file mode 100644
index 1ab9ab564..000000000
--- a/changelogs/unreleased/sh-bump-rugged.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use rugged 0.27.1 for security fixes
-merge_request: 744
-author:
-type: security
diff --git a/changelogs/unreleased/sh-upgrade-to-ruby-2-4.yml b/changelogs/unreleased/sh-upgrade-to-ruby-2-4.yml
deleted file mode 100644
index 42665ab9c..000000000
--- a/changelogs/unreleased/sh-upgrade-to-ruby-2-4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade to Ruby 2.4.4
-merge_request: 725
-author:
-type: other
diff --git a/changelogs/unreleased/zj-go-git-find-commit.yml b/changelogs/unreleased/zj-go-git-find-commit.yml
deleted file mode 100644
index e8b3dfd6b..000000000
--- a/changelogs/unreleased/zj-go-git-find-commit.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use Go-Git for the FindCommit RPC
-merge_request: 691
-author:
-type: added