diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-06 21:06:55 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-06 21:06:55 +0000 |
| commit | 915306ec50c50b3b1b0793150a7cb4f31fbbee75 (patch) | |
| tree | c9f6a045ee02003ca9b715783692cb1d623f619d /app/models/project.rb | |
| parent | c353773787407158b6319b6944dee57a6e3522b9 (diff) | |
| parent | 7aa6766cd15036dcfb5391b3fd7bffb9069ffbcf (diff) | |
| download | gitlab-ce-915306ec50c50b3b1b0793150a7cb4f31fbbee75.tar.gz | |
Merge branch 'master' into 'alerts-for-built-in-metrics'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 435ecc59bc4..997c1cf98fc 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1186,10 +1186,9 @@ class Project < ActiveRecord::Base def execute_hooks(data, hooks_scope = :push_hooks) run_after_commit_or_now do - hooks.hooks_for(hooks_scope).each do |hook| + hooks.hooks_for(hooks_scope).select_active(hooks_scope, data).each do |hook| hook.async_execute(data, hooks_scope.to_s) end - SystemHooksService.new.execute_hooks(data, hooks_scope) end end |