diff options
author | Stan Hu <stanhu@gmail.com> | 2016-01-08 15:47:25 -0800 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-01-08 16:08:10 -0800 |
commit | d5c8f1fdde7dd9c0467f7743694ffdecd15fdf94 (patch) | |
tree | 7dc871d50154b9be13acd980d8ccf7f69b1eb4fa | |
parent | 6d9544410830166521c576eefc4e65a2c7b395d8 (diff) | |
download | gitlab-ce-d5c8f1fdde7dd9c0467f7743694ffdecd15fdf94.tar.gz |
Fix caching issue where build status was not updating in project dashboard
Closes #3268
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/views/shared/projects/_project.html.haml | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 921dac01264..f87b1cc8016 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.4.0 (unreleased) - The default GitLab logo now acts as a loading indicator + - Fix caching issue where build status was not updating in project dashboard (Stan Hu) - Accept 2xx status codes for successful Web hook triggers (Stan Hu) - Fix missing date of month in network graph when commits span a month (Stan Hu) - Expire view caches when application settings change (e.g. Gravatar disabled) (Stan Hu) diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 86249851a82..5db8056b77c 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -4,8 +4,12 @@ - skip_namespace = false unless local_assigns[:skip_namespace] == true - css_class = '' unless local_assigns[:css_class] - css_class += " no-description" unless project.description.present? +- ci_commit = project.ci_commit(project.commit.sha) if ci && !project.empty_repo? && project.commit +- cache_key = [project.namespace, project, controller.controller_name, controller.action_name, current_application_settings, 'v2.2'] +- cache_key.push(ci_commit.status) if ci_commit + %li.project-row{ class: css_class } - = cache [project.namespace, project, controller.controller_name, controller.action_name, current_application_settings, 'v2.2'] do + = cache(cache_key) do = link_to project_path(project), class: dom_class(project) do - if avatar .dash-project-avatar @@ -19,10 +23,9 @@ = project.name .project-controls - - if ci && !project.empty_repo? && project.commit - - if ci_commit = project.ci_commit(project.commit.sha) - = render_ci_status(ci_commit) - + - if ci_commit + = render_ci_status(ci_commit) + - if stars %span %i.fa.fa-star |