kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Replace Entities::RunnerProjectDetails with Entities::ForkedFromProject

This commit is contained in:
Tomasz Maczukin 2016-02-17 21:06:21 +01:00
parent f8f492e589
commit 7ea60c8564
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/api/runners.md
View File

@ -122,7 +122,9 @@ Example response:
"projects": [
{
"id": 1,
"name": "GitLab Community Edition",
"name_with_namespace": "GitLab.org / GitLab Community Edition",
"path": "gitlab-ce",
"path_with_namespace": "gitlab-org/gitlab-ce"
}
],
@ -170,7 +172,9 @@ Example response:
"projects": [
{
"id": 1,
"name": "GitLab Community Edition",
"name_with_namespace": "GitLab.org / GitLab Community Edition",
"path": "gitlab-ce",
"path_with_namespace": "gitlab-org/gitlab-ce"
}
],

8
lib/api/entities.rb
View File

@ -369,12 +369,6 @@ module API
expose :id, :variables
end
class RunnerProjectDetails < Grape::Entity
expose :id
expose :name_with_namespace
expose :path_with_namespace
end
class Runner < Grape::Entity
expose :id
expose :description
@ -388,7 +382,7 @@ module API
expose :version, :revision, :platform, :architecture
expose :contacted_at, as: :last_contact
expose :token, if: lambda { |runner, options| options[:current_user].is_admin? || !runner.is_shared? }
expose :projects, with: Entities::RunnerProjectDetails do |runner, options|
expose :projects, with: Entities::ForkedFromProject do |runner, options|
if options[:current_user].is_admin?
runner.projects
else