summaryrefslogtreecommitdiff
path: root/GITALY_SERVER_VERSION
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2019-01-31 16:32:44 -0200
committerOswaldo Ferreira <oswaldo@gitlab.com>2019-02-25 10:40:58 -0300
commit1ad699677fa4b24a9bc002c6dc20164b8832bca5 (patch)
tree8018d8af35b14d78b20144788a0b271226347a9b /GITALY_SERVER_VERSION
parent992183534dd1af54bf891789aca5777ea91c0942 (diff)
downloadgitlab-ce-1ad699677fa4b24a9bc002c6dc20164b8832bca5.tar.gz
Support merge to ref for merge-commit and squash
Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
Diffstat (limited to 'GITALY_SERVER_VERSION')
-rw-r--r--GITALY_SERVER_VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 39893559155..3500250a4b0 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.20.0
+1.21.0