Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-key

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 2 insertions, 7 deletions

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index fd85217debf..98bbcfaaba5 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -158,8 +158,7 @@ module ProjectsHelper
 
   def project_list_cache_key(project)
     key = [
-      'parent/' + project.namespace.parent_full_path,
-      project.namespace.cache_key,
+      project.route.cache_key,
       project.cache_key,
       controller.controller_name,
       controller.action_name,
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index cf82b56cc7a..a7ede5e3b9e 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -224,10 +224,6 @@ class Namespace < ActiveRecord::Base
     parent.present?
   end
 
-  def parent_full_path
-    full_path.split('/')[0...-1].join('/')
-  end
-
   private
 
   def repository_storage_paths
diff --git a/app/models/route.rb b/app/models/route.rb
index 12a7fa3d01b..be77b8b51a5 100644
--- a/app/models/route.rb
+++ b/app/models/route.rb
@@ -35,7 +35,7 @@ class Route < ActiveRecord::Base
         old_path = route.path
 
         # Callbacks must be run manually
-        route.update_columns(attributes)
+        route.update_columns(attributes.merge(updated_at: Time.now))
 
         # We are not calling route.delete_conflicting_redirects here, in hopes
         # of avoiding deadlocks. The parent (self, in this method) already