diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-07-28 13:59:57 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-07-28 13:59:57 +0100 |
| commit | fdfb4bbe5c659e02734258615b57b5f012afb2b4 (patch) | |
| tree | fc21d52ad74c37bf59608e2271b398ef17d2cf8e /app/helpers/diff_helper.rb | |
| parent | 4ccecb7db4879b0eae8211578b533911ee8920df (diff) | |
| download | gitlab-ce-fdfb4bbe5c659e02734258615b57b5f012afb2b4.tar.gz | |
Fix diff commenting results just after changing view35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inline
When you change the diff view (inline / side-by-side), we set a cookie based on
that new view. When you add a comment, we choose the style to use in the
response based on that cookie.
However, when you have just changed diff style, the request cookie will contain
the old value, so we should use the view param instead.
Diffstat (limited to 'app/helpers/diff_helper.rb')
| -rw-r--r-- | app/helpers/diff_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 926502bf239..91ddd73fac1 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -15,7 +15,7 @@ module DiffHelper def diff_view @diff_view ||= begin diff_views = %w(inline parallel) - diff_view = cookies[:diff_view] + diff_view = params[:view] || cookies[:diff_view] diff_view = diff_views.first unless diff_views.include?(diff_view) diff_view.to_sym end |