diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
| commit | db384e6b19af03b4c3c82a5760d83a3fd79f7982 (patch) | |
| tree | 34beaef37df5f47ccbcf5729d7583aae093cffa0 /lib/gitlab/pages | |
| parent | 54fd7b1bad233e3944434da91d257fa7f63c3996 (diff) | |
Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42
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]) |