diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 15:09:08 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 15:09:08 +0000 |
commit | b3a736ed88a1db0391cd9881e70b987bab7d89d1 (patch) | |
tree | a91ca3a06abd4c3412775ac3c49b11e3151df2be /lib/api/entities.rb | |
parent | 5366964a10484c2783a646b35a6da9eece01b242 (diff) | |
download | gitlab-ce-b3a736ed88a1db0391cd9881e70b987bab7d89d1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r-- | lib/api/entities.rb | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index df7c7b15aeb..3435d1d6f11 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -199,50 +199,6 @@ module API end.compact end end - - class UserAgentDetail < Grape::Entity - expose :user_agent - expose :ip_address - expose :submitted, as: :akismet_submitted - end - - class CustomAttribute < Grape::Entity - expose :key - expose :value - end - - class PagesDomainCertificateExpiration < Grape::Entity - expose :expired?, as: :expired - expose :expiration - end - - class Application < Grape::Entity - expose :id - expose :uid, as: :application_id - expose :name, as: :application_name - expose :redirect_uri, as: :callback_url - expose :confidential - end - - # Use with care, this exposes the secret - class ApplicationWithSecret < Application - expose :secret - end - - class Blob < Grape::Entity - expose :basename - expose :data - expose :path - # TODO: :filename was renamed to :path but both still return the full path, - # in the future we can only return the filename here without the leading - # directory path. - # https://gitlab.com/gitlab-org/gitlab/issues/34521 - expose :filename, &:path - expose :id - expose :ref - expose :startline - expose :project_id - end end end |