Revert "Store pages in shared/pages/fqdn/fqdn/public or shared/pages/fqdn/subpath/public - makes it simpler to implement CNAMEs in future"

This reverts commit 86a2a78f0d13a678899460638add6b862059433e.

1 files changed, 6 insertions, 8 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 9cdd01e433d..a1888c089ce 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1137,7 +1137,6 @@ class Project < ActiveRecord::Base
     issues.opened.count
   end
 
-<<<<<<< HEAD
   def visibility_level_allowed_as_fork?(level = self.visibility_level)
     return true unless forked?
 
@@ -1163,23 +1162,22 @@ class Project < ActiveRecord::Base
     ensure_runners_token!
   end
 
-  def pages_host
-    "#{namespace.path}.#{Settings.pages.host}"
-  end
-
   def pages_url
     if Dir.exist?(public_pages_path)
-      url = Gitlab.config.pages.url.sub(Settings.pages.host, pages_host)
+      host = "#{namespace.path}.#{Settings.pages.host}"
+      url = Gitlab.config.pages.url.sub(/^https?:\/\//) do |prefix|
+        "#{prefix}#{namespace.path}."
+      end
 
       # If the project path is the same as host, leave the short version
-      return url if pages_host == path
+      return url if host == path
 
       "#{url}/#{path}"
     end
   end
 
   def pages_path
-    File.join(Settings.pages.path, pages_host, path)
+    File.join(Settings.pages.path, path_with_namespace)
   end
 
   def public_pages_path