summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-01-24 14:44:49 +0000
committerRémy Coutable <remy@rymai.me>2018-01-24 14:44:49 +0000
commitc28ffa1da3aaed0c189a1787a17ed2c944882f09 (patch)
treeee03616501908f9b974a022ed145ac1798747e65 /lib/api/entities.rb
parent09da89e634c197919b129ad0f781c3cec9b93c37 (diff)
parent45b62dfd324318959ff6fa37f9d3f8a1a95b4aa7 (diff)
downloadgitlab-ce-c28ffa1da3aaed0c189a1787a17ed2c944882f09.tar.gz
Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master'
Add application create API Closes #24035 See merge request gitlab-org/gitlab-ce!16643
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 3f4b62dc1b2..7b9a80a234b 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1157,5 +1157,15 @@ module API
pages_domain
end
end
+
+ class Application < Grape::Entity
+ expose :uid, as: :application_id
+ expose :redirect_uri, as: :callback_url
+ end
+
+ # Use with care, this exposes the secret
+ class ApplicationWithSecret < Application
+ expose :secret
+ end
end
end