summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-06-22 13:42:34 -0500
committerDouwe Maan <douwe@selenight.nl>2017-06-22 13:42:56 -0500
commit12e939672cf5a64cb5d7185775cec7de65236ab2 (patch)
treec1b877432c6adda1271fbc952a9bd3e5523eb8e4
parent5cd1a48d5e1b020770cb105eb946ff2936e2136a (diff)
downloadgitlab-ce-12e939672cf5a64cb5d7185775cec7de65236ab2.tar.gz
Adjust commit partial cache key to fix browse buttons
-rw-r--r--app/views/projects/commits/_commit.html.haml2
-rw-r--r--changelogs/unreleased/dm-commit-row-browse-button.yml4
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 11de6915961..8a4ef5a45b3 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -5,7 +5,7 @@
- notes = commit.notes
- note_count = notes.user.count
-- cache_key = [project.path_with_namespace, commit.id, current_application_settings, note_count]
+- cache_key = [project.path_with_namespace, commit.id, current_application_settings, note_count, @path.presence, current_controller?(:commits)]
- cache_key.push(commit.status(ref)) if commit.status(ref)
= cache(cache_key, expires_in: 1.day) do
diff --git a/changelogs/unreleased/dm-commit-row-browse-button.yml b/changelogs/unreleased/dm-commit-row-browse-button.yml
new file mode 100644
index 00000000000..4689dc3b0e2
--- /dev/null
+++ b/changelogs/unreleased/dm-commit-row-browse-button.yml
@@ -0,0 +1,4 @@
+---
+title: Adjust commit partial cache key to fix browse buttons
+merge_request:
+author: