summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-02-23 17:39:54 +0000
committerRobert Speicher <robert@gitlab.com>2018-02-23 17:39:54 +0000
commit53d7491a73f73f9634dbecde8d8c1333bfadadad (patch)
tree4808e56b3ba11c860d8d4c892b55dcf8cb560809 /lib/api
parentdda2394f9b7196d1a988b8608fd56f346965e934 (diff)
parent3540841b214846deff7cd79baf6cc86aa8653b81 (diff)
downloadgitlab-ce-53d7491a73f73f9634dbecde8d8c1333bfadadad.tar.gz
Merge branch '29497-pages-custom-domain-dns-verification' into 'master'
Resolve "Domain validation for Pages custom domains" (master branch) Closes #29497, #42971, and #42083 See merge request gitlab-org/gitlab-ce!17311
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/entities.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 45c737c6c29..167878ba600 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1154,6 +1154,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? },
@@ -1165,6 +1169,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|