提交 a7892e71 编写于 作者: M Mathieu Parent

Add build_timeout to project API

上级 353e6877
...@@ -734,6 +734,7 @@ POST /projects ...@@ -734,6 +734,7 @@ POST /projects
| `avatar` | mixed | no | Image file for avatar of the project | | `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 | | `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_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_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 | | `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 | | `approvals_before_merge` | integer | no | **[STARTER]** How many approvers should approve merge requests by default |
...@@ -786,6 +787,7 @@ POST /projects/user/:user_id ...@@ -786,6 +787,7 @@ POST /projects/user/:user_id
| `avatar` | mixed | no | Image file for avatar of the project | | `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 | | `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_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_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 | | `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 | | `approvals_before_merge` | integer | no | **[STARTER]** How many approvers should approve merge requests by default |
...@@ -837,6 +839,7 @@ PUT /projects/:id ...@@ -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 | | `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 | | `avatar` | mixed | no | Image file for avatar of the project |
| `build_git_strategy` | string | no | The Git strategy. Defaults to `fetch` | | `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_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) | | `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 | | `repository_storage` | string | no | Which storage shard the repository is on. Available only to admins |
......
...@@ -278,6 +278,7 @@ module API ...@@ -278,6 +278,7 @@ module API
expose :build_git_strategy, if: lambda { |project, options| options[:user_can_admin_project] } do |project, options| expose :build_git_strategy, if: lambda { |project, options| options[:user_can_admin_project] } do |project, options|
project.build_allow_git_fetch ? 'fetch' : 'clone' project.build_allow_git_fetch ? 'fetch' : 'clone'
end end
expose :build_timeout
expose :ci_config_path, if: -> (project, options) { Ability.allowed?(options[:current_user], :download_code, project) } expose :ci_config_path, if: -> (project, options) { Ability.allowed?(options[:current_user], :download_code, project) }
expose :shared_with_groups do |project, options| expose :shared_with_groups do |project, options|
SharedGroup.represent(project.project_group_links, options) SharedGroup.represent(project.project_group_links, options)
......
...@@ -9,6 +9,7 @@ module API ...@@ -9,6 +9,7 @@ module API
params :optional_project_params_ce do params :optional_project_params_ce do
optional :description, type: String, desc: 'The description of the project' 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_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`' 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 # TODO: remove in API v5, replaced by *_access_level
...@@ -60,6 +61,7 @@ module API ...@@ -60,6 +61,7 @@ module API
def self.update_params_at_least_one_of def self.update_params_at_least_one_of
[ [
:build_git_strategy, :build_git_strategy,
:build_timeout,
:builds_access_level, :builds_access_level,
:ci_config_path, :ci_config_path,
:container_registry_enabled, :container_registry_enabled,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册