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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a7892e71
Commit
a7892e71
authored
May 15, 2019
by
Mathieu Parent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add build_timeout to project API
parent
353e6877
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
0 deletions
+6
-0
doc/api/projects.md
doc/api/projects.md
+3
-0
lib/api/entities.rb
lib/api/entities.rb
+1
-0
lib/api/helpers/projects_helpers.rb
lib/api/helpers/projects_helpers.rb
+2
-0
No files found.
doc/api/projects.md
View file @
a7892e71
...
...
@@ -734,6 +734,7 @@ POST /projects
|
`avatar`
| mixed | no | Image file for avatar of the project |
|
`printing_merge_request_link_enabled`
| boolean | no | Show link to create/view merge request when pushing from the command line |
|
`build_git_strategy`
| string | no | The Git strategy. Defaults to
`fetch`
|
|
`build_timeout`
| integer | no | The maximum amount of time in minutes that a job is able run (in seconds) |
|
`ci_config_path`
| string | no | The path to CI config file |
|
`repository_storage`
| string | no | Which storage shard the repository is on. Available only to admins |
|
`approvals_before_merge`
| integer | no |
**[STARTER]**
How many approvers should approve merge requests by default |
...
...
@@ -786,6 +787,7 @@ POST /projects/user/:user_id
|
`avatar`
| mixed | no | Image file for avatar of the project |
|
`printing_merge_request_link_enabled`
| boolean | no | Show link to create/view merge request when pushing from the command line |
|
`build_git_strategy`
| string | no | The Git strategy. Defaults to
`fetch`
|
|
`build_timeout`
| integer | no | The maximum amount of time in minutes that a job is able run (in seconds) |
|
`ci_config_path`
| string | no | The path to CI config file |
|
`repository_storage`
| string | no | Which storage shard the repository is on. Available only to admins |
|
`approvals_before_merge`
| integer | no |
**[STARTER]**
How many approvers should approve merge requests by default |
...
...
@@ -837,6 +839,7 @@ PUT /projects/:id
|
`tag_list`
| array | no | The list of tags for a project; put array of tags, that should be finally assigned to a project |
|
`avatar`
| mixed | no | Image file for avatar of the project |
|
`build_git_strategy`
| string | no | The Git strategy. Defaults to
`fetch`
|
|
`build_timeout`
| integer | no | The maximum amount of time in minutes that a job is able run (in seconds) |
|
`ci_config_path`
| string | no | The path to CI config file |
|
`ci_default_git_depth`
| integer | no | Default number of revisions for
[
shallow cloning
](
../user/project/pipelines/settings.md#git-shallow-clone
)
|
|
`repository_storage`
| string | no | Which storage shard the repository is on. Available only to admins |
...
...
lib/api/entities.rb
View file @
a7892e71
...
...
@@ -278,6 +278,7 @@ module API
expose
:build_git_strategy
,
if:
lambda
{
|
project
,
options
|
options
[
:user_can_admin_project
]
}
do
|
project
,
options
|
project
.
build_allow_git_fetch
?
'fetch'
:
'clone'
end
expose
:build_timeout
expose
:ci_config_path
,
if:
->
(
project
,
options
)
{
Ability
.
allowed?
(
options
[
:current_user
],
:download_code
,
project
)
}
expose
:shared_with_groups
do
|
project
,
options
|
SharedGroup
.
represent
(
project
.
project_group_links
,
options
)
...
...
lib/api/helpers/projects_helpers.rb
View file @
a7892e71
...
...
@@ -9,6 +9,7 @@ module API
params
:optional_project_params_ce
do
optional
:description
,
type:
String
,
desc:
'The description of the project'
optional
:build_git_strategy
,
type:
String
,
values:
%w(fetch clone)
,
desc:
'The Git strategy. Defaults to `fetch`'
optional
:build_timeout
,
type:
Integer
,
desc:
'Build timeout'
optional
:ci_config_path
,
type:
String
,
desc:
'The path to CI config file. Defaults to `.gitlab-ci.yml`'
# TODO: remove in API v5, replaced by *_access_level
...
...
@@ -60,6 +61,7 @@ module API
def
self
.
update_params_at_least_one_of
[
:build_git_strategy
,
:build_timeout
,
:builds_access_level
,
:ci_config_path
,
:container_registry_enabled
,
...
...
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