summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew.blessing@buckle.com>2013-05-19 13:38:53 -0500
committerDrew Blessing <drew.blessing@buckle.com>2013-06-11 21:38:02 -0500
commit31b06ebd011025ef44cbc384ad74736e75b62184 (patch)
treed0039ad241535a215b7c8881c7328ea4dc0a2193
parent964f7a1196c56a100242525eb3b8a4b69118d2ff (diff)
downloadgitlab-ce-31b06ebd011025ef44cbc384ad74736e75b62184.tar.gz
Issue 3599: Add snippets_enabled flag to projects for API
s 3599: Add snippets_enabled flag to projects for API Replace missing comma
-rw-r--r--doc/api/projects.md20
-rw-r--r--lib/api/entities.rb2
-rw-r--r--lib/api/projects.rb22
3 files changed, 26 insertions, 18 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 323c0be63a4..7b66f8bfcd3 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)
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 0d8cac5c8fd..42f434e24ad 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -30,7 +30,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
end
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 6dc051e4ba2..ab6f2c70de9 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