diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-01-14 18:50:42 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-01-14 18:50:42 +0300 |
| commit | 8aacfc36317eaa286d2f04990de4c4acf218aa52 (patch) | |
| tree | 82d8a3e0013a2c3ad112240375bf36e3c027d9ec | |
| parent | 78f7fc3e6ef2cc06dcc55b61f8a1ce72f3f31cb9 (diff) | |
Version 1.12.1v1.12.1
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/1447-using-https_proxy-in-gitaly-environment-breaks-communication-with-rails-since-11-6.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-rebase-test-flake.yml | 5 |
4 files changed, 9 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b6fba80e..e76c7db03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Gitaly changelog +## v1.12.1 + +#### Fixed +- Fix flaky rebase test + https://gitlab.com/gitlab-org/gitaly/merge_requests/1028 +- Fix regression for https_proxy and unix socket connections + https://gitlab.com/gitlab-org/gitaly/merge_requests/1032 + ## v1.12.0 #### Fixed @@ -1 +1 @@ -1.12.0 +1.12.1 diff --git a/changelogs/unreleased/1447-using-https_proxy-in-gitaly-environment-breaks-communication-with-rails-since-11-6.yml b/changelogs/unreleased/1447-using-https_proxy-in-gitaly-environment-breaks-communication-with-rails-since-11-6.yml deleted file mode 100644 index 4f93491a6..000000000 --- a/changelogs/unreleased/1447-using-https_proxy-in-gitaly-environment-breaks-communication-with-rails-since-11-6.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix regression for https_proxy and unix socket connections -merge_request: 1032 -author: -type: fixed diff --git a/changelogs/unreleased/fix-rebase-test-flake.yml b/changelogs/unreleased/fix-rebase-test-flake.yml deleted file mode 100644 index 2377849d5..000000000 --- a/changelogs/unreleased/fix-rebase-test-flake.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix flaky rebase test -merge_request: 1028 -author: -type: fixed |