summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-01-05 14:29:37 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-01-05 14:29:37 +0000
commit0788b37fba26ab7113ff4a580d3fb92c926299b7 (patch)
tree60f1c6b649cd1380b2bc1c44c91b708ab6e6f67d /lib
parent737f0ae8fdf3bdd23d02da8b7fbfd8e42ba78fdd (diff)
parent78cdac8401375cc85be54ae68e5d94d02a90233c (diff)
downloadgitlab-ce-0788b37fba26ab7113ff4a580d3fb92c926299b7.tar.gz
Merge branch 'api-domains-expose-project_id' into 'master'
Expose project_id on /api/v4/pages/domains See merge request gitlab-org/gitlab-ce!16200
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 516d767ef5e..bd0c54a1b04 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1137,6 +1137,7 @@ module API
class PagesDomainBasic < Grape::Entity
expose :domain
expose :url
+ expose :project_id
expose :certificate,
as: :certificate_expiration,
if: ->(pages_domain, _) { pages_domain.certificate? },