Merge branch 'ph/fixDiffExpandingNotWorkingWithParallelDiffs' into 'master'

Fixes diff expanding not working in parallel mode

See merge request gitlab-org/gitlab!41971

app/controllers/projects/merge_requests/diffs_controller.rb

@@ -64,7 +64,7 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
       render: ->(partial, locals) { view_to_html_string(partial, locals) }
     }
 
-    options = additional_attributes.merge(diff_view: diff_view)
+    options = additional_attributes.merge(diff_view: Feature.enabled?(:unified_diff_lines, @merge_request.project) ? "inline" : diff_view)
 
     if @merge_request.project.context_commits_enabled?
       options[:context_commits] = @merge_request.recent_context_commits