diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-07-20 14:32:01 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-07-20 14:32:01 +0000 |
| commit | a337ae07421c863fbc76a60063fceee6d53652f8 (patch) | |
| tree | 65795ec33d47635f944d0f1002c584a56a8e9525 | |
| parent | 6623d36b65a87f8db9d35a83f832ee2e0564f8b1 (diff) | |
| parent | a9d5b07769b56286903534cde0fcf8e6063c8eb0 (diff) | |
| download | gitlab-ce-a337ae07421c863fbc76a60063fceee6d53652f8.tar.gz | |
Merge branch 'compare-code-view' into 'master'
Apply diff view cookie on compare
## What does this MR do?
Correctly respects the code view changing when comparing 2 refs.
## What are the relevant issue numbers?
Closes #19573
## Screenshots (if relevant)
See merge request !5135
| -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 e7526d8ef28..8f20d7cb21d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -56,6 +56,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 |