diff options
Diffstat (limited to 'lib/gitlab/pages')
-rw-r--r-- | lib/gitlab/pages/url_builder.rb | 3 | ||||
-rw-r--r-- | lib/gitlab/pages/virtual_host_finder.rb | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/pages/url_builder.rb b/lib/gitlab/pages/url_builder.rb index 215154b7248..5a28a5ffd23 100644 --- a/lib/gitlab/pages/url_builder.rb +++ b/lib/gitlab/pages/url_builder.rb @@ -82,8 +82,7 @@ module Gitlab end def unique_domain_enabled? - Feature.enabled?(:pages_unique_domain, project) && - project.project_setting.pages_unique_domain_enabled? + project.project_setting.pages_unique_domain_enabled? end def config diff --git a/lib/gitlab/pages/virtual_host_finder.rb b/lib/gitlab/pages/virtual_host_finder.rb index d5e2159fb52..88ee0e44c00 100644 --- a/lib/gitlab/pages/virtual_host_finder.rb +++ b/lib/gitlab/pages/virtual_host_finder.rb @@ -28,7 +28,6 @@ module Gitlab def by_unique_domain(name) project = Project.by_pages_enabled_unique_domain(name) - return unless Feature.enabled?(:pages_unique_domain, project) return unless project&.pages_deployed? ::Pages::VirtualDomain.new(projects: [project]) |