Commit f41b535c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

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
parents 57a4319d d5c8f1fd
......@@ -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)
......@@ -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
......@@ -19,10 +23,9 @@
- 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment