Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

3 files changed, 6 insertions, 1 deletions

diff --git a/lib/gitlab/data_builder/build.rb b/lib/gitlab/data_builder/build.rb
index 4c31f986be5..91e6fc11a53 100644
--- a/lib/gitlab/data_builder/build.rb
+++ b/lib/gitlab/data_builder/build.rb
@@ -83,7 +83,9 @@ module Gitlab
         {
           id: runner.id,
           description: runner.description,
+          runner_type: runner.runner_type,
           active: runner.active?,
+          is_shared: runner.instance_type?,
           tags: runner.tags&.map(&:name)
         }
       end
diff --git a/lib/gitlab/data_builder/pipeline.rb b/lib/gitlab/data_builder/pipeline.rb
index 766eaf54afe..4d70e3949dd 100644
--- a/lib/gitlab/data_builder/pipeline.rb
+++ b/lib/gitlab/data_builder/pipeline.rb
@@ -79,7 +79,9 @@ module Gitlab
         {
           id: runner.id,
           description: runner.description,
+          runner_type: runner.runner_type,
           active: runner.active?,
+          is_shared: runner.instance_type?,
           tags: runner.tags&.map(&:name)
         }
       end
diff --git a/lib/gitlab/data_builder/wiki_page.rb b/lib/gitlab/data_builder/wiki_page.rb
index 8aee25e9fe6..87679654a17 100644
--- a/lib/gitlab/data_builder/wiki_page.rb
+++ b/lib/gitlab/data_builder/wiki_page.rb
@@ -18,7 +18,8 @@ module Gitlab
           wiki: wiki.hook_attrs,
           object_attributes: wiki_page.hook_attrs.merge(
             url: Gitlab::UrlBuilder.build(wiki_page),
-            action: action
+            action: action,
+            diff_url: Gitlab::UrlBuilder.build(wiki_page, action: :diff, version_id: wiki_page.version.id)
           )
         }
       end