diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-31 17:24:13 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-31 17:24:13 +0100 |
| commit | 0ac012f0ad14e8a77eedb026a2de12bf59fa5881 (patch) | |
| tree | ac4693a27c1ad2c5d37b5884f4ac316f4d56b0f7 /app/helpers/diff_helper.rb | |
| parent | 933cfe1e0c493964052b664c2426a90f845f0042 (diff) | |
| parent | 2519027442a5645cc9467e842172143e3f56c7c3 (diff) | |
| download | gitlab-ce-0ac012f0ad14e8a77eedb026a2de12bf59fa5881.tar.gz | |
Merge remote-tracking branch 'origin/master' into ide
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 ed4704aa838..51ab2867e47 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 |