Merge branch 'comments_in_default_hooks' of /home/git/repositories/gitlab/gitlab-shell

f31c38e8 · Dmitriy Zaporozhets · be15f4aa · be34f867 · f31c38e8 · f31c38e8
Commit f31c38e8 authored Jul 19, 2013 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

hooks/post-receive hooks/post-receive +1 -3

hooks/update hooks/update +1 -0

No files found.
--- a/hooks/post-receive
+++ b/hooks/post-receive
 #!/usr/bin/env ruby

 # This file was placed here by GitLab.
-# IT IS DEPRECATED NOW.
-# All GitLab logic handled by update hook
-
+# You can put your own hook here, but be careful when updating gitlab-shell!
--- a/hooks/update
+++ b/hooks/update
@@ -2,6 +2,7 @@

 # This file was placed here by GitLab. It makes sure that your pushed commits
 # will be processed properly.
+# You can add your own hooks to this file, but be careful when updating gitlab-shell!

 refname = ARGV[0]
 key_id  = ENV['GL_ID']