diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-19 05:39:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-19 05:39:46 +0000 |
| commit | fcccf7622b7df6b87b4f024963b1bccf0dcf24d8 (patch) | |
| tree | d0761f4b07a9ba1884cb7613d07a0218e75501ac /lib/api/entities.rb | |
| parent | 670aaaeb9db7902c8776cb7754ac8fd1e7a606a1 (diff) | |
| parent | 1b3b90dbfd3219f571084321c751bd2263ad1836 (diff) | |
| download | gitlab-ce-fcccf7622b7df6b87b4f024963b1bccf0dcf24d8.tar.gz | |
Merge branch 'remove/user_teams' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev
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 0d8cac5c8fd..14d6c0f9353 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -99,10 +99,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 |