summaryrefslogtreecommitdiff
path: root/app/models/merge_request_diff.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-08-15 17:57:19 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-08-15 17:57:19 +0300
commit643a368fa437725cbfffcfdc251055c4d125438c (patch)
treefec1a88b4e81dbe2da97fa86901332668e43bd5a /app/models/merge_request_diff.rb
parent5e95c0b8d201a6bfdd020aa29a5a6e14c7085e3f (diff)
downloadgitlab-ce-643a368fa437725cbfffcfdc251055c4d125438c.tar.gz
Make merge request diff works with new FileCollection logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/merge_request_diff.rb')
-rw-r--r--app/models/merge_request_diff.rb14
1 files changed, 9 insertions, 5 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 8920641cfec..9a34d099acd 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -141,7 +141,13 @@ class MergeRequestDiff < ActiveRecord::Base
base_commit_sha? && head_commit_sha? && start_commit_sha?
end
- private
+ def diffs(diff_options = nil)
+ Gitlab::Diff::FileCollection::MergeRequestDiff.new(self, diff_options: diff_options)
+ end
+
+ def project
+ merge_request.target_project
+ end
def compare
@compare ||=
@@ -157,6 +163,8 @@ class MergeRequestDiff < ActiveRecord::Base
end
end
+ private
+
def dump_commits(commits)
commits.map(&:to_hash)
end
@@ -229,10 +237,6 @@ class MergeRequestDiff < ActiveRecord::Base
update_columns_serialized(new_attributes)
end
- def project
- merge_request.target_project
- end
-
def repository
project.repository
end