diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 18:08:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 18:08:58 +0000 |
| commit | 1ca9950d5f890cd8f185e1eda158b969a7244fe2 (patch) | |
| tree | 6f62715938a4b2b001705c51c697609a8e0850ae /app/models/pages_domain.rb | |
| parent | bcc77054ee9aefd1e332e04a4189390fd5a3112e (diff) | |
| download | gitlab-ce-1ca9950d5f890cd8f185e1eda158b969a7244fe2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/pages_domain.rb')
| -rw-r--r-- | app/models/pages_domain.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb index 330764ebc7f..91767c53f81 100644 --- a/app/models/pages_domain.rb +++ b/app/models/pages_domain.rb @@ -62,6 +62,8 @@ class PagesDomain < ApplicationRecord scope :for_removal, -> { where("remove_at < ?", Time.now) } + scope :with_logging_info, -> { includes(project: [:namespace, :route]) } + def verified? !!verified_at end @@ -285,3 +287,5 @@ class PagesDomain < ApplicationRecord !auto_ssl_enabled? && project&.pages_https_only? end end + +PagesDomain.prepend_if_ee('::EE::PagesDomain') |