diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-28 18:38:49 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-28 18:38:49 +0300 |
| commit | 699a30f06b98445ca630db84cfafba5e0cd320b2 (patch) | |
| tree | 2e45062245434d6796f64bed8d6bbf8ade129316 /app | |
| parent | 6e3eec16c7dbe56ce27fa2283941a5f31ba3c16f (diff) | |
| parent | fdfb4bbe5c659e02734258615b57b5f012afb2b4 (diff) | |
Merge branch '35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inline' into 'master'
Resolve "Comment appears in a wrong place after changing diff view to inline"
Closes #35695
See merge request !13156
Diffstat (limited to 'app')
| -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 |