summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-13 09:01:03 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-13 09:01:03 +0000
commit0c24192fb1190f94e8b324605cf2cd972cc62c0c (patch)
tree08023241d896955abe53559b4fe6c3c78a25f2ab
parent3723a9dcd1132d68f9d0df1506e3decf90f5df4a (diff)
parent562a9b1a87ff0880a5a60f1a01d79d09bbaf7ea7 (diff)
downloadgitlab-ce-0c24192fb1190f94e8b324605cf2cd972cc62c0c.tar.gz
Merge branch 'fix-group-project-list-cache' into 'master'
Bust group page project list cache when namespace name or path changes. Fixes gitlab-com/support-forum#144. See merge request !509
-rw-r--r--CHANGELOG2
-rw-r--r--app/views/shared/_project.html.haml2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f544e63a124..35d794d8bd2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -71,6 +71,8 @@ v 7.10.0 (unreleased)
- Authometic setup GitLab CI project for forks if origin project has GitLab CI enabled
- Prevent duplicate Buildkite service creation.
- Fix git over ssh errors 'fatal: protocol error: bad line length character'
+ - Automatically setup GitLab CI project for forks if origin project has GitLab CI enabled
+ - Bust group page project list cache when namespace name or path changes.
v 7.9.3
- Contains no changes
diff --git a/app/views/shared/_project.html.haml b/app/views/shared/_project.html.haml
index 8746970c239..722a7f7ce0f 100644
--- a/app/views/shared/_project.html.haml
+++ b/app/views/shared/_project.html.haml
@@ -1,4 +1,4 @@
-= cache [project, controller.controller_name, controller.action_name] do
+= cache [project.namespace, project, controller.controller_name, controller.action_name] do
= link_to project_path(project), class: dom_class(project) do
- if avatar
.dash-project-avatar