diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-12 14:42:35 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-12 14:42:35 +0300 |
| commit | 518181697041c5111bb42ca2bfdc119e258d425e (patch) | |
| tree | d02b7c6ff60f40fdec158b9d789e741c2c267b38 /lib/api | |
| parent | e49ec46461ef033fb54c717378628a31bd33248b (diff) | |
| parent | d938486c3607dde357bf10f2d31b204290cdfd3f (diff) | |
| download | gitlab-ce-518181697041c5111bb42ca2bfdc119e258d425e.tar.gz | |
Merge branch 'master' into 6-0-dev
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 2 | ||||
| -rw-r--r-- | lib/api/projects.rb | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 7fcc7eba9d2..f31050b008d 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 |