BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 8cdfa86b by Dmitriy Zaporozhets
Options

Merge pull request #3993 from bke-drewb/3599

Issue 3599: Add snippets_enabled flag to projects for API
parents 7740005b 31b06ebd
Showing with 26 additions and 18 deletions
doc/api/projects.md
...@@ -53,6 +53,7 @@ GET /projects ...@@ -53,6 +53,7 @@ GET /projects
"merge_requests_enabled": true, "merge_requests_enabled": true,
"wall_enabled": true, "wall_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": true,
"created_at": "2012-05-30T12:49:20Z", "created_at": "2012-05-30T12:49:20Z",
"last_activity_at": "2012-05-23T08:05:02Z" "last_activity_at": "2012-05-23T08:05:02Z"
} }
...@@ -95,6 +96,7 @@ Parameters: ...@@ -95,6 +96,7 @@ Parameters:
"merge_requests_enabled": true, "merge_requests_enabled": true,
"wall_enabled": true, "wall_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": true,
"created_at": "2012-05-30T12:49:20Z", "created_at": "2012-05-30T12:49:20Z",
"last_activity_at": "2012-05-23T08:05:02Z" "last_activity_at": "2012-05-23T08:05:02Z"
} }
...@@ -182,10 +184,11 @@ Parameters: ...@@ -182,10 +184,11 @@ Parameters:
+ `name` (required) - new project name + `name` (required) - new project name
+ `description` (optional) - short project description + `description` (optional) - short project description
+ `default_branch` (optional) - 'master' by default + `default_branch` (optional) - 'master' by default
+ `issues_enabled` (optional) - enabled by default + `issues_enabled` (optional)
+ `wall_enabled` (optional) - enabled by default + `wall_enabled` (optional)
+ `merge_requests_enabled` (optional) - enabled by default + `merge_requests_enabled` (optional)
+ `wiki_enabled` (optional) - enabled by default + `wiki_enabled` (optional)
+ `snippets_enabled` (optional)
**Project access levels** **Project access levels**
...@@ -213,10 +216,11 @@ Parameters: ...@@ -213,10 +216,11 @@ Parameters:
+ `name` (required) - new project name + `name` (required) - new project name
+ `description` (optional) - short project description + `description` (optional) - short project description
+ `default_branch` (optional) - 'master' by default + `default_branch` (optional) - 'master' by default
+ `issues_enabled` (optional) - enabled by default + `issues_enabled` (optional)
+ `wall_enabled` (optional) - enabled by default + `wall_enabled` (optional)
+ `merge_requests_enabled` (optional) - enabled by default + `merge_requests_enabled` (optional)
+ `wiki_enabled` (optional) - enabled by default + `wiki_enabled` (optional)
+ `snippets_enabled` (optional)
......
lib/api/entities.rb
...@@ -36,7 +36,7 @@ module API ...@@ -36,7 +36,7 @@ module API
expose :owner, using: Entities::UserBasic expose :owner, using: Entities::UserBasic
expose :name, :name_with_namespace expose :name, :name_with_namespace
expose :path, :path_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 :namespace
expose :forked_from_project, using: Entities::ForkedFromProject, :if => lambda{ | project, options | project.forked? } expose :forked_from_project, using: Entities::ForkedFromProject, :if => lambda{ | project, options | project.forked? }
end end
......
lib/api/projects.rb
...@@ -61,10 +61,11 @@ module API ...@@ -61,10 +61,11 @@ module API
# name (required) - name for new project # name (required) - name for new project
# description (optional) - short project description # description (optional) - short project description
# default_branch (optional) - 'master' by default # default_branch (optional) - 'master' by default
# issues_enabled (optional) - enabled by default # issues_enabled (optional)
# wall_enabled (optional) - enabled by default # wall_enabled (optional)
# merge_requests_enabled (optional) - enabled by default # merge_requests_enabled (optional)
# wiki_enabled (optional) - enabled by default # wiki_enabled (optional)
# snippets_enabled (optional)
# namespace_id (optional) - defaults to user namespace # namespace_id (optional) - defaults to user namespace
# Example Request # Example Request
# POST /projects # POST /projects
...@@ -77,6 +78,7 @@ module API ...@@ -77,6 +78,7 @@ module API
:wall_enabled, :wall_enabled,
:merge_requests_enabled, :merge_requests_enabled,
:wiki_enabled, :wiki_enabled,
:snippets_enabled,
:namespace_id] :namespace_id]
@project = ::Projects::CreateContext.new(current_user, attrs).execute @project = ::Projects::CreateContext.new(current_user, attrs).execute
if @project.saved? if @project.saved?
...@@ -96,10 +98,11 @@ module API ...@@ -96,10 +98,11 @@ module API
# name (required) - name for new project # name (required) - name for new project
# description (optional) - short project description # description (optional) - short project description
# default_branch (optional) - 'master' by default # default_branch (optional) - 'master' by default
# issues_enabled (optional) - enabled by default # issues_enabled (optional)
# wall_enabled (optional) - enabled by default # wall_enabled (optional)
# merge_requests_enabled (optional) - enabled by default # merge_requests_enabled (optional)
# wiki_enabled (optional) - enabled by default # wiki_enabled (optional)
# snippets_enabled (optional)
# Example Request # Example Request
# POST /projects/user/:user_id # POST /projects/user/:user_id
post "user/:user_id" do post "user/:user_id" do
...@@ -111,7 +114,8 @@ module API ...@@ -111,7 +114,8 @@ module API
:issues_enabled, :issues_enabled,
:wall_enabled, :wall_enabled,
:merge_requests_enabled, :merge_requests_enabled,
:wiki_enabled] :wiki_enabled,
:snippets_enabled]
@project = ::Projects::CreateContext.new(user, attrs).execute @project = ::Projects::CreateContext.new(user, attrs).execute
if @project.saved? if @project.saved?
present @project, with: Entities::Project present @project, with: Entities::Project
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment