summaryrefslogtreecommitdiff
path: root/lib/api/entities
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-07 03:08:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-07 03:08:03 +0000
commit73f25276606bed7d822153814de9467900aac244 (patch)
tree4d98413398c19441369a15bbef67c261bcb53363 /lib/api/entities
parent3e31cffa203fd718381421e8035f7161a9f0338e (diff)
downloadgitlab-ce-73f25276606bed7d822153814de9467900aac244.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/entities')
-rw-r--r--lib/api/entities/gpg_key.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities/gpg_key.rb b/lib/api/entities/gpg_key.rb
index a97e704a5dd..50b72680cc8 100644
--- a/lib/api/entities/gpg_key.rb
+++ b/lib/api/entities/gpg_key.rb
@@ -2,7 +2,7 @@
module API
module Entities
- class GPGKey < Grape::Entity
+ class GpgKey < Grape::Entity
expose :id, :key, :created_at
end
end