diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-03-05 22:29:49 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-03-05 22:29:49 +0100 |
| commit | 61cfa2a7a6e1d4557b69e17c537656e8a0201ac8 (patch) | |
| tree | f868b5a1d870a42afe57e2b4dbbf35c9445c002b /lib/api/projects.rb | |
| parent | d269d107d86c600ab2add651f47cced8f601ae84 (diff) | |
| parent | 6beae84ea37e03e68affd2b69fba25f45a4e5386 (diff) | |
| download | gitlab-ce-61cfa2a7a6e1d4557b69e17c537656e8a0201ac8.tar.gz | |
Merge branch 'master' into fixes/api
Conflicts:
lib/api/projects.rb
Diffstat (limited to 'lib/api/projects.rb')
| -rw-r--r-- | lib/api/projects.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index abd115d31b0..6df00db70a0 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -52,8 +52,8 @@ module Gitlab :issues_enabled, :wall_enabled, :merge_requests_enabled, - :wiki_enabled] - + :wiki_enabled, + :namespace_id] @project = ::Projects::CreateContext.new(current_user, attrs).execute if @project.saved? present @project, with: Entities::Project |