Clicking on side-by-side in MR switches back to inline in master
Using master (c465af09), when I click on the side-by-side diff button in a merge request, the screen flashes from side-by-side back to inline. For example, on a local server, using this URL:
http://localhost:3000/gitlab-org/gitlab-test/merge_requests/1/diffs?view=parallel
I ran this in the debugger. It looks like in the first call, everything is fine. Then another request gets called with params
:
"{"action"=>"diffs", "controller"=>"projects/merge_requests", "namespace_id"=>"gitlab-org", "project_id"=>"gitlab-test", "id"=>"1", "format"=>"json"}"
Notice that params[:view]
is no longer parallel
, and so the inline button is activated.