Merge branch 'create-hooks' into 'master'

Use create-hooks instead of rewrite-hooks.sh

The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's
create-hooks script.

See merge request !1068

3 files changed, 4 insertions, 4 deletions

diff --git a/db/migrate/20140903115954_migrate_to_new_shell.rb b/db/migrate/20140903115954_migrate_to_new_shell.rb
index 69912887da8..2d832109513 100644
--- a/db/migrate/20140903115954_migrate_to_new_shell.rb
+++ b/db/migrate/20140903115954_migrate_to_new_shell.rb
@@ -1,7 +1,7 @@
 class MigrateToNewShell < ActiveRecord::Migration
   def change
     gitlab_shell_path = Gitlab.config.gitlab_shell.path
-    if system("sh #{gitlab_shell_path}/support/rewrite-hooks.sh")
+    if system("#{gitlab_shell_path}/bin/create-hooks")
       puts 'Repositories updated with new hooks'
     else
       raise 'Failed to rewrite gitlab-shell hooks in repositories'
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 6f7c4f7c909..ea05fa2c261 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -69,7 +69,7 @@ module Backup
       end
 
       print 'Put GitLab hooks in repositories dirs'.yellow
-      if system("#{Gitlab.config.gitlab_shell.path}/support/rewrite-hooks.sh", Gitlab.config.gitlab_shell.repos_path)
+      if system("#{Gitlab.config.gitlab_shell.path}/bin/create-hooks")
         puts " [DONE]".green
       else
         puts " [FAILED]".red
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index d15944bada3..9ea5c55abd6 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -541,7 +541,7 @@ namespace :gitlab do
               "sudo -u #{gitlab_shell_ssh_user} ln -sf #{gitlab_shell_hook_file} #{project_hook_file}"
             )
             for_more_information(
-              "#{gitlab_shell_path}/support/rewrite-hooks.sh"
+              "#{gitlab_shell_path}/bin/create-hooks"
             )
             fix_and_rerun
             next
@@ -556,7 +556,7 @@ namespace :gitlab do
               "sudo -u #{gitlab_shell_ssh_user} ln -sf #{gitlab_shell_hook_file} #{project_hook_file}"
             )
             for_more_information(
-              "lib/support/rewrite-hooks.sh"
+              "#{gitlab_shell_path}/bin/create-hooks"
             )
             fix_and_rerun
           end