kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'dm-commit-cache-i18n' into 'master'

Browse source 
Add current locale to commit partial cache key

Closes #36591

See merge request !13669
This commit is contained in:
Robert Speicher 2017-08-18 19:56:16 +00:00
commit 8936a92e81
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/commits/_commit.html.haml
View file

@ -5,7 +5,7 @@
- notes = commit.notes
- note_count = notes.user.count
- cache_key = [project.full_path, commit.id, current_application_settings, note_count, @path.presence, current_controller?(:commits)]
- cache_key = [project.full_path, commit.id, current_application_settings, note_count, @path.presence, current_controller?(:commits), I18n.locale]
- cache_key.push(commit.status(ref)) if commit.status(ref)
= cache(cache_key, expires_in: 1.day) do

5
changelogs/unreleased/dm-commit-cache-i18n.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Commit rows would occasionally render with the wrong language
merge_request:
author:
type: fixed