diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-09-30 11:06:08 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-09-30 11:06:08 +0000 |
| commit | 4f92f29e703cba47b835285041cbd40063958716 (patch) | |
| tree | a314dcc5232bdf9936446dc7f5331f9381fba151 /lib | |
| parent | f80e7683237a4aca01ff3d0c729c4933dde8753c (diff) | |
| parent | 59157c0423d34c1f20c446548df540d103bda939 (diff) | |
| download | gitlab-ce-4f92f29e703cba47b835285041cbd40063958716.tar.gz | |
Merge branch 'koding-setting-api' into 'master'
Expose the Koding application settings in the API
## Why was this MR needed?
When saving the GitLab application secrets in Koding, and authorising your admin user to have access to the UI, we want to let Koding enable the integration, and populate the url in GitLab for the user.
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22705
See merge request !6555
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index c5dc8b22f60..04437322ec1 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -494,6 +494,8 @@ module API expose :after_sign_out_path expose :container_registry_token_expire_delay expose :repository_storage + expose :koding_enabled + expose :koding_url end class Release < Grape::Entity |