summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-22 15:17:23 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-22 15:17:23 +0000
commitcdaa9aecac5d7c93399e87330fa42eaa2eacc2a3 (patch)
tree5c83e94803b54580f9a26f6908a1a0be86b57a79
parentfccdcc071b8ea20b282e1a092ef014f0b2ad8181 (diff)
parente65a02aa8f97efc103029af00dc56ba0276d3426 (diff)
downloadgitlab-shell-cdaa9aecac5d7c93399e87330fa42eaa2eacc2a3.tar.gz
Merge branch 'bump_2.6.6' into 'master' v2.6.6
Version bump 2.6.6 See merge request !22
-rw-r--r--CHANGELOG2
-rw-r--r--VERSION2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d82ccc6..1fa2c5d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-v2.6.6 (unreleased)
+v2.6.6
- Do not clean LANG environment variable for the git hooks when working through the SSH-protocol
- Add git-lfs-authenticate command to white list (this command is used by git-lfs for SSO authentication through SSH-protocol)
- Handle git-annex and gcryptsetup
diff --git a/VERSION b/VERSION
index 57cf282..338a5b5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.5
+2.6.6