diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-12 13:17:25 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-12 13:17:25 +0000 |
| commit | c43b289612b2420bc7e3c5faaf014b527ccace04 (patch) | |
| tree | b8c914942c8c69cfa7886712e68b8cd63abcf079 /lib/api/entities.rb | |
| parent | f1fc1ae6f10d122c6b852edc0fdf11f38a2d7e30 (diff) | |
| parent | 92ef845fa5fdf0ffbc50e0a35cf366765fbfc631 (diff) | |
| download | gitlab-ce-c43b289612b2420bc7e3c5faaf014b527ccace04.tar.gz | |
Merge branch '6-0-dev' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index edc6302f021..f31050b008d 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -106,10 +106,6 @@ module API expose :id, :title, :key, :created_at end - class UserTeam < Grape::Entity - expose :id, :name, :path, :owner_id - end - class MergeRequest < Grape::Entity expose :id, :target_branch, :source_branch, :project_id, :title, :state expose :author, :assignee, using: Entities::UserBasic |