Merge pull request #1043 from NARKOZ/api

API docs

2 files changed, 10 insertions, 2 deletions

diff --git a/lib/api.rb b/lib/api.rb
index 309d254ba3d..e24e0a78f71 100644
--- a/lib/api.rb
+++ b/lib/api.rb
@@ -5,6 +5,10 @@ module Gitlab
     VERSION = 'v2'
     version VERSION, :using => :path
 
+    rescue_from ActiveRecord::RecordNotFound do
+      rack_response({'message' => '404 Not found'}.to_json, 404)
+    end
+
     format :json
     error_format :json
     helpers APIHelpers
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 7129e761a52..35ad4d430ad 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -5,9 +5,13 @@ module Gitlab
              :dark_scheme, :theme_id, :blocked, :created_at
     end
 
+    class UserBasic < Grape::Entity
+      expose :id, :email, :name, :blocked, :created_at
+    end
+
     class Project < Grape::Entity
       expose :id, :code, :name, :description, :path, :default_branch
-      expose :owner, :using => Entities::User
+      expose :owner, :using => Entities::UserBasic
       expose :private_flag, :as => :private
       expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :created_at
     end
@@ -22,7 +26,7 @@ module Gitlab
 
     class ProjectSnippet < Grape::Entity
       expose :id, :title, :file_name
-      expose :author, :using => Entities::User
+      expose :author, :using => Entities::UserBasic
       expose :expires_at, :updated_at, :created_at
     end
   end