Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 6 deletions

diff --git a/app/models/pages/lookup_path.rb b/app/models/pages/lookup_path.rb
index 1b3183a2a43..51c496c77d3 100644
--- a/app/models/pages/lookup_path.rb
+++ b/app/models/pages/lookup_path.rb
@@ -2,9 +2,10 @@
 
 module Pages
   class LookupPath
-    def initialize(project, domain: nil)
+    def initialize(project, trim_prefix: nil, domain: nil)
       @project = project
       @domain = domain
+      @trim_prefix = trim_prefix || project.full_path
     end
 
     def project_id
@@ -28,11 +29,15 @@ module Pages
     end
 
     def prefix
-      '/'
+      if project.pages_group_root?
+        '/'
+      else
+        project.full_path.delete_prefix(trim_prefix) + '/'
+      end
     end
 
     private
 
-    attr_reader :project, :domain
+    attr_reader :project, :trim_prefix, :domain
   end
 end
diff --git a/app/models/pages/virtual_domain.rb b/app/models/pages/virtual_domain.rb
index 3a876dc06a2..7e42b8e6ae2 100644
--- a/app/models/pages/virtual_domain.rb
+++ b/app/models/pages/virtual_domain.rb
@@ -2,8 +2,9 @@
 
 module Pages
   class VirtualDomain
-    def initialize(projects, domain: nil)
+    def initialize(projects, trim_prefix: nil, domain: nil)
       @projects = projects
+      @trim_prefix = trim_prefix
       @domain = domain
     end
 
@@ -17,12 +18,12 @@ module Pages
 
     def lookup_paths
       projects.map do |project|
-        project.pages_lookup_path(domain: domain)
+        project.pages_lookup_path(trim_prefix: trim_prefix, domain: domain)
       end.sort_by(&:prefix).reverse
     end
 
     private
 
-    attr_reader :projects, :domain
+    attr_reader :projects, :trim_prefix, :domain
   end
 end