diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-11 12:10:33 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-11 12:10:33 +0000 |
| commit | f41b535ced0cdddb67661bdb0a6216216dc6b89c (patch) | |
| tree | d9656ae0dfb354d1a41b16edb818075fffc08624 | |
| parent | 57a4319d4277b2d7897afd91936694308e8016bf (diff) | |
| parent | d5c8f1fdde7dd9c0467f7743694ffdecd15fdf94 (diff) | |
| download | gitlab-ce-f41b535ced0cdddb67661bdb0a6216216dc6b89c.tar.gz | |
Merge branch 'fix-build-status-caching' into 'master'
Fix caching issue where build status was not updating in project dashboard
The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable.
Closes #3268
See merge request !2353
| -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 efb261f6573..9ff4820c12c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.4.0 (unreleased) - Add housekeeping function to project settings page - 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 |