diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-22 18:09:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-22 18:09:08 +0300 |
| commit | 7e81076708c00325c922928aa593070b1c9b402c (patch) | |
| tree | 380802616a02d97cf0c6404a4bbb2b67f23335ab /lib/gitlab/data_builder | |
| parent | ab08967ca2412c9be06eacbfd2e66157fac5433e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/data_builder')
| -rw-r--r-- | lib/gitlab/data_builder/build.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/data_builder/pipeline.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/data_builder/build.rb b/lib/gitlab/data_builder/build.rb index e6702c5a38b..e17bd25e57e 100644 --- a/lib/gitlab/data_builder/build.rb +++ b/lib/gitlab/data_builder/build.rb @@ -82,7 +82,8 @@ module Gitlab id: runner.id, description: runner.description, active: runner.active?, - is_shared: runner.instance_type? + is_shared: runner.instance_type?, + tags: runner.tags&.map(&:name) } end end diff --git a/lib/gitlab/data_builder/pipeline.rb b/lib/gitlab/data_builder/pipeline.rb index 14facd6b1d4..2413f68f4d0 100644 --- a/lib/gitlab/data_builder/pipeline.rb +++ b/lib/gitlab/data_builder/pipeline.rb @@ -76,7 +76,8 @@ module Gitlab id: runner.id, description: runner.description, active: runner.active?, - is_shared: runner.instance_type? + is_shared: runner.instance_type?, + tags: runner.tags&.map(&:name) } end end |