Merge branch 'fix-cache-for-commit-status' into 'master'

Fix cache for commit status in commits list to respect branches Fix cache for commit status in commits list to respect branches Closes #24324 See merge request !7372

Merge branch 'fix-cache-for-commit-status' into 'master'
2a829885 · Rémy Coutable · 5b695dbb · e39d21ae · 2a829885 · 2a829885
Commit 2a829885 authored Nov 10, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

_commit.html.haml app/views/projects/commits/_commit.html.haml +1 -1

fix-cache-for-commit-status.yml changelogs/unreleased/fix-cache-for-commit-status.yml +4 -0

No files found.
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -6,7 +6,7 @@
  - note_count = notes.user.count

 - cache_key = [project.path_with_namespace, commit.id, current_application_settings, note_count]
- cache_key.push(commit.status) if commit.status
+- cache_key.push(commit.status(ref)) if commit.status(ref)

 = cache(cache_key, expires_in: 1.day) do
  %li.commit.js-toggle-container{ id: "commit-#{commit.short_id}" }

--- a/changelogs/unreleased/fix-cache-for-commit-status.yml
+++ b/changelogs/unreleased/fix-cache-for-commit-status.yml
+---
+title: Fix cache for commit status in commits list to respect branches
+merge_request: 7372
+author: