summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-07-07 17:13:31 +0000
committerDouwe Maan <douwe@gitlab.com>2017-07-07 17:13:31 +0000
commit820aeb4e8d8df9ed5a197a4f9529e107a170e9de (patch)
tree8783945cd1a61351beb3a772c2cf51c082eb6b04 /lib/api/entities.rb
parentc5e11d0405ce6f1b28af50e918af24cd330cfd65 (diff)
parent4c735e1bd4bd0d67dc6f5496e13346a8b5926cd0 (diff)
downloadgitlab-ce-820aeb4e8d8df9ed5a197a4f9529e107a170e9de.tar.gz
Merge branch 'feature/user-agent-details-api' into 'master'
Allow admins to retrieve user agent details for an issue or snippet Closes #29508 See merge request !12655
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index fdc0c562248..f4796f311a5 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -888,5 +888,11 @@ module API
expose :dependencies, using: Dependency
end
end
+
+ class UserAgentDetail < Grape::Entity
+ expose :user_agent
+ expose :ip_address
+ expose :submitted, as: :akismet_submitted
+ end
end
end