diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-10 13:59:46 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-10 13:59:46 +0000 |
| commit | 2a829885e2e7aecfdd2ac55fff5d1ff08a25ef0f (patch) | |
| tree | bdd8b693626dbcc2b951f4cc687df2d843b9b0f8 | |
| parent | 5b695dbbda58323d3ea751bf4194f80e686ad067 (diff) | |
| parent | e39d21aeb1b0986de4fae2df1650bcde9011dce1 (diff) | |
| download | gitlab-ce-2a829885e2e7aecfdd2ac55fff5d1ff08a25ef0f.tar.gz | |
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
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-cache-for-commit-status.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 9f80a974d64..34855c54176 100644 --- 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}" } diff --git a/changelogs/unreleased/fix-cache-for-commit-status.yml b/changelogs/unreleased/fix-cache-for-commit-status.yml new file mode 100644 index 00000000000..eb4e96e75ae --- /dev/null +++ b/changelogs/unreleased/fix-cache-for-commit-status.yml @@ -0,0 +1,4 @@ +--- +title: Fix cache for commit status in commits list to respect branches +merge_request: 7372 +author: |