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

Add current locale to commit partial cache key Closes #36591 See merge request !13669

Merge branch 'dm-commit-cache-i18n' into 'master'
767973b3 · Robert Speicher · Jarka Kadlecova · a43eb8dd · 767973b3 · 767973b3
Commit 767973b3 authored Aug 18, 2017 by Robert Speicher Committed by Jarka Kadlecova Aug 22, 2017
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

_commit.html.haml app/views/projects/commits/_commit.html.haml +1 -1

dm-commit-cache-i18n.yml changelogs/unreleased/dm-commit-cache-i18n.yml +5 -0

No files found.
--- 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.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

--- a/changelogs/unreleased/dm-commit-cache-i18n.yml
+++ b/changelogs/unreleased/dm-commit-cache-i18n.yml
+---
+title: Commit rows would occasionally render with the wrong language
+merge_request:
+author:
+type: fixed