diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 15:07:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 15:07:54 +0300 |
commit | 41e8b05e8d06f4b13a984e4a3ad26e9a48294543 (patch) | |
tree | 833a6ca2518dab3923f0ffbc760d9ba241cab196 /lib/gitlab/data_builder | |
parent | 0e65189f85bb393e16e60335a42933beb0834295 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/data_builder')
-rw-r--r-- | lib/gitlab/data_builder/wiki_page.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/data_builder/wiki_page.rb b/lib/gitlab/data_builder/wiki_page.rb index 9368446fa59..8aee25e9fe6 100644 --- a/lib/gitlab/data_builder/wiki_page.rb +++ b/lib/gitlab/data_builder/wiki_page.rb @@ -8,6 +8,9 @@ module Gitlab def build(wiki_page, user, action) wiki = wiki_page.wiki + # TODO: group hooks https://gitlab.com/gitlab-org/gitlab/-/issues/216904 + return {} if wiki.container.is_a?(Group) + { object_kind: wiki_page.class.name.underscore, user: user.hook_attrs, |