diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-11-09 21:16:42 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-11-09 21:20:17 +0800 |
| commit | 6cb83dd6ede7242678dc14147fd1f349e5c8f280 (patch) | |
| tree | 36d76ace6e3341d32540a643652cc336262df831 | |
| parent | 940cb3db5b936aec90a08c94aa9952f9b52c1fd3 (diff) | |
| download | gitlab-ce-fix-cache-for-commit-status.tar.gz | |
Fix cache for commit status in commits list to respect branchesfix-cache-for-commit-status
| -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: |