diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-17 15:10:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-17 15:10:15 +0000 |
| commit | 68c476dbd8a2c670aeeebffce8b63b554a3ac7f0 (patch) | |
| tree | c46b90a5c131d8e8d7fb530f1b8f9390b8eb2613 /app/models/pages/virtual_domain.rb | |
| parent | a62238de7302e54edafa3407a2dc8ba1a5f96e4d (diff) | |
| download | gitlab-ce-68c476dbd8a2c670aeeebffce8b63b554a3ac7f0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/pages/virtual_domain.rb')
| -rw-r--r-- | app/models/pages/virtual_domain.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/pages/virtual_domain.rb b/app/models/pages/virtual_domain.rb index 90cb8253b52..497f67993ae 100644 --- a/app/models/pages/virtual_domain.rb +++ b/app/models/pages/virtual_domain.rb @@ -21,9 +21,7 @@ module Pages project.pages_lookup_path(trim_prefix: trim_prefix, domain: domain) end - # TODO: remove in https://gitlab.com/gitlab-org/gitlab/-/issues/297524 - # source can only be nil if pages_serve_from_legacy_storage FF is disabled - # we can remove this filtering once we remove legacy storage + # TODO: remove in https://gitlab.com/gitlab-org/gitlab/-/issues/328715 paths = paths.select(&:source) paths.sort_by(&:prefix).reverse |