summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-11 09:19:25 +0000
committerDouwe Maan <douwe@gitlab.com>2015-04-11 09:19:25 +0000
commit940150dc9a94ce2792a8f67a2cf69fc5e39b0cf1 (patch)
tree6d2061c7ec9cb3f791045ad9ea95d2956ebda042
parent5155b9794db107bdb44297a7c01ced13581ee303 (diff)
parenteabbcf4ea84a4630f817716d18170d60e2b250cb (diff)
downloadgitlab-ce-940150dc9a94ce2792a8f67a2cf69fc5e39b0cf1.tar.gz
Merge branch 'bump-gitlab-shell' into 'master'
Bump gitlab-shell Fix git over ssh errors 'fatal: protocol error: bad line length character' Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM @patricio See merge request !506
-rw-r--r--CHANGELOG1
-rw-r--r--GITLAB_SHELL_VERSION2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 38a4117eb80..7d2052b592a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -67,6 +67,7 @@ v 7.10.0 (unreleased)
- Fix and improve help rendering (Sullivan Sénéchal)
- Fix final line in EmailsOnPush email diff being rendered as error.
- Authometic setup GitLab CI project for forks if origin project has GitLab CI enabled
+ - Fix git over ssh errors 'fatal: protocol error: bad line length character'
v 7.9.3
- Contains no changes
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index e70b4523ae7..6a6a3d8e35c 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-2.6.0
+2.6.1