Merge branch 'master' into fixes/api

Conflicts: lib/api/projects.rb
2013-03-05 22:29:49 +01:00 · 2013-03-05 22:29:49 +01:00 · 61cfa2a7a6
commit 61cfa2a7a6
parent d269d107d8 6beae84ea3
146 changed files with 1562 additions and 859 deletions
--- 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