summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-01-14 05:44:35 +0000
committerStan Hu <stanhu@gmail.com>2018-01-14 05:44:35 +0000
commitd2bcae4c016ddb88a305e91762df46f9c8ebb0ff (patch)
tree0b485a23b958d83d84015b73a7b54e6841712a7d
parenta478813e1e0c792733ef4a7639d8191bd20a0261 (diff)
parent6216ac186248c86e2bd0abd540232ea48bcdae22 (diff)
downloadgitlab-shell-d2bcae4c016ddb88a305e91762df46f9c8ebb0ff.tar.gz
Merge branch 'fix-pre-receive' into 'master'v6.0.1
Fix git push by removing a bad require in the pre-receive hook Closes gitlab-qa#158 See merge request gitlab-org/gitlab-shell!183
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
-rwxr-xr-xhooks/pre-receive1
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c710622..7b03f7b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v6.0.1
+ - Fix git push by removing a bad require in the pre-receive hook (!183)
+
v6.0.0
- Remove bin/gitlab_projects (!180)
- Remove direct redis integration (!181)
diff --git a/VERSION b/VERSION
index 09b254e..5fe6072 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0
+6.0.1
diff --git a/hooks/pre-receive b/hooks/pre-receive
index d113697..58a628b 100755
--- a/hooks/pre-receive
+++ b/hooks/pre-receive
@@ -16,7 +16,6 @@ def increase_reference_counter(gl_repository, repo_path)
end
require_relative '../lib/gitlab_custom_hook'
-require_relative '../lib/gitlab_reference_counter'
require_relative '../lib/gitlab_access'
require_relative '../lib/gitlab_net'