From a9d5b07769b56286903534cde0fcf8e6063c8eb0 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 7 Jul 2016 12:36:33 +0100
Subject: [PATCH] Apply diff view cookie on compare

Closes #19573
---
 CHANGELOG                                      | 1 +
 app/controllers/projects/compare_controller.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 5ab16db31cee9..4beed8a8a17da 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@ v 8.10.0 (unreleased)
   - The Markdown reference parsers now re-use query results to prevent running the same queries multiple times !5020
   - Updated project header design
   - Issuable collapsed assignee tooltip is now the users name
+  - Fix compare view not changing code view rendering style
   - Exclude email check from the standard health check
   - Updated layout for Projects, Groups, Users on Admin area !4424
   - Fix changing issue state columns in milestone view
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 5f3ee71444dd8..10749d0fef8cc 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -15,6 +15,7 @@ def index
   end
 
   def show
+    apply_diff_view_cookie!
   end
 
   def diff_for_path
-- 
GitLab