diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-27 21:56:03 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-27 21:56:03 +0100 |
| commit | 496c750e3f387624fd51a37954efe87ef6b465bd (patch) | |
| tree | b94bd0e1b1e0e7ae179cd2cdb91aa194d7276eb2 /lib/api/entities.rb | |
| parent | 90b06afdeaa13fe14218a53c8afbc4802af53a27 (diff) | |
| parent | dfd6c3f824ada5558546b809fd32468325788b94 (diff) | |
| download | gitlab-ce-ph-multi-file-upload-file.tar.gz | |
Merge branch 'master' into ph-multi-file-upload-fileph-multi-file-upload-file
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 5f0bad14839..efe874b2e6b 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1043,5 +1043,22 @@ module API expose :key expose :value end + + class PagesDomainCertificate < Grape::Entity + expose :subject + expose :expired?, as: :expired + expose :certificate + expose :certificate_text + end + + class PagesDomain < Grape::Entity + expose :domain + expose :url + expose :certificate, + if: ->(pages_domain, _) { pages_domain.certificate? }, + using: PagesDomainCertificate do |pages_domain| + pages_domain + end + end end end |