diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-07 12:36:33 +0100 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-07-15 13:42:18 -0500 |
| commit | a9d5b07769b56286903534cde0fcf8e6063c8eb0 (patch) | |
| tree | 7ac06528ff00f6601138989b9072d5eab7ff27d3 | |
| parent | d4677353b84681bd73f321a0b04bb7eba32dbc9c (diff) | |
| download | gitlab-ce-compare-code-view.tar.gz | |
Apply diff view cookie on comparecompare-code-view
Closes #19573
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/projects/compare_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5ab16db31ce..4beed8a8a17 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 5f3ee71444d..10749d0fef8 100644 --- a/app/controllers/projects/compare_controller.rb +++ b/app/controllers/projects/compare_controller.rb @@ -15,6 +15,7 @@ class Projects::CompareController < Projects::ApplicationController end def show + apply_diff_view_cookie! end def diff_for_path |