diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-05 21:09:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-05 21:09:33 +0300 |
| commit | c20e6edd8a648a2cecb7ba0c4e8be48ce68e25a1 (patch) | |
| tree | 804cbc1984f4b6636d958bf7b70a00f323a8137f /app/models | |
| parent | 3e6c042eb05e09d88c2bd988cb9ef5f9eba67794 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/pages/lookup_path.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/pages/lookup_path.rb b/app/models/pages/lookup_path.rb index e8becc833ca..8a02415aef4 100644 --- a/app/models/pages/lookup_path.rb +++ b/app/models/pages/lookup_path.rb @@ -55,6 +55,12 @@ module Pages strong_memoize_attr :prefix def unique_host + # When serving custom domain we don't present the unique host to avoid + # GitLab Pages auto-redirect to the unique domain instead of keeping serving + # from the custom domain. + # https://gitlab.com/gitlab-org/gitlab/-/issues/426435 + return if domain.present? + url_builder.unique_host end strong_memoize_attr :unique_host |