diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-07-04 10:39:28 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-07-04 10:39:28 +0000 |
| commit | 48bbb36347c1c5d4d7922e1998c47d235eb71208 (patch) | |
| tree | d24a0587b1fed960aa5c8060d32aab1b8028b124 /lib/api/entities.rb | |
| parent | d026441b3c68e682a136d09d68b18fa0a73684fe (diff) | |
| parent | d3bcb06dc6365129b62dadf49efc58daecd39a83 (diff) | |
| download | gitlab-ce-48bbb36347c1c5d4d7922e1998c47d235eb71208.tar.gz | |
Merge branch 'remove-is-shared-from-ci-runners' into 'master'
Remove the use of `is_shared` of `Ci::Runner`
See merge request gitlab-org/gitlab-ce!20172
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index bb48a86fe9e..d04f92885a3 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1010,7 +1010,7 @@ module API expose :description expose :ip_address expose :active - expose :is_shared + expose :instance_type?, as: :is_shared expose :name expose :online?, as: :online expose :status @@ -1024,7 +1024,7 @@ module API expose :access_level expose :version, :revision, :platform, :architecture expose :contacted_at - expose :token, if: lambda { |runner, options| options[:current_user].admin? || !runner.is_shared? } + expose :token, if: lambda { |runner, options| options[:current_user].admin? || !runner.instance_type? } expose :projects, with: Entities::BasicProjectDetails do |runner, options| if options[:current_user].admin? runner.projects |