diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-27 16:12:58 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-27 16:12:58 +0000 |
| commit | 92f87f6d8bdd4424334131132394df343c006a63 (patch) | |
| tree | dd04e06a6089b86db9784f4878c4e5fbff79c458 | |
| parent | 762a1d60db0deca6d371fa66521b5494d74e42a7 (diff) | |
| parent | 58454d9b4222f0be5211e6672f656f5c4883b547 (diff) | |
| download | gitlab-ce-92f87f6d8bdd4424334131132394df343c006a63.tar.gz | |
Merge branch 'dm-commit-row-browse-button' into 'master'
Adjust commit partial cache key to fix browse buttons
Closes #26899
See merge request !12393
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/dm-commit-row-browse-button.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 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..4240a7de5de --- /dev/null +++ b/changelogs/unreleased/dm-commit-row-browse-button.yml @@ -0,0 +1,4 @@ +--- +title: Fix inconsistent display of the "Browse files" button in the commit list +merge_request: +author: |