summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2016-01-07 10:39:02 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2016-01-07 10:39:02 +0100
commitba9799b42f5bc861df1fc5d41c149cf72e9daf04 (patch)
treeb64e5b1be4a03011303a3ee0b49000892ebe6056
parent0a21731e3bc400ceb9898c9efbc2a186f5348e09 (diff)
downloadgitlab-ce-ba9799b42f5bc861df1fc5d41c149cf72e9daf04.tar.gz
Update ./doc/api
-rw-r--r--doc/api/projects.md36
-rw-r--r--lib/api/projects.rb9
2 files changed, 42 insertions, 3 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 0ca81ffd49e..96a3f08490c 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -76,7 +76,14 @@ Parameters:
"updated_at": "2013-09-30T13: 46: 02Z"
},
"archived": false,
- "avatar_url": "http://example.com/uploads/project/avatar/4/uploads/avatar.png"
+ "avatar_url": "http://example.com/uploads/project/avatar/4/uploads/avatar.png",
+ "shared_runners_enabled": true,
+ "forks_count": 0,
+ "star_count": 0,
+ "build_allow_git_fetch": true,
+ "build_coverage_regex": null,
+ "build_timeout": 3600,
+ "runners_token": "4f9e77be0eed5ef29548fccda3b371"
},
{
"id": 6,
@@ -129,7 +136,14 @@ Parameters:
}
},
"archived": false,
- "avatar_url": null
+ "avatar_url": null,
+ "shared_runners_enabled": true,
+ "forks_count": 0,
+ "star_count": 0,
+ "build_allow_git_fetch": true,
+ "build_coverage_regex": null,
+ "build_timeout": 3600,
+ "runners_token": "b8547b1dc37721d05889db52fa2f02"
}
]
```
@@ -244,7 +258,14 @@ Parameters:
}
},
"archived": false,
- "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png"
+ "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
+ "shared_runners_enabled": true,
+ "forks_count": 0,
+ "star_count": 0,
+ "build_allow_git_fetch": true,
+ "build_coverage_regex": null,
+ "build_timeout": 3600,
+ "runners_token": "b8bc4a7a29eb76ea83cf79e4908c2b"
}
```
@@ -409,6 +430,9 @@ Parameters:
- `public` (optional) - if `true` same as setting visibility_level = 20
- `visibility_level` (optional)
- `import_url` (optional)
+- `build_allow_git_fetch` (optional)
+- `build_timeout` (optional)
+- `build_coverage_regex` (optional)
### Create project for user
@@ -431,6 +455,9 @@ Parameters:
- `public` (optional) - if `true` same as setting visibility_level = 20
- `visibility_level` (optional)
- `import_url` (optional)
+- `build_allow_git_fetch` (optional)
+- `build_timeout` (optional)
+- `build_coverage_regex` (optional)
### Edit project
@@ -454,6 +481,9 @@ Parameters:
- `snippets_enabled` (optional)
- `public` (optional) - if `true` same as setting visibility_level = 20
- `visibility_level` (optional)
+- `build_allow_git_fetch` (optional)
+- `build_timeout` (optional)
+- `build_coverage_regex` (optional)
On success, method returns 200 with the updated project. If parameters are
invalid, 400 is returned.
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 7dd6b133f9b..31b081266a8 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -98,6 +98,9 @@ module API
# public (optional) - if true same as setting visibility_level = 20
# visibility_level (optional) - 0 by default
# import_url (optional)
+ # build_allow_git_fetch (optional)
+ # build_timeout (optional)
+ # build_coverage_regex (optional)
# Example Request
# POST /projects
post do
@@ -146,6 +149,9 @@ module API
# public (optional) - if true same as setting visibility_level = 20
# visibility_level (optional)
# import_url (optional)
+ # build_allow_git_fetch (optional)
+ # build_timeout (optional)
+ # build_coverage_regex (optional)
# Example Request
# POST /projects/user/:user_id
post "user/:user_id" do
@@ -207,6 +213,9 @@ module API
# shared_runners_enabled (optional)
# public (optional) - if true same as setting visibility_level = 20
# visibility_level (optional) - visibility level of a project
+ # build_allow_git_fetch (optional)
+ # build_timeout (optional)
+ # build_coverage_regex (optional)
# Example Request
# PUT /projects/:id
put ':id' do