diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-12 18:24:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-12 18:24:40 +0000 |
| commit | 2d83e4c5d15cdfd8da71be6ee0d5746b8ec9ef99 (patch) | |
| tree | 3c17731b38ef42902cbe347254e9d8c4c5434cd6 /app/helpers | |
| parent | ec1a3c093f7a8d2fe29e46ec06e6b35e3f1d97ff (diff) | |
| parent | bbd1be002b15ad50b559c217c4e2f9d50a79ef20 (diff) | |
| download | gitlab-ce-2d83e4c5d15cdfd8da71be6ee0d5746b8ec9ef99.tar.gz | |
Merge branch 'dz-project-list-cache-key' into 'master'
Improve project list cache key
Closes #31863
See merge request !11325
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/projects_helper.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 78b54dc20e5..98bbcfaaba5 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -157,7 +157,15 @@ module ProjectsHelper end def project_list_cache_key(project) - key = [project.namespace.cache_key, project.cache_key, controller.controller_name, controller.action_name, current_application_settings.cache_key, 'v2.4'] + key = [ + project.route.cache_key, + project.cache_key, + controller.controller_name, + controller.action_name, + current_application_settings.cache_key, + 'v2.4' + ] + key << pipeline_status_cache_key(project.pipeline_status) if project.pipeline_status.has_status? key |