diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-11-27 15:04:36 +0300 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-11-27 15:04:36 +0300 |
commit | e5e58f04284a3ae524aa2b85d750b8a9597d779a (patch) | |
tree | 39b86b920536adc5b22962550c93815d1e3fa8c1 | |
parent | e48eb51b1dceb144672646c51e55c8e76e43b52f (diff) |
Version 1.2.0v1.2.0
-rw-r--r-- | CHANGELOG.md | 12 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | changelogs/unreleased/51083-fix-move-operation.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/test-authentication.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/zj-update-proto.yml | 5 |
5 files changed, 13 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 91cb84e46..67b1a5358 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Gitaly changelog +## v1.2.0 + +#### Added +- Upgrade proto to v1.2 + https://gitlab.com/gitlab-org/gitaly/merge_requests/985 +- Allow moved files to infer their content based on the source + https://gitlab.com/gitlab-org/gitaly/merge_requests/980 + +#### Other +- Add connectivity tests + https://gitlab.com/gitlab-org/gitaly/merge_requests/968 + ## v1.1.0 #### Other @@ -1 +1 @@ -1.1.0 +1.2.0 diff --git a/changelogs/unreleased/51083-fix-move-operation.yml b/changelogs/unreleased/51083-fix-move-operation.yml deleted file mode 100644 index 8efa6b008..000000000 --- a/changelogs/unreleased/51083-fix-move-operation.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow moved files to infer their content based on the source -merge_request: 980 -author: -type: added diff --git a/changelogs/unreleased/test-authentication.yml b/changelogs/unreleased/test-authentication.yml deleted file mode 100644 index c68f1092c..000000000 --- a/changelogs/unreleased/test-authentication.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add connectivity tests -merge_request: 968 -author: -type: other diff --git a/changelogs/unreleased/zj-update-proto.yml b/changelogs/unreleased/zj-update-proto.yml deleted file mode 100644 index 647a58009..000000000 --- a/changelogs/unreleased/zj-update-proto.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade proto to v1.2 -merge_request: 985 -author: -type: added |