diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-11 09:54:15 -0700 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-11 09:54:15 -0700 |
commit | 8cdfa86b578a27feefe2c30f28eb3f46afbb8201 (patch) | |
tree | da63c0cef74a83b3598d210d5263f2ad3ffc5efe | |
parent | 7740005b76b179a2358d2d23714f0afad7075824 (diff) | |
parent | 31b06ebd011025ef44cbc384ad74736e75b62184 (diff) | |
download | gitlab-ce-8cdfa86b578a27feefe2c30f28eb3f46afbb8201.tar.gz |
Merge pull request #3993 from bke-drewb/3599
Issue 3599: Add snippets_enabled flag to projects for API
-rw-r--r-- | doc/api/projects.md | 22 | ||||
-rw-r--r-- | lib/api/entities.rb | 2 | ||||
-rw-r--r-- | lib/api/projects.rb | 22 |
3 files changed, 27 insertions, 19 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md index 41b6b6add39..b3e4ec0214e 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -53,6 +53,7 @@ GET /projects "merge_requests_enabled": true, "wall_enabled": true, "wiki_enabled": true, + "snippets_enabled": true, "created_at": "2012-05-30T12:49:20Z", "last_activity_at": "2012-05-23T08:05:02Z" } @@ -95,6 +96,7 @@ Parameters: "merge_requests_enabled": true, "wall_enabled": true, "wiki_enabled": true, + "snippets_enabled": true, "created_at": "2012-05-30T12:49:20Z", "last_activity_at": "2012-05-23T08:05:02Z" } @@ -182,10 +184,11 @@ Parameters: + `name` (required) - new project name + `description` (optional) - short project description + `default_branch` (optional) - 'master' by default -+ `issues_enabled` (optional) - enabled by default -+ `wall_enabled` (optional) - enabled by default -+ `merge_requests_enabled` (optional) - enabled by default -+ `wiki_enabled` (optional) - enabled by default ++ `issues_enabled` (optional) ++ `wall_enabled` (optional) ++ `merge_requests_enabled` (optional) ++ `wiki_enabled` (optional) ++ `snippets_enabled` (optional) **Project access levels** @@ -213,10 +216,11 @@ Parameters: + `name` (required) - new project name + `description` (optional) - short project description + `default_branch` (optional) - 'master' by default -+ `issues_enabled` (optional) - enabled by default -+ `wall_enabled` (optional) - enabled by default -+ `merge_requests_enabled` (optional) - enabled by default -+ `wiki_enabled` (optional) - enabled by default ++ `issues_enabled` (optional) ++ `wall_enabled` (optional) ++ `merge_requests_enabled` (optional) ++ `wiki_enabled` (optional) ++ `snippets_enabled` (optional) @@ -477,4 +481,4 @@ DELETE /projects/:id/fork Parameter: -+ `id` (required) - The ID of the project
\ No newline at end of file ++ `id` (required) - The ID of the project diff --git a/lib/api/entities.rb b/lib/api/entities.rb index dea5771d6b6..edc6302f021 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -36,7 +36,7 @@ module API expose :owner, using: Entities::UserBasic expose :name, :name_with_namespace expose :path, :path_with_namespace - expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :created_at, :last_activity_at + expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at expose :namespace expose :forked_from_project, using: Entities::ForkedFromProject, :if => lambda{ | project, options | project.forked? } end diff --git a/lib/api/projects.rb b/lib/api/projects.rb index d5709f5cb59..eb8a814be5d 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -61,10 +61,11 @@ module API # name (required) - name for new project # description (optional) - short project description # default_branch (optional) - 'master' by default - # issues_enabled (optional) - enabled by default - # wall_enabled (optional) - enabled by default - # merge_requests_enabled (optional) - enabled by default - # wiki_enabled (optional) - enabled by default + # issues_enabled (optional) + # wall_enabled (optional) + # merge_requests_enabled (optional) + # wiki_enabled (optional) + # snippets_enabled (optional) # namespace_id (optional) - defaults to user namespace # Example Request # POST /projects @@ -77,6 +78,7 @@ module API :wall_enabled, :merge_requests_enabled, :wiki_enabled, + :snippets_enabled, :namespace_id] @project = ::Projects::CreateContext.new(current_user, attrs).execute if @project.saved? @@ -96,10 +98,11 @@ module API # name (required) - name for new project # description (optional) - short project description # default_branch (optional) - 'master' by default - # issues_enabled (optional) - enabled by default - # wall_enabled (optional) - enabled by default - # merge_requests_enabled (optional) - enabled by default - # wiki_enabled (optional) - enabled by default + # issues_enabled (optional) + # wall_enabled (optional) + # merge_requests_enabled (optional) + # wiki_enabled (optional) + # snippets_enabled (optional) # Example Request # POST /projects/user/:user_id post "user/:user_id" do @@ -111,7 +114,8 @@ module API :issues_enabled, :wall_enabled, :merge_requests_enabled, - :wiki_enabled] + :wiki_enabled, + :snippets_enabled] @project = ::Projects::CreateContext.new(user, attrs).execute if @project.saved? present @project, with: Entities::Project |