diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-22 09:48:33 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-22 09:48:33 +0000 |
| commit | bee2bcc5546031aa66d0a3e028bb709282275254 (patch) | |
| tree | f9c887fc699da982d1b3209eb4c567e29e0cfb9a | |
| parent | 47924c460a288ab145c4448e8a6be7eea70a8a6d (diff) | |
| parent | 2d581970af86ed06ead0d758ba99b9783d87c3f6 (diff) | |
| download | gitlab-shell-bee2bcc5546031aa66d0a3e028bb709282275254.tar.gz | |
Merge branch '108-pre-receive-undefined-variable' into 'master'v5.9.2
pre-receive: Fix undefined local variable error
Closes #108
See merge request gitlab-org/gitlab-shell!169
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rwxr-xr-x | hooks/pre-receive | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -1,3 +1,6 @@ +v5.9.2 + - Fix pre-receive error when gitlab doesn't have /internal/pre_receive (!169) + v5.9.1 - Adds --force option to push branches diff --git a/hooks/pre-receive b/hooks/pre-receive index 78ff991..d7fecc7 100755 --- a/hooks/pre-receive +++ b/hooks/pre-receive @@ -9,7 +9,7 @@ protocol = ENV.delete('GL_PROTOCOL') repo_path = Dir.pwd gl_repository = ENV['GL_REPOSITORY'] -def increase_reference_counter(gl_repository) +def increase_reference_counter(gl_repository, repo_path) result = GitlabNet.new.pre_receive(gl_repository) result['reference_counter_increased'] @@ -28,7 +28,7 @@ require_relative '../lib/gitlab_net' # and we don't want to skip it if the custom hook fails. if GitlabAccess.new(gl_repository, repo_path, key_id, refs, protocol).exec && GitlabCustomHook.new(repo_path, key_id).pre_receive(refs) && - increase_reference_counter(gl_repository) + increase_reference_counter(gl_repository, repo_path) exit 0 else exit 1 |