diff options
author | Rémy Coutable <remy@rymai.me> | 2018-10-22 08:52:42 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-10-22 08:52:42 +0000 |
commit | 631f4e2f54290b539fa3a7bc928589b1949adc34 (patch) | |
tree | b9da9af0823ab3a8ab618a61a60b1ee63f2af612 /lib | |
parent | 5b6007f995b60b938c65efe9a18ed4f2c7dafa4d (diff) | |
parent | 192ccaebfc09c29bc62defb5f9a0fc69600600a1 (diff) | |
download | gitlab-ce-631f4e2f54290b539fa3a7bc928589b1949adc34.tar.gz |
Merge branch '52559-applications-api-get-delete' into 'master'
Add Applications API endpoints for listing and deleting entries.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52559
See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22296
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/applications.rb | 16 | ||||
-rw-r--r-- | lib/api/entities.rb | 2 |
2 files changed, 18 insertions, 0 deletions
diff --git a/lib/api/applications.rb b/lib/api/applications.rb index f29cd7fc003..92717e04543 100644 --- a/lib/api/applications.rb +++ b/lib/api/applications.rb @@ -24,6 +24,22 @@ module API render_validation_error! application end end + + desc 'Get applications' do + success Entities::Application + end + get do + applications = ApplicationsFinder.new.execute + present applications, with: Entities::Application + end + + desc 'Delete an application' + delete ':id' do + application = ApplicationsFinder.new(params).execute + application.destroy + + status 204 + end end end end diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 65855e8aac4..18c30723d73 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1412,7 +1412,9 @@ module API end class Application < Grape::Entity + expose :id expose :uid, as: :application_id + expose :name, as: :application_name expose :redirect_uri, as: :callback_url end |