summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-11-17 11:30:43 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-11-17 11:30:43 +0000
commit94fa095e0ccb706464689fe7cd45f6b153edc1a9 (patch)
treea5ad233e1a13fb097183fb59bc05c20972babbf3
parentdee0304570d9fb225dd7ec62be97711e8c0375bd (diff)
parentbf694898582bfc07027a6a4128c63512be824182 (diff)
downloadgitlab-shell-94fa095e0ccb706464689fe7cd45f6b153edc1a9.tar.gz
Merge branch '70-push-fails-because-of-missing-dependencies-on-gitlab_custom_hooks' into 'master'
Fix gitlab_custom_hook dependencies See merge request !107
-rw-r--r--CHANGELOG3
-rw-r--r--lib/gitlab_custom_hook.rb1
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7f899ca..10695fc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v4.0.2
+ - Fix gitlab_custom_hook dependencies
+
v4.0.1
- Add instrumentation to push hooks
diff --git a/lib/gitlab_custom_hook.rb b/lib/gitlab_custom_hook.rb
index 6f2e901..25385cf 100644
--- a/lib/gitlab_custom_hook.rb
+++ b/lib/gitlab_custom_hook.rb
@@ -1,4 +1,5 @@
require 'open3'
+require_relative 'gitlab_init'
require_relative 'gitlab_metrics'
class GitlabCustomHook