Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-07 18:09:56 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-07 18:09:56 +0300
commit79f98200f84590af39cf1af7f57f6e8ba89d2bb6 (patch)
tree289fadec4d3f96a681b3938debaf3800806471ff /lib/gitlab/data_builder
parentde8e5077c3671b0b29642faf1b5e562bc4f99453 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/data_builder')
-rw-r--r--lib/gitlab/data_builder/build.rb2
-rw-r--r--lib/gitlab/data_builder/pipeline.rb2
2 files changed, 4 insertions, 0 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