diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 12:09:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 12:09:18 +0000 |
| commit | b7c735c8ac11b8182807070fc6f84f2606e15427 (patch) | |
| tree | e74b4d25abb8bbf23546f001dd94515e2840a3a3 /lib/api/entities | |
| parent | 221b529789f4090341a825695aeb49b8df6dd11d (diff) | |
| download | gitlab-ce-b7c735c8ac11b8182807070fc6f84f2606e15427.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/entities')
| -rw-r--r-- | lib/api/entities/runner_details.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/entities/runner_details.rb b/lib/api/entities/runner_details.rb index 17202821e6e..2bb143253fe 100644 --- a/lib/api/entities/runner_details.rb +++ b/lib/api/entities/runner_details.rb @@ -10,7 +10,11 @@ module API expose :access_level expose :version, :revision, :platform, :architecture expose :contacted_at + + # @deprecated in 12.10 https://gitlab.com/gitlab-org/gitlab/-/issues/214320 + # will be removed by 13.0 https://gitlab.com/gitlab-org/gitlab/-/issues/214322 expose :token, if: lambda { |runner, options| options[:current_user].admin? || !runner.instance_type? } + # rubocop: disable CodeReuse/ActiveRecord expose :projects, with: Entities::BasicProjectDetails do |runner, options| if options[:current_user].admin? |