Fix specs

app/controllers/projects/compare_controller.rb

@@ -61,7 +61,6 @@ class Projects::CompareController < Projects::ApplicationController
       @environment = EnvironmentsFinder.new(@project, current_user, environment_params).execute.last
       @diff_notes_disabled = true
-      @grouped_diff_discussions = {}
     end
   end

app/controllers/projects/merge_requests_controller.rb

@@ -122,7 +122,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       build_merge_request
       @diffs = @merge_request.diffs(diff_options)
       @diff_notes_disabled = true
-      @grouped_diff_discussions = {}
     end
     define_commit_vars
@@ -576,10 +575,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id }
     if params[:start_sha].present?
-      start_sha = params[:start_sha]
-      @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == start_sha }
-      @start_sha = start_sha if @start_version
+      @start_sha = params[:start_sha]
+      @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha }
+      unless @start_version
+        @start_sha = @merge_request_diff.head_commit_sha
+        @start_version = @merge_request_diff
+      end
     end
     @diffs =

app/helpers/diff_helper.rb

@@ -62,6 +62,8 @@ module DiffHelper
   end
   def parallel_diff_discussions(left, right, diff_file)
+    return unless @grouped_diff_discussions
+    
     discussions_left = discussions_right = nil
     if left && (left.unchanged? || left.removed?)