diff options
Diffstat (limited to 'app/services/wiki_pages')
-rw-r--r-- | app/services/wiki_pages/base_service.rb | 2 | ||||
-rw-r--r-- | app/services/wiki_pages/create_service.rb | 5 | ||||
-rw-r--r-- | app/services/wiki_pages/update_service.rb | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/services/wiki_pages/base_service.rb b/app/services/wiki_pages/base_service.rb index 4ec884469eb..891e18c0acc 100644 --- a/app/services/wiki_pages/base_service.rb +++ b/app/services/wiki_pages/base_service.rb @@ -12,7 +12,7 @@ module WikiPages def execute_hooks(page) page_data = payload(page) container.execute_hooks(page_data, :wiki_page_hooks) - container.execute_services(page_data, :wiki_page_hooks) + container.execute_integrations(page_data, :wiki_page_hooks) increment_usage create_wiki_event(page) end diff --git a/app/services/wiki_pages/create_service.rb b/app/services/wiki_pages/create_service.rb index 9702876effa..d14d94d77df 100644 --- a/app/services/wiki_pages/create_service.rb +++ b/app/services/wiki_pages/create_service.rb @@ -6,11 +6,12 @@ module WikiPages wiki = Wiki.for_container(container, current_user) page = WikiPage.new(wiki) - if page.create(@params) - execute_hooks(page) + wiki.capture_git_error(event_action) do + page.create(@params) end if page.persisted? + execute_hooks(page) ServiceResponse.success(payload: { page: page }) else ServiceResponse.error(message: _('Could not create wiki page'), payload: { page: page }) diff --git a/app/services/wiki_pages/update_service.rb b/app/services/wiki_pages/update_service.rb index 88275f8c417..12b2cf87d5d 100644 --- a/app/services/wiki_pages/update_service.rb +++ b/app/services/wiki_pages/update_service.rb @@ -8,7 +8,7 @@ module WikiPages # this class is not thread safe! @old_slug = page.slug - if page.update(@params) + if page.wiki.capture_git_error(event_action) { page.update(@params) } execute_hooks(page) ServiceResponse.success(payload: { page: page }) else |