summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-27 11:38:29 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-27 11:38:29 +0300
commit2cbdfbfd1edd251fdeab0e238552175644fe18d1 (patch)
treefa98080e8ac6aac1acaa94bc62275d52a7cca1a9 /app/controllers/admin
parent817d93e8607c77e5f6a521f708addb3997d412f8 (diff)
parent38e2ae5ae0a8e0ca5baefbd0ffc41cc11eba2db1 (diff)
downloadgitlab-ce-2cbdfbfd1edd251fdeab0e238552175644fe18d1.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/hooks_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/hooks_controller.rb b/app/controllers/admin/hooks_controller.rb
index 0a463239d74..690096bdbcf 100644
--- a/app/controllers/admin/hooks_controller.rb
+++ b/app/controllers/admin/hooks_controller.rb
@@ -33,7 +33,7 @@ class Admin::HooksController < Admin::ApplicationController
owner_name: "Someone",
owner_email: "example@gitlabhq.com"
}
- @hook.execute(data)
+ @hook.execute(data, 'system_hooks')
redirect_to :back
end