diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-06-19 22:41:56 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-06-19 22:41:56 +0300 |
| commit | 2471571e8f3195b0f2ae84d6e4a2d47d3cfa03a2 (patch) | |
| tree | 254ac409418fce17c3d2d399201846c2233d7372 | |
| parent | 723136fd62a717d3c8cf08456deba99af027535c (diff) | |
Version 1.48.0v1.48.0
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/osw-skip-hooks-for-merge-to-ref.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-fix-praefect-socket-config.yml | 5 |
4 files changed, 11 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6817a1010..94cd9c54e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Gitaly changelog +## v1.48.0 + +#### Fixed +- Fix praefect not listening to the correct socket path + https://gitlab.com/gitlab-org/gitaly/merge_requests/1313 + +#### Other +- Skip hooks for UserMergeToRef RPC + https://gitlab.com/gitlab-org/gitaly/merge_requests/1312 + ## v1.47.0 #### Changed @@ -1 +1 @@ -1.47.0 +1.48.0 diff --git a/changelogs/unreleased/osw-skip-hooks-for-merge-to-ref.yml b/changelogs/unreleased/osw-skip-hooks-for-merge-to-ref.yml deleted file mode 100644 index 25eab6c52..000000000 --- a/changelogs/unreleased/osw-skip-hooks-for-merge-to-ref.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Skip hooks for UserMergeToRef RPC -merge_request: 1312 -author: -type: other diff --git a/changelogs/unreleased/zj-fix-praefect-socket-config.yml b/changelogs/unreleased/zj-fix-praefect-socket-config.yml deleted file mode 100644 index 0536c95eb..000000000 --- a/changelogs/unreleased/zj-fix-praefect-socket-config.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix praefect not listening to the correct socket path -merge_request: 1313 -author: -type: fixed |