diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-24 19:22:23 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-24 19:22:23 +0000 |
| commit | 956c55e2abf9c9780f37d14d69eb4b53fec4621e (patch) | |
| tree | c38a06c0d2212d066b2d654d0164741b506f4d94 /app/models | |
| parent | a403011e4f7adae339a3a8584e22a75f4872c3c5 (diff) | |
| parent | 4564795195f4dafa3ff0578565fc13234b164a97 (diff) | |
| download | gitlab-ce-956c55e2abf9c9780f37d14d69eb4b53fec4621e.tar.gz | |
Merge branch 'dm-project-system-hooks-in-transaction' into 'master'
Execute system hooks after-commit when executing project hooks
See merge request gitlab-org/gitlab-ce!16673
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 0570bbc8ee3..e19873f64ce 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -971,9 +971,9 @@ class Project < ActiveRecord::Base hooks.hooks_for(hooks_scope).each do |hook| hook.async_execute(data, hooks_scope.to_s) end - end - SystemHooksService.new.execute_hooks(data, hooks_scope) + SystemHooksService.new.execute_hooks(data, hooks_scope) + end end def execute_services(data, hooks_scope = :push_hooks) |