DRY up diff_for_path actions

1. Move render method to a concern, not a helper.
2. Let DiffHelper#diff_options automatically add the path option.
3. Move more instance var definitions to before filters.

1 files changed, 3 insertions, 21 deletions

diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index fd7b71407f3..ebfe4e27b78 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -12,26 +12,6 @@ module DiffHelper
     @expand_all || params[:expand].present?
   end
 
-  def render_diff_for_path(diffs, diff_refs, project)
-    diff_file = safe_diff_files(diffs, diff_refs).first
-
-    return render_404 unless diff_file
-
-    diff_commit = commit_for_diff(diff_file)
-    blob = project.repository.blob_for_diff(diff_commit, diff_file)
-    @expand_all = true
-
-    locals = {
-      diff_file: diff_file,
-      diff_commit: diff_commit,
-      diff_refs: diff_refs,
-      blob: blob,
-      project: project
-    }
-
-    render json: { html: view_to_html_string('projects/diffs/_content', locals) }
-  end
-
   def diff_view
     diff_views = %w(inline parallel)
 
@@ -43,7 +23,9 @@ module DiffHelper
   end
 
   def diff_options
-    Commit.max_diff_options.merge(ignore_whitespace_change: hide_whitespace?)
+    default_options = Commit.max_diff_options
+    default_options[:paths] = [params[:path]] if params[:path]
+    default_options.merge(ignore_whitespace_change: hide_whitespace?)
   end
 
   def safe_diff_files(diffs, diff_refs: nil, repository: nil)