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
Léo-Paul Géneau
gitlab-ce
Commits
1ce76636
Commit
1ce76636
authored
Jan 15, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change dependencies.builds to depends_on_builds
parent
ac652d82
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
25 deletions
+21
-25
doc/ci/api/builds.md
doc/ci/api/builds.md
+17
-19
lib/ci/api/entities.rb
lib/ci/api/entities.rb
+2
-4
spec/requests/ci/api/builds_spec.rb
spec/requests/ci/api/builds_spec.rb
+2
-2
No files found.
doc/ci/api/builds.md
View file @
1ce76636
...
@@ -53,8 +53,7 @@ Returns:
...
@@ -53,8 +53,7 @@ Returns:
"public"
:
true
"public"
:
true
}
}
],
],
"dependencies"
:
{
"depends_on_builds"
:
[
"builds"
:
[
{
{
"id"
:
48584
,
"id"
:
48584
,
"ref"
:
"0.1.1"
,
"ref"
:
"0.1.1"
,
...
@@ -72,7 +71,6 @@ Returns:
...
@@ -72,7 +71,6 @@ Returns:
}
}
}
}
]
]
}
}
}
```
```
...
...
lib/ci/api/entities.rb
View file @
1ce76636
...
@@ -20,7 +20,7 @@ module Ci
...
@@ -20,7 +20,7 @@ module Ci
expose
:name
,
:token
,
:stage
expose
:name
,
:token
,
:stage
expose
:project_id
expose
:project_id
expose
:project_name
expose
:project_name
expose
:artifacts_file
,
using:
ArtifactFile
,
if:
lambda
{
|
build
,
opts
|
build
.
artifacts
_file
.
exists
?
}
expose
:artifacts_file
,
using:
ArtifactFile
,
if:
lambda
{
|
build
,
opts
|
build
.
artifacts?
}
end
end
class
BuildDetails
<
Build
class
BuildDetails
<
Build
...
@@ -39,9 +39,7 @@ module Ci
...
@@ -39,9 +39,7 @@ module Ci
end
end
expose
:variables
expose
:variables
expose
:dependencies
do
expose
:depends_on_builds
,
using:
Build
expose
:depends_on_builds
,
as: :builds
,
using:
Build
end
end
end
class
Runner
<
Grape
::
Entity
class
Runner
<
Grape
::
Entity
...
...
spec/requests/ci/api/builds_spec.rb
View file @
1ce76636
...
@@ -110,8 +110,8 @@ describe Ci::API::API do
...
@@ -110,8 +110,8 @@ describe Ci::API::API do
post
ci_api
(
"/builds/register"
),
token:
runner
.
token
,
info:
{
platform: :darwin
}
post
ci_api
(
"/builds/register"
),
token:
runner
.
token
,
info:
{
platform: :darwin
}
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
json_response
[
"depend
encies"
][
"
builds"
].
count
).
to
eq
(
2
)
expect
(
json_response
[
"depend
s_on_
builds"
].
count
).
to
eq
(
2
)
expect
(
json_response
[
"depend
encies"
][
"
builds"
][
0
][
"name"
]).
to
eq
(
"rspec"
)
expect
(
json_response
[
"depend
s_on_
builds"
][
0
][
"name"
]).
to
eq
(
"rspec"
)
end
end
end
end
...
...
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