diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-02-21 00:05:31 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-02-21 00:12:46 +0300 |
| commit | 456f24a00e5c55518a9930fd414c4ec6d829fe0d (patch) | |
| tree | 9c74ba7eda466eb709d7ee529405db53a31c88e7 /lib | |
| parent | b4503e64810826f06be25b4f17ac793e8e8e4f58 (diff) | |
Merge branch '29497-pages-custom-domain-dns-verification' into 'security-10-5'
Add DNS verification to Pages custom domains (GitLab 10.5)
See merge request gitlab/gitlabhq!2322
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 1608af97d38..14a3fb82620 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1138,6 +1138,10 @@ module API expose :domain expose :url expose :project_id + expose :verified?, as: :verified + expose :verification_code, as: :verification_code + expose :enabled_until + expose :certificate, as: :certificate_expiration, if: ->(pages_domain, _) { pages_domain.certificate? }, @@ -1149,6 +1153,10 @@ module API class PagesDomain < Grape::Entity expose :domain expose :url + expose :verified?, as: :verified + expose :verification_code, as: :verification_code + expose :enabled_until + expose :certificate, if: ->(pages_domain, _) { pages_domain.certificate? }, using: PagesDomainCertificate do |pages_domain| |