Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
7ea60c85
Commit
7ea60c85
authored
Feb 17, 2016
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace Entities::RunnerProjectDetails with Entities::ForkedFromProject
parent
f8f492e5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
doc/api/runners.md
doc/api/runners.md
+4
-0
lib/api/entities.rb
lib/api/entities.rb
+1
-7
No files found.
doc/api/runners.md
View file @
7ea60c85
...
@@ -122,7 +122,9 @@ Example response:
...
@@ -122,7 +122,9 @@ Example response:
"projects"
:
[
"projects"
:
[
{
{
"id"
:
1
,
"id"
:
1
,
"name"
:
"GitLab Community Edition"
,
"name_with_namespace"
:
"GitLab.org / GitLab Community Edition"
,
"name_with_namespace"
:
"GitLab.org / GitLab Community Edition"
,
"path"
:
"gitlab-ce"
,
"path_with_namespace"
:
"gitlab-org/gitlab-ce"
"path_with_namespace"
:
"gitlab-org/gitlab-ce"
}
}
],
],
...
@@ -170,7 +172,9 @@ Example response:
...
@@ -170,7 +172,9 @@ Example response:
"projects"
:
[
"projects"
:
[
{
{
"id"
:
1
,
"id"
:
1
,
"name"
:
"GitLab Community Edition"
,
"name_with_namespace"
:
"GitLab.org / GitLab Community Edition"
,
"name_with_namespace"
:
"GitLab.org / GitLab Community Edition"
,
"path"
:
"gitlab-ce"
,
"path_with_namespace"
:
"gitlab-org/gitlab-ce"
"path_with_namespace"
:
"gitlab-org/gitlab-ce"
}
}
],
],
...
...
lib/api/entities.rb
View file @
7ea60c85
...
@@ -369,12 +369,6 @@ module API
...
@@ -369,12 +369,6 @@ module API
expose
:id
,
:variables
expose
:id
,
:variables
end
end
class
RunnerProjectDetails
<
Grape
::
Entity
expose
:id
expose
:name_with_namespace
expose
:path_with_namespace
end
class
Runner
<
Grape
::
Entity
class
Runner
<
Grape
::
Entity
expose
:id
expose
:id
expose
:description
expose
:description
...
@@ -388,7 +382,7 @@ module API
...
@@ -388,7 +382,7 @@ module API
expose
:version
,
:revision
,
:platform
,
:architecture
expose
:version
,
:revision
,
:platform
,
:architecture
expose
:contacted_at
,
as: :last_contact
expose
:contacted_at
,
as: :last_contact
expose
:token
,
if:
lambda
{
|
runner
,
options
|
options
[
:current_user
].
is_admin?
||
!
runner
.
is_shared?
}
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?
if
options
[
:current_user
].
is_admin?
runner
.
projects
runner
.
projects
else
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment