summaryrefslogtreecommitdiff
path: root/app/helpers/diff_helper.rb
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-01-14 16:38:37 -0500
committerRubén Dávila <rdavila84@gmail.com>2016-01-14 16:47:55 -0500
commit6b9c730e91962a6d6343bcb7fc4dc75c99b41bde (patch)
treeb9f7cafa96b131b6039e858e2c2503011551cfd6 /app/helpers/diff_helper.rb
parent70bc322415b33a4789067b81387d30f1411c9091 (diff)
downloadgitlab-ce-6b9c730e91962a6d6343bcb7fc4dc75c99b41bde.tar.gz
More refactoring from last code review. #3945
* Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
Diffstat (limited to 'app/helpers/diff_helper.rb')
-rw-r--r--app/helpers/diff_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index 1596f9e7d19..425a8ced549 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -19,13 +19,13 @@ module DiffHelper
end
end
- def safe_diff_files(diffs, diff_refs, repository)
+ def safe_diff_files(diffs, diff_refs)
lines = 0
safe_files = []
diffs.first(allowed_diff_size).each do |diff|
lines += diff.diff.lines.count
break if lines > allowed_diff_lines
- safe_files << Gitlab::Diff::File.new(diff, diff_refs, repository)
+ safe_files << Gitlab::Diff::File.new(diff, diff_refs)
end
safe_files
end