Version 0.114.0v0.114.0

13 files changed, 35 insertions, 57 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8295a293e..51241280c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,39 @@
 # Gitaly changelog
 
+## v0.114.0
+
+#### Added
+- Remove stale config.lock files
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/832
+
+#### Fixed
+- Handle nil commit in buildLocalBranch
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/822
+- Handle non-existing branch on UserDeleteBranch
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/826
+- Handle non-existing tags on UserDeleteTag
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/827
+
+#### Other
+- Lower gitaly-ruby default max_rss to 200MB
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/833
+- Vendor gitlab-git at 92802e51
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/825
+- Bump Linguist version to match Rails
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/821
+- Stop vendoring gitlab/git/index.rb
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/824
+- Bump rspec from 3.6.0 to 3.7.0
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/830
+
+#### Performance
+- Bump nokogiri to 1.8.4 and sanitize to 4.6.6
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/831
+
+#### Security
+- Update to gitlab-gollum-lib v4.2.7.5 and make Gemfile consistent with GitLab versions
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/828
+
 ## v0.113.0
 
 #### Added
diff --git a/VERSION b/VERSION
index 5fea17685..18455b77f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.113.0
+0.114.0
diff --git a/changelogs/unreleased/1006-operationservice-userdeletebranch-doesn-t-handle-non-existing-branches-correctly.yml b/changelogs/unreleased/1006-operationservice-userdeletebranch-doesn-t-handle-non-existing-branches-correctly.yml
deleted file mode 100644
index dfd1eb322..000000000
--- a/changelogs/unreleased/1006-operationservice-userdeletebranch-doesn-t-handle-non-existing-branches-correctly.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Handle non-existing branch on UserDeleteBranch
-merge_request: 826
-author:
-type: fixed
diff --git a/changelogs/unreleased/1267-userdeletetag-nomethoderror-undefined-method-gsub-for-gitlab-git-commiterror.yml b/changelogs/unreleased/1267-userdeletetag-nomethoderror-undefined-method-gsub-for-gitlab-git-commiterror.yml
deleted file mode 100644
index 319eb631f..000000000
--- a/changelogs/unreleased/1267-userdeletetag-nomethoderror-undefined-method-gsub-for-gitlab-git-commiterror.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Handle non-existing tags on UserDeleteTag
-merge_request: 827
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-local-branch-nil-commit.yml b/changelogs/unreleased/fix-local-branch-nil-commit.yml
deleted file mode 100644
index a403f990f..000000000
--- a/changelogs/unreleased/fix-local-branch-nil-commit.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Handle nil commit in buildLocalBranch
-merge_request: 822
-author:
-type: fixed
diff --git a/changelogs/unreleased/gitaly-ruby-memory-limit.yml b/changelogs/unreleased/gitaly-ruby-memory-limit.yml
deleted file mode 100644
index dd7531bbe..000000000
--- a/changelogs/unreleased/gitaly-ruby-memory-limit.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Lower gitaly-ruby default max_rss to 200MB
-merge_request: 833
-author:
-type: other
diff --git a/changelogs/unreleased/sh-bump-rspec-3-7-0.yml b/changelogs/unreleased/sh-bump-rspec-3-7-0.yml
deleted file mode 100644
index 1e478f112..000000000
--- a/changelogs/unreleased/sh-bump-rspec-3-7-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump rspec from 3.6.0 to 3.7.0
-merge_request: 830
-author:
-type: other
diff --git a/changelogs/unreleased/sh-bump-sanitize-and-nokogiri.yml b/changelogs/unreleased/sh-bump-sanitize-and-nokogiri.yml
deleted file mode 100644
index c441ab01f..000000000
--- a/changelogs/unreleased/sh-bump-sanitize-and-nokogiri.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump nokogiri to 1.8.4 and sanitize to 4.6.6
-merge_request: 831
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-update-gollum-libs.yml b/changelogs/unreleased/sh-update-gollum-libs.yml
deleted file mode 100644
index d11b5a45a..000000000
--- a/changelogs/unreleased/sh-update-gollum-libs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Update to gitlab-gollum-lib v4.2.7.5 and make Gemfile consistent with GitLab
-  versions
-merge_request: 828
-author:
-type: security
diff --git a/changelogs/unreleased/stop-vendoring-index.yml b/changelogs/unreleased/stop-vendoring-index.yml
deleted file mode 100644
index 5a496525a..000000000
--- a/changelogs/unreleased/stop-vendoring-index.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Stop vendoring gitlab/git/index.rb
-merge_request: 824
-author:
-type: other
diff --git a/changelogs/unreleased/vendor-mirroring.yml b/changelogs/unreleased/vendor-mirroring.yml
deleted file mode 100644
index a6b9aa293..000000000
--- a/changelogs/unreleased/vendor-mirroring.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Vendor gitlab-git at 92802e51
-merge_request: 825
-author:
-type: other
diff --git a/changelogs/unreleased/zj-bump-linguist.yml b/changelogs/unreleased/zj-bump-linguist.yml
deleted file mode 100644
index c4da0ccdb..000000000
--- a/changelogs/unreleased/zj-bump-linguist.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump Linguist version to match Rails
-merge_request: 821
-author:
-type: other
diff --git a/changelogs/unreleased/zj-config-lock-removal.yml b/changelogs/unreleased/zj-config-lock-removal.yml
deleted file mode 100644
index 41433a9d3..000000000
--- a/changelogs/unreleased/zj-config-lock-removal.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove stale config.lock files
-merge_request: 832
-author:
-type: added