Download as
Browse Code »

Commit 31b06ebd011025ef44cbc384ad74736e75b62184

Authored by Drew Blessing
1 parent 964f7a11
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Issue 3599: Add snippets_enabled flag to projects for API 

s 3599: Add snippets_enabled flag to projects for API

Replace missing comma
Showing 3 changed files with 26 additions and 18 deletions   Show diff stats
doc/api/projects.md
  Diff comments   View file @31b06eb
... ... @@ -53,6 +53,7 @@ GET /projects
53 53 "merge_requests_enabled": true,
54 54 "wall_enabled": true,
55 55 "wiki_enabled": true,
  56 + "snippets_enabled": true,
56 57 "created_at": "2012-05-30T12:49:20Z",
57 58 "last_activity_at": "2012-05-23T08:05:02Z"
58 59 }
... ... @@ -95,6 +96,7 @@ Parameters:
95 96 "merge_requests_enabled": true,
96 97 "wall_enabled": true,
97 98 "wiki_enabled": true,
  99 + "snippets_enabled": true,
98 100 "created_at": "2012-05-30T12:49:20Z",
99 101 "last_activity_at": "2012-05-23T08:05:02Z"
100 102 }
... ... @@ -182,10 +184,11 @@ Parameters:
182 184 + `name` (required) - new project name
183 185 + `description` (optional) - short project description
184 186 + `default_branch` (optional) - 'master' by default
185   -+ `issues_enabled` (optional) - enabled by default
186   -+ `wall_enabled` (optional) - enabled by default
187   -+ `merge_requests_enabled` (optional) - enabled by default
188   -+ `wiki_enabled` (optional) - enabled by default
  187 ++ `issues_enabled` (optional)
  188 ++ `wall_enabled` (optional)
  189 ++ `merge_requests_enabled` (optional)
  190 ++ `wiki_enabled` (optional)
  191 ++ `snippets_enabled` (optional)
189 192  
190 193 **Project access levels**
191 194  
... ... @@ -213,10 +216,11 @@ Parameters:
213 216 + `name` (required) - new project name
214 217 + `description` (optional) - short project description
215 218 + `default_branch` (optional) - 'master' by default
216   -+ `issues_enabled` (optional) - enabled by default
217   -+ `wall_enabled` (optional) - enabled by default
218   -+ `merge_requests_enabled` (optional) - enabled by default
219   -+ `wiki_enabled` (optional) - enabled by default
  219 ++ `issues_enabled` (optional)
  220 ++ `wall_enabled` (optional)
  221 ++ `merge_requests_enabled` (optional)
  222 ++ `wiki_enabled` (optional)
  223 ++ `snippets_enabled` (optional)
220 224  
221 225  
222 226  
... ...
lib/api/entities.rb
  Diff comments   View file @31b06eb
... ... @@ -30,7 +30,7 @@ module API
30 30 expose :owner, using: Entities::UserBasic
31 31 expose :name, :name_with_namespace
32 32 expose :path, :path_with_namespace
33   - expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :created_at, :last_activity_at
  33 + expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at
34 34 expose :namespace
35 35 end
36 36  
... ...
lib/api/projects.rb
  Diff comments   View file @31b06eb
... ... @@ -61,10 +61,11 @@ module API
61 61 # name (required) - name for new project
62 62 # description (optional) - short project description
63 63 # default_branch (optional) - 'master' by default
64   - # issues_enabled (optional) - enabled by default
65   - # wall_enabled (optional) - enabled by default
66   - # merge_requests_enabled (optional) - enabled by default
67   - # wiki_enabled (optional) - enabled by default
  64 + # issues_enabled (optional)
  65 + # wall_enabled (optional)
  66 + # merge_requests_enabled (optional)
  67 + # wiki_enabled (optional)
  68 + # snippets_enabled (optional)
68 69 # namespace_id (optional) - defaults to user namespace
69 70 # Example Request
70 71 # POST /projects
... ... @@ -77,6 +78,7 @@ module API
77 78 :wall_enabled,
78 79 :merge_requests_enabled,
79 80 :wiki_enabled,
  81 + :snippets_enabled,
80 82 :namespace_id]
81 83 @project = ::Projects::CreateContext.new(current_user, attrs).execute
82 84 if @project.saved?
... ... @@ -96,10 +98,11 @@ module API
96 98 # name (required) - name for new project
97 99 # description (optional) - short project description
98 100 # default_branch (optional) - 'master' by default
99   - # issues_enabled (optional) - enabled by default
100   - # wall_enabled (optional) - enabled by default
101   - # merge_requests_enabled (optional) - enabled by default
102   - # wiki_enabled (optional) - enabled by default
  101 + # issues_enabled (optional)
  102 + # wall_enabled (optional)
  103 + # merge_requests_enabled (optional)
  104 + # wiki_enabled (optional)
  105 + # snippets_enabled (optional)
103 106 # Example Request
104 107 # POST /projects/user/:user_id
105 108 post "user/:user_id" do
... ... @@ -111,7 +114,8 @@ module API
111 114 :issues_enabled,
112 115 :wall_enabled,
113 116 :merge_requests_enabled,
114   - :wiki_enabled]
  117 + :wiki_enabled,
  118 + :snippets_enabled]
115 119 @project = ::Projects::CreateContext.new(user, attrs).execute
116 120 if @project.saved?
117 121 present @project, with: Entities::Project
... ...