diff options
| author | Paco Guzman <pacoguzmanp@gmail.com> | 2016-07-20 18:25:36 +0200 |
|---|---|---|
| committer | Paco Guzman <pacoguzmanp@gmail.com> | 2016-08-03 07:00:19 +0200 |
| commit | cd7c2cb6ddd4d9c9f9bdae00c887c0022c121c17 (patch) | |
| tree | fad9386721cc514f28a011ef734b8791fc1c13be /app/controllers/concerns | |
| parent | 195b20e1b9ff08437c5a436dc14f04e7f1bee807 (diff) | |
| download | gitlab-ce-cd7c2cb6ddd4d9c9f9bdae00c887c0022c121c17.tar.gz | |
Cache highlighted diff lines for merge requests
Introducing the concept of SafeDiffs which relates
diffs with UI highlighting.
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/diff_for_path.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/concerns/diff_for_path.rb b/app/controllers/concerns/diff_for_path.rb index 026d8b2e1e0..aeec3009f15 100644 --- a/app/controllers/concerns/diff_for_path.rb +++ b/app/controllers/concerns/diff_for_path.rb @@ -1,8 +1,8 @@ module DiffForPath extend ActiveSupport::Concern - def render_diff_for_path(diffs, diff_refs, project) - diff_file = safe_diff_files(diffs, diff_refs: diff_refs, repository: project.repository).find do |diff| + def render_diff_for_path(diffs) + diff_file = diffs.diff_files.find do |diff| diff.old_path == params[:old_path] && diff.new_path == params[:new_path] end @@ -14,7 +14,7 @@ module DiffForPath locals = { diff_file: diff_file, diff_commit: diff_commit, - diff_refs: diff_refs, + diff_refs: diffs.diff_refs, blob: blob, project: project } |