diff options
author | Rémy Coutable <remy@rymai.me> | 2017-07-20 15:12:07 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-07-20 15:12:07 +0000 |
commit | 7f78a78a36a4341680a71afa5a12a1f4d4876c66 (patch) | |
tree | 91cfff5c3c9f6a118d69df5e2816b7461ce2ccc5 /lib | |
parent | 020b6a0be06614815d96854084f3dcafeefcf0b7 (diff) | |
parent | e0ab5618a0998175df9f90c95ebd35d7afa01db7 (diff) | |
download | gitlab-ce-7f78a78a36a4341680a71afa5a12a1f4d4876c66.tar.gz |
Merge branch '5971-webhook-testing' into 'master'
Wrong data type when testing webhooks
Closes #5971
See merge request !11728
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/data_builder/push.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/data_builder/wiki_page.rb | 22 |
2 files changed, 24 insertions, 0 deletions
diff --git a/lib/gitlab/data_builder/push.rb b/lib/gitlab/data_builder/push.rb index e81d19a7a2e..8c8729b6557 100644 --- a/lib/gitlab/data_builder/push.rb +++ b/lib/gitlab/data_builder/push.rb @@ -74,6 +74,8 @@ module Gitlab build(project, user, commits.last&.id, commits.first&.id, ref, commits) end + private + def checkout_sha(repository, newrev, ref) # Checkout sha is nil when we remove branch or tag return if Gitlab::Git.blank_ref?(newrev) diff --git a/lib/gitlab/data_builder/wiki_page.rb b/lib/gitlab/data_builder/wiki_page.rb new file mode 100644 index 00000000000..226974b698c --- /dev/null +++ b/lib/gitlab/data_builder/wiki_page.rb @@ -0,0 +1,22 @@ +module Gitlab + module DataBuilder + module WikiPage + extend self + + def build(wiki_page, user, action) + wiki = wiki_page.wiki + + { + object_kind: wiki_page.class.name.underscore, + user: user.hook_attrs, + project: wiki.project.hook_attrs, + wiki: wiki.hook_attrs, + object_attributes: wiki_page.hook_attrs.merge( + url: Gitlab::UrlBuilder.build(wiki_page), + action: action + ) + } + end + end + end +end |