Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 5 deletions

diff --git a/lib/gitlab/pages/url_builder.rb b/lib/gitlab/pages/url_builder.rb
index 7fe9c611f5b..f01ec54b853 100644
--- a/lib/gitlab/pages/url_builder.rb
+++ b/lib/gitlab/pages/url_builder.rb
@@ -14,10 +14,9 @@ module Gitlab
       end
 
       def pages_url(with_unique_domain: false)
+        return namespace_in_path_url(with_unique_domain && unique_domain_enabled?) if config.namespace_in_path
         return unique_url if with_unique_domain && unique_domain_enabled?
 
-        return "#{pages_base_url}/#{project_namespace}/#{project_path}".downcase if config.namespace_in_path
-
         project_path_url = "#{config.protocol}://#{project_path}".downcase
 
         # If the project path is the same as host, we serve it as group page
@@ -31,6 +30,7 @@ module Gitlab
 
       def unique_host
         return unless unique_domain_enabled?
+        return if config.namespace_in_path
 
         URI(unique_url).host
       end
@@ -73,9 +73,17 @@ module Gitlab
 
       def pages_base_url
         @pages_url ||= URI(config.url)
-                         .tap { |url| url.port = config.port }
-                         .to_s
-                         .downcase
+          .tap { |url| url.port = config.port }
+          .to_s
+          .downcase
+      end
+
+      def namespace_in_path_url(with_unique_domain)
+        if with_unique_domain
+          "#{pages_base_url}/#{project.project_setting.pages_unique_domain}".downcase
+        else
+          "#{pages_base_url}/#{project_namespace}/#{project_path}".downcase
+        end
       end
 
       def url_for(subdomain)