Merge branch 'zj-grape-keys' into 'master'

GrapeDSL for Keys endpoint No changelog item as it doesn't change behaviour Cherry-picket from !6330 See merge request !6631

Merge branch 'zj-grape-keys' into 'master'
5bc1e93c · Rémy Coutable · 2cbc7a78 · dd088d14 · 5bc1e93c
Commit 5bc1e93c authored Oct 03, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

keys.rb lib/api/keys.rb +3 -4

No files found.
--- a/lib/api/keys.rb
+++ b/lib/api/keys.rb
@@ -4,10 +4,9 @@ module API
    before { authenticate! }

    resource :keys do
-      # Get single ssh key by id. Only available to admin users.
-      #
-      # Example Request:
-      #   GET /keys/:id
+      desc 'Get single ssh key by id. Only available to admin users' do
+        success Entities::SSHKeyWithUser
+      end
      get ":id" do
        authenticated_as_admin!