From 28e7d1a8bf3ef172331125cf56d92af85ea5e8b2 Mon Sep 17 00:00:00 2001
From: Alex Denisov <1101.debian@gmail.com>
Date: Mon, 18 Mar 2013 20:11:28 +0000
Subject: Abilities added to /user and /sign_in requests

---
 lib/api/entities.rb | 6 +++++-
 lib/api/projects.rb | 4 ++--
 lib/api/users.rb    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib/api')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 5479765a089..92191e4b6e3 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -15,6 +15,10 @@ module Gitlab
 
     class UserLogin < UserBasic
       expose :private_token
+      expose :is_admin?, as: :is_admin
+      expose :can_create_group?, as: :can_create_group
+      expose :can_create_project?, as: :can_create_project
+      expose :can_create_team?, as: :can_create_team
     end
 
     class Hook < Grape::Entity
@@ -31,7 +35,7 @@ module Gitlab
     end
 
     class ProjectMember < UserBasic
-      expose :project_access, :as => :access_level do |user, options|
+      expose :project_access, as: :access_level do |user, options|
         options[:project].users_projects.find_by_user_id(user.id).project_access
       end
     end
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index e82cfeca45d..d4f50fda1b5 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -191,7 +191,7 @@ module Gitlab
         unless team_member.nil?
           team_member.destroy
         else
-          {:message => "Access revoked", :id => params[:user_id].to_i}
+          {message: "Access revoked", id: params[:user_id].to_i}
         end
       end
 
@@ -322,7 +322,7 @@ module Gitlab
         protected = user_project.protected_branches.find_by_name(@branch.name)
 
         unless protected
-          user_project.protected_branches.create(:name => @branch.name)
+          user_project.protected_branches.create(name: @branch.name)
         end
 
         present @branch, with: Entities::RepoObject, project: user_project
diff --git a/lib/api/users.rb b/lib/api/users.rb
index e9cf16fa37d..567750dfa45 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -124,7 +124,7 @@ module Gitlab
       # Example Request:
       #   GET /user
       get do
-        present @current_user, with: Entities::User
+        present @current_user, with: Entities::UserLogin
       end
 
       # Get currently authenticated user's keys
-- 
cgit v1.2.1


From a15fe61fb041ae7c2704bde6d73c246b85d618f7 Mon Sep 17 00:00:00 2001
From: Alex Denisov <1101.debian@gmail.com>
Date: Mon, 18 Mar 2013 21:06:24 +0000
Subject: API docs updated

---
 lib/api/entities.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/api')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 92191e4b6e3..42dae53b4d1 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -13,7 +13,7 @@ module Gitlab
       expose :id, :username, :email, :name, :state, :created_at
     end
 
-    class UserLogin < UserBasic
+    class UserLogin < User
       expose :private_token
       expose :is_admin?, as: :is_admin
       expose :can_create_group?, as: :can_create_group
-- 
cgit v1.2.1