Merge pull request #3993 from bke-drewb/3599

Issue 3599: Add snippets_enabled flag to projects for API

diff --cc doc/api/projects.md
index 41b6b6a,7b66f8b..b3e4ec0
--- 1/doc/api/projects.md
--- 2/doc/api/projects.md
+++ b/doc/api/projects.md
@@@ -453,28 -457,3 +457,28 @@@ Parameters
  + `id` (required) - The ID of the project.
  + `branch` (required) - The name of the branch.
  
- + `id` (required) - The ID of the project
 +
 +## Admin fork relation
 +
 +Allows modification of the forked relationship between existing projects. . Available only for admins.
 +
 +### Create a forked from/to relation between existing projects.
 +
 +```
 +POST /projects/:id/fork/:forked_from_id
 +```
 +
 +Parameters:
 +
 ++ `id` (required) - The ID of the project
 ++ `forked_from_id:` (required) - The ID of the project that was forked from
 +
 +### Delete an existing forked from relationship
 +
 +```
 +DELETE /projects/:id/fork
 +```
 +
 +Parameter:
 +
+++ `id` (required) - The ID of the project

diff --cc lib/api/entities.rb
index dea5771,42f434e..edc6302
--- 1/lib/api/entities.rb
--- 2/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@@ -36,9 -30,8 +36,9 @@@ module AP
        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
  
      class ProjectMember < UserBasic

diff --cc lib/api/projects.rb
Simple merge